Import Strings from Riot

matrix-sdk-android/src/main/res/values-de/strings.xml

@@ -166,4 +166,14 @@
     <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: Importiere Benutzerkonto…</string>
+    <string name="initial_sync_start_importing_account_crypto">Erste Synchronisation: Importiere Cryptoschlüssel</string>
+    <string name="initial_sync_start_importing_account_rooms">Erste Synchronisation: Importiere Räume</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Erste Synchronisation: Importiere betretene Räume</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Erste Synchronisation: Importiere eingeladene Räume</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Erste Synchronisation: Importiere verlassene Räume</string>
+    <string name="initial_sync_start_importing_account_groups">Erste Synchronisation: Importiere Gemeinschaften</string>
+    <string name="initial_sync_start_importing_account_data">Erste Synchronisation: Importiere 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>
 </resources>

matrix-sdk-android/src/main/res/values-eu/strings.xml

@@ -172,4 +172,5 @@
     <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>
 </resources>

matrix-sdk-android/src/main/res/values-fi/strings.xml

@@ -22,7 +22,7 @@
     <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 käyttäjälle %2$s</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>
@@ -34,7 +34,7 @@
     <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 profiilikuva vaihdettiin)</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>
@@ -173,4 +173,5 @@
     <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>
 </resources>

matrix-sdk-android/src/main/res/values-fr/strings.xml

@@ -172,4 +172,5 @@
     <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>
 </resources>

matrix-sdk-android/src/main/res/values-hu/strings.xml

@@ -171,4 +171,5 @@
     <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 a meghívót a belépéshez ebbe a szobába: %2$s</string>
 </resources>

matrix-sdk-android/src/main/res/values-it/strings.xml

@@ -172,4 +172,5 @@
     <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>
 </resources>

matrix-sdk-android/src/main/res/values-ko/strings.xml

@@ -26,12 +26,12 @@
     <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_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">%1$s님이 종단간 암호화를 켰습니다 (%2$s)</string>
     <string name="notice_room_update">%s님이 방을 업그레이드했습니다.</string>
 
     <string name="notice_requested_voip_conference">%1$s님이 VoIP 회의를 요청했습니다</string>
@@ -52,7 +52,7 @@
     <string name="notice_crypto_unable_to_decrypt">** 암호를 해독할 수 없음: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">발신인의 기기에서 이 메시지의 키를 보내지 않았습니다.</string>
 
-    <string name="message_reply_to_prefix">이 답장의 질문</string>
+    <string name="message_reply_to_prefix">관련 대화</string>
 
     <string name="could_not_redact">검열할 수 없습니다</string>
     <string name="unable_to_send_message">메시지를 보낼 수 없습니다</string>
@@ -170,4 +170,5 @@
     <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>

matrix-sdk-android/src/main/res/values-nl/strings.xml

@@ -181,4 +181,5 @@
     <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>
 </resources>

matrix-sdk-android/src/main/res/values-ru/strings.xml

@@ -185,4 +185,5 @@
     <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>

matrix-sdk-android/src/main/res/values-sq/strings.xml

@@ -168,4 +168,5 @@
     <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>
 </resources>

matrix-sdk-android/src/main/res/values-vls/strings.xml

@@ -44,7 +44,7 @@
     <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 treden</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>
@@ -172,4 +172,5 @@
     <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>

matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml

@@ -170,4 +170,5 @@
     <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>

matrix-sdk-android/src/main/res/values/strings.xml

@@ -46,6 +46,7 @@
     <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_room_third_party_invite">%1$s sent an invitation to %2$s to join the room</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_registered_invite">%1$s accepted the invitation for %2$s</string>
 
     <string name="notice_crypto_unable_to_decrypt">** Unable to decrypt: %s **</string>

tools/import_from_riot.sh

@@ -65,50 +65,51 @@ cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-zh-rTW/strings.xml ./mat
 echo
 echo "Copy strings to RiotX"
 
-cp ../riot-android/vector/src/main/res/values/strings.xml        ./vector/src/main/res/values/strings.xml
-cp ../riot-android/vector/src/main/res/values-ar/strings.xml     ./vector/src/main/res/values-ar/strings.xml
-cp ../riot-android/vector/src/main/res/values-bg/strings.xml     ./vector/src/main/res/values-bg/strings.xml
-cp ../riot-android/vector/src/main/res/values-bn-rIN/strings.xml ./vector/src/main/res/values-bn-rIN/strings.xml
-cp ../riot-android/vector/src/main/res/values-bs/strings.xml     ./vector/src/main/res/values-bs/strings.xml
-cp ../riot-android/vector/src/main/res/values-ca/strings.xml     ./vector/src/main/res/values-ca/strings.xml
-cp ../riot-android/vector/src/main/res/values-cs/strings.xml     ./vector/src/main/res/values-cs/strings.xml
-cp ../riot-android/vector/src/main/res/values-da/strings.xml     ./vector/src/main/res/values-da/strings.xml
-cp ../riot-android/vector/src/main/res/values-de/strings.xml     ./vector/src/main/res/values-de/strings.xml
-cp ../riot-android/vector/src/main/res/values-el/strings.xml     ./vector/src/main/res/values-el/strings.xml
-cp ../riot-android/vector/src/main/res/values-eo/strings.xml     ./vector/src/main/res/values-eo/strings.xml
-cp ../riot-android/vector/src/main/res/values-es/strings.xml     ./vector/src/main/res/values-es/strings.xml
-cp ../riot-android/vector/src/main/res/values-es-rMX/strings.xml ./vector/src/main/res/values-es-rMX/strings.xml
-cp ../riot-android/vector/src/main/res/values-eu/strings.xml     ./vector/src/main/res/values-eu/strings.xml
-cp ../riot-android/vector/src/main/res/values-fa/strings.xml     ./vector/src/main/res/values-fa/strings.xml
-cp ../riot-android/vector/src/main/res/values-fi/strings.xml     ./vector/src/main/res/values-fi/strings.xml
-cp ../riot-android/vector/src/main/res/values-fr/strings.xml     ./vector/src/main/res/values-fr/strings.xml
-cp ../riot-android/vector/src/main/res/values-fr-rCA/strings.xml ./vector/src/main/res/values-fr-rCA/strings.xml
-cp ../riot-android/vector/src/main/res/values-gl/strings.xml     ./vector/src/main/res/values-gl/strings.xml
-cp ../riot-android/vector/src/main/res/values-hu/strings.xml     ./vector/src/main/res/values-hu/strings.xml
-cp ../riot-android/vector/src/main/res/values-id/strings.xml     ./vector/src/main/res/values-id/strings.xml
-cp ../riot-android/vector/src/main/res/values-in/strings.xml     ./vector/src/main/res/values-in/strings.xml
-cp ../riot-android/vector/src/main/res/values-is/strings.xml     ./vector/src/main/res/values-is/strings.xml
-cp ../riot-android/vector/src/main/res/values-it/strings.xml     ./vector/src/main/res/values-it/strings.xml
-cp ../riot-android/vector/src/main/res/values-ja/strings.xml     ./vector/src/main/res/values-ja/strings.xml
-cp ../riot-android/vector/src/main/res/values-ko/strings.xml     ./vector/src/main/res/values-ko/strings.xml
-cp ../riot-android/vector/src/main/res/values-lv/strings.xml     ./vector/src/main/res/values-lv/strings.xml
-cp ../riot-android/vector/src/main/res/values-nl/strings.xml     ./vector/src/main/res/values-nl/strings.xml
-cp ../riot-android/vector/src/main/res/values-nn/strings.xml     ./vector/src/main/res/values-nn/strings.xml
-cp ../riot-android/vector/src/main/res/values-pl/strings.xml     ./vector/src/main/res/values-pl/strings.xml
-cp ../riot-android/vector/src/main/res/values-pt/strings.xml     ./vector/src/main/res/values-pt/strings.xml
-cp ../riot-android/vector/src/main/res/values-pt-rBR/strings.xml ./vector/src/main/res/values-pt-rBR/strings.xml
-cp ../riot-android/vector/src/main/res/values-ro/strings.xml     ./vector/src/main/res/values-ro/strings.xml
-cp ../riot-android/vector/src/main/res/values-ru/strings.xml     ./vector/src/main/res/values-ru/strings.xml
-cp ../riot-android/vector/src/main/res/values-sk/strings.xml     ./vector/src/main/res/values-sk/strings.xml
-cp ../riot-android/vector/src/main/res/values-sq/strings.xml     ./vector/src/main/res/values-sq/strings.xml
-cp ../riot-android/vector/src/main/res/values-te/strings.xml     ./vector/src/main/res/values-te/strings.xml
-cp ../riot-android/vector/src/main/res/values-th/strings.xml     ./vector/src/main/res/values-th/strings.xml
-cp ../riot-android/vector/src/main/res/values-tlh/strings.xml    ./vector/src/main/res/values-tlh/strings.xml
-cp ../riot-android/vector/src/main/res/values-tr/strings.xml     ./vector/src/main/res/values-tr/strings.xml
-cp ../riot-android/vector/src/main/res/values-uk/strings.xml     ./vector/src/main/res/values-uk/strings.xml
-cp ../riot-android/vector/src/main/res/values-vls/strings.xml    ./vector/src/main/res/values-vls/strings.xml
-cp ../riot-android/vector/src/main/res/values-zh-rCN/strings.xml ./vector/src/main/res/values-zh-rCN/strings.xml
-cp ../riot-android/vector/src/main/res/values-zh-rTW/strings.xml ./vector/src/main/res/values-zh-rTW/strings.xml
+cp ../riot-android/vector/src/main/res/values/strings.xml           ./vector/src/main/res/values/strings.xml
+cp ../riot-android/vector/src/main/res/values-ar/strings.xml        ./vector/src/main/res/values-ar/strings.xml
+cp ../riot-android/vector/src/main/res/values-b+sr+Latn/strings.xml ./vector/src/main/res/values-b+sr+Latn/strings.xml
+cp ../riot-android/vector/src/main/res/values-bg/strings.xml        ./vector/src/main/res/values-bg/strings.xml
+cp ../riot-android/vector/src/main/res/values-bn-rIN/strings.xml    ./vector/src/main/res/values-bn-rIN/strings.xml
+cp ../riot-android/vector/src/main/res/values-bs/strings.xml        ./vector/src/main/res/values-bs/strings.xml
+cp ../riot-android/vector/src/main/res/values-ca/strings.xml        ./vector/src/main/res/values-ca/strings.xml
+cp ../riot-android/vector/src/main/res/values-cs/strings.xml        ./vector/src/main/res/values-cs/strings.xml
+cp ../riot-android/vector/src/main/res/values-da/strings.xml        ./vector/src/main/res/values-da/strings.xml
+cp ../riot-android/vector/src/main/res/values-de/strings.xml        ./vector/src/main/res/values-de/strings.xml
+cp ../riot-android/vector/src/main/res/values-el/strings.xml        ./vector/src/main/res/values-el/strings.xml
+cp ../riot-android/vector/src/main/res/values-eo/strings.xml        ./vector/src/main/res/values-eo/strings.xml
+cp ../riot-android/vector/src/main/res/values-es/strings.xml        ./vector/src/main/res/values-es/strings.xml
+cp ../riot-android/vector/src/main/res/values-es-rMX/strings.xml    ./vector/src/main/res/values-es-rMX/strings.xml
+cp ../riot-android/vector/src/main/res/values-eu/strings.xml        ./vector/src/main/res/values-eu/strings.xml
+cp ../riot-android/vector/src/main/res/values-fa/strings.xml        ./vector/src/main/res/values-fa/strings.xml
+cp ../riot-android/vector/src/main/res/values-fi/strings.xml        ./vector/src/main/res/values-fi/strings.xml
+cp ../riot-android/vector/src/main/res/values-fr/strings.xml        ./vector/src/main/res/values-fr/strings.xml
+cp ../riot-android/vector/src/main/res/values-fr-rCA/strings.xml    ./vector/src/main/res/values-fr-rCA/strings.xml
+cp ../riot-android/vector/src/main/res/values-gl/strings.xml        ./vector/src/main/res/values-gl/strings.xml
+cp ../riot-android/vector/src/main/res/values-hu/strings.xml        ./vector/src/main/res/values-hu/strings.xml
+cp ../riot-android/vector/src/main/res/values-id/strings.xml        ./vector/src/main/res/values-id/strings.xml
+cp ../riot-android/vector/src/main/res/values-in/strings.xml        ./vector/src/main/res/values-in/strings.xml
+cp ../riot-android/vector/src/main/res/values-is/strings.xml        ./vector/src/main/res/values-is/strings.xml
+cp ../riot-android/vector/src/main/res/values-it/strings.xml        ./vector/src/main/res/values-it/strings.xml
+cp ../riot-android/vector/src/main/res/values-ja/strings.xml        ./vector/src/main/res/values-ja/strings.xml
+cp ../riot-android/vector/src/main/res/values-ko/strings.xml        ./vector/src/main/res/values-ko/strings.xml
+cp ../riot-android/vector/src/main/res/values-lv/strings.xml        ./vector/src/main/res/values-lv/strings.xml
+cp ../riot-android/vector/src/main/res/values-nl/strings.xml        ./vector/src/main/res/values-nl/strings.xml
+cp ../riot-android/vector/src/main/res/values-nn/strings.xml        ./vector/src/main/res/values-nn/strings.xml
+cp ../riot-android/vector/src/main/res/values-pl/strings.xml        ./vector/src/main/res/values-pl/strings.xml
+cp ../riot-android/vector/src/main/res/values-pt/strings.xml        ./vector/src/main/res/values-pt/strings.xml
+cp ../riot-android/vector/src/main/res/values-pt-rBR/strings.xml    ./vector/src/main/res/values-pt-rBR/strings.xml
+cp ../riot-android/vector/src/main/res/values-ro/strings.xml        ./vector/src/main/res/values-ro/strings.xml
+cp ../riot-android/vector/src/main/res/values-ru/strings.xml        ./vector/src/main/res/values-ru/strings.xml
+cp ../riot-android/vector/src/main/res/values-sk/strings.xml        ./vector/src/main/res/values-sk/strings.xml
+cp ../riot-android/vector/src/main/res/values-sq/strings.xml        ./vector/src/main/res/values-sq/strings.xml
+cp ../riot-android/vector/src/main/res/values-te/strings.xml        ./vector/src/main/res/values-te/strings.xml
+cp ../riot-android/vector/src/main/res/values-th/strings.xml        ./vector/src/main/res/values-th/strings.xml
+cp ../riot-android/vector/src/main/res/values-tlh/strings.xml       ./vector/src/main/res/values-tlh/strings.xml
+cp ../riot-android/vector/src/main/res/values-tr/strings.xml        ./vector/src/main/res/values-tr/strings.xml
+cp ../riot-android/vector/src/main/res/values-uk/strings.xml        ./vector/src/main/res/values-uk/strings.xml
+cp ../riot-android/vector/src/main/res/values-vls/strings.xml       ./vector/src/main/res/values-vls/strings.xml
+cp ../riot-android/vector/src/main/res/values-zh-rCN/strings.xml    ./vector/src/main/res/values-zh-rCN/strings.xml
+cp ../riot-android/vector/src/main/res/values-zh-rTW/strings.xml    ./vector/src/main/res/values-zh-rTW/strings.xml
 
 echo
 echo "Success!"

vector/src/main/res/values-ar/strings.xml

@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="resources_language">ar</string>
+    <string name="resources_country_code">""</string>
 
     <string name="light_theme">السمة الفاتحة</string>
     <string name="dark_theme">السمة الداكنة</string>
@@ -111,8 +112,6 @@
     <string name="auth_password_placeholder">كلمة السر</string>
     <string name="auth_new_password_placeholder">كلمة السر الجديدة</string>
     <string name="auth_user_name_placeholder">اسم المستخدم</string>
-    <string name="auth_add_email_message">أضِف عنوان بريد إلكتروني إلى حسابك ليستطيع الغير اكتشافك على الشبكة، وأيضا لإتاحة خاصية تصفير كلمة السر.</string>
-    <string name="auth_add_phone_message">أضِف رقم هاتف إلى حسابك ليستطيع الغير اكتشافك على الشبكة.</string>
     <string name="auth_email_placeholder">عنوان البريد الإلكتروني</string>
     <string name="auth_opt_email_placeholder">عنوان البريد الإلكتروني (اختياري)</string>
     <string name="auth_phone_number_placeholder">رقم الهاتف</string>
@@ -373,7 +372,6 @@
 
     <!-- share keys -->
     <string name="conference_call_warning_title">تحذير!</string>
-    <string name="resources_country_code">العربية</string>
 
     <string name="room_unknown_devices_messages_notification">لم تُرسل الرسائل بسبب وجود أجهزة مجهولة. ماذا أفعل؟ %1$s. ‏%2$s.</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">ليس ’⁨%s⁩‘ تنسيقا صالحا لاختصار</string>
@@ -533,12 +531,6 @@
     <string name="start_voice_call_prompt_msg">أمتأكد من بدء محادثة صوتية؟</string>
     <string name="start_video_call_prompt_msg">أمتأكد من بدء محادثة صورية؟</string>
 
-    <string name="auth_add_email_phone_message">أضِف عنوان بريد إلكتروني و/أو رقم هاتف لحسابك ليستطيع الناس اكتشافك.
-
-ستقدر أيضا على تصفير كلمة السر عبر البريد الإلكتروني.</string>
-    <string name="auth_add_email_and_phone_message">أضِف عنوان بريد إلكتروني ورقم هاتف لحسابك ليستطيع الناس اكتشافك.
-
-ستقدر أيضا على تصفير كلمة السر عبر البريد الإلكتروني.</string>
     <string name="auth_email_already_defined">عنوان البريد مُعرّف بالفعل.</string>
     <string name="auth_invalid_token">الأمارة غير صالحة</string>
     <string name="auth_threepid_warning_message">التسجيل عبر البريد ورقم الهاتف معا ليس مدعوما إلى حين توفر واجهة API لذلك. سيُستخدم رقم الهاتف فقط دون البريد.

vector/src/main/res/values-b+sr+Latn/strings.xml

@@ -0,0 +1,405 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="resources_language">sr</string>
+    <string name="resources_country_code">RS</string>
+    <string name="resources_script">Latn</string>
+
+    <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>
+    <string name="notification_noisy_notifications">Bučna obaveštenja</string>
+    <string name="notification_silent_notifications">Tiha obaveštenja</string>
+
+    <string name="title_activity_home">Poruke</string>
+    <string name="title_activity_room">Soba</string>
+    <string name="title_activity_settings">Podešavanja</string>
+    <string name="title_activity_member_details">Podaci o članu</string>
+    <string name="title_activity_historical">Istorijski</string>
+    <string name="title_activity_bug_report">Prijava bug-a</string>
+    <string name="title_activity_choose_sticker">Pošalji nalepnicu</string>
+    <string name="title_activity_keys_backup_setup">Rezervna kopija ključeva</string>
+    <string name="title_activity_keys_backup_restore">Koristi rezervnu kopiju ključeva</string>
+    <string name="title_activity_verify_device">Verifikuj uređaj</string>
+
+    <string name="keys_backup_is_not_finished_please_wait">Kreiranje rezervne kopije ključeva se nije završilo, molim sačekajte…</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Izgubićete vaše šifrovane poruke ukoliko se sada odjavite</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Kreiranje rezervne kopije ključeva je u toku. Ako se odjavite sada, izgubićete pristup vašim šifrovanim porukama.</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Sigurnosna kopija ključeva bi trebalo da bude aktivna na svim vašim uređajima kako bi izbegli gubitak pristupa vašim šifrovanim porukama.</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Ne želim moje šifrovane poruke</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Pravljenje rezervne kopije ključeva u toku…</string>
+    <string name="keys_backup_activate">Koristi rezervnu kopiju ključeva</string>
+    <string name="are_you_sure">Da li ste sigurni\?</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Izgubićete pristup vašim šifrovanim porukama ukoliko ne napravite rezervu kopiju ključeva pre nego što se odjavite.</string>
+
+    <string name="loading">Učitavanje…</string>
+
+    <string name="ok">U redu</string>
+    <string name="cancel">Otkaži</string>
+    <string name="save">Sačuvaj</string>
+    <string name="leave">Napusti</string>
+    <string name="stay">Ostani</string>
+    <string name="send">Pošalji</string>
+    <string name="copy">Kopiraj</string>
+    <string name="resend">Pošalji ponovo</string>
+    <string name="redact">Ukloni</string>
+    <string name="share">Podeli</string>
+    <string name="later">Kasnije</string>
+    <string name="forward">Prosledi</string>
+    <string name="delete">Obriši</string>
+    <string name="rename">Preimenuj</string>
+    <string name="ongoing_conference_call">Konferencijski poziv u toku.
+\nPriključi se kao %1$s ili %2$s</string>
+    <string name="ongoing_conference_call_voice">Glas</string>
+    <string name="ongoing_conference_call_video">Video</string>
+    <string name="cannot_start_call">Nemoguća uspostava poziva, molim probajte kasnije</string>
+    <string name="missing_permissions_warning">Neke opcije mogu nedostajati usled manjka dozvola…</string>
+    <string name="missing_permissions_error">Ova akcija nije moguća zbog nedosatka dozvola.</string>
+    <string name="missing_permissions_to_start_conf_call">Treba vam dozvola da pozovete kako bi započeli konferencijski poziv u ovoj sobi</string>
+    <string name="missing_permissions_title_to_start_conf_call">Nemoguća uspostava poziva</string>
+    <string name="device_information">Informacije o uređaju</string>
+    <string name="room_no_conference_call_in_encrypted_rooms">Konferencijski pozivi nisu podržani u šifrovanim sobama</string>
+    <string name="call_anyway">Ipak zovi</string>
+    <string name="send_anyway">Ipak pošalji</string>
+    <string name="or">ili</string>
+    <string name="invite">Pošalji pozivnicu</string>
+    <string name="accept">Prihvati</string>
+    <string name="skip">Preskoči</string>
+    <string name="done">Gotovo</string>
+    <string name="abort">Obustavi</string>
+    <string name="ignore">Ignoriši</string>
+    <string name="review">Pregledaj</string>
+    <string name="decline">Odbaci</string>
+
+    <string name="action_exit">Izađi</string>
+    <string name="actions">Akcije</string>
+    <string name="action_sign_out">Odjavi se</string>
+    <string name="action_sign_out_confirmation_simple">Da li ste sigurni da želite da se odjavite\?</string>
+    <string name="action_voice_call">Glasovni poziv</string>
+    <string name="action_video_call">Video poziv</string>
+    <string name="action_global_search">Globalna pretraga</string>
+    <string name="action_mark_all_as_read">Označi sve kao pročitano</string>
+    <string name="action_quick_reply">Brzi odgovor</string>
+    <string name="action_mark_room_read">Označi kao pročitano</string>
+    <string name="action_open">Otvori</string>
+    <string name="action_close">Zatvori</string>
+    <string name="disable">Onemogući</string>
+
+    <string name="dialog_title_confirmation">Potvrda</string>
+    <string name="dialog_title_warning">Upozorenje</string>
+    <string name="dialog_title_error">Greška</string>
+
+    <string name="bottom_action_people">Ljudi</string>
+    <string name="bottom_action_rooms">Sobe</string>
+    <string name="invitations_header">Pozivnice</string>
+    <string name="low_priority_header">Nizak prioritet</string>
+    <string name="local_address_book_header">Lokalni adresar</string>
+    <string name="user_directory_header">Lista korisnika</string>
+    <string name="matrix_only_filter">Samo Matrix kontakti</string>
+    <string name="rooms_header">Sobe</string>
+    <string name="rooms_directory_header">Lista soba</string>
+    <string name="no_room_placeholder">Nema soba</string>
+    <string name="no_public_room_placeholder">Nema javnih soba</string>
+    <string name="no_group_placeholder">Nema grupa</string>
+
+    <string name="send_bug_report_description_in_english">Ako je moguće, molim opišite na engleskom.</string>
+    <string name="send_bug_report_placeholder">Opišite vaš problem ovde</string>
+    <string name="username">Korisničko ime</string>
+    <string name="create_account">Napravi nalog</string>
+    <string name="login">Prijavi se</string>
+    <string name="logout">Odjavi se</string>
+    <string name="start_new_chat">Započni novo ćaskanje</string>
+    <string name="start_voice_call">Započni glasovni poziv</string>
+    <string name="start_video_call">Započni video poziv</string>
+
+    <string name="call_failed_dont_ask_again">Ne pitaj ponovo</string>
+
+    <string name="option_send_sticker">Pošalji nalepnicu</string>
+    <string name="option_take_photo_video">Napravi fotografiju ili video snimak</string>
+    <string name="option_take_photo">Napravi fotografiju</string>
+    <string name="option_take_video">Napravi video snimak</string>
+
+    <string name="auth_login">Prijavi se</string>
+    <string name="auth_register">Napravi nalog</string>
+    <string name="auth_skip">Preskoči</string>
+    <string name="auth_password_placeholder">Lozinka</string>
+    <string name="auth_new_password_placeholder">Nova lozinka</string>
+    <string name="auth_user_name_placeholder">Korisničko ime</string>
+    <string name="auth_phone_number_placeholder">Broj telefona</string>
+    <string name="auth_opt_phone_number_placeholder">Broj telefona (opciono)</string>
+    <string name="auth_repeat_password_placeholder">Ponovi lozinku</string>
+    <string name="auth_repeat_new_password_placeholder">Potvrdite vašu novu lozinku</string>
+    <string name="auth_invalid_login_param">Pogrešno korisničko ime i/ili lozinka</string>
+    <string name="clear">Obriši</string>
+    <string name="view_source">Vidi izvor</string>
+    <string name="report_content">Prijavi sadržaj</string>
+    <string name="send_bug_report_progress">Napredak (%s%%)</string>
+
+    <string name="send_files_in">Pošalji u</string>
+    <string name="join_room">Priključi se sobi</string>
+    <string name="search">Pretraži</string>
+
+    <string name="option_send_files">Pošalji datoteke</string>
+    <string name="auth_email_placeholder">Adresa elektronske pošte</string>
+    <string name="auth_opt_email_placeholder">Adresa elektronske pošte (opciono)</string>
+    <string name="auth_invalid_password">Lozinka je prekratka (minimum 6)</string>
+    <string name="auth_missing_password">Lozinka nedostaje</string>
+    <string name="auth_invalid_email">Ovo ne izgleda kao validna adresa elektronske pošte</string>
+    <string name="auth_invalid_phone">Ovo ne izgleda kao validan broj telefona</string>
+    <string name="auth_email_already_defined">Ova adresa elektronske pošte je već definisana.</string>
+    <string name="auth_missing_email">Adresa elektronske pošte nedostaje</string>
+    <string name="auth_missing_phone">Broj telefona nedostaje</string>
+    <string name="auth_missing_email_or_phone">Nedostaje adresa elektronske pošte ili broj telefona</string>
+    <string name="auth_password_dont_match">Lozinke nisu iste</string>
+    <string name="auth_forgot_password">Zaboravili ste lozinku\?</string>
+    <string name="auth_use_server_options">Koristi prilagođene opcije servera (napredno)</string>
+    <string name="auth_email_validation_message">Molim proverite vašu elektronsku poštu kako bi nastavili registraciju</string>
+    <string name="auth_username_in_use">Korisničko ime je već u upotrebi</string>
+    <string name="auth_reset_password_next_step_button">Verifikovao sam adresu elektronske pošte</string>
+    <string name="auth_reset_password_message">Kako bi resetovali vašu lozinku, unesite adresu elektronske pošte povezanu sa vašim nalogom:</string>
+    <string name="auth_reset_password_missing_email">Morate uneti adresu elektronske pošte povezane sa vašim nalogom.</string>
+    <string name="auth_reset_password_missing_password">Morate uneti novu lozinku.</string>
+    <string name="login_mobile_device">Mobilni</string>
+
+    <string name="login_error_limit_exceeded">Poslato je previše zahteva</string>
+    <string name="login_error_user_in_use">Ovo korisničko ime je već korišćeno</string>
+    <string name="login_error_login_email_not_yet">Link u elektronskoj pošti još uvek nije kliknut</string>
+
+    <string name="e2e_re_request_encryption_key_sent">Zahtev za ključ poslat.</string>
+
+    <string name="e2e_re_request_encryption_key_dialog_title">Zahtev poslat</string>
+    <string name="compression_options">Pošalji kao</string>
+    <string name="compression_opt_list_original">Original</string>
+    <string name="compression_opt_list_large">Veliko</string>
+    <string name="compression_opt_list_medium">Srednje</string>
+    <string name="compression_opt_list_small">Malo</string>
+
+    <string name="yesterday">Juče</string>
+    <string name="today">Danas</string>
+
+    <string name="room_info_room_name">Ime sobe</string>
+    <string name="room_info_room_topic">Tema sobe</string>
+
+    <string name="settings_call_category">Pozivi</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Koristi podrazumevani Riot 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>
+
+    <string name="call">Poziv</string>
+    <string name="call_connected">Poziv uspostavljen</string>
+    <string name="call_connecting">Poziv se uspostavlja…</string>
+    <string name="call_ended">Poziv završen</string>
+    <string name="call_ring">Pozivam…</string>
+    <string name="incoming_call">Dolazeći poziv</string>
+    <string name="incoming_video_call">Dolazeći video poziv</string>
+    <string name="incoming_voice_call">Dolazeći glasovni poziv</string>
+    <string name="call_in_progress">Poziv u toku…</string>
+    <string name="video_call_in_progress">Video poziv u toku..</string>
+
+    <string name="room_participants_action_remove">Izbaci iz ove sobe</string>
+    <string name="room_participants_action_kick">Izbaci</string>
+    <string name="room_participants_action_mention">Pomeni</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_title">Servis Obaveštenja</string>
+    <string name="settings_troubleshoot_test_foreground_service_startedt_success">Servis obaveštenja radi.</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_failed">Servis obaveštenja ne radi.
+\nPokušajte da ponovo pokrenete aplikaciju.</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Pokreni servis</string>
+
+    <string name="settings_troubleshoot_test_service_restart_title">Servis obaveštenja, automatsko ponovno pokretanje</string>
+    <string name="settings_troubleshoot_test_service_restart_success">Servis je eliminisan i pokrenut ponovo automatski.</string>
+    <string name="settings_troubleshoot_test_service_restart_failed">Servis nije uspeo da se ponovo pokrene</string>
+
+    <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 Riot.</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">Ignoriši optimizacije</string>
+
+    <string name="settings_notification_privacy_normal">Normalno</string>
+    <string name="settings_notification_privacy_reduced">Smanjena privatnost</string>
+    <string name="settings_notification_privacy_need_permission">Aplikaciji treba dozvola za rad u pozadini</string>
+    <string name="settings_notification_privacy_metadata">• Obaveštenja sadrže samo meta podatke</string>
+    <string name="settings_notification_privacy_nosecure_message_content">• Obaveštenja sadrže <b>meta podatke i poruku</b></string>
+    <string name="settings_notification_privacy_message_content_not_shown">"•  Obaveštenja "<b>neće prikazivati sadržaj poruke</b></string>
+
+    <string name="settings_notification_ringtone">Zvuk obaveštenja</string>
+    <string name="settings_enable_all_notif">Omogući obaveštenja za ovaj nalog</string>
+    <string name="settings_enable_this_device">Omogući obaveštenja za ovaj uređaj</string>
+    <string name="settings_turn_screen_on">Upali ekran na 3 sekunde</string>
+    <string name="settings_noisy_notifications_preferences">Podesi bučna obaveštenja</string>
+    <string name="settings_call_notifications_preferences">Podesi obaveštenja o pozivima</string>
+    <string name="settings_silent_notifications_preferences">Podesi tiha obaveštenja</string>
+    <string name="settings_system_preferences_summary">Izabeti LED boju, vibraciju, zvuk…</string>
+
+
+    <string name="settings_invited_to_room">Kada sam pozvan u sobu</string>
+    <string name="settings_messages_sent_by_bot">Poruke koje je poslao bot</string>
+
+    <string name="settings_background_sync">Sinhronizacija u pozadini</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimizovano za potrošnju baterije</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Bez sinhronizacije u pozadini</string>
+    <string name="settings_second">sekundu</string>
+    <string name="settings_seconds">sekundi</string>
+
+    <string name="settings_version">Verzija</string>
+    <string name="settings_olm_version">olm verzija</string>
+    <string name="settings_other">Drugo</string>
+    <string name="settings_advanced">Napredno</string>
+    <string name="settings_cryptography">Kriptografija</string>
+    <string name="settings_cryptography_manage_keys">Rukovanje kriptografskim ključevima</string>
+    <string name="settings_contact">Učitaj kontakte</string>
+    <string name="settings_contacts_app_permission">Dozvola za kontakte</string>
+    <string name="settings_contacts_phonebook_country">Zemlja telefonskog imenika</string>
+    <string name="settings_home_display">Glavni prikaz</string>
+    <string name="settings_devices_list">Uređaji</string>
+    <string name="settings_send_typing_notifs">Šalji obaveštenja o pisanju</string>
+    <string name="settings_send_typing_notifs_summary">Dozvoli da drugi korisnici znaju da pisete.</string>
+    <string name="settings_show_read_receipts">Prikaži obaveštenja o pročitanim porukama</string>
+    <string name="settings_show_read_receipts_summary">Klikni na obaveštenja o pročitanim porukama za detaljan prikaz.</string>
+    <string name="settings_show_join_leave_messages">Pokaži obaveštenja o priključivanjima i napuštanjima</string>
+    <string name="settings_show_join_leave_messages_summary">Ne odnosi se na pozivnice, izbacivanja i zabrane.</string>
+    <string name="settings_show_avatar_display_name_changes_messages">Prikaži obaveštenja o nalogu</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">Uključuje obaveštenja o promeni avatara i imena.</string>
+    <string name="settings_vibrate_on_mention">Vibriraj kad neko pomene korisnika</string>
+    <string name="settings_send_message_with_enter">Pošalji poruku pritiskom na enter</string>
+    <string name="settings_send_message_with_enter_summary">Dugme enter na softverskoj tastaturi će poslati poruku umesto da napravi novu liniju</string>
+
+    <string name="settings_deactivate_account_section">Deaktiviraj nalog</string>
+    <string name="settings_deactivate_my_account">Deaktiviraj moj nalog</string>
+    <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">Riot 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>
+
+    <string name="startup_notification_fdroid_battery_optim_title">Pozadinska veza</string>
+    <string name="settings_opt_in_of_analytics_ok">Da, želim da pomognem!</string>
+
+    <string name="settings_data_save_mode">Režim uštede podataka</string>
+    <string name="settings_data_save_mode_summary">Režim uštede podataka primenjuje poseban filter tako da se obaveštenja o prisutnosti i pisanju filtriraju.</string>
+
+    <string name="devices_details_dialog_title">Podaci o uređaju</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="devices_details_name_title">Javno ime</string>
+    <string name="devices_details_device_name">Promeni javno ime</string>
+    <string name="devices_details_last_seen_title">Poslednji put viđen</string>
+    <string name="devices_delete_dialog_text">Ova operacija zahteva dodatnu autentifikaciju.
+\nMolim unesite vašu lozinku, kako bi nastavili.</string>
+    <string name="devices_delete_dialog_title">Autentifikacija</string>
+    <string name="devices_delete_pswd">Lozinka:</string>
+    <string name="devices_delete_submit_button_label">Pošalji</string>
+
+    <string name="settings_logged_in">Prijavljen kao</string>
+    <string name="settings_interface_language">Jezik</string>
+    <string name="settings_select_language">Izaberi jezik</string>
+
+    <string name="account_email_validation_title">Čeka se verifikacija</string>
+    <string name="account_email_validation_message">Molim proverite vašu elektronsku poštu i kliknite na link u njoj. Kad ovo uradite, kliknite na nastavi.</string>
+    <string name="settings_password">Lozinka</string>
+    <string name="settings_change_password">Promeni lozinku</string>
+    <string name="settings_old_password">Trenutna lozinka</string>
+    <string name="settings_new_password">Nova lozinka</string>
+    <string name="settings_confirm_password">Potvrdite novu lozinku</string>
+    <string name="settings_change_password_submit">Promeni lozinku</string>
+    <string name="settings_fail_to_update_password">Promena lozinke nije uspela</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">Lozinka nije tačna</string>
+    <string name="settings_password_updated">Vaša lozinka je promenjena</string>
+    <string name="settings_select_country">Izaberi zemlju</string>
+
+    <string name="settings_phone_number_country_label">Zemlja</string>
+    <string name="settings_phone_number_country_error">Molim izaberite zemlju</string>
+    <string name="settings_phone_number_label">Broj telefona</string>
+    <string name="settings_phone_number_error">Pogrešan broj telefona za izabranu zemlju</string>
+    <string name="settings_phone_number_verification">Verifikacija putem telefona</string>
+    <string name="settings_phone_number_verification_instruction">Poslali smo vam SMS sa aktivacionim kodom. Molimo unesite ovaj kod ispod.</string>
+    <string name="settings_phone_number_verification_error_empty_code">Unesi aktivacioni kod</string>
+    <string name="settings_phone_number_verification_error">Desila se greška prilikom validacije vašeg broja telefona</string>
+    <string name="settings_phone_number_code">Kod</string>
+    <string name="account_phone_number_error">Desila se greška prilikom verifikacije vašeg broja telefona.</string>
+    <string name="account_additional_info">Dodatne informacije: %s</string>
+
+    <string name="compression_opt_list_choose">Izaberi</string>
+    <string name="media_source_choose">Izaberi</string>
+    <string name="media_saving_period_3_days">3 dana</string>
+    <string name="media_saving_period_1_week">1 nedelja</string>
+    <string name="media_saving_period_1_month">1 mesec</string>
+    <string name="media_saving_period_forever">Zauvek</string>
+
+    <string name="room_settings_tag_pref_entry_favourite">Omiljeno</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Nizak prioritet</string>
+    <string name="room_settings_tag_pref_entry_none">Ništa</string>
+
+    <string name="room_settings_room_access_rules_pref_title">Pristup sobi</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Ko može čitati istoriju\?</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">Ko može pristupiti ovoj sobi\?</string>
+
+    <string name="room_settings_read_history_entry_anyone">BIlo ko</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Samo članovi (od trenutka kad je ova opcija izabrana)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Samo članovi (od trenutka kad su pozvani)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Samo članovi (od trenutka kad su se pridružili)</string>
+
+    <string name="room_settings_room_access_entry_only_invited">Samo ljudi koji su pozvani</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Bilo ko, ko zna link sobe, sem gostiju</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Bilo ko, ko zna link sobe, uključujući goste</string>
+
+    <string name="room_settings_banned_users_title">Izbačeni korisnici</string>
+
+    <string name="room_settings_category_advanced_title">Napredno</string>
+    <string name="room_settings_room_internal_id">Interni ID ove sobe</string>
+    <string name="room_settings_addresses_pref_title">Adrese</string>
+    <string name="room_settings_labs_pref_title">Laboratorije</string>
+    <string name="room_settings_labs_warning_message">Ovo su eksperimentalne karakteristike koje se mogu pokvariti na neočekivane načine. Koristiti sa pažnjom.</string>
+    <string name="room_settings_addresses_add_new_address">Nova adresa (npr. #foo:matrix.org)</string>
+
+    <string name="encryption_information_algorithm">Algoritam</string>
+    <string name="encryption_information_session_id">ID sesije</string>
+    <string name="encryption_information_decryption_error">Greška prilikom dešifrovanja</string>
+
+    <string name="encryption_information_sender_device_information">Informacije o uređaju pošiljaoca</string>
+    <string name="encryption_information_device_name">Javno ime</string>
+    <string name="encryption_information_verification">Verifikacija</string>
+    <string name="encryption_import_room_keys">Uvezi ključeve za sobu</string>
+    <string name="encryption_import_room_keys_summary">Uvezi ključeve iz datoteke</string>
+    <string name="encryption_import_import">Uvezi</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Šifruj samo ka verifikovanim uređajima</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Nikad ne šalji šifrovane poruke ka neverifikovanim uređajima sa ovog uređaja.</string>
+    <string name="encryption_information_verified">Verifikovan</string>
+    <string name="encryption_information_blocked">Na crnoj listi</string>
+
+    <string name="encryption_information_unknown_device">nepoznat uređaj</string>
+    <string name="encryption_information_unknown_ip">nepoznata IP adresa</string>
+    <string name="encryption_information_none">ništa</string>
+
+    <string name="encryption_information_verify">Verifikuj</string>
+    <string name="encryption_information_unverify">Ukloni verifikaciju</string>
+    <string name="encryption_information_block">Stavi na crnu listu</string>
+    <string name="encryption_information_unblock">Ukloni sa crne liste</string>
+
+    <string name="encryption_information_verify_device">Verifikuj uređaj</string>
+    <string name="unknown_devices_alert_title">Soba sadrži nepoznate uređaje</string>
+    <string name="notification_unknown_room_name">Soba</string>
+    <string name="notification_new_messages">Nove poruke</string>
+    <string name="notification_new_invitation">Nova pozivnica</string>
+    <string name="notification_sender_me">Ja</string>
+    <string name="font_size">Veličina fonta</string>
+    <string name="tiny">Najmanji</string>
+    <string name="small">Mali</string>
+    <string name="normal">Normalni</string>
+    <string name="large">Veliki</string>
+    <string name="larger">Veći</string>
+    <string name="largest">Najveći</string>
+    <string name="huge">Ogroman</string>
+
+    <string name="widget_integration_failed_to_send_request">Slanje zahteva nije uspelo.</string>
+    <string name="widget_integration_must_be_in_room">Niste u ovoj sobi.</string>
+    <string name="widget_integration_no_permission_in_room">Nemate dozvolu da uradite to u ovoj sobi.</string>
+    <string name="widget_integration_missing_room_id">Nedostajući room_id u zahtevu.</string>
+    <string name="widget_integration_missing_user_id">Nedostajući user_id u zahtevu.</string>
+    <string name="widget_integration_room_not_visible">Soba %s nije vidljiva.</string>
+    <string name="widget_integration_missing_parameter">Nedostaje parametar koji je obavezan.</string>
+    <string name="widget_integration_invalid_parameter">Parametar nije ispravan.</string>
+    <string name="settings_labs_enable_send_voice">Šalji glasovne poruke</string>
+</resources>

vector/src/main/res/values-bg/strings.xml

@@ -212,14 +212,6 @@
     <string name="auth_password_placeholder">Парола</string>
     <string name="auth_new_password_placeholder">Нова парола</string>
     <string name="auth_user_name_placeholder">Потребителско име</string>
-    <string name="auth_add_email_message">Добавете имейл адрес в профила си, за да позволите на потребители да ви откриват и да можете да възстановявате Вашата парола.</string>
-    <string name="auth_add_phone_message">Добавете телефонен номер в профила си, за да позволите на потребители да ви откриват.</string>
-    <string name="auth_add_email_phone_message">Добавете имейл адрес и/или телефонен номер в профила си, за да позволите на потребители да ви откриват.
-
-Имейл адресът също Ви позволява да възстановите Вашата парола.</string>
-    <string name="auth_add_email_and_phone_message">Добавете имейл адрес и телефонен номер в профила си, за да позволите на потребители да Ви откриват.
-
-Имейл адресът също Ви позволява да възстановявате Вашата парола.</string>
     <string name="auth_email_placeholder">Имейл адрес</string>
     <string name="auth_opt_email_placeholder">Имейл адрес (по избор)</string>
     <string name="auth_phone_number_placeholder">Телефонен номер</string>
@@ -1487,7 +1479,7 @@
 
     <string name="event_redacted_by_user_reason">Събитие изтрито от потребителя</string>
     <string name="event_redacted_by_admin_reason">Събитие модерирано от администратор на стаята</string>
-    <string name="last_edited_info_message">Последно редактирано от %s на %s</string>
+    <string name="last_edited_info_message">Последно редактирано от %1$s на %2$s</string>
 
 
     <string name="malformed_message">Повредено събитие, не може да се покаже</string>
@@ -1566,7 +1558,7 @@
 \n
 \nRiotX поддържа: • Вход в съществуващ акаунт • Създаване на стая и влизане в публични стаи • Приемане и отхвърляне на покани • Показване на списък със стаите • Преглеждане на информация за стая • Изпращане на текстови съобщения • Изпращане на прикачени файлове • Четене и писане на съобщения в шифровани стаи • Шифроване: резервни копия на E2E ключове, потвърждение на устройства, заявяване и отговаряне на заявки за споделяне на ключове • Уведомления • Светла, Тъмна и Черна тема
 \n
-\nЗасега не всички функции на Riot са налични в RiotX. Основни липсващи (и скоро пристигащи!) функции са: • Създаване на нов профил • Настройки на стаи (показване на членове и т.н.) • Създаване на директни чатове • Обаждания • Приспособления • …</string>
+\nЗасега не всички функции на Riot са налични в RiotX. Основни липсващи (и скоро пристигащи!) функции са: • Създаване на нов профил • Настройки на стаи (показване на членове и т.н.) • Обаждания • Приспособления • …</string>
 
     <string name="bottom_action_people_x">Директни съобщения</string>
 
@@ -1613,4 +1605,21 @@
 
     <string name="message_view_edit_history">Виж историята на редакциите</string>
 
+    <string name="review">Прегледай</string>
+    <string name="decline">Откажи</string>
+
+    <string name="widget_integration_review_terms">За да продължите трябва да приемете условията за използване на услугата.</string>
+
+    <string name="security_warning_identity_server">Предишни версии на Riot имат проблем със сигурността, давайки достъп на сървъра за самоличност (%1$s) до профила ви. Ако се доверявате на %2$s, може да игнорирате проблема; в противен случай, излезте от профила си и влезте наново.
+\n
+\nНаучете повече подробности тук:
+\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
+
+    <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="read_at">Прочетете на</string>
+
 </resources>

vector/src/main/res/values-bn-rIN/strings.xml

@@ -202,14 +202,6 @@
     <string name="auth_password_placeholder">পাসওয়ার্ড</string>
     <string name="auth_new_password_placeholder">নতুন পাসওয়ার্ড</string>
     <string name="auth_user_name_placeholder">ব্যবহারকারীর নাম</string>
-    <string name="auth_add_email_message">ব্যবহারকারীদের আপনাকে খুঁজে পাওয়ার জন্য আপনার অ্যাকাউন্টে একটি ইমেল ঠিকানা যোগ করুন এবং আপনাকে পাসওয়ার্ড পুনরায় সেট করতে দিন।</string>
-    <string name="auth_add_phone_message">ব্যবহারকারীদের আপনাকে খুঁজে পাওয়ার জন্য আপনার অ্যাকাউন্টে একটি ফোন নম্বর যুক্ত করুন।</string>
-    <string name="auth_add_email_phone_message">ব্যবহারকারীদের আপনাকে খুঁজে পাওয়ার জন্য আপনার অ্যাকাউন্টে একটি ইমেল ঠিকানা এবং / অথবা একটি ফোন নম্বর যোগ করুন।
-\n
-\nইমেল ঠিকানা আপনাকে আপনার পাসওয়ার্ড পুনরায় সেট করতে দেয়।</string>
-    <string name="auth_add_email_and_phone_message">ব্যবহারকারীদের আপনাকে খুঁজে পাওয়ার জন্য আপনার অ্যাকাউন্টে একটি ইমেল ঠিকানা এবং একটি ফোন নম্বর যুক্ত করুন।
-\n
-\nইমেল ঠিকানা আপনাকে আপনার পাসওয়ার্ড পুনরায় সেট করতে দেয়।</string>
     <string name="auth_email_placeholder">ইমেইল ঠিকানা</string>
     <string name="auth_opt_email_placeholder">ইমেইল ঠিকানা (ঐচ্ছিক)</string>
     <string name="auth_phone_number_placeholder">ফোন নম্বর</string>

vector/src/main/res/values-bs/strings.xml

@@ -138,14 +138,6 @@
     <string name="auth_password_placeholder">Lozinka</string>
     <string name="auth_new_password_placeholder">Nova lozinka</string>
     <string name="auth_user_name_placeholder">Korisničko ime</string>
-    <string name="auth_add_email_message">Dodajte email adresu na svoj račun kako biste korisnicima omogućili da vas pronađu, te vam omoguće resetovanje lozinke.</string>
-    <string name="auth_add_phone_message">Dodaj broj telefona na svoj račun da bi omogućili korisnicima da vas pronađu.</string>
-    <string name="auth_add_email_phone_message">Dodajte email adresu i / ili telefonski broj na svoj račun da biste omogućili korisnicima da vas pronađu.
-
-Email adresa će vam također omogućiti resetovanje lozinke.</string>
-    <string name="auth_add_email_and_phone_message">Dodajte email adresu i telefonski broj na svoj račun da biste omogućili korisnicima da vas pronađu.
-
-Email adresa će vam također omogućiti resetovanje lozinke.</string>
     <string name="auth_email_placeholder">Email adresa</string>
     <string name="auth_opt_email_placeholder">Email adresa (nije obavezno)</string>
     <string name="auth_phone_number_placeholder">Broj telefona</string>

vector/src/main/res/values-ca/strings.xml

@@ -169,10 +169,6 @@
     <string name="auth_password_placeholder">Contrasenya</string>
     <string name="auth_new_password_placeholder">Contrasenya nova</string>
     <string name="auth_user_name_placeholder">Nom d\'usuari</string>
-    <string name="auth_add_email_message">"Afegiu un correu electrònic al vostre compte per tal que altres usuaris us trobin i per poder reiniciar la contrasenya."</string>
-    <string name="auth_add_phone_message">"Afegiu un número de telefon al vostre compte per tal que altres usuaris us trobin."</string>
-    <string name="auth_add_email_phone_message">"Afegiu un correu electrònic i/o un númerode telefon al vostre compte per tal que altres usuaris us trobin.\n\nSi afegiu un correu electrònic també us permetrà poder reiniciar la contrasenya."</string>
-    <string name="auth_add_email_and_phone_message">"Afegiu un correu electrònic i un número de telefon al vostre compte per tal que altres usuaris us trobin.\n\nSi afegiu un correu electrònic també us permetrà poder reiniciar la contrasenya."</string>
     <string name="auth_email_placeholder">Correu electrònic</string>
     <string name="auth_opt_email_placeholder">Correu electrònic (opcional)</string>
     <string name="auth_phone_number_placeholder">Número de telefon</string>
@@ -1531,7 +1527,7 @@ Per què triar Riot.im?
 
     <string name="event_redacted_by_user_reason">Esdeveniment eliminat per l\'usuari</string>
     <string name="event_redacted_by_admin_reason">Esdeveniment moderat per l\'administrador de la sala</string>
-    <string name="last_edited_info_message">Última edició per %s el %s</string>
+    <string name="last_edited_info_message">Última edició per %1$s el %2$s</string>
 
 
     <string name="malformed_message">Esdeveniment mal format, no es pot mostrar</string>

vector/src/main/res/values-cs/strings.xml

@@ -158,8 +158,6 @@
     <string name="auth_password_placeholder">Heslo</string>
     <string name="auth_new_password_placeholder">Nové heslo</string>
     <string name="auth_user_name_placeholder">Uživatelské jméno</string>
-    <string name="auth_add_email_message">Přidat emailovou adresu k vašemu účtu aby vás mohli ostatní uživatelé najít a abyste si mohl vyresetovat heslo.</string>
-    <string name="auth_add_phone_message">Přidat telefonní číslo k vašemu účtu aby vás mohli ostatní uživatelé najít.</string>
     <string name="auth_email_placeholder">E-mailová adresa</string>
     <string name="auth_opt_email_placeholder">E-mailová adresa (nepovinné)</string>
     <string name="auth_phone_number_placeholder">Telefonní číslo</string>
@@ -237,12 +235,6 @@
 
     <string name="encrypted_message">Šifrovaná zpráva</string>
 
-    <string name="auth_add_email_phone_message">Přidejte k účtu e-mailovou adresu a/nebo telefoní číslo, aby Vás mohli ostatní nalézt.
-
-E-mailová adresa Vám také umožní obnovit heslo.</string>
-    <string name="auth_add_email_and_phone_message">Přidejte k účtu e-mailovou adresu a telefoní číslo, aby Vás mohli ostatní nalézt.
-
-E-mailová adresa Vám také umožní obnovit heslo.</string>
     <string name="auth_threepid_warning_message">Registrace e-mailem a telefonním číslem najednou není zatím podporována z důvodu neexistujícího API. Pouze telefonní čislo bude bráno v potaz.
 
 Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>

vector/src/main/res/values-da/strings.xml

@@ -137,14 +137,6 @@
     <string name="auth_password_placeholder">Adgangskode</string>
     <string name="auth_new_password_placeholder">Ny adgangskode</string>
     <string name="auth_user_name_placeholder">Brugernavn</string>
-    <string name="auth_add_email_message">Tilføj en mailadresse til din konto for at lade brugere finde dig og for at gendanne dit password.</string>
-    <string name="auth_add_phone_message">Tilføj et telefonnummer til din konto for at brugere kan finde dig.</string>
-    <string name="auth_add_email_phone_message">Tilføj en emailadresse og/eller et telefonnummer til din konto for at andre brugere kan finde dig.
-
-En emailadresse vil også give dig mulighed for at nulstille din adgangskode.</string>
-    <string name="auth_add_email_and_phone_message">Tilføj en emailadresse og et telefonnummer til din konto for at andre brugere kan finde dig.
-
-En emailadresse vil også give dig mulighed for at nulstille dit password.</string>
     <string name="auth_email_placeholder">Emailadresse</string>
     <string name="auth_opt_email_placeholder">Emailadresse (valgfri)</string>
     <string name="auth_phone_number_placeholder">Telefonnummer</string>

vector/src/main/res/values-de/strings.xml

@@ -140,14 +140,6 @@
     <string name="auth_password_placeholder">Passwort</string>
     <string name="auth_new_password_placeholder">Neues Passwort</string>
     <string name="auth_user_name_placeholder">Benutzername</string>
-    <string name="auth_add_email_message">Füge eine E-Mail-Adresse zu deinem Account hinzu, damit andere Benutzer dich finden können und du dein Passwort zurücksetzen kannst.</string>
-    <string name="auth_add_phone_message">Füge eine Telefonnummer zu deinem Benutzerkonto hinzu, damit andere Benutzer dich finden können.</string>
-    <string name="auth_add_email_phone_message">Füge eine E-Mail-Adresse und/oder eine Telefonnummer zu deinem Benutzerkonto hinzu, damit andere Benutzer dich finden können.
-
-Das Hinzufügen einer E-Mail-Adresse erlaubt es dir außerdem, dein Passwort zurückzusetzen.</string>
-    <string name="auth_add_email_and_phone_message">Füge eine E-Mail-Adresse und eine Telefonnummer zu deinem Benutzerkonto hinzu, damit andere Benutzer dich finden können.
-
-Das Hinzufügen einer E-Mail-Adresse erlaubt es dir außerdem, dein Passwort zurückzusetzen.</string>
     <string name="auth_email_placeholder">E-Mail-Adresse</string>
     <string name="auth_opt_email_placeholder">E-Mail-Adresse (optional)</string>
     <string name="auth_phone_number_placeholder">Telefonnummer</string>
@@ -1527,7 +1519,7 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
 
     <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 %s am %s</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>
@@ -1650,7 +1642,7 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
 
     <string name="room_filtering_footer_title">Können Sie nicht finden, wonach Sie suchen\?</string>
     <string name="room_filtering_footer_create_new_room">Erstelle einen neuen Raum</string>
-    <string name="room_directory_search_hint">Name oder ID (#Beispiel: matrix.org)</string>
+    <string name="room_directory_search_hint">Name oder ID (#beispiel:matrix.org)</string>
 
     <string name="labs_swipe_to_reply_in_timeline">Aktivieren Sie das Streichen, um in der Zeitleiste zu antworten</string>
 
@@ -1660,4 +1652,8 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
 
     <string name="joining_room">Raum betreten…</string>
 
+    <string name="decline">Ablehnen</string>
+
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="review">Überprüfung</string>
 </resources>

vector/src/main/res/values-el/strings.xml

@@ -3,7 +3,7 @@
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
     <string name="resources_language">el</string>
-    <string name="resources_country_code">ΕL</string>
+    <string name="resources_country_code">GR</string>
 
 
     <string name="cancel">Ακύρωση</string>

vector/src/main/res/values-es-rMX/strings.xml

@@ -139,10 +139,6 @@
     <string name="auth_password_placeholder">Contraseña</string>
     <string name="auth_new_password_placeholder">Contraseña nueva</string>
     <string name="auth_user_name_placeholder">Nombre de usuario</string>
-    <string name="auth_add_email_message">"Añadir un correo electrónico a tu cuenta para que otros te descubran, y para que puedas reiniciar tu contraseña."</string>
-    <string name="auth_add_phone_message">"Añadir número telefónico a tu cuenta para que otros te descubran."</string>
-    <string name="auth_add_email_phone_message">"Añadir un correo electrónico y/o número telefónico a tu cuenta para que otros te descubran.\n\nEl correo electrónico te permitira reiniciar tu contraseña."</string>
-    <string name="auth_add_email_and_phone_message">"Añadir un correo electrónico y un número telefónico a tu cuenta para que otros te descubran.\n\nEl correo electrónico te permitira reiniciar tu contraseña."</string>
     <string name="auth_email_placeholder">Correo electrónico</string>
     <string name="auth_opt_email_placeholder">Correo electrónico (opcional)</string>
     <string name="auth_phone_number_placeholder">Número telefónico</string>

vector/src/main/res/values-es/strings.xml

@@ -140,14 +140,6 @@
     <string name="auth_password_placeholder">Contraseña</string>
     <string name="auth_new_password_placeholder">Nueva contraseña</string>
     <string name="auth_user_name_placeholder">Nombre de usuario</string>
-    <string name="auth_add_email_message">Añade una dirección de correo electrónico a tu cuenta para poder ser descubierto por otros usuarios, y ser capaz de restablecer tu contraseña.</string>
-    <string name="auth_add_phone_message">Añade un número telefónico a tu cuenta para poder ser descubierto por otros usuarios.</string>
-    <string name="auth_add_email_phone_message">Añade una dirección de correo electrónico y/o un número telefónico a tu cuenta para poder ser descubierto por otros usuarios.
-
-Además, la dirección de correo electrónico te permitirá restablecer tu contraseña.</string>
-    <string name="auth_add_email_and_phone_message">Añade una dirección de correo electrónico y un número telefónico a tu cuenta para poder ser descubierto por otros usuarios.
-
-Además, la dirección de correo electrónico te permitirá restablecer tu contraseña.</string>
     <string name="auth_email_placeholder">Dirección de correo electrónico</string>
     <string name="auth_opt_email_placeholder">Dirección de correo electrónico (opcional)</string>
     <string name="auth_phone_number_placeholder">Número telefónico</string>
@@ -1540,7 +1532,7 @@ Ten en cuenta que esta acción reiniciará la aplicación y puede tardar algo de
 
     <string name="event_redacted_by_user_reason">Evento borrado por el usuario</string>
     <string name="event_redacted_by_admin_reason">Evento moderado por el administrador de la sala</string>
-    <string name="last_edited_info_message">Última edición por %s on %s</string>
+    <string name="last_edited_info_message">Última edición por %1$s on %2$s</string>
 
 
     <string name="malformed_message">Evento con error, no se puede mostrar</string>

vector/src/main/res/values-eu/strings.xml

@@ -129,14 +129,6 @@
     <string name="auth_password_placeholder">Pasahitza</string>
     <string name="auth_new_password_placeholder">Pasahitz berria</string>
     <string name="auth_user_name_placeholder">Erabiltzaile-izena</string>
-    <string name="auth_add_email_message">Gehitu e-mail helbide bat zure kontura erabiltzaileek zu aurkitzea baimentzeko, eta zuk pasahitza berrezarri ahal izateko.</string>
-    <string name="auth_add_phone_message">Gehitu telefono zenbaki bat zure kontura beste erabiltzaileek zu aurkitzea ahalbidetzeko.</string>
-    <string name="auth_add_email_phone_message">Gehitu e-mail helbide bat eta/edo telefono zenbaki bat zure kontura beste erabiltzaileek zu aurkitzea ahalbidetzeko.
-
-E-mail helbideak zuri pasahitza berrezartzea ahalbidetzen dizu ere.</string>
-    <string name="auth_add_email_and_phone_message">Gehitu e-mail helbide bat eta telefono zenbaki bat zure kontura beste erabiltzaileek zu aurkitzea ahalbidetzeko.
-
-E-mail helbideak zuri pasahitza berrezartzea ahalbidetzen dizu ere.</string>
     <string name="auth_email_placeholder">E-mail helbidea</string>
     <string name="auth_opt_email_placeholder">E-mail helbidea (aukerakoa)</string>
     <string name="auth_phone_number_placeholder">Telefono zenbakia</string>
@@ -422,7 +414,7 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
     <string name="settings_background_sync">Bigarren planoko sinkronizazioa</string>
     <string name="settings_enable_background_sync">Gaitu bigarren planoko sinkronizazioa</string>
     <string name="settings_set_sync_timeout">Sinkronizazio eskaerak debora-muga gainditu du</string>
-    <string name="settings_set_sync_delay">Eskaeren arteko itxaronaldia</string>
+    <string name="settings_set_sync_delay">Sinkronizazioen arteko itxaronaldia</string>
     <string name="settings_second">segundo</string>
     <string name="settings_seconds">segundo</string>
 
@@ -449,10 +441,10 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
     <string name="settings_pin_unread_messages">Finkatu irakurri gabeko mezuak dituzten gelak</string>
     <string name="settings_devices_list">Gailuak</string>
     <string name="settings_always_show_timestamps">Erakutsi mezu guztien denbora-zigilua</string>
-    <string name="devices_details_dialog_title">Gailuaren xehetasunak</string>
+    <string name="devices_details_dialog_title">Gailuaren informazioa</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Izena</string>
-    <string name="devices_details_device_name">Gailuaren izena</string>
+    <string name="devices_details_name_title">Izen publikoa</string>
+    <string name="devices_details_device_name">Aldatu izen publikoa</string>
     <string name="devices_details_last_seen_title">Azkenekoz ikusia</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_text">Eragiketa honek autentifikazio gehigarria behar du.
@@ -582,9 +574,9 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
     <string name="encryption_information_decryption_error">Deszifratze errorea</string>
 
     <string name="encryption_information_sender_device_information">Igorlearen gailuaren informazioa</string>
-    <string name="encryption_information_device_name">Gailuaren izena</string>
-    <string name="encryption_information_name">Izena</string>
-    <string name="encryption_information_device_id">Gailuaren IDa</string>
+    <string name="encryption_information_device_name">Izen publikoa</string>
+    <string name="encryption_information_name">Izen publikoa</string>
+    <string name="encryption_information_device_id">IDa</string>
     <string name="encryption_information_device_key">Gailuaren gakoa</string>
     <string name="encryption_information_verification">Egiaztaketa</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 hatz-marka</string>
@@ -878,7 +870,7 @@ Baten bat gehitu orain?</string>
     <string name="deactivate_account_submit">Desaktibatu kontua</string>
 
     <string name="dialog_user_consent_content">%1$s hasiera-zerbitzaria erabiltzen jarraitzeko erabilera baldintzak irakurri eta onartu behar dituzu.</string>
-    <string name="dialog_user_consent_submit">Irakurri orain</string>
+    <string name="dialog_user_consent_submit">Berrikusi orain</string>
 
     <string name="deactivate_account_title">Desaktibatu kontua</string>
     <string name="deactivate_account_content">Honek kontua behin betirako erabilgaitza bihurtuko du. Ezin izango duzu saioa hasi, eta ezin izango du beste inork ID hori erabili. Kontua dagoen gela guztietatik aterako da, eta kontuaren xehetasunak identitate-zerbitzaritik ezabatuko dira. <b>Ekintza hau ezin da desegin</b>.
@@ -1056,7 +1048,7 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
 
     <string name="accept">Onartu</string>
 
-    <string name="auth_accept_policies">Berrikusi eta onartu hasiera-zerbitzari honen politikak:</string>
+    <string name="auth_accept_policies">Irakurri eta onartu hasiera-zerbitzari honen baldintzak:</string>
 
     <string name="encryption_import_room_keys_success">%1$d/%2$d gako ongi inportatu dira.</string>
 
@@ -1494,7 +1486,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="event_redacted_by_user_reason">Gertaera ezabatu du erabiltzaileak</string>
     <string name="event_redacted_by_admin_reason">Gertaera moderatu du gelako administratzaileak</string>
-    <string name="last_edited_info_message">%s erabiltzaileak editatuta, azkenekoz: %s</string>
+    <string name="last_edited_info_message">%1$s erabiltzaileak editatuta, azkenekoz: %2$s</string>
 
 
     <string name="malformed_message">Gaizki formatutako gertaera, ezin da bistaratu</string>
@@ -1572,7 +1564,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 \n
 \nRiotX bezeroak honakoa ahalbidetzen du: • Badagoen kontu batean saioa hasi • Gelak sortu eta gela publikoetara elkartu • Gonbidapenak onartu edo ukatu • Erabiltzailearen gelak zerrendatu • Gelaren xehetasunak ikusi • Testuzko mezuak bidali • Eranskinak bidali • Zifratutako geletan mezuak irakurri eta idatzi • Zifratzea: E2Egakoen babeskopia, gailuaren egiaztaketa aurreratua, gakoa partekatzeko eskaria eta erantzuna • Push jakinarazpena • Gai argia, iluna eta beltza
 \n
-\nEz dira oraindik Riot bezeroaren ezaugarri guztiak ezarri RiotX bezeroan. Falta diren (eta laster etorriko direnen) artean nabarmenak dira: • Kontua sortzea • Gelaren ezarpenak (gelako kideak zerrendatzea, eta abar.) • Txat zuzenerako gelak sortzea • Deiak • Trepetak • …</string>
+\nEz dira oraindik Riot bezeroaren ezaugarri guztiak ezarri RiotX bezeroan. Falta diren (eta laster etorriko direnen) artean nabarmenak dira: • Kontua sortzea • Gelaren ezarpenak (gelako kideak zerrendatzea, eta abar.) • Deiak • Trepetak • …</string>
 
     <string name="push_gateway_item_app_display_name">app_display_name:</string>
     <string name="bottom_action_people_x">Mezu zuzenak</string>
@@ -1620,4 +1612,89 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="message_view_edit_history">Ikusi edizioen historiala</string>
 
+    <string name="none">Bat ere ez</string>
+    <string name="revoke">Indargabetu</string>
+    <string name="disconnect">Deskonektatu</string>
+    <string name="review">Berrikusi</string>
+    <string name="decline">Ukatu</string>
+
+    <string name="people_no_identity_server">Ez da identitate-zerbitzaririk konfiguratu.</string>
+
+    <string name="call_failed_no_ice_title">Deiak huts egin du zerbitzaria gaizki konfiguratuta dagoelako</string>
+    <string name="call_failed_no_ice_description">Eskatu zure hasiera-zerbitzariko administratzaileari (%1$s) TURN zerbitzari bat konfiguratu dezala deiak ondo funtzionatu dezaten.
+\n
+\nBestela, %2$s zerbitzari publikoa erabili dezakezu, baina hau ez da hain fidagarria izango, eta zure IP-a partekatuko du zerbitzari horrekin. Hau ezarpenetan aldatu dezakezu.</string>
+    <string name="call_failed_no_ice_use_alt">Saiatu %s erabiltzen</string>
+    <string name="call_failed_dont_ask_again">Ez galdetu berriro</string>
+
+    <string name="auth_add_email_message_2">Ezarri E-mail bat kontua berreskuratzeko, eta gero aukeran zure ezagunek aurkitu zaitzaten.</string>
+    <string name="auth_add_phone_message_2">Ezarri telefono bat gero aukeran zure ezagunek aurkitu zaitzaten.</string>
+    <string name="auth_add_email_phone_message_2">Ezarri E-mail bat kontua berreskuratzeko. Erabili geroo aukeran e-maila edo telefonoa zure ezagunek aurkitu zaitzaten.</string>
+    <string name="auth_add_email_and_phone_message_2">Ezarri E-mail bat kontua berreskuratzeko. Erabili geroo aukeran e-maila edo telefonoa zure ezagunek aurkitu zaitzaten.</string>
+    <string name="login_error_homeserver_not_found">Ezin izan da hasiera-zerbitzari bat atzitu URL honetan, egiaztatu ezazu</string>
+    <string name="settings_call_ringtone_use_default_stun">Baimendu lehenetsitako deien laguntzarako zerbitzaria</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">%s erabiliko da laguntzarako zure hasiera-zerbitzariak ez badu bat eskaintzen (Zure IP helbidea deian partekatuko da)</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">Riot 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">Riot bigarren planoan sinkronizatuko da maiztasun finkoarekin (konfiguragarria).
+\nHonek irrati eta bateriaren erabileran eragina izango du, eta Riot 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>
+
+
+    <string name="settings_set_workmanager_delay">Hobetsitako sinkronizazio tartea</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nSinkronizazioa atzeratu daiteke zure baliabideen arabera (bateria) edo gailuaren egoeraren arabera (lo).</string>
+    <string name="settings_discovery_category">Aurkitzea</string>
+    <string name="settings_discovery_manage">Kudeatu aurkitzeko ezarpenak.</string>
+    <string name="encryption_information_device_name_with_warning">Izen publikoa (Zurekin komunikatzen den jendeak ikusi dezake)</string>
+    <string name="device_name_warning">Gailu baten izen publikoa zurekin komunikatzen den jendeak ikusi dezake</string>
+    <string name="widget_integration_review_terms">Jarraitzeko erabilera baldintzak onartu behar dituzu.</string>
+
+    <string name="identity_server_not_defined">Ez duzu identitate zerbitzaririk erabiltzen</string>
+    <string name="identity_server_not_defined_for_password_reset">Ez da identitate zerbitzaririk konfiguratu, zure pasahitza berrezartzeko beharrezkoa da.</string>
+
+    <string name="security_warning_identity_server">Riot bertsio zaharrek segurtasun akats bat zuten eta zure identitate zerbitzariak (%1$s) zure kontua atzitu zezakeen. %2$s fidagarritzat jotzen baduzu hau ezikusi dezakezu, bestela maiatu saioa eta hasi berriro.
+\n
+\nXehetasun gehiago hemen:
+\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
+
+    <string name="error_user_already_logged_in">Badirudi beste hasiera-zerbitzari batera konektatzen saiatzen ari zarela. Saioa amaitu nahi duzu\?</string>
+
+    <string name="terms_of_service">Erabilera baldintzak</string>
+    <string name="review_terms">Irakurri baldintzak</string>
+    <string name="terms_description_for_identity_server">Izan besteentzat aurkigarria</string>
+    <string name="terms_description_for_integration_manager">Erabili botak, zubiak, trepetak eta eranskailu multzoak</string>
+
+    <string name="read_at">Irakurri hemen</string>
+
+
+    <string name="identity_server">Identitate-zerbitzaria</string>
+    <string name="disconnect_identity_server">Deskonektatu identitate-zerbitzaria</string>
+    <string name="add_identity_server">Konfiguratu identitate-zerbitzaria</string>
+    <string name="change_identity_server">Aldatu identitate-zerbitzaria</string>
+    <string name="settings_discovery_identity_server_info">Orain %1$s erabiltzen ari zara ezagunak aurkitzeko eta ezagunek zu aurkitzeko.</string>
+    <string name="settings_discovery_identity_server_info_none">Orain ez duzu identitate-zerbitzaririk erabiltzen. Kontaktuak aurkitzeko eta aurkigarria izateko, gehitu bat azpian.</string>
+    <string name="settings_discovery_emails_title">E-mail helbide aurkigarria</string>
+    <string name="settings_discovery_no_mails">Aurkitze aukerak behin e-mail bat gehitu duzunean agertuko dira.</string>
+    <string name="settings_discovery_no_msisdn">Aurkitze aukerak behin telefono zenbaki bat gehitu duzunean agertuko dira.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Identitate-zerbitzaritik deskonektatzean beste erabiltzaileek ezin izango zaituzte e-mail edo telefonoa erabilita aurkitu, eta zuk ezin izango dituzu e-mail edo telefonoa erabilita aurkitu.</string>
+    <string name="settings_discovery_msisdn_title">Telefono zenbaki aurkigarriak</string>
+    <string name="settings_discovery_confirm_mail">Berrespen e-mail bat bidali dizugu %s helbidera, begiratu zure e-maila eta sakatu baieztapen esteka</string>
+    <string name="settings_discovery_mail_pending">Egiteke</string>
+
+    <string name="settings_discovery_enter_identity_server">Sartu identitate-zerbitzari berria</string>
+    <string name="settings_discovery_bad_identity_server">Ezin izan da identitate-zerbitzarira konektatu</string>
+    <string name="settings_discovery_please_enter_server">Sartu identitate-zerbitzariaren URL-a</string>
+    <string name="settings_discovery_no_terms_title">Identitate-zerbitzariak ez du erabilera baldintzarik</string>
+    <string name="settings_discovery_no_terms">Hautatu duzun identitate-zerbitzariak ez du erabilera baldintzarik. Jarraitu soilik zerbitzuaren jabea fidagarritzat jotzen baduzu</string>
+    <string name="settings_text_message_sent">SMS mezu bat bidali zaizu %s zenbakira. Sartu hemen mezu horrek daukan egiaztatze-kodea.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">Orain e-mail helbideak edo telefono zenbakiak partekatzen dituzu %s zerbitzarian. %s zerbitzarira konektatu beharko zara partekatzeari uzteko.</string>
+    <string name="settings_agree_to_terms">Onartu %s identitate-zerbitzariaren erabilera baldintzak besteek zu e-mail helbidea edo telefonoa erabiliz aurkitzea ahalbidetzeko.</string>
 </resources>

vector/src/main/res/values-fa/strings.xml

@@ -326,14 +326,6 @@
     <string name="permalink">پیوند دائمی</string>
     <string name="view_decrypted_source">مشاهده منبع رمز نشده</string>
     <string name="action_historical">تاریخچه</string>
-    <string name="auth_add_email_message">یک ایمیل به حساب خود اضافه کنید تا دیگر کاربران بتوانند شما را پیدا کنند و برای شما نیز امکاناتی مانند بازیابی گذرواژه فعال شود.</string>
-    <string name="auth_add_phone_message">یک شماره تلفن به حساب خود اضافه کنید تا دیگر کاربران بتوانند شما را توسط آن پیدا کنند.</string>
-    <string name="auth_add_email_phone_message">یک ایمیل یا شماره تلفن به حساب خود اضافه کنید تا دیگر کاربران بتوانند شما را پیدا کنند.
-\n
-\nنشانی ایمیل امکان بازیابی گذرواژه را نیز به شما می‌دهد.</string>
-    <string name="auth_add_email_and_phone_message">یک ایمیل و یک شماره تلفن به حساب خود اضافه کنید تا دیگر کاربران بتوانند شما را پیدا کنند.
-\n
-\nنشانی ایمیل امکان بازیابی گذرواژه را نیز به شما می‌دهد.</string>
     <string name="auth_invalid_user_name">نام کاربری تنها می‌تواند شامل حروف انگلیسی، اعداد، نقطه، خط زیر و خط تیره باشد</string>
     <string name="auth_threepid_warning_message">ثبت‌نام با ورود همزمان ایمیل و شماره تلفن در حال حاضر پشتیبانی نمی‌شود. تنها شماره تلفن شما برای حساب‌تان ثبت خواهد شد.
 \n

vector/src/main/res/values-fi/strings.xml

@@ -148,14 +148,6 @@
     <string name="auth_password_placeholder">Salasana</string>
     <string name="auth_new_password_placeholder">Uusi salasana</string>
     <string name="auth_user_name_placeholder">Käyttäjätunnus</string>
-    <string name="auth_add_email_message">"Lisää sähköpostiosoite tiliisi antaaksesi muiden käyttäjien löytää sinut. Voit myös nollata salasanasi."</string>
-    <string name="auth_add_phone_message">Lisää puhelinnumero tiliisi, jotta muut käyttäjät löytävät sinut.</string>
-    <string name="auth_add_email_phone_message">Lisää sähköpostiosoite ja/tai puhelinnumero tiliisi, jotta muut käyttäjät löytävät sinut.
-\n
-\nSähköpostiosoitteella voit myös nollata salasanasi.</string>
-    <string name="auth_add_email_and_phone_message">Lisää sähköpostiosoite ja puhelinnumero tiliisi, jotta muut käyttäjät löytävät sinut.
-\n
-\nSähköpostiosoitteella voit myös nollata salasanasi.</string>
     <string name="auth_email_placeholder">Sähköpostiosoite</string>
     <string name="auth_opt_email_placeholder">Sähköpostiosoite (valinnainen)</string>
     <string name="auth_phone_number_placeholder">Puhelinnumero</string>
@@ -360,7 +352,7 @@
     <string name="room_unsent_messages_notification">Viesteja ei lähetetty. %1$s vai %2$s\?</string>
     <string name="room_unknown_devices_messages_notification">Viestejä ei lähetetty koska huoneessa on tuntemattomia laitteita. %1$s vai %2$s\?</string>
     <string name="room_prompt_resend">Lähetä kaikki uudelleen</string>
-    <string name="room_prompt_cancel">peru kaikki</string>
+    <string name="room_prompt_cancel">Peruuta kaikki</string>
     <string name="room_resend_unsent_messages">Lähetä lähettämättömät viestit</string>
     <string name="room_delete_unsent_messages">Poista lähettämättömät viestit</string>
     <string name="room_message_file_not_found">Tiedostoa ei löydy</string>
@@ -463,7 +455,7 @@
     <string name="settings_background_sync">Taustasynkronointi</string>
     <string name="settings_enable_background_sync">Käytä taustasynkronointia</string>
     <string name="settings_set_sync_timeout">Synkronointipyynnön aikakatkaisu</string>
-    <string name="settings_set_sync_delay">Viive jokaisen pyynnön välillä</string>
+    <string name="settings_set_sync_delay">Viive synkronointien välillä</string>
     <string name="settings_second">sekunti</string>
     <string name="settings_seconds">sekuntia</string>
 
@@ -493,8 +485,8 @@
     <string name="settings_devices_list">Laitteet</string>
     <string name="devices_details_dialog_title">Laitteen tiedot</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Nimi</string>
-    <string name="devices_details_device_name">Laitteen nimi</string>
+    <string name="devices_details_name_title">Julkinen nimi</string>
+    <string name="devices_details_device_name">Päivitä julkinen nimi</string>
     <string name="devices_details_last_seen_title">Viimeksi käytetty</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_text">Tämä toimenpide vaatii lisätunnistautumisen.
@@ -627,8 +619,8 @@
     <string name="encryption_information_decryption_error">Salauksenpurkuvirhe</string>
 
     <string name="encryption_information_sender_device_information">Lähettävän laitteen tiedot</string>
-    <string name="encryption_information_device_name">Laitteen nimi</string>
-    <string name="encryption_information_name">Nimi</string>
+    <string name="encryption_information_device_name">Julkinen nimi</string>
+    <string name="encryption_information_name">Julkinen nimi</string>
     <string name="encryption_information_device_id">Laitteen ID</string>
     <string name="encryption_information_device_key">Laitteen avain</string>
     <string name="encryption_information_verification">Vahvistus</string>
@@ -1534,7 +1526,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="settings_preferences">Asetukset</string>
     <string name="settings_security_and_privacy">Tietoturva ja yksityisyys</string>
     <string name="room_list_catchup_empty_title">Olet ajan tasalla!</string>
-    <string name="last_edited_info_message">Viimeksi muokannut %s %s</string>
+    <string name="last_edited_info_message">Viimeksi muokannut %1$s %2$s</string>
 
 
     <string name="change_room_directory_network">Vaihda verkkoa</string>
@@ -1612,4 +1604,57 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Storen kuvaus</string>
     <string name="settings_push_rules">Push-säännöt</string>
     <string name="riotx_no_registration_notice">%1$s luodaksesi tilin.</string>
+    <string name="disconnect">Katkaise yhteys</string>
+    <string name="decline">Kieltäydy</string>
+
+    <string name="people_no_identity_server">Identiteettipalvelinta ei ole määritetty.</string>
+
+    <string name="call_failed_no_ice_title">Puhelu epäonnistui väärin määritetyn palvelimen takia</string>
+    <string name="call_failed_dont_ask_again">Älä kysy uudestaan</string>
+
+    <string name="login_error_homeserver_not_found">Kotipalvelinta ei voi tavoittaa tästä URL-osoitteesta, tarkista osoite</string>
+    <string name="invite_no_identity_server_error">Lisää identiteettipalvelin asetuksissasi, jotta voit tehdä tämän toiminnon.</string>
+    <string name="settings_background_fdroid_sync_mode">Taustasynkronointitila (kokeellinen)</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Ei taustasynkronointia</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Et saa ilmoituksia saapuvista viesteistä, kun sovellus on taustalla.</string>
+    <string name="settings_background_sync_update_error">Asetusten päivittäminen epäonnistui.</string>
+
+
+    <string name="settings_set_workmanager_delay">Haluttu synkronointiväli</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nSynkronointia saatetaan lykätä resursseista (akusta) tai laitteen tilasta (virransäästö) riippuen.</string>
+    <string name="encryption_information_device_name_with_warning">Julkinen nimi (näkyy ihmisille, joihin olet yhteydessä)</string>
+    <string name="device_name_warning">Laitteen julkinen nimi näkyy ihmisille, joihin olet yhteydessä</string>
+    <string name="widget_integration_review_terms">Jatkaaksesi sinun täytyy hyväksyä palvelun käyttöehdot.</string>
+
+    <string name="identity_server_not_defined">Et käytä identiteettipalvelinta</string>
+    <string name="identity_server_not_defined_for_password_reset">Identiteettipalvelinta ei ole määritetty, salasanan palautus vaaditaan.</string>
+
+    <string name="error_user_already_logged_in">Näyttää, että yrität yhdistää toiseen kotipalvelimeen. Haluatko kirjautua ulos\?</string>
+
+    <string name="push_gateway_item_url">URL-osoite:</string>
+    <string name="labs_swipe_to_reply_in_timeline">Ota käyttöön pyyhkäisemällä vastaaminen aikajanalla</string>
+
+    <string name="terms_of_service">Käyttöehdot</string>
+    <string name="review_terms">Lue ehdot</string>
+    <string name="terms_description_for_integration_manager">Käytä botteja, siltoja, sovelmia ja tarrapaketteja</string>
+
+    <string name="read_at">Lue osoitteessa</string>
+
+
+    <string name="identity_server">Identiteettipalvelin</string>
+    <string name="disconnect_identity_server">Katkaise yhteys identiteettipalvelimeen</string>
+    <string name="add_identity_server">Määritä identiteettipalvelin</string>
+    <string name="change_identity_server">Vaihda identiteettipalvelinta</string>
+    <string name="settings_discovery_identity_server_info">Käytät palvelinta %1$s löytääksesi tuntemiasi ihmisiä ja jotta he löytäisivät sinut.</string>
+    <string name="settings_discovery_identity_server_info_none">Et käytä tällä hetkellä identiteettipalvelinta. Jotta voit löytää tuntemiasi ihmisiä ja jotta he löytävät sinut, määritä identiteettipalvelin alla.</string>
+    <string name="settings_discovery_mail_pending">Odottaa</string>
+
+    <string name="settings_discovery_enter_identity_server">Syötä uusi identiteettipalvelin</string>
+    <string name="settings_discovery_bad_identity_server">Identiteettipalvelimeen ei saatu yhteyttä</string>
+    <string name="settings_discovery_please_enter_server">Syötä identiteettipalvelimen URL-osoite</string>
+    <string name="settings_discovery_no_terms_title">Identiteettipalvelimella ei ole käyttöehtoja</string>
+    <string name="settings_discovery_no_terms">Valitsemallasi identiteettipalvelimella ei ole käyttöehtoja. Jatka vain, jos luotat palvelun omistajaan</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Jaat sähköpostiosoitteita tai puhelinnumeroita identiteettipalvelimella %s. Sinun täytyy yhdistää uudelleen palvelimeen %s, jotta voit lopettaa niiden jakamisen.</string>
+    <string name="settings_agree_to_terms">Hyväksy identiteettipalvelimen (%s) käyttöehdot salliaksesi, että sinut voi löytää sähköpostiosoitteen tai puhelinnumeron perusteella.</string>
 </resources>

vector/src/main/res/values-fr/strings.xml

@@ -293,7 +293,7 @@
     <string name="settings_background_sync">Synchronisation en arrière-plan</string>
     <string name="settings_enable_background_sync">Activer la synchronisation en arrière-plan</string>
     <string name="settings_set_sync_timeout">Délai d’attente de la requête de synchronisation</string>
-    <string name="settings_set_sync_delay">Délai entre chaque requête</string>
+    <string name="settings_set_sync_delay">Délai entre chaque synchronisation</string>
     <string name="settings_second">seconde</string>
     <string name="settings_seconds">secondes</string>
 
@@ -317,10 +317,10 @@
     <string name="settings_pin_missed_notifications">Épingler les salons avec des notifications manquées</string>
     <string name="settings_pin_unread_messages">Épingler les salons avec des messages non lus</string>
     <string name="settings_devices_list">Appareils</string>
-    <string name="devices_details_dialog_title">Détails de l’appareil</string>
+    <string name="devices_details_dialog_title">Informations de l’appareil</string>
     <string name="devices_details_id_title">Identifiant</string>
-    <string name="devices_details_name_title">Nom</string>
-    <string name="devices_details_device_name">Nom de l’appareil</string>
+    <string name="devices_details_name_title">Nom public</string>
+    <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>
@@ -391,9 +391,9 @@
     <string name="encryption_information_decryption_error">Erreur de déchiffrement</string>
 
     <string name="encryption_information_sender_device_information">Informations sur l’appareil de l’expéditeur</string>
-    <string name="encryption_information_device_name">Nom de l’appareil</string>
-    <string name="encryption_information_name">Nom</string>
-    <string name="encryption_information_device_id">Identifiant de l’appareil</string>
+    <string name="encryption_information_device_name">Nom public</string>
+    <string name="encryption_information_name">Nom public</string>
+    <string name="encryption_information_device_id">Identifiant</string>
     <string name="encryption_information_device_key">Clé de l’appareil</string>
     <string name="encryption_information_verification">Vérification</string>
     <string name="encryption_information_ed25519_fingerprint">Empreinte Ed25519</string>
@@ -439,14 +439,6 @@
 
     <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="auth_add_email_message">Ajoutez une adresse e-mail à votre compte pour permettre aux autres utilisateurs de vous retrouver et pour pouvoir réinitialiser votre mot de passe.</string>
-    <string name="auth_add_phone_message">Ajoutez un numéro de téléphone à votre compte pour permettre aux autres utilisateurs de vous retrouver.</string>
-    <string name="auth_add_email_phone_message">Ajoutez une adresse e-mail et / ou un numéro de téléphone à votre compte pour permettre aux autres utilisateurs de vous retrouver.
-
-L’adresse e-mail vous permettra également de réinitialiser votre mot de passe.</string>
-    <string name="auth_add_email_and_phone_message">Ajoutez une adresse e-mail et un numéro de téléphone à votre compte pour permettre aux autres utilisateurs de vous retrouver.
-
-L’adresse e-mail vous permettra également de réinitialiser votre mot de passe.</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>
@@ -1501,7 +1493,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="event_redacted_by_user_reason">Évènement supprimé par l’utilisateur</string>
     <string name="event_redacted_by_admin_reason">Évènement modéré par l’administrateur du salon</string>
-    <string name="last_edited_info_message">Dernière édition par %s le %s</string>
+    <string name="last_edited_info_message">Dernière édition par %1$s le %2$s</string>
 
 
     <string name="malformed_message">Évènement malformé, affichage impossible</string>
@@ -1578,7 +1570,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 \n
 \nRiotX prend en charge : • Se connecter à un compte existant • Créer de salons et rejoindre des salons publics • Accepter et refuser des invitations • Lister les salons des utilisateurs • Voir les informations des salons • Envoyer des messages texte • Envoyer des pièces jointes • Lire et écrire des messages dans les salons chiffrés • Chiffrement : sauvegarde des clés de chiffrement, vérification avancée des appareils, demande et réponse de partage de clé • Notifications • Thèmes clair, sombre et noir
 \n
-\nToutes les fonctionnalités de Riot ne sont pas encore implémentées dans RiotX. Principales fonctionnalités manquantes (et qui arrivent bientôt !) : • Création de compte • Réglages des salons (lister les membres du salon etc.) • Création de salons de discussion directe • Appels • Widgets • …</string>
+\nToutes les fonctionnalités de Riot ne sont pas encore implémentées dans RiotX. Principales fonctionnalités manquantes (et qui arrivent bientôt !) : • Création de compte • Réglages des salons (lister les membres du salon etc.) • Appels • Widgets • …</string>
 
     <string name="bottom_action_people_x">Messages directs</string>
 
@@ -1625,4 +1617,88 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="message_view_edit_history">Voir l’historique des éditions</string>
 
+    <string name="review">Examiner</string>
+    <string name="decline">Refuser</string>
+
+    <string name="widget_integration_review_terms">Pour continuer, vous devez accepter les conditions de ce service.</string>
+
+    <string name="security_warning_identity_server">Les versions précédentes de Riot avaient un problème de sécurité qui pouvait permettre à votre serveur d’identité (%1$s) d’accéder à votre compte. Si vous faites confiance à %2$s, vous pouvez ignorer cela ; sinon déconnectez-vous et reconnectez-vous.
+\n
+\nVous trouverez plus de détails ici :
+\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
+
+    <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 packs de stickers</string>
+
+    <string name="read_at">Lu à</string>
+
+    <string name="none">Aucun</string>
+    <string name="revoke">Révoquer</string>
+    <string name="disconnect">Déconnecter</string>
+    <string name="people_no_identity_server">Aucun serveur d’identité configuré.</string>
+
+    <string name="call_failed_no_ice_title">L’appel a échoué en raison d’un serveur mal configuré</string>
+    <string name="call_failed_no_ice_description">Demandez à l’administrateur de votre serveur d’accueil (%1$s) de configurer un serveur TURN afin que les appels fonctionnent de manière fiable.
+\n
+\nSinon, vous pouvez essayer d’utiliser le serveur public à %2$s, mais ça ne sera pas fiable et ça partagera votre adresse IP avec ce serveur. Vous pouvez aussi régler cela dans les paramètres.</string>
+    <string name="call_failed_no_ice_use_alt">Essayez d’utiliser %s</string>
+    <string name="call_failed_dont_ask_again">Ne plus me demander</string>
+
+    <string name="auth_add_email_message_2">Renseignez une adresse e-mail pour la récupération de compte et pour être éventuellement découvrable par les personnes qui vous connaissent.</string>
+    <string name="auth_add_phone_message_2">Renseignez un numéro de téléphone pour être éventuellement découvrable par les personnes qui vous connaissent.</string>
+    <string name="auth_add_email_phone_message_2">Renseignez une adresse e-mail pour la récupération de compte. Utilisez ensuite un e-mail ou un téléphone pour être éventuellement découvrable par les personnes qui vous connaissent.</string>
+    <string name="auth_add_email_and_phone_message_2">Renseignez une adresse e-mail pour la récupération de compte. Utilisez ensuite un e-mail ou un téléphone pour être éventuellement découvrable par les personnes qui vous connaissent.</string>
+    <string name="login_error_homeserver_not_found">Impossible de joindre le serveur d’accueil à cette URL, veuillez la vérifier</string>
+    <string name="settings_call_ringtone_use_default_stun">Autoriser le serveur d’assistance d’appel de secours</string>
+    <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 (expérimental)</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimisé pour la batterie</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Riot 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">Riot 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 Riot 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>
+
+
+    <string name="settings_set_workmanager_delay">Intervalle de synchronisation préféré</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nLa synchronisation peut être retardée selon les ressources (batterie) ou l’état (veille) de l’appareil.</string>
+    <string name="settings_discovery_category">Découverte</string>
+    <string name="settings_discovery_manage">Gérer vos paramètres de découverte.</string>
+    <string name="encryption_information_device_name_with_warning">Nom public (visible par les personnes avec qui vous communiquez)</string>
+    <string name="device_name_warning">Le nom public d’un appareil est visible par les personnes avec qui vous communiquez</string>
+    <string name="identity_server_not_defined">Vous n’utilisez aucun serveur d’identité</string>
+    <string name="identity_server_not_defined_for_password_reset">Aucun serveur d’identité n’est configuré, il est nécessaire pour réinitialiser votre mot de passe.</string>
+
+    <string name="error_user_already_logged_in">Il semblerait que vous essayez de vous connecter à un autre serveur d’accueil. Voulez-vous vous déconnecter \?</string>
+
+    <string name="identity_server">Serveur d’identité</string>
+    <string name="disconnect_identity_server">Se déconnecter du serveur d’identité</string>
+    <string name="add_identity_server">Configurer le serveur d’identité</string>
+    <string name="change_identity_server">Modifier le serveur d’identité</string>
+    <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_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_mail_pending">En attente</string>
+
+    <string name="settings_discovery_enter_identity_server">Renseignez un nouveau serveur d’identité</string>
+    <string name="settings_discovery_bad_identity_server">Impossible de se connecter au serveur d’identité</string>
+    <string name="settings_discovery_please_enter_server">Veuillez renseigner l’URL du serveur d’identité</string>
+    <string name="settings_discovery_no_terms_title">Le serveur d’identité n’a pas de conditions de service</string>
+    <string name="settings_discovery_no_terms">Le serveur d’identité qui vous avez choisi n’a pas de conditions de service. Continuez uniquement si vous faites confiance au propriétaire de ce service</string>
+    <string name="settings_text_message_sent">Un SMS a été envoyé à %s. Saisissez le code de vérification qu’il contient.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">Vous partagez actuellement des adresse e-mails et des numéros de téléphone sur le serveur d’identité %s. Vous devrez vous reconnecter à %s pour arrêter de les partager.</string>
+    <string name="settings_agree_to_terms">Acceptez les conditions de service du serveur d’identité (%s) pour vous permettre d’être découvrable avec une adresse e-mail ou un numéro de téléphone.</string>
 </resources>

vector/src/main/res/values-gl/strings.xml

@@ -168,14 +168,6 @@ Quere engadir algún?</string>
     <string name="auth_password_placeholder">Contrasinal</string>
     <string name="auth_new_password_placeholder">Novo contrasinal</string>
     <string name="auth_user_name_placeholder">Nome de usuario</string>
-    <string name="auth_add_email_message">Engadíndolle unha dirección de correo á súa conta permite que outros usuarios o atopen e que poida restaurar o seu contrasinal.</string>
-    <string name="auth_add_phone_message">Engadíndolle o teléfono á súa conta permite que outros usuarios o atopen.</string>
-    <string name="auth_add_email_phone_message">Engade unha dirección de correo e/ou número de teléfono á súa conta e permite que outros usuarios o atopen.
-
-A dirección de correo permitiralle restaurar o contrasinal.</string>
-    <string name="auth_add_email_and_phone_message">Engade unha dirección de correo e un número de teléfono á súa conta para permitirlle a outros usuarios que o atopen.
-
-A dirección de correo permitiralle restaurar o contrasinal.</string>
     <string name="auth_email_placeholder">Enderezo de correo</string>
     <string name="auth_opt_email_placeholder">Enderezo de correo (opcional)</string>
     <string name="auth_phone_number_placeholder">Número de teléfono</string>

vector/src/main/res/values-hu/strings.xml

@@ -129,14 +129,6 @@
     <string name="auth_password_placeholder">Jelszó</string>
     <string name="auth_new_password_placeholder">Új jelszó</string>
     <string name="auth_user_name_placeholder">Felhasználónév</string>
-    <string name="auth_add_email_message">Adj meg egy e-mail címet a fiókodhoz, hogy mások megtalálhassanak és hogy visszaállíthasd a jelszavadat.</string>
-    <string name="auth_add_phone_message">Adj meg telefonszámot a fiókodhoz, hogy mások megtalálhassanak.</string>
-    <string name="auth_add_email_phone_message">Adj meg e-mail címet és/vagy telefonszámot a fiókodhoz, hogy mások megtalálhassanak.
-
- Az e-mail címmel a jelszavadat is helyreállíthatod.</string>
-    <string name="auth_add_email_and_phone_message">Adj meg e-mail címet és telefonszámot a fiókodhoz, hogy mások megtalálhassanak.
-
- Az e-mail címmel a jelszavadat is helyreállíthatod.</string>
     <string name="auth_email_placeholder">E-mail cím</string>
     <string name="auth_opt_email_placeholder">E-mail cím (nem kötelező)</string>
     <string name="auth_phone_number_placeholder">Telefonszám</string>
@@ -421,7 +413,7 @@ Vedd figyelembe, hogy az alkalmazás újraindul  ami sok időt vehet igénybe."<
     <string name="settings_background_sync">Szinkronizálás a háttérben</string>
     <string name="settings_enable_background_sync">Háttérben történő szinkronizáció engedélyezése</string>
     <string name="settings_set_sync_timeout">Szinkronizáció kérelem időtúllépés</string>
-    <string name="settings_set_sync_delay">Késleltetés kérések között</string>
+    <string name="settings_set_sync_delay">Késleltetés a szinkronizációk között</string>
     <string name="settings_second">másodperc</string>
     <string name="settings_seconds">másodperc</string>
 
@@ -448,8 +440,8 @@ Vedd figyelembe, hogy az alkalmazás újraindul  ami sok időt vehet igénybe."<
     <string name="settings_devices_list">Eszközök</string>
     <string name="devices_details_dialog_title">Eszköz adatai</string>
     <string name="devices_details_id_title">Azonosító</string>
-    <string name="devices_details_name_title">Név</string>
-    <string name="devices_details_device_name">Készüléknév</string>
+    <string name="devices_details_name_title">Nyilvános Név</string>
+    <string name="devices_details_device_name">Nyilvános Név frissítése</string>
     <string name="devices_details_last_seen_title">Legutóbb láttuk</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_text">Ez a művelethez újra azonosításra van szükség.
@@ -565,9 +557,9 @@ Vedd figyelembe, hogy az alkalmazás újraindul  ami sok időt vehet igénybe."<
     <string name="encryption_information_decryption_error">Visszafejtés hiba</string>
 
     <string name="encryption_information_sender_device_information">A küldő eszköz információi</string>
-    <string name="encryption_information_device_name">Eszköz információ</string>
-    <string name="encryption_information_name">Név</string>
-    <string name="encryption_information_device_id">Eszköz azonosító</string>
+    <string name="encryption_information_device_name">Nyilvános név</string>
+    <string name="encryption_information_name">Nyilvános név</string>
+    <string name="encryption_information_device_id">Azon.</string>
     <string name="encryption_information_device_key">Eszköz kulcs</string>
     <string name="encryption_information_verification">Hitelesítés</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 ujjlenyomat</string>
@@ -1498,7 +1490,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">Az eseményt a felhasználó törölte</string>
     <string name="event_redacted_by_admin_reason">Az eseményt a szoba adminisztrátora moderálta</string>
-    <string name="last_edited_info_message">Utoljára szerkesztette: %s ekkor: %s</string>
+    <string name="last_edited_info_message">Utoljára szerkesztette: %1$s ekkor: %2$s</string>
 
 
     <string name="malformed_message">Hibás esemény, nem lehet megjeleníteni</string>
@@ -1577,7 +1569,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \n
 \nRiotX ezeket támogatja: • Bejelentkezés létező fiókba • Szoba készítés és nyilvános szobába való belépés • Meghívók fogadása és elutasítás • Felhasználók szobáinak listázása • Szoba adatainak megtekintése • Szöveges üzenet küldése • Csatolmány küldése • Titkosított szobákban üzenetek olvasása és írása • Titkosítás: Végponttól végpontig titkosító kulcsok mentése, fejlett eszköz ellenőrzés, kulcs megosztás kérése és válasz • „Push” értesítések • Világos, sötét és fekete téma
 \n
-\nNem minden Riot funkció támogatott a RiotX-ben jelenleg. A fő hiányzó (és hamarosan elérhető!) funkciók: • Felhasználói fiók létrehozása • Szoba beállítások (szoba tagság mutatása, stb…) • Közvetlen beszélgetések indítása • Hívások • Kisalkalmazások • …</string>
+\nNem minden Riot funkció támogatott a RiotX-ben jelenleg. A fő hiányzó (és hamarosan elérhető!) funkciók: • Felhasználói fiók létrehozása • Szoba beállítások (szoba tagság mutatása, stb…) • Hívások • Kisalkalmazások • …</string>
 
     <string name="bottom_action_people_x">Közvetlen beszélgetés</string>
 
@@ -1624,4 +1616,88 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="message_view_edit_history">Szerkesztési napló megtekintése</string>
 
+    <string name="review">Átnéz</string>
+    <string name="decline">Elutasít</string>
+
+    <string name="widget_integration_review_terms">A továbblépéshez el kell fogadnod a Felhasználási feltételeket.</string>
+
+    <string name="security_warning_identity_server">A Riot előző verziója egy biztonsági hibát tartalmazott ami az Azonosítási Szervernek (%1$s) hozzáférést adott a fiókodhoz. Ha megbízol a %2$s szerverben, akkor ezt figyelmen kívül hagyhatod különben jelentkezz ki és újra vissza.
+\n
+\nTovábbi információ itt:
+\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
+
+    <string name="terms_of_service">Felhasználási feltételek</string>
+    <string name="review_terms">Feltételek átnézése</string>
+    <string name="terms_description_for_identity_server">Mások által is megtalálható legyél</string>
+    <string name="terms_description_for_integration_manager">Használj botokat, hidakat (bridges), kisalkalmazásokat és matrica csomagokat</string>
+
+    <string name="read_at">Olvasd itt</string>
+
+    <string name="none">Nincs</string>
+    <string name="revoke">Visszavon</string>
+    <string name="disconnect">Lecsatlakozik</string>
+    <string name="people_no_identity_server">Azonosítási szerver nincs beállítva.</string>
+
+    <string name="call_failed_no_ice_title">A hívás sikertelen a hibásan beállított szerver miatt</string>
+    <string name="call_failed_no_ice_description">Kérd meg a matrix szervered (%1$s) adminisztrátorát, hogy állítson be egy TURN szervert, hogy a hívások megbízhatóan működjenek.
+\n
+\nAlternatív megoldásként használhatod a nyilvános szervert itt: %2$s, de ez lehet, hogy nem lesz annyira megbízható és az IP címedet megosztja a szerverrel. Ezt a Beállításokban tudod megadni.</string>
+    <string name="call_failed_no_ice_use_alt">Próbáld ki ezt: %s</string>
+    <string name="call_failed_dont_ask_again">Ne kérdezz újra</string>
+
+    <string name="auth_add_email_message_2">Fiók visszaállításhoz e-mail beállítása, később esetleg megtalálhatnak akik ismernek téged.</string>
+    <string name="auth_add_phone_message_2">Telefonszám beállítása, és később esetleg megtalálhatnak akik ismernek téged.</string>
+    <string name="auth_add_email_phone_message_2">Fiók visszaállításhoz e-mail beállítás. Később esetleg e-mail vagy telefonszám alapján megtalálhatnak akik ismernek téged.</string>
+    <string name="auth_add_email_and_phone_message_2">Fiók visszaállításhoz e-mail beállítás. Később esetleg e-mail vagy telefonszám alapján megtalálhatnak akik ismernek téged.</string>
+    <string name="login_error_homeserver_not_found">A matrix szerver elérhetetlen ezen a címen, kérlek ellenőrizd</string>
+    <string name="settings_call_ringtone_use_default_stun">Tartalék hívás segítő szerver engedélyezése</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Segítségként %s lesz használatban ha a matrix szervered nem ajánl fel egyet (a hívás ideje alatt az IP címed megosztásra kerül)</string>
+    <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">Riot 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">Riot 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 riot 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>
+
+
+    <string name="settings_set_workmanager_delay">Előnyben részesített szinkronizációs időköz</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nA szinkronizáció az eszköz erőforrásainak (akkumulátor) és állapotának (alvó mód) függvényében késleltetve lehet.</string>
+    <string name="settings_discovery_category">Felderítés</string>
+    <string name="settings_discovery_manage">Felderítési beállítások megváltoztatása.</string>
+    <string name="encryption_information_device_name_with_warning">Nyilvános név (a beszélgetőpartnerek által látható)</string>
+    <string name="device_name_warning">Az eszköz nyilvános neve látható azoknál akikkel beszélgetsz</string>
+    <string name="identity_server_not_defined">Nem használsz Azonosítási Szervert</string>
+    <string name="identity_server_not_defined_for_password_reset">Nincs beállítva azonosítási szerver amire a jelszó visszaállításához szükség van.</string>
+
+    <string name="error_user_already_logged_in">Úgy látszik másik matrix szerverhez szeretnél csatlakozni. Kijelentkezel\?</string>
+
+    <string name="identity_server">Azonosítási szerver</string>
+    <string name="disconnect_identity_server">Azonosítási szerverről lecsatlakozás</string>
+    <string name="add_identity_server">Azonosítási szerver beállítása</string>
+    <string name="change_identity_server">Azonosítási szerver megváltoztatása</string>
+    <string name="settings_discovery_identity_server_info">A felderítésekhez és hogy megtaláljanak az ismerősök ezt a szervert használod jelenleg: %1$s.</string>
+    <string name="settings_discovery_identity_server_info_none">Jelenleg nem használsz azonosítási szervert. A felderítéshez és, hogy az ismerősök megtalálhassanak állíts be egyet alább.</string>
+    <string name="settings_discovery_emails_title">Felderíthető e-mail címek</string>
+    <string name="settings_discovery_no_mails">Amint hozzáadtál egy e-mail címet megjelenik a felderítési beállítási lehetőség.</string>
+    <string name="settings_discovery_no_msisdn">Amint hozzáadtál egy telefonszámot megjelenik a felderítési beállítási lehetőség.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Az azonosítási szerverről való lecsatlakozással nem leszel mások által megtalálható és másokat sem tudsz meghívni e-mail címmel vagy telefonszámmal.</string>
+    <string name="settings_discovery_msisdn_title">Felderíthető telefonszámok</string>
+    <string name="settings_discovery_confirm_mail">Megerősítő levelet küldtünk ide: %s, ellenőrizd az e-mailedet és kattints a megerősítő hivatkozásra</string>
+    <string name="settings_discovery_mail_pending">Várakozás</string>
+
+    <string name="settings_discovery_enter_identity_server">Add meg az új azonosítási szervert</string>
+    <string name="settings_discovery_bad_identity_server">Az azonosítási szerverhez nem lehet csatlakozni</string>
+    <string name="settings_discovery_please_enter_server">Kérlek add meg az azonosítási szerver url-jét</string>
+    <string name="settings_discovery_no_terms_title">Az azonosítási szervernek nincsen felhasználási feltétele</string>
+    <string name="settings_discovery_no_terms">Az általad választott azonosítási szervernek nincs felhasználási feltétele. Csak akkor lépj tovább ha megbízol a szolgáltatás tulajdonosában</string>
+    <string name="settings_text_message_sent">Szöveges üzenetet küldtünk ide: %s. Kérlek add meg az ellenőrző kódot amit az üzenet tartalmaz.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">Az azonosítási szerverrel (%s) megosztod az e-mail címeket és telefonszámokat. Újra kell csatlakoznod ehhez: %s, hogy megállítsd a megosztást.</string>
+    <string name="settings_agree_to_terms">Egyetértek az azonosítási szerver (%s) Felhasználási feltételeivel ahhoz, hogy megtalálható legyek e-mail címmel vagy telefonszámmal.</string>
 </resources>

vector/src/main/res/values-id/strings.xml

@@ -194,14 +194,6 @@
 
     <string name="send_files_in">Kirim ke</string>
     <string name="username">Nama Pengguna</string>
-    <string name="auth_add_email_message">Tambahkan alamat email ke akun agar pengguna lain dapat menemukan Anda, dan kata sandi dapat disetel ulang.</string>
-    <string name="auth_add_phone_message">Tambahkan nomor telpon ke akun agar pengguna lain dapat menemukan Anda.</string>
-    <string name="auth_add_email_phone_message">Tambahkan alamat email dan/atau nomor telpon ke akun agar pengguna lain dapat menemukan Anda.
-
-Alamat email juga memungkinkan Anda menyetel ulang kata sandi.</string>
-    <string name="auth_add_email_and_phone_message">Tambahkan alamat email dan nomor telpon ke akun agar pengguna lain dapat menemukan Anda.
-
-Alamat email juga memungkinkan Anda menyetel ulang kata sandi Anda.</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>

vector/src/main/res/values-in/strings.xml

@@ -194,14 +194,6 @@
 
     <string name="send_files_in">Kirim ke</string>
     <string name="username">Nama Pengguna</string>
-    <string name="auth_add_email_message">Tambahkan alamat email ke akun agar pengguna lain dapat menemukan Anda, dan kata sandi dapat disetel ulang.</string>
-    <string name="auth_add_phone_message">Tambahkan nomor telpon ke akun agar pengguna lain dapat menemukan Anda.</string>
-    <string name="auth_add_email_phone_message">Tambahkan alamat email dan/atau nomor telpon ke akun agar pengguna lain dapat menemukan Anda.
-
-Alamat email juga memungkinkan Anda menyetel ulang kata sandi.</string>
-    <string name="auth_add_email_and_phone_message">Tambahkan alamat email dan nomor telpon ke akun agar pengguna lain dapat menemukan Anda.
-
-Alamat email juga memungkinkan Anda menyetel ulang kata sandi Anda.</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>

vector/src/main/res/values-is/strings.xml

@@ -793,14 +793,6 @@ Leyfa Riot nota tengiliðina ?</string>
     <string name="send_bug_report_alert_message">Það er eins og þú sért að hrista símann ákveðið. Myndirðu vilja senda villuskýrslu?</string>
     <string name="send_bug_report_app_crashed">Forritið hrundi síðast. Myndirðu vilja senda inn villuskýrslu?</string>
     <string name="option_send_sticker">Senda límmerki</string>
-    <string name="auth_add_email_message">Bættu tölvupóstfangi við notandaaðganginn þinn til að gera öðrum notendum kleift að finna þig og einnig til að endurstilla lykilorðið þitt.</string>
-    <string name="auth_add_phone_message">Bættu símanúmeri við notandaaðganginn þinn til að gera öðrum notendum kleift að finna þig.</string>
-    <string name="auth_add_email_phone_message">Bættu tölvupóstfangi og/eða símanúmeri við notandaaðganginn þinn til að gera öðrum notendum kleift að finna þig.
-
-Tölvupóstfang nýtist einnig til að endurstilla lykilorðið þitt.</string>
-    <string name="auth_add_email_and_phone_message">Bættu tölvupóstfangi og símanúmeri við notandaaðganginn þinn til að gera öðrum notendum kleift að finna þig.
-
-Tölvupóstfang nýtist einnig til að endurstilla lykilorðið þitt.</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>

vector/src/main/res/values-it/strings.xml

@@ -144,14 +144,6 @@
     <string name="auth_password_placeholder">Password</string>
     <string name="auth_new_password_placeholder">Nuova password</string>
     <string name="auth_user_name_placeholder">Nome utente</string>
-    <string name="auth_add_email_message">Aggiungi un indirizzo email al tuo account per farti trovare e per poter resettare la password.</string>
-    <string name="auth_add_phone_message">Aggiungi un numero di telefono al tuo account per farti trovare.</string>
-    <string name="auth_add_email_phone_message">Aggiungi un indirizzo email e/o un numero di telefono al tuo account per farti trovare.
-
-L\'indirizzo email ti permetterà anche di resettare la password.</string>
-    <string name="auth_add_email_and_phone_message">Aggiungi un indirizzo email ed un numero di telefono al tuo account per farti trovare.
-
-L\'indirizzo email ti permetterà anche di resettare la password.</string>
     <string name="auth_email_placeholder">Indirizzo email</string>
     <string name="auth_opt_email_placeholder">Indirizzo email (facoltativo)</string>
     <string name="auth_phone_number_placeholder">Numero di telefono</string>
@@ -294,7 +286,7 @@ Per favore consenti l\'accesso nella prossima finestra per potere effettuare la
     <string name="reject">Rifiuta</string>
 
     <!-- Room -->
-    <string name="room_jump_to_first_unread">Primo messaggio non letto.</string>
+    <string name="room_jump_to_first_unread">Vai al primo messaggio non letto.</string>
 
     <!-- Room Preview -->
     <string name="room_preview_invitation_format">Sei stato invitato ad unirti in questa stanza da %s</string>
@@ -465,7 +457,7 @@ Tieni presente che questa azione riavvierà l\'app e potrebbe richiedere del tem
     <string name="settings_background_sync">Sincronizzazione in sottofondo</string>
     <string name="settings_enable_background_sync">Abilita sync in sottofondo</string>
     <string name="settings_set_sync_timeout">Attesa per una richiesta di sync</string>
-    <string name="settings_set_sync_delay">Attesa prima di una nuova richiesta</string>
+    <string name="settings_set_sync_delay">Attesa per ogni sincronizzazione</string>
     <string name="settings_second">secondo</string>
     <string name="settings_seconds">secondi</string>
 
@@ -496,10 +488,10 @@ Tieni presente che questa azione riavvierà l\'app e potrebbe richiedere del tem
     <string name="settings_always_show_timestamps">Mostra data e ora di tutti i messaggi</string>
     <string name="settings_data_save_mode">Modalità risparmio banda</string>
 
-    <string name="devices_details_dialog_title">Dettagli dispositivo</string>
+    <string name="devices_details_dialog_title">Informazioni dispositivo</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Nome</string>
-    <string name="devices_details_device_name">Nome dispositivo</string>
+    <string name="devices_details_name_title">Nome pubblico</string>
+    <string name="devices_details_device_name">Aggiorna nome pubblico</string>
     <string name="devices_details_last_seen_title">Ultima visualizzazione</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_text">Questa operazione richiede un\'autenticazione aggiuntiva.\nPer proseguire, inserisci la tua password.</string>
@@ -640,9 +632,9 @@ Tieni presente che questa azione riavvierà l\'app e potrebbe richiedere del tem
     <string name="encryption_information_decryption_error">Errore decriptazione</string>
 
     <string name="encryption_information_sender_device_information">Informazioni dispositivo mittente</string>
-    <string name="encryption_information_device_name">Nome dispositivo</string>
-    <string name="encryption_information_name">Nome</string>
-    <string name="encryption_information_device_id">ID dispositivo</string>
+    <string name="encryption_information_device_name">Nome pubblico</string>
+    <string name="encryption_information_name">Nome pubblico</string>
+    <string name="encryption_information_device_id">ID</string>
     <string name="encryption_information_device_key">Chiave dispositivo</string>
     <string name="encryption_information_verification">Verifica</string>
     <string name="encryption_information_ed25519_fingerprint">Impronta digitale Ed25519</string>
@@ -1542,7 +1534,7 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
 
     <string name="event_redacted_by_user_reason">Evento eliminato dall\'utente</string>
     <string name="event_redacted_by_admin_reason">Evento moderato da un admin della stanza</string>
-    <string name="last_edited_info_message">Ultima modifica di %s il %s</string>
+    <string name="last_edited_info_message">Ultima modifica di %1$s il %2$s</string>
 
 
     <string name="malformed_message">Evento malformato, impossibile visualizzarlo</string>
@@ -1621,7 +1613,7 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
 \n
 \nRiotX supporta: • Accesso ad account esistente • Crea stanze ed entra in stanze pubbliche • Accetta e rifiuta inviti • Elenca stanze utenti • Vedi dettagli stanza • Invia messaggi di testo • Invia allegati • Leggi e scrivi messaggi in stanze cifrate • Crypto: backup chiavi E2E, verifica avanzata dispositivi, richiesta e risposta condivisione chiavi • Notifiche push • Tema chiaro, scuro e nero
 \n
-\nNon tutte le funzioni di Riot sono già implementate in RiotX. Principali funzioni mancanti (prossimamente!): • Creazione account • Impostazioni stanza (elenca membri stanza, ecc.) • Creazione di stanze di chat diretta • Chiamate • Widget • …</string>
+\nNon tutte le funzioni di Riot sono già implementate in RiotX. Principali funzioni mancanti (prossimamente!): • Creazione account • Impostazioni stanza (elenca membri stanza, ecc.) • Chiamate • Widget • …</string>
 
     <string name="room_list_catchup_empty_title">Non hai nulla di nuovo da vedere!</string>
     <string name="bottom_action_people_x">Messaggi diretti</string>
@@ -1669,4 +1661,88 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
 
     <string name="message_view_edit_history">Visualizza Modifica cronologia</string>
 
+    <string name="review">Leggi</string>
+    <string name="decline">Rifiuta</string>
+
+    <string name="widget_integration_review_terms">Per continuare, devi accettare i termini di servizio.</string>
+
+    <string name="security_warning_identity_server">Le precedenti versioni di Riot avevano un errore di sicurezza che poteva dare accesso al tuo account al tuo Server di Identità (%1$s). Se ti fidi di %2$s, puoi ignorare; altrimenti disconnettiti e riaccedi di nuovo.
+\n
+\nLeggi maggiori dettagli qui:
+\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
+
+    <string name="terms_of_service">Termini di servizio</string>
+    <string name="review_terms">Leggi i termini</string>
+    <string name="terms_description_for_identity_server">Diventa trovabile dagli altri</string>
+    <string name="terms_description_for_integration_manager">Usa bot, bridge, widget e pacchetti di adesivi</string>
+
+    <string name="read_at">Leggi su</string>
+
+    <string name="none">Nessuno</string>
+    <string name="revoke">Revoca</string>
+    <string name="disconnect">Disconnetti</string>
+    <string name="people_no_identity_server">Nessun server di identità configurato.</string>
+
+    <string name="call_failed_no_ice_title">Chiamata fallita per server malconfigurato</string>
+    <string name="call_failed_no_ice_description">Chiedi all\'amministratore del tuo homeserver (%1$s) di configurare un server TURN affinché le chiamate funzionino in modo affidabile.
+\n
+\nAltrimenti, puoi provare ad usare il server pubblico su %2$s, ma non è ugualmente affidabile e vedrà il tuo indirizzo IP. Puoi fare la tua scelta anche nelle Impostazioni.</string>
+    <string name="call_failed_no_ice_use_alt">Prova ad usare %s</string>
+    <string name="call_failed_dont_ask_again">Non chiedermelo più</string>
+
+    <string name="auth_add_email_message_2">Imposta un\'email per il recupero dell\'account, o più tardi per essere trovabile dalle persone che ti conoscono.</string>
+    <string name="auth_add_phone_message_2">Imposta un telefono, o più tardi per essere trovabile dalle persone che ti conoscono.</string>
+    <string name="auth_add_email_phone_message_2">Imposta un\'email per il recupero dell\'account. Più tardi usa email o telefono per essere trovabile dalle persone che ti conoscono.</string>
+    <string name="auth_add_email_and_phone_message_2">Imposta un\'email per il recupero dell\'account. Più tardi usa email o telefono per essere trovabile dalle persone che ti conoscono.</string>
+    <string name="login_error_homeserver_not_found">Impossibile raggiungere un homeserver con questo URL, controllalo</string>
+    <string name="settings_call_ringtone_use_default_stun">Permetti server di assistenza chiamata di riserva</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Userà %s come assistente quando l\'homeserver non ne offre uno (il tuo indirizzo IP sarà visibile durante le chiamate)</string>
+    <string name="invite_no_identity_server_error">Aggiungi un server di identità nelle impostazioni per poterlo fare.</string>
+    <string name="settings_background_fdroid_sync_mode">Modalità sync in background (Sperimentale)</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Ottimizzato per la batteria</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Riot sincronizzerà in background in modo da preservare le risorse limitate del dispositivo (batteria).
+\nA seconda dello stato delle risorse del tuo dispositivo, la sincronizzazione può essere ritardata dal sistema operativo.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Ottimizzato per il tempo reale</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot sincronizzerà in background periodicamente in momenti precisi (configurabile).
+\nCiò avrà impatto sull\'uso di dati e batteria, ci sarà una notifica permanente per comunicare che Riot è in attesa di eventi.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Nessun sync in background</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Non ti verranno notificati i messaggi in arrivo quando l\'app è in background.</string>
+    <string name="settings_background_sync_update_error">Aggiornamento impostazioni fallito.</string>
+
+
+    <string name="settings_set_workmanager_delay">Intervallo di sync preferito</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nLa sincronizzazione può essere ritardata a seconda delle risorse (batteria) o dello stato del dispositivo (sospensione).</string>
+    <string name="settings_discovery_category">Scoperte</string>
+    <string name="settings_discovery_manage">Gestisci le tue impostazioni di rilevamento.</string>
+    <string name="encryption_information_device_name_with_warning">Nome pubblico (visibile alle persone con cui comunichi)</string>
+    <string name="device_name_warning">Il nome pubblico di un dispositivo è visibile alle persone con cui comunichi</string>
+    <string name="identity_server_not_defined">Non stai usando alcun server di identità</string>
+    <string name="identity_server_not_defined_for_password_reset">Nessun server di identità configurato, è necessario per ripristinare la tua password.</string>
+
+    <string name="error_user_already_logged_in">Pare che tu stia provando a connetterti ad un altro homeserver. Vuoi disconnetterti da qui\?</string>
+
+    <string name="identity_server">Server di identità</string>
+    <string name="disconnect_identity_server">Disconnetti server di identità</string>
+    <string name="add_identity_server">Configura server di identità</string>
+    <string name="change_identity_server">Cambia server di identità</string>
+    <string name="settings_discovery_identity_server_info">Attualmente stai usando %1$s per scoprire ed essere trovabile dai contatti esistenti che conosci.</string>
+    <string name="settings_discovery_identity_server_info_none">Attualmente non stai usando alcun server di identità. Per scoprire ed essere trovabile dai contatti esistenti che conosci, configurane uno qua sotto.</string>
+    <string name="settings_discovery_emails_title">Indirizzi email trovabili</string>
+    <string name="settings_discovery_no_mails">Le opzioni di scoperta appariranno dopo avere aggiunto un\'email.</string>
+    <string name="settings_discovery_no_msisdn">Le opzioni di scoperta appariranno dopo avere aggiunto un numero di telefono.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Se ti disconnetti dal server di identità non potrai più essere trovato da altri utenti e non potrai invitarne altri per email o telefono.</string>
+    <string name="settings_discovery_msisdn_title">Numeri di telefono trovabili</string>
+    <string name="settings_discovery_confirm_mail">Ti abbiamo inviato un\'email di conferma a %s, controlla l\'email e clicca sul link di conferma</string>
+    <string name="settings_discovery_mail_pending">In attesa</string>
+
+    <string name="settings_discovery_enter_identity_server">Inserisci un nuovo server di identità</string>
+    <string name="settings_discovery_bad_identity_server">Impossibile connettersi al server di identità</string>
+    <string name="settings_discovery_please_enter_server">Inserisci l\'URL del server di identità</string>
+    <string name="settings_discovery_no_terms_title">Il server di identità non ha condizioni di servizio</string>
+    <string name="settings_discovery_no_terms">Il server di identità che hai scelto non ha alcuna condizione di servizio. Continua solo se ti fidi del proprietario del servizio</string>
+    <string name="settings_text_message_sent">È stato inviato un messaggio a %s. Inserisci il codice di verifica contenuto.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">Attualmente stai condividendo indirizzi email o numeri di telefono sul server di identità %s. Dovrai riconnetterti a %s per fermarne la condivisione.</string>
+    <string name="settings_agree_to_terms">Accetta le condizioni di servizio del server di identità (%s) per consentire di essere trovabile per email o numero di telefono.</string>
 </resources>

vector/src/main/res/values-ja/strings.xml

@@ -349,19 +349,11 @@
     <string name="auth_password_placeholder">パスワード</string>
     <string name="auth_new_password_placeholder">新しいパスワード</string>
     <string name="auth_user_name_placeholder">ユーザ名</string>
-    <string name="auth_add_email_message">電子メールアドレスを登録すると, 誰かがあなたを検索をしたり, パスワード紛失時に初期化のメールを送ることができます.</string>
-    <string name="auth_add_phone_message">電話番号を登録すると, 誰かがあなたを電話番号で検索できるようになります.</string>
     <string name="auth_email_placeholder">電子メールアドレス</string>
     <string name="auth_opt_email_placeholder">電子メールアドレス (任意で)</string>
     <string name="auth_repeat_password_placeholder">パスワード再確認</string>
     <string name="auth_repeat_new_password_placeholder">新しいパスワードを再確認</string>
     <string name="auth_missing_password">パスワードが違います</string>
-    <string name="auth_add_email_phone_message">電子メールアドレスや電話番号を登録すると, それらを使用して誰かがあなたを検索できるようになります.
-
-電子メールアドレスは, パスワード紛失時に初期化の連絡をするためにも使用されます.</string>
-    <string name="auth_add_email_and_phone_message">電子メールアドレスや電話番号を登録すると, それらを使用して誰かがあなたを検索できるようになります.
-
-電子メールアドレスは, パスワード紛失時に初期化の連絡をするためにも使用されます.</string>
     <string name="auth_missing_email">電子メールアドレスが違います</string>
     <string name="auth_missing_phone">電話番号が違います</string>
     <string name="auth_missing_email_or_phone">電子メールアドレスまたは電話番号が違います</string>

vector/src/main/res/values-ko/strings.xml

@@ -12,7 +12,7 @@
     <string name="title_activity_room">방</string>
     <string name="title_activity_settings">설정</string>
     <string name="title_activity_historical">기록</string>
-    <string name="title_activity_bug_report">버그 보고서</string>
+    <string name="title_activity_bug_report">버그 신고</string>
     <string name="title_activity_choose_sticker">스티커 보내기</string>
 
     <string name="dialog_title_third_party_licences">제 3자 라이선스</string>
@@ -24,18 +24,18 @@
     <string name="save">저장</string>
     <string name="leave">떠나기</string>
     <string name="send">보내기</string>
-    <string name="copy">복사하기</string>
+    <string name="copy">복사</string>
     <string name="resend">다시 보내기</string>
-    <string name="redact">삭제하기</string>
+    <string name="redact">감추기</string>
     <string name="quote">인용</string>
-    <string name="download">받기</string>
+    <string name="download">다운로드</string>
     <string name="share">공유</string>
-    <string name="permalink">퍼머링크</string>
-    <string name="view_source">출처 보기</string>
-    <string name="view_decrypted_source">해독된 출처 보기</string>
-    <string name="delete">지우기</string>
-    <string name="rename">다시 이름짓기</string>
-    <string name="report_content">컨텐츠 신고</string>
+    <string name="permalink">고유 주소</string>
+    <string name="view_source">소스 보기</string>
+    <string name="view_decrypted_source">해독된 소스 보기</string>
+    <string name="delete">삭제</string>
+    <string name="rename">다시 이름 짓기</string>
+    <string name="report_content">내용 신고하기</string>
     <string name="ongoing_conference_call_voice">음성</string>
     <string name="ongoing_conference_call_video">영상</string>
     <string name="cannot_start_call">전화를 걸 수 없습니다, 나중에 다시 시도해주세요</string>
@@ -46,10 +46,10 @@
     <string name="send_anyway">무시하고 보내기</string>
     <string name="or">또는</string>
     <string name="invite">초대</string>
-    <string name="offline">미접속</string>
+    <string name="offline">오프라인</string>
 
     <string name="action_exit">나가기</string>
-    <string name="actions">행동</string>
+    <string name="actions">활동</string>
     <string name="action_sign_out">로그아웃</string>
     <string name="action_voice_call">음성 통화하기</string>
     <string name="action_video_call">영상 통화하기</string>
@@ -80,7 +80,7 @@
     <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>
-    <string name="send_bug_report">버그 보고하기</string>
+    <string name="send_bug_report">버그 신고하기</string>
     <string name="send_bug_report_description">버그에 대해 설명해주세요. 무엇을 했나요? 어떤 일이 일어나길 바라고 한 건가요? 실제로는 어떤 일이 일어났나요?</string>
     <string name="send_bug_report_description_in_english">가능하다면, 영어로 설명해주세요.</string>
     <string name="send_bug_report_placeholder">여기에 문제를 설명해주세요</string>
@@ -115,8 +115,6 @@
     <string name="auth_password_placeholder">비밀번호</string>
     <string name="auth_new_password_placeholder">새 비밀번호</string>
     <string name="auth_user_name_placeholder">사용자 이름</string>
-    <string name="auth_add_email_message">사용자가 당신을 찾고 재 설정 비밀번호를 보낼 수 있게 이메일 주소를 적어주세요.</string>
-    <string name="auth_add_phone_message">사용자가 당신을 찾을 수 있게 계정에 전화번호를 추가해주세요.</string>
     <string name="status_theme">Status.im 테마</string>
 
     <string name="notification_sync_init">서비스 초기화 중</string>
@@ -127,7 +125,7 @@
     <string name="title_activity_group_details">커뮤니티 정보</string>
     <string name="title_activity_keys_backup_setup">키 백업</string>
     <string name="title_activity_keys_backup_restore">키 백업하기</string>
-    <string name="title_activity_verify_device">인증 기기</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>
@@ -139,9 +137,9 @@
     <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">Riot이 주소록에 접근할 수 없게 되어 있습니다</string>
+    <string name="no_contact_access_placeholder">Riot이 연락처에 접근할 수 없게 되어 있습니다</string>
     <plurals name="public_room_nb_users">
-        <item quantity="other">%d 명의 사용자</item>
+        <item quantity="other">%d명의 사용자</item>
     </plurals>
 
     <string name="groups_invite_header">초대</string>
@@ -190,7 +188,7 @@
     <string name="later">후</string>
     <string name="forward">가져오기</string>
     <string name="active_call">현재 전화</string>
-    <string name="ongoing_conference_call">회의 전화 진행 중.
+    <string name="ongoing_conference_call">회의 전화가 진행 중입니다.
 \n%1$s 또는 %2$s로 참가하세요</string>
     <string name="missing_permissions_to_start_conf_call">이 방에서 회의를 시작하려면 초대할 권한이 필요합니다</string>
     <string name="room_no_conference_call_in_encrypted_rooms">회의 전화는 암호화된 방에서 지원하지 않습니다</string>
@@ -208,34 +206,28 @@
     <string name="invitations_header">초대</string>
     <string name="low_priority_header">중요하지 않음</string>
     <string name="direct_chats_header">대화</string>
-    <string name="local_address_book_header">로컬 주소록</string>
-    <string name="user_directory_header">사용자 디렉토리</string>
-    <string name="matrix_only_filter">Matrix 주소록만</string>
+    <string name="local_address_book_header">로컬 연락처</string>
+    <string name="user_directory_header">사용자 목록</string>
+    <string name="matrix_only_filter">Matrix 연락처만</string>
     <string name="no_conversation_placeholder">대화 안 함</string>
-    <string name="rooms_directory_header">방 디렉토리</string>
+    <string name="rooms_directory_header">방 목록</string>
     <string name="no_room_placeholder">방 없음</string>
     <string name="no_public_room_placeholder">이용할 수 있는 공공 방이 없음</string>
     <string name="no_group_placeholder">그룹 없음</string>
 
     <string name="send_bug_report_logs_description">문제를 진단하기 위해, 이 클라이언트의 로그는 버그 보고서와 함께 전송됩니다. 이 버그 보고서에는 로그와 스크린샷이 포함되면 공개적으로 표시되지 않습니다. 위의 텍스트만 보내려면 다음을 선택 해제하세요:</string>
     <string name="send_bug_report_alert_message">좌절감에 휴대 전화를 흔들고 있는 것 같네요. 버그 보고서 화면을 열어보겠습니까\?</string>
-    <string name="send_bug_report_rage_shake">분노의 흔들기로 버그 보고하기</string>
+    <string name="send_bug_report_rage_shake">분노의 흔들기로 버그 신고하기</string>
 
     <string name="send_bug_report_progress">진행 (%s%%)</string>
 
     <string name="send_files_in">여기로 보내기</string>
     <string name="join_room">방 들어가기</string>
     <string name="go_on_with">계속…</string>
-    <string name="error_no_external_application_found">죄송합니다, 이 행동을 완료하기 위한 외부 애플리케이션이 없습니다.</string>
+    <string name="error_no_external_application_found">죄송합니다, 이 작업을 완료하기 위한 외부 애플리케이션이 없습니다.</string>
 
     <string name="auth_login_sso">통합 인증으로 로그인</string>
     <string name="auth_send_reset_email">재 설정 이메일 보내기</string>
-    <string name="auth_add_email_phone_message">사용자가 당신을 찾을 수 있도록 계정에 이메일 주소 그리고/또는 전화번호를 추가하세요.
-\n
-\n이메일 주소로 비밀번호를 재 설정할 수도 있습니다.</string>
-    <string name="auth_add_email_and_phone_message">사용자가 당신을 찾을 수 있도록 계정에 이메일 주소 그리고 전화번호를 추가하세요.
-\n
-\n이메일 주소로 비밀번호를 재 설정할 수도 있습니다.</string>
     <string name="auth_invalid_user_name">사용자 이름은 문자, 숫자, 점, 하이픈 및 밑줄만 포함할 수 있습니다</string>
     <string name="auth_missing_password">비밀번호가 누락되었습니다</string>
     <string name="auth_email_already_defined">이 이메일 주소는 이미 정의되었습니다.</string>
@@ -243,17 +235,17 @@
     <string name="auth_missing_phone">전화번호가 누락되었습니다</string>
     <string name="auth_missing_email_or_phone">이메일 주소나 전화번호가 누락되었습니다</string>
     <string name="auth_invalid_token">옳지 않은 토큰</string>
-    <string name="auth_use_server_options">맞춤 서버 옵션을 사용하기 (고급)</string>
+    <string name="auth_use_server_options">맞춤 서버 설정을 사용하기 (고급)</string>
     <string name="auth_email_validation_message">등록을 계속하려면 이메일을 확인하세요</string>
     <string name="auth_threepid_warning_message">API가 존재하기 전까지는 이메일과 전화번호로 한 번에 등록할 수 없습니다. 오직 전화번호만 고려됩니다.
 \n
 \n설정에서 프로필에 이메일을 추가할 수 있습니다.</string>
     <string name="auth_recaptcha_message">이 홈서버는 당신이 로봇인지 아닌 지를 확인하고 싶습니다</string>
     <string name="auth_identity_server">ID 서버:</string>
-    <string name="auth_reset_password_next_step_button">제 이메일 주소를 인증했습니다</string>
+    <string name="auth_reset_password_next_step_button">제 이메일 주소를 확인했습니다</string>
     <string name="auth_reset_password_missing_email">계정에 연결된 이메일 주소를 입력해야 합니다.</string>
     <string name="auth_reset_password_email_validation_message">이메일 %s(으)로 전송했습니다. 이메일에 포함된 링크를 들어갔다면, 아래를 클릭해주세요.</string>
-    <string name="auth_reset_password_error_unauthorized">이메일 주소를 인증할 수 없습니다: 이메일에 있는 링크를 클릭했는 지 확인하세요</string>
+    <string name="auth_reset_password_error_unauthorized">이메일 주소를 확인할 수 없습니다: 이메일에 있는 링크를 클릭했는 지 확인하세요</string>
     <string name="auth_accept_policies">이 홈서버의 규칙을 숙지한 후 수락하세요:</string>
 
     <string name="login_error_must_start_http">URL은 http[s]://로 시작해야 합니다</string>
@@ -289,7 +281,7 @@
     <string name="groups_list">그룹 목록</string>
 
     <plurals name="membership_changes">
-        <item quantity="other">%d 구성원십 변경</item>
+        <item quantity="other">%d명의 구성원 변경 사항</item>
     </plurals>
 
     <string name="compression_options">이렇게 보내기</string>
@@ -344,14 +336,14 @@
     <string name="permissions_rationale_msg_record_audio">음성 통화를 하려면 Riot은 마이크에 접근하는 권한이 필요합니다.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
-\n전화를 하려면 다은 팝업에서 접근을 허용하세요."</string>
+\n전화를 하려면 다음 팝업에서 접근을 허용해주세요."</string>
     <string name="permissions_rationale_msg_camera_and_audio">영상 통화를 하려면 Riot은 카메라와 마이크에 접근하는 권한이 필요합니다.
 \n
 \n전화를 하려면 다음 팝업에서 접근을 허용해주세요.</string>
-    <string name="permissions_rationale_msg_contacts">Riot은 당신의 주소록을 확인해서 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다. 이런 이유로 주소록을 공유하는 것을 허용한다면, 다음 팝업에서 접근을 허용해주세요.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">"Riot은  당신의 주소록을 확인하여 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다.
-\n
-\n이런 이유로 주소록을 공유하는 것을 허용하겠습니까\?"</string>
+    <string name="permissions_rationale_msg_contacts">Riot은 당신의 연락처를 확인해서 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다. 이런 이유로 연락처를 공유하는 것을 허용한다면, 다음 팝업에서 접근을 허용해주세요.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">"Riot은  당신의 연락처를 확인하여 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다. 
+\n 
+\n이런 이유로 연락처를 공유하는 것을 허용하겠습니까\?"</string>
 
     <string name="permissions_action_not_performed_missing_permissions">죄송합니다. 권한이 없어서, 작업이 수행되지 않았습니다</string>
 
@@ -361,7 +353,7 @@
     <string name="no">아니오</string>
     <string name="_continue">계속</string>
 
-    <string name="remove">삭제</string>
+    <string name="remove">제거</string>
     <string name="join">참가</string>
     <string name="preview">미리보기</string>
     <string name="reject">받지 않기</string>
@@ -407,7 +399,7 @@
     <string name="room_participants_create">만들기</string>
 
     <string name="room_participants_online">온라인</string>
-    <string name="room_participants_offline">미접속</string>
+    <string name="room_participants_offline">오프라인</string>
     <string name="room_participants_idle">휴식</string>
     <string name="room_participants_now">%1$s 상태</string>
     <string name="room_participants_ago">%2$s 전 %1$s 상태였음</string>
@@ -424,16 +416,16 @@
     <string name="room_participants_action_unban">차단 해제</string>
     <string name="room_participants_action_kick">추방</string>
     <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_set_moderator">중재자로 하기</string>
+    <string name="room_participants_action_set_admin">관리자로 하기</string>
     <string name="room_participants_action_ignore">이 사용자의 모든 메시지 숨기기</string>
-    <string name="room_participants_action_unignore">이 사용자의 모든 메시지 보여주기</string>
+    <string name="room_participants_action_unignore">이 사용자의 모든 메시지 보이기</string>
     <string name="room_participants_action_unignore_prompt">이 사용자의 모든 메시지를 보이겠습니까\?
 \n
 \n이 동작은 앱을 재시작하며 일정 시간이 걸릴 수 있습니다.</string>
     <string name="room_participants_invite_search_another_user">사용자 ID, 이름 혹은 이메일</string>
     <string name="room_participants_action_mention">언급</string>
-    <string name="room_participants_action_devices_list">기기 목록 보여주기</string>
+    <string name="room_participants_action_devices_list">기기 목록 보이기</string>
     <string name="room_participants_power_level_prompt">사용자를 자신과 동일한 권한 등급으로 승격시키는 것은 취소할 수 없습니다.
 \n확신합니까\?</string>
 
@@ -450,7 +442,7 @@
 
     <string name="people_search_invite_by_id"><u>ID로 초대</u></string>
     <string name="people_search_local_contacts">로컬 연락처 (%d)</string>
-    <string name="people_search_user_directory">사용자 디렉토리 (%s)</string>
+    <string name="people_search_user_directory">사용자 목록 (%s)</string>
     <string name="people_search_filter_text">Matrix 사용자만</string>
 
     <string name="people_search_invite_by_id_dialog_title">ID로 사용자 초대</string>
@@ -460,13 +452,13 @@
     <string name="room_menu_search">검색</string>
     <string name="room_one_user_is_typing">%s님이 입력 중…</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_reply_to_encrypted">암호화된 답장 보내기…</string>
-    <string name="room_message_placeholder_reply_to_not_encrypted">(암호화 안 된) 답장 보내기…</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_reply_to_encrypted">암호화된 답장을 보내세요…</string>
+    <string name="room_message_placeholder_reply_to_not_encrypted">(암호화 안 된) 답장을 보내세요…</string>
     <string name="room_offline_notification">서버와의 연결이 끊어졌습니다.</string>
-    <string name="room_unsent_messages_notification">메시지가 보내지지 않았습니다. %1$s, %2$s, 둘 중 어떤 것을 하겠습니까\?</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_prompt_resend">모두 다시 보내기</string>
     <string name="room_prompt_cancel">모두 취소하기</string>
@@ -483,7 +475,7 @@
     <string name="ssl_logout_account">로그아웃</string>
     <string name="ssl_remain_offline">무시하기</string>
     <string name="ssl_fingerprint_hash">핑거프린트 (%s):</string>
-    <string name="ssl_could_not_verify">원격 서버의 신원을 인증할 수 없습니다.</string>
+    <string name="ssl_could_not_verify">원격 서버의 ID를 확인할 수 없습니다.</string>
     <string name="ssl_cert_not_trust">이는 누군가가 당신의 트래픽을 악의적으로 가로채고 있거나, 휴대 전화가 원격 서버에서 제공한 인증서를 신뢰하지 않는 것입니다.</string>
     <string name="ssl_cert_new_account_expl">서버 관리자가 이것이 예상된다고 말한다면, 아래 핑거프린트가 해당 핑거프린트와 일치하는 지 확인하세요.</string>
     <string name="ssl_unexpected_existing_expl">인증서가 휴대 전화가 신뢰하는 인증서에서 변경되었습니다. 이것은 매우 비정상적입니다. 새 인증서에 수락하지 않는 것을 권합니다.</string>
@@ -501,7 +493,7 @@
     <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_reason">이 콘텐츠를 보고하는 이유</string>
+    <string name="room_event_action_report_prompt_reason">이 내용을 신고하는 이유</string>
     <string name="room_event_action_report_prompt_ignore_user">이 사용자의 모든 메시지를 숨기겠습니까\?
 \n
 \n이 동작은 앱을 다시 시작하며 일정 시간이 걸릴 수 있습니다.</string>
@@ -517,7 +509,7 @@
     <string name="tab_title_search_files">파일</string>
 
     <string name="room_recents_join">참가</string>
-    <string name="room_recents_directory">디렉토리</string>
+    <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>
@@ -528,14 +520,14 @@
     <string name="room_recents_join_room_title">방 참가하기</string>
     <string name="room_recents_join_room_prompt">방 ID나 방 별칭을 입력</string>
 
-    <string name="directory_search_results_title">디렉토리 찾기</string>
+    <string name="directory_search_results_title">목록 찾기</string>
     <plurals name="directory_search_rooms">
         <item quantity="other">%d개의 방</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
         <item quantity="other">%2$s 검색 결과로 %1$s개의 방을 찾음</item>
     </plurals>
-    <string name="directory_searching_title">디렉토리 검색 중…</string>
+    <string name="directory_searching_title">목록 검색 중…</string>
 
     <string name="room_settings_all_messages_noisy">모든 메시지 (소리)</string>
     <string name="room_settings_all_messages">모든 메시지</string>
@@ -553,7 +545,7 @@
     <string name="room_sliding_menu_version">버전</string>
     <string name="room_sliding_menu_version_x">버전 %s</string>
     <string name="room_sliding_menu_term_and_conditions">이용 약관</string>
-    <string name="room_sliding_menu_third_party_notices">제 3자 공지</string>
+    <string name="room_sliding_menu_third_party_notices">제 3자 고지</string>
     <string name="room_sliding_menu_copyright">저작권</string>
     <string name="room_sliding_menu_privacy_policy">개인 정보 정책</string>
 
@@ -576,9 +568,9 @@
     <string name="settings_troubleshoot_diagnostic">문제 해결 진단</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">테스트 실행</string>
     <string name="settings_troubleshoot_diagnostic_running_status">실행 중… (%2$d개 중 %1$d개 째)</string>
-    <string name="settings_troubleshoot_diagnostic_success_status">기본 진단은 괜찮습니다. 여전히 알림을 받지 못하고 있다면, 버그를 보고해서 우리가 조사할 수 있도록 도와주세요.</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">기본 진단은 괜찮습니다. 여전히 알림을 받지 못하고 있다면, 버그를 신고해서 우리가 조사할 수 있도록 도와주세요.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">1개 이상의 테스트가 실패했습니다, 제안된 수정을 시도하세요.</string>
-    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">1개 이상의 테스트가 실패했습니다, 버그를 보고해서 우리가 조사할 수 있도록 도와주세요.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">1개 이상의 테스트가 실패했습니다, 버그를 신고해서 우리가 조사할 수 있도록 도와주세요.</string>
 
     <string name="settings_troubleshoot_test_system_settings_title">시스템 설정.</string>
     <string name="settings_troubleshoot_test_system_settings_success">알림이 시스템 설정에서 켜집니다.</string>
@@ -669,7 +661,7 @@
     <string name="settings_notification_ringtone">알림 소리</string>
     <string name="settings_enable_all_notif">이 계정에서 알림 켜기</string>
     <string name="settings_enable_this_device">이 기기에서 알림 켜기</string>
-    <string name="settings_turn_screen_on">3초 동안 화면을 켬</string>
+    <string name="settings_turn_screen_on">3초 동안 화면을 켜기</string>
     <string name="settings_noisy_notifications_preferences">소리 알림 설정</string>
     <string name="settings_call_notifications_preferences">전화 알림 설정</string>
     <string name="settings_silent_notifications_preferences">조용한 알림 설정</string>
@@ -688,14 +680,14 @@
     <string name="settings_start_on_boot">부팅 시 시작</string>
     <string name="settings_enable_background_sync">백그라운드 동기화 켜기</string>
     <string name="settings_set_sync_timeout">동기화 요청 시간 초과</string>
-    <string name="settings_set_sync_delay">각 요청 간 딜레이</string>
+    <string name="settings_set_sync_delay">각 동기화 간 딜레이</string>
     <string name="settings_second">초</string>
     <string name="settings_seconds">초</string>
 
     <string name="settings_version">버전</string>
     <string name="settings_olm_version">olm 버전</string>
     <string name="settings_app_term_conditions">이용 약관</string>
-    <string name="settings_third_party_notices">제 3자 공지</string>
+    <string name="settings_third_party_notices">제 3자 고지</string>
     <string name="settings_copyright">저작권</string>
     <string name="settings_privacy_policy">개인 정보 정책</string>
     <string name="settings_keep_media">미디어 유지</string>
@@ -710,8 +702,8 @@
     <string name="settings_cryptography">암호화</string>
     <string name="settings_cryptography_manage_keys">암호화 키 관리</string>
     <string name="settings_notifications_targets">알림 대상</string>
-    <string name="settings_contact">로컬 주소록</string>
-    <string name="settings_contacts_app_permission">주소록 권한</string>
+    <string name="settings_contact">로컬 연락처</string>
+    <string name="settings_contacts_app_permission">연락처 권한</string>
     <string name="settings_contacts_phonebook_country">국제전화 나라 번호</string>
     <string name="settings_home_display">홈 표시</string>
     <string name="settings_pin_missed_notifications">알림을 놓친 방을 고정</string>
@@ -723,13 +715,13 @@
     <string name="settings_send_typing_notifs_summary">다른 사용자가 당신이 입력 중인 것을 알게 합니다.</string>
     <string name="settings_send_markdown">마크다운 형식</string>
     <string name="settings_send_markdown_summary">마크다운 문법을 사용해 메시지를 보내기 전에 형식을 지정합니다. 별표를 사용해 기울임 꼴 문자를 표시하는 고급 서식을 지정할 수 있습니다.</string>
-    <string name="settings_always_show_timestamps">모든 메시지에 타임스탬프 보여주기</string>
-    <string name="settings_12_24_timestamps">12시간 단위를 사용하는 타임스탬프 보여주기</string>
-    <string name="settings_show_read_receipts">읽은 기록 보여주기</string>
+    <string name="settings_always_show_timestamps">모든 메시지에 타임스탬프 보이기</string>
+    <string name="settings_12_24_timestamps">12시간 단위를 사용하는 타임스탬프 보이기</string>
+    <string name="settings_show_read_receipts">읽은 기록 보이기</string>
     <string name="settings_show_read_receipts_summary">세부적인 목록으로 읽은 목록을 클릭하세요.</string>
-    <string name="settings_show_join_leave_messages">참가 및 떠남 이벤트 보여주기</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="settings_vibrate_on_mention">사용자가 언급할 때 진동</string>
     <string name="settings_preview_media_before_sending">보내기 전 미디어 미리보기</string>
@@ -742,7 +734,7 @@
     <string name="startup_notification_privacy_title">알림 개인 정보</string>
     <string name="startup_notification_privacy_message">Riot은 백그라운드에서 실행되어 알림을 안전하고 은밀하게 관리할 수 있습니다. 이것은 배터리 사용량에 영향을 줄 수 있습니다.</string>
     <string name="startup_notification_privacy_button_grant">권한 부여</string>
-    <string name="startup_notification_privacy_button_other">다른 옵션을 선택하세요</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">Riot은 신뢰가 있는 알림을 위해 낮은 영향의 백그라운드 연결을 유지해야 합니다.
@@ -758,10 +750,10 @@
     <string name="settings_data_save_mode">데이터 절약 모드</string>
     <string name="settings_data_save_mode_summary">데이터 절약 모드는 특정 필터를 적용하여 현재 상태 업데이트와 입력 중 알림을 걸러냅니다.</string>
 
-    <string name="devices_details_dialog_title">기기 세부 사항</string>
+    <string name="devices_details_dialog_title">기기 정보</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">이름</string>
-    <string name="devices_details_device_name">기기 이름</string>
+    <string name="devices_details_name_title">공개 이름</string>
+    <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">이 작업은 추가 인증이 필요합니다.
@@ -779,13 +771,13 @@
     <string name="settings_interface_language">언어</string>
     <string name="settings_select_language">언어를 선택하세요</string>
 
-    <string name="account_email_validation_title">인증 보류 중</string>
+    <string name="account_email_validation_title">확인 보류 중</string>
     <string name="account_email_validation_message">이메일을 인증해서 거기에 있는 링크를 클릭하세요. 모두 끝나면, 계속하기를 클릭하세요.</string>
-    <string name="account_email_validation_error">이메일 주소를 인증할 수 없습니다. 이메일을 인증해서 거기에 있는 링크를 클릭하세요. 모두 끝나면, 계속하기를 클릭하세요.</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="account_email_error">이메일 주소를 인증하는 중 오류가 발생했습니다.</string>
+    <string name="account_email_error">이메일 주소를 확인하는 중 오류가 발생했습니다.</string>
 
     <string name="settings_password">비밀번호</string>
     <string name="settings_change_password">비밀번호 변경</string>
@@ -803,7 +795,7 @@
 
     <string name="settings_delete_notification_targets_confirmation">이 알림 대상을 제거하겠습니까\?</string>
 
-    <string name="settings_delete_threepid_confirmation">%1$s %2$s를 제거하겠습니까\?</string>
+    <string name="settings_delete_threepid_confirmation">%1$s %2$s님을 제거하겠습니까\?</string>
 
     <string name="settings_select_country">나라를 선택하세요</string>
 
@@ -811,12 +803,12 @@
     <string name="settings_phone_number_country_error">나라를 선택해주세요</string>
     <string name="settings_phone_number_label">전화번호</string>
     <string name="settings_phone_number_error">선택한 나라에 올바르지 않은 전화번호</string>
-    <string name="settings_phone_number_verification">휴대 전화 인증</string>
+    <string name="settings_phone_number_verification">휴대 전화 확인</string>
     <string name="settings_phone_number_verification_instruction">활성 코드가 담신 SMS를 보냈습니다. 코드를 아래에 입력하세요.</string>
     <string name="settings_phone_number_verification_error_empty_code">활성 코드 입력</string>
-    <string name="settings_phone_number_verification_error">전화번호를 인증하는 중 오류</string>
+    <string name="settings_phone_number_verification_error">전화번호를 확인하는 중 오류</string>
     <string name="settings_phone_number_code">코드</string>
-    <string name="account_phone_number_error">전화번호를 인증하는 중 오류가 발생했습니다.</string>
+    <string name="account_phone_number_error">전화번호를 확인하는 중 오류가 발생했습니다.</string>
     <string name="account_additional_info">추가 정보: %s</string>
 
     <string name="settings_media">미디어</string>
@@ -845,7 +837,7 @@
     <string name="room_settings_tag_pref_entry_none">없음</string>
 
     <string name="room_settings_category_access_visibility_title">접근성 및 가시성</string>
-    <string name="room_settings_directory_visibility">이 방을 방 디렉토리에 놓기</string>
+    <string name="room_settings_directory_visibility">이 방을 방 목록에 놓기</string>
     <string name="room_settings_room_notifications_title">알림</string>
     <string name="room_settings_room_access_rules_pref_title">방 접근성</string>
     <string name="room_settings_room_read_history_rules_pref_title">방 기록 읽기 권한</string>
@@ -853,7 +845,7 @@
     <string name="room_settings_room_access_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_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>
 
@@ -872,8 +864,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>
 
     <string name="room_settings_addresses_no_local_addresses">이 방은 로컬 주소가 없습니다</string>
     <string name="room_settings_addresses_add_new_address">새 주소 (예: #foo:matrix.org)</string>
@@ -899,7 +891,7 @@
     <string name="room_settings_addresses_e2e_encryption_warning">암호화 활성화
 \n(경고: 다시 비활성화할 수 없음!)</string>
 
-    <string name="directory_title">디렉토리</string>
+    <string name="directory_title">목록</string>
     <string name="settings_theme">테마</string>
 
     <string name="failed_to_load_timeline_position">%s님이 이 방의 특정 지점을 불러오려 했으나 찾을 수 없었습니다.</string>
@@ -909,17 +901,17 @@
     <string name="encryption_information_device_info">이벤트 정보</string>
     <string name="encryption_information_user_id">사용자 ID</string>
     <string name="encryption_information_curve25519_identity_key">Curve25519 ID 키</string>
-    <string name="encryption_information_claimed_ed25519_fingerprint_key">청구된 Ed25519 핑거프린트 키</string>
+    <string name="encryption_information_claimed_ed25519_fingerprint_key">Ed25519 핑거프린트 키가 필요함</string>
     <string name="encryption_information_algorithm">알고리즘</string>
     <string name="encryption_information_session_id">세션 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>
-    <string name="encryption_information_device_id">기기 ID</string>
+    <string name="encryption_information_device_name">공개 이름</string>
+    <string name="encryption_information_name">공개 이름</string>
+    <string name="encryption_information_device_id">ID</string>
     <string name="encryption_information_device_key">기기 키</string>
-    <string name="encryption_information_verification">인증</string>
+    <string name="encryption_information_verification">확인</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 핑거프린트</string>
 
     <string name="encryption_export_e2e_room_keys">종단간 암호화 방 키 내보내기</string>
@@ -938,40 +930,40 @@
     <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_never_send_to_unverified_devices_title">확인된 기기로만 암호화</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">이 기기에서 확인되지 않은 기기로 절대 암호화된 메시지를 보내지 않습니다.</string>
     <string name="encryption_import_room_keys_success">%1$d/%2$d 키를 성공적으로 가져왔습니다.</string>
 
-    <string name="encryption_information_not_verified">인증되지 않음</string>
-    <string name="encryption_information_verified">인증됨</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_unknown_ip">알 수 없는 ip</string>
     <string name="encryption_information_none">없음</string>
 
-    <string name="encryption_information_verify">인증</string>
-    <string name="encryption_information_unverify">인증하지 않음</string>
+    <string name="encryption_information_verify">확인</string>
+    <string name="encryption_information_unverify">확인하지 않음</string>
     <string name="encryption_information_block">블랙리스트</string>
     <string name="encryption_information_unblock">블랙리스트 제외</string>
 
-    <string name="encryption_information_verify_device">인증 기기</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="encryption_information_verify_device">기기 확인</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="e2e_enabling_on_app_update">Riot은 이제 종단간 암호화를 지원하지만 활성화하려면 다시 로그인해야 합니다.
 \n
 \n지금 바로 하거나 나중에 애플리케이션 설정에서 할 수 있습니다.</string>
 
     <string name="unknown_devices_alert_title">알 수 없는 기기가 있는 방</string>
-    <string name="unknown_devices_alert_message">이 방에는 인증되지 않은 알 수 없는 기기가 있습니다.
-\n즉, 사용자에 속해 있다고 주장하는 기기라는 보장이 없습니다.
-\n저희는 계속하기 전에 각 기기에 인증 절차를 하기를 권합니다, 하지만 원한다면 인증하지 않고 바로 메시지를 보낼 수 있습니다.
-\n
+    <string name="unknown_devices_alert_message">이 방에는 확인되지 않은 알 수 없는 기기가 있습니다. 
+\n즉, 사용자에 속해 있다고 주장하는 기기라는 보장이 없습니다. 
+\n저희는 계속하기 전에 각 기기에 확인 절차를 하기를 권합니다, 하지만 원한다면 확인하지 않고 바로 메시지를 보낼 수 있습니다. 
+\n 
 \n알 수 없는 기기:</string>
 
-    <string name="select_room_directory">방 디렉토리 선택</string>
+    <string name="select_room_directory">방 목록 선택</string>
     <string name="directory_server_fail_to_retrieve_server">서버를 이용할 수 없거나 과부하 상태입니다</string>
     <string name="directory_server_type_homeserver">공개 서버를 표시할 홈서버를 입력하세요</string>
     <string name="directory_server_placeholder">홈서버 URL</string>
@@ -1044,22 +1036,22 @@
     <string name="settings_labs_native_camera_summary">맞춤 카메라 화면 대신 시스템 카메라를 실행합니다.</string>
     <string name="settings_labs_keyboard_options_to_send_message">키보드 엔터 키로 메시지 보내기</string>
     <string name="settings_labs_enable_send_voice">음성 메시지 보내기</string>
-    <string name="settings_labs_enable_send_voice_summary">이 옵션은 메시지를 기록하기 위한 제 3자 애플리케이션이 필요합니다.</string>
+    <string name="settings_labs_enable_send_voice_summary">이 설정은 메시지를 기록하기 위한 제 3자 애플리케이션이 필요합니다.</string>
 
     <string name="you_added_a_new_device">새 기기 \'%s\'을(를) 추가했습니다, 여기에는 암호화 키가 필요합니다.</string>
     <string name="you_added_a_new_device_with_info">새 기기에는 암호화 키가 필요합니다.
 \n기기 이름: %1$s
 \n마지막으로 본 순간: %2$s
 \n다른 기기에서 로그인하지 않았다면, 이 요청을 무시하세요.</string>
-    <string name="your_unverified_device_requesting">인증되지 않은 기기 \'%s\'가 암호화 키를 요청했습니다.</string>
-    <string name="your_unverified_device_requesting_with_info">인증되지 않은 기기가 암호화 키를 요청했습니다.
-\n기기 이름: %1$s
-\n마지막으로 본 순간: %2$s
+    <string name="your_unverified_device_requesting">확인되지 않은 기기 \'%s\'이(가) 암호화 키를 요청했습니다.</string>
+    <string name="your_unverified_device_requesting_with_info">확인되지 않은 기기가 암호화 키를 요청했습니다. 
+\n기기 이름: %1$s 
+\n마지막으로 본 순간: %2$s 
 \n다른 기기에서 로그인하지 않았다면, 이 요청을 무시하세요.</string>
 
-    <string name="start_verification">인증 시작</string>
-    <string name="start_verification_short_label">인증</string>
-    <string name="share_without_verifying">인증 없이 공유</string>
+    <string name="start_verification">확인 시작</string>
+    <string name="start_verification_short_label">확인</string>
+    <string name="share_without_verifying">확인하지 않고 공유</string>
     <string name="share_without_verifying_short_label">공유</string>
     <string name="key_share_request">키 공유 요청</string>
     <string name="ignore_request">요청 무시하기</string>
@@ -1071,9 +1063,9 @@
     <string name="command_error">명령어 오류</string>
     <string name="unrecognized_command">인식할 수 없는 명령어: %s</string>
     <string name="command_problem_with_parameters">\"%s\" 명령어는 더 많은 매개 변수가 필요하거나, 일부 매개 변수가 옳지 않습니다.</string>
-    <string name="command_description_emote">동작 표시하기</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_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>
@@ -1121,8 +1113,8 @@
     </plurals>
     <string name="group_no_long_description">커뮤니티 관리자가 이 커뮤니티에 대한 자세한 설명을 제공하지 않았습니다.</string>
 
-    <string name="has_been_kicked">%2$s님에 의해 %1$s에서 추방당했습니다</string>
-    <string name="has_been_banned">%2$s님에 의해 %1$s에서 차단됬습니다</string>
+    <string name="has_been_kicked">%2$s님에 의해 %1$s 방에서 추방당했습니다</string>
+    <string name="has_been_banned">%2$s님에 의해 %1$s 방에서 차단당했습니다</string>
     <string name="reason_colon">이유: %1$s</string>
     <string name="rejoin">다시 참가하기</string>
     <string name="forget_room">방 잊어버리기</string>
@@ -1135,10 +1127,10 @@
     <string name="dialog_user_consent_submit">지금 검토하기</string>
 
     <string name="deactivate_account_title">계정 비활성화</string>
-    <string name="deactivate_account_content">이것으로 계정은 영구적으로 사용할 수 없게 됩니다. 로그인할 수 없고 누구도 같은 사용자 ID로 다시 가입할 수 없게 됩니다. 이 계정으로 참가한 모든 방에서 떠나게 되고, ID 서버의 계정 세부 사항도 삭제됩니다. <b>이 행동은 돌이킬 수 없습니다</b>.
-\n
-\n계정을 비활성화해도 <b>기본적으로 보낸 메시지를 잊지 않습니다</b>. 메시지를 잊기를 원한다면, 아래 상자를 선택하세요.
-\n
+    <string name="deactivate_account_content">이것으로 계정은 영구적으로 사용할 수 없게 됩니다. 로그인할 수 없고 누구도 같은 사용자 ID로 다시 등록할 수 없게 됩니다. 이 계정으로 참가한 모든 방에서 떠나게 되고, ID 서버의 계정 세부 사항도 삭제됩니다. <b>이 행동은 돌이킬 수 없습니다</b>. 
+\n 
+\n계정을 비활성화해도 <b>기본적으로 보낸 메시지를 잊지 않습니다</b>. 메시지를 잊기를 원한다면, 아래 상자를 선택하세요. 
+\n 
 \nMatrix의 메시지 가시성은 이메일과 유사합니다. 우리가 메시지를 잊는 것은 보낸 메시지가 모든 새 사용자 혹은 등록하지 않은 사용자와 공유하지 않는다는 것입니다, 하지만 이 메시지에 접근한 등록된 사용자는 이 사본으로 여전히 접근할 수 있을 것입니다.</string>
     <string name="deactivate_account_delete_checkbox">내 계정을 비활성화하면 내가 보낸 모든 메시지는 잊어주세요 (경고: 이것은 미래 사용자가 불완전한 대화를 읽게 됩니다)</string>
     <string name="deactivate_account_prompt_password">계속하려면, 비밀번호를 입력하세요:</string>
@@ -1160,7 +1152,7 @@
     <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_hard_mau">이 홈서버가 월 간 활성 사용자 한도를 초과했습니다.</string>
 
     <string name="resource_limit_soft_contact">한도를 높이려면 %s하세요.</string>
     <string name="resource_limit_hard_contact">이 서비스 사용을 계속하려면 %s하세요.</string>
@@ -1174,7 +1166,7 @@
     <string name="merged_events_expand">펼치기</string>
     <string name="merged_events_collapse">접기</string>
 
-    <string name="settings_info_area_show">정보 영역 보여주기</string>
+    <string name="settings_info_area_show">정보 영역 보이기</string>
     <string name="show_info_area_always">항상</string>
     <string name="show_info_area_messages_and_errors">메시지와 오류일 시</string>
     <string name="show_info_area_only_errors">오류만</string>
@@ -1188,21 +1180,21 @@
     <string name="store_title">Riot.im - 대화하세요, 나만의 방식</string>
     <string name="store_whats_new">우리는 항상 Riot.im을 변경하고 개선하고 있습니다. 전체 변경 내역은 여기서 찾을 수 있습니다: %1$s. 놓치지 않도록 업데이트를 켜 놓아주세요.</string>
     <string name="store_short_description">전적으로 여러분의 통제 하에 있는 범용 보안 대화 앱.</string>
-    <string name="store_full_description">여러분의 통제 하에 완전히 유연한 대화 앱. Riot은 여러분이 원하는 방식으로 대화할 수 있도록 합니다. 개방형 분산 커뮤니티의 표준 - [matrix]를 위해 제작됨.
-\n
-\n무료 matrix.org 계정을 만들고, https://modular.im에서 자신만의 서버, 혹은 다른 Matrix 서버를 얻으세요.
-\n
-\n왜 Riot.im을 선택해야 하나요\?
-\n
-\n• 완전한 대화: 원하는 대로 팀이나 친구, 커뮤니티를 중심으로 방을 만드세요! 대화, 파일 공유, 위젯 추가와 음성 및 영상 통화 - 모두 무료입니다.
-\n
-\n• 강력한 통합: 여러분이 알고 사랑하는 도구와 함께 Riot.im을 사용하세요. Riot.im이라면 다른 대화 앱의 사용자와 그룹까지도 대화할 수 있습니다.
-\n
-\n• 개인 및 보안: 대화를 비밀로 유지하세요. 최첨단 종단간 암호화로 비밀 대화를 은밀하게 유지해줍니다.
-\n
-\n• 오픈 소스: Matrix로 만들어진 오픈 소스입니다. 자신의 데이터를 자신의 서버에 소유하거나, 신뢰하는 서버에 맡기세요.
-\n
-\n• 어디에 있든: 모든 기기나 https://riot.im에서 완전히 동기화된 메시지 기록으로 연락을 유지합니다.</string>
+    <string name="store_full_description">여러분의 통제 하에 완전히 유연한 대화 앱. Riot은 여러분이 원하는 방식으로 대화할 수 있도록 합니다. 개방형 분산 커뮤니티의 표준 - [matrix]를 위해 제작됨. 
+\n 
+\n무료 matrix.org 계정을 만들고, https://modular.im 에서 자신만의 서버, 혹은 다른 Matrix 서버를 얻으세요. 
+\n 
+\n왜 Riot.im을 선택해야 하나요\? 
+\n 
+\n• 완전한 대화: 원하는 대로 팀이나 친구, 커뮤니티를 중심으로 방을 만드세요! 대화, 파일 공유, 위젯 추가와 음성 및 영상 통화 - 모두 무료입니다. 
+\n 
+\n• 강력한 통합: 여러분이 알고 사랑하는 도구와 함께 Riot.im을 사용하세요. Riot.im이라면 다른 대화 앱의 사용자와 그룹까지도 대화할 수 있습니다. 
+\n 
+\n• 개인 및 보안: 대화를 비밀로 유지하세요. 최첨단 종단간 암호화로 비밀 대화를 은밀하게 유지해줍니다. 
+\n 
+\n• 오픈 소스: Matrix로 만들어진 오픈 소스입니다. 자신의 데이터를 자신의 서버에 소유하거나, 신뢰하는 서버에 맡기세요. 
+\n 
+\n• 어디에 있든: 모든 기기나 https://riot.im 에서 완전히 동기화된 메시지 기록으로 연락을 유지합니다.</string>
 
     <string name="passphrase_create_passphrase">암호 만들기</string>
     <string name="passphrase_confirm_passphrase">암호 확인</string>
@@ -1272,7 +1264,7 @@
     <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>
@@ -1281,7 +1273,7 @@
     <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>
+    <string name="keys_backup_recovery_code_error_decrypt">이 복구 키로 백업을 해독할 수 없습니다: 올바른 복구 키를 입력해서 확인해주세요.</string>
 
     <string name="keys_backup_restore_success_title">백업이 복구되었습니다 %s !</string>
     <string name="keys_backup_restore_success_description">%1$d개의 세션 키를 복구했고, 이 기기에서 알려지지 않은 %2$d개의 새 키를 추가함</string>
@@ -1305,10 +1297,10 @@
 
     <string name="keys_backup_settings_signature_from_unknown_device">백업이 ID %s의 알 수 없는 기기의 서명이 있습니다.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">백업이 이 기기의 올바른 서명이 있습니다.</string>
-    <string name="keys_backup_settings_valid_signature_from_verified_device">백업이 인증된 기기 %s의 올바른 서명이 있습니다.</string>
-    <string name="keys_backup_settings_valid_signature_from_unverified_device">백업이 인증되지 않은 기기 %s의 올바른 서명이 있습니다</string>
-    <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_settings_valid_signature_from_verified_device">백업이 확인된 기기 %s의 올바른 서명이 있습니다.</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">백업이 확인되지 않은 기기 %s의 올바른 서명이 있습니다</string>
+    <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>
@@ -1354,7 +1346,7 @@
 
     <string name="sas_verify_title">짧은 문장과 비교하여 확인하세요.</string>
     <string name="sas_security_advise">보안을 최대화하려면, 상대방과 직접 대면하거나 신뢰할 수 있는 다른 대화 수단을 사용하는 것이 좋습니다.</string>
-    <string name="sas_verify_start_button_title">인증 시작</string>
+    <string name="sas_verify_start_button_title">확인 시작</string>
     <string name="sas_incoming_request_title">수신 확인 요청</string>
     <string name="sas_incoming_request_description">이 기기를 확인하여 신뢰할 수 있는 것으로 표시하세요. 종단간 암호화 메시지를 사용하는 경우 상대방의 기기를 신뢰하면 안심할 수 있습니다.</string>
     <string name="sas_incoming_request_description_2">이 기기를 확인하여 신뢰할 수 있는 것으로 표시하세요, 그리고 당신의 기기도 상대방에게 신뢰할 수 있는 것으로 표시하세요.</string>
@@ -1366,27 +1358,27 @@
     <string name="sas_view_request_action">요청 보기</string>
     <string name="sas_waiting_for_partner">상대방이 확인하기를 기다리는 중…</string>
 
-    <string name="sas_verified">인증되었습니다!</string>
-    <string name="sas_verified_successful">성공적으로 이 기기를 인증했습니다.</string>
+    <string name="sas_verified">확인되었습니다!</string>
+    <string name="sas_verified_successful">성공적으로 이 기기를 확인했습니다.</string>
     <string name="sas_verified_successful_description">이 사용자 간의 보안 메시지는 종단간 암호화 되며 제 3자가 읽을 수 없습니다.</string>
     <string name="sas_got_it">알겠습니다</string>
 
-    <string name="sas_verifying_keys">아무것도 안 나타나나요\? 일부 클라이언트는 아직 대화 식 인증을 지원하지 않습니다. 옛날 인증 방식을 사용하세요.</string>
-    <string name="sas_legacy_verification_button_title">옛날 인증 방식 사용하기.</string>
+    <string name="sas_verifying_keys">아무것도 안 나타나나요\? 일부 클라이언트는 아직 대화 식 확인을 지원하지 않습니다. 옛날 확인 방식을 사용하세요.</string>
+    <string name="sas_legacy_verification_button_title">옛날 확인 방식 사용하기.</string>
 
-    <string name="sas_verification_request_notification_channel_title">키 인증</string>
+    <string name="sas_verification_request_notification_channel_title">키 확인</string>
     <string name="sas_cancelled_dialog_title">요청 취소됨</string>
     <string name="sas_cancelled_by_other">상대방이 확인을 취소했습니다.
 \n%s</string>
-    <string name="sas_cancelled_by_me">인증이 취소되었습니다.
+    <string name="sas_cancelled_by_me">확인이 취소되었습니다. 
 \n이유: %s</string>
 
-    <string name="sas_verification_request_notification_channel">상호작용 기기 인증</string>
-    <string name="sas_incoming_request_notif_title">인증 요청</string>
-    <string name="sas_incoming_request_notif_content">%s님이 당신의 기기를 인증하고 싶습니다</string>
+    <string name="sas_verification_request_notification_channel">상호작용 기기 확인</string>
+    <string name="sas_incoming_request_notif_title">확인 요청</string>
+    <string name="sas_incoming_request_notif_content">%s님이 당신의 기기를 확인하고 싶습니다</string>
 
-    <string name="sas_error_m_user">사용자가 인증을 취소했습니다</string>
-    <string name="sas_error_m_timeout">인증 과정 시간이 초과되었습니다</string>
+    <string name="sas_error_m_user">사용자가 확인을 취소했습니다</string>
+    <string name="sas_error_m_timeout">확인 과정 시간이 초과되었습니다</string>
     <string name="sas_error_m_unknown_transaction">기기는 이 처리에 대해 모릅니다</string>
     <string name="sas_error_m_unknown_method">기기는 키 계약, 해시, MAC 또는 SAS 방식에 동의할 수 없습니다</string>
     <string name="sas_error_m_mismatched_commitment">해시 커밋이 일치하지 않습니다</string>
@@ -1422,9 +1414,9 @@
     <string name="message_view_reaction">리액션 보기</string>
     <string name="reactions">리액션</string>
 
-    <string name="event_redacted_by_user_reason">사용자가 삭제한 이벤트</string>
-    <string name="event_redacted_by_admin_reason">방 관리자가 중재한 이벤트</string>
-    <string name="last_edited_info_message">%s님이 %s에 마지막으로 편집함</string>
+    <string name="event_redacted_by_user_reason">사용자가 감춘 이벤트</string>
+    <string name="event_redacted_by_admin_reason">방 관리자가 감춘 이벤트</string>
+    <string name="last_edited_info_message">%1$s님이 %2$s에 마지막으로 편집함</string>
 
 
     <string name="malformed_message">잘못된 이벤트, 표시할 수 없음</string>
@@ -1446,22 +1438,22 @@
     <string name="create_room_name_hint">방 이름</string>
     <string name="create_room_public_title">공공</string>
     <string name="create_room_public_description">누구나 이 방에 참가할 수 있습니다</string>
-    <string name="create_room_directory_title">방 디렉토리</string>
-    <string name="create_room_directory_description">이 방을 방 디렉토리에 게시</string>
+    <string name="create_room_directory_title">방 목록</string>
+    <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="alpha_disclaimer_title">베타 버전에 온 것을 환영합니다!</string>
     <string name="alpha_disclaimer_content_line_1">RiotX가 개발 중에 있기에, 일부 기능이 부족하고 버그가 나올 수 있습니다.</string>
-    <string name="alpha_disclaimer_content_line_2_gplay">최신 기능 목록은 항상 %1$s에 있고, 버그를 발견했다면 홈의 왼쪽 위 메뉴에서 보고해주세요, 그러면 가능한 한 빨리 고치겠습니다.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay">최신 기능 목록은 항상 %1$s에 있고, 버그를 발견했다면 홈의 왼쪽 위 메뉴에서 신고해주세요, 그러면 가능한 한 빨리 고치겠습니다.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play 스토어 설명</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">버그를 발견했다면 홈의 왼쪽 위 메뉴에서 보고해주세요, 그러면 가능한 한 빨리 고치겠습니다.</string>
+    <string name="alpha_disclaimer_content_line_2_fdroid">버그를 발견했다면 홈의 왼쪽 위 메뉴에서 신고해주세요, 그러면 가능한 한 빨리 고치겠습니다.</string>
 
     <string name="import_e2e_keys_from_file">파일 \"%1$s\"에서 종단간 암호화 키 가져옴.</string>
 
     <string name="settings_sdk_version">Matrix SDK 버전</string>
-    <string name="settings_other_third_party_notices">다른 제 3자 공지</string>
+    <string name="settings_other_third_party_notices">다른 제 3자 고지</string>
     <string name="navigate_to_room_when_already_in_the_room">이 방을 이미 봤습니다!</string>
 
     <string name="quick_reactions">빠른 리액션</string>
@@ -1493,17 +1485,17 @@
     <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="settings_labs_show_hidden_events_in_timeline">타임라인에서 숨겨진 이벤트 보이기</string>
 
     <string name="store_riotx_title">RiotX - 차세대 Matrix 클라이언트</string>
     <string name="store_riotx_short_description">최신 안드로이드 프레임워크를 사용해 더 빠르고 가벼운 Matrix를 위한 클라이언트</string>
-    <string name="store_riotx_full_description">RiotX는 Matrix 프로토콜 (Matrix.org)을 위한 새 클라이언트입니다: 안전한 분산 통신을 위한 개방형 네트워크. RiotX는 Matrix 안드로이드 SDK의 Riot 안드로이드 클라이언트 전체 개정판을 기반으로 한 Riot 안드로이드 클라이언트의 전체 개정판입니다.
-\n
-\n면책 조항: 이것은 베타 버전입니다. RiotX는 현재 개발 중이고 한계가 있으며 (많지 않으면 좋겠지만) 버그가 있습니다. 모든 피드백은 환영합니다!
-\n
-\nRiotX 지원: • 존재하는 계정으로 로그인 • 방을 만들고 공공 방에 참가 • 초대를 수락하거나 거절 • 사용자 방 목록 • 방 세부 정보 보기 • 문자 메시지 보내기 • 첨부 파일 보내기 • 암호화된 방에서 메시지 읽고 쓰기 • 암호화: 종단간 암호화 키 백업, 고급 기기 인증, 키 공유 요청과 답장 • 푸시 알림 • 밝은 테마, 어두운 테마 그리고 검정 테마
-\n
-\n아직 Riot의 모든 기능이 RiotX에 구현되지 않았습니다. 주요 없는 (그리고 곧 나올!) 기능: • 계정 만들기 • 방 설정 (방 구성원 목록 등) • 다이렉트 대화 방 만들기 • 전화 • 위젯 • …</string>
+    <string name="store_riotx_full_description">RiotX는 Matrix 프로토콜 (Matrix.org)을 위한 새 클라이언트입니다: 안전한 분산 통신을 위한 개방형 네트워크. RiotX는 Matrix 안드로이드 SDK의 Riot 안드로이드 클라이언트 전체 개정판을 기반으로 한 Riot 안드로이드 클라이언트의 전체 개정판입니다. 
+\n 
+\n면책 조항: 이것은 베타 버전입니다. RiotX는 현재 개발 중이고 한계가 있으며 (많지 않으면 좋겠지만) 버그가 있습니다. 모든 피드백은 환영합니다! 
+\n 
+\nRiotX 지원: • 존재하는 계정으로 로그인 • 방을 만들고 공공 방에 참가 • 초대를 수락하거나 거절 • 사용자 방 목록 • 방 세부 정보 보기 • 문자 메시지 보내기 • 첨부 파일 보내기 • 암호화된 방에서 메시지 읽고 쓰기 • 암호화: 종단간 암호화 키 백업, 고급 기기 확인, 키 공유 요청과 답장 • 푸시 알림 • 밝은 테마, 어두운 테마 그리고 검정 테마 
+\n 
+\n아직 Riot의 모든 기능이 RiotX에 구현되지 않았습니다. 주요 없는 (그리고 곧 나올!) 기능: • 계정 만들기 • 방 설정 (방 구성원 목록 등) • 전화 • 위젯 • …</string>
 
     <string name="bottom_action_people_x">다이렉트 메시지</string>
 
@@ -1529,7 +1521,7 @@
     <string name="room_filtering_footer_title">원하는 것을 찾을 수 없나요\?</string>
     <string name="room_filtering_footer_create_new_room">새 방 만들기</string>
     <string name="room_filtering_footer_create_new_direct_message">새 다이렉트 메시지 보내기</string>
-    <string name="room_filtering_footer_open_room_directory">방 디렉토리 보기</string>
+    <string name="room_filtering_footer_open_room_directory">방 목록 보기</string>
 
     <string name="room_directory_search_hint">이름 혹은 ID (#예시:matrix.org)</string>
 
@@ -1547,4 +1539,88 @@
 
     <string name="message_view_edit_history">편집 기록 보기</string>
 
+    <string name="review">검토</string>
+    <string name="decline">끊기</string>
+
+    <string name="widget_integration_review_terms">계속 하려면 이 서비스 약관에 동의해야 합니다.</string>
+
+    <string name="security_warning_identity_server">Riot의 이전 버전은 보안 버그로 ID 서버 (%1$s)가 계정으로 접근할 수 있었습니다. %2$s을(를) 신뢰하면 이것을 무시하고, 그렇지 않다면 로그아웃한 후 다시 로그인하세요.
+\n
+\n자세한 설명은 여기서 읽으세요:
+\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
+
+    <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="read_at">읽은 시간</string>
+
+    <string name="none">없음</string>
+    <string name="revoke">취소</string>
+    <string name="disconnect">연결 해제</string>
+    <string name="people_no_identity_server">설정된 ID 서버가 없습니다.</string>
+
+    <string name="call_failed_no_ice_title">잘놋 설정된 서버로 인해 전화에 실패함</string>
+    <string name="call_failed_no_ice_description">전화가 정상적으로 작동하도록 TURN 서버를 설정하려면 홈서버 (%1$s)의 관리자에게 연락해주세요.
+\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_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_homeserver_not_found">이 URL로는 홈서버에 접근할 수 없습니다, 확인해주세요</string>
+    <string name="settings_call_ringtone_use_default_stun">대체 전화 지원 서버 허용</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">홈서버가 전화를 지원하지 않는다면 %s을(를) 지원 서버로 사용합니다 (전화하는 동안 IP 주소가 공유됩니다)</string>
+    <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">Riot은 기기의 제한된 자원 (배터리)을 유지하기 위해 백그라운드에서 동기화합니다.
+\n기기 자원 상태에 따라 운영체제에 의해 동기화는 지연될 수 있습니다.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">실시간으로 최적화됨</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot은 (설정할 수 있는) 특정 시간에 주기적으로 백그라운드에거 동기화됩니다.
+\n이는 라디오와 배터리 사용에 영향을 주며 Riot이 이벤트를 수신하고 있는 상태라는 알림이 영구적으로 표시됩니다.</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>
+
+
+    <string name="settings_set_workmanager_delay">원하는 동기화 간격</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\n동기화는 자원 (배터리)이나 기기의 상태 (수면)에 따라 지연됩니다.</string>
+    <string name="settings_discovery_category">탐색</string>
+    <string name="settings_discovery_manage">탐색 설정을 관리합니다.</string>
+    <string name="encryption_information_device_name_with_warning">공개 이름 (대화하는 사람들에게 보여집니다)</string>
+    <string name="device_name_warning">기기의 공개 이름은 대화하는 사람들에게 보여집니다</string>
+    <string name="identity_server_not_defined">ID 서버를 사용하고 있지 않습니다</string>
+    <string name="identity_server_not_defined_for_password_reset">설정된 ID 서버가 없습니다, 비밀번호를 초기화하려면 ID 서버가 필요합니다.</string>
+
+    <string name="error_user_already_logged_in">다른 홈서버로 연결을 시도합니다. 로그아웃하겠습니까\?</string>
+
+    <string name="identity_server">ID 서버</string>
+    <string name="disconnect_identity_server">ID 서버 연결 해제</string>
+    <string name="add_identity_server">ID 서버 설정</string>
+    <string name="change_identity_server">ID 서버 바꾸기</string>
+    <string name="settings_discovery_identity_server_info">알고 있는 연락처 사람들을 찾거나 연락처 사람들이 당신을 찾도록 현재 %1$s을(를) 사용하고 있습니다.</string>
+    <string name="settings_discovery_identity_server_info_none">현재 ID 서버를 사용하고 있지 않습니다. 알고 있는 연락처 사람들을 찾거나 연락처 사람들이 당신을 찾도록 하려면, 아래에서 하나를 설정하세요.</string>
+    <string name="settings_discovery_emails_title">이메일 주소로 찾을 수 있음</string>
+    <string name="settings_discovery_no_mails">이메일을 추가하면 탐색 설정이 나타납니다.</string>
+    <string name="settings_discovery_no_msisdn">전화번호를 추가하면 탐색 설정이 나타납니다.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">ID 서버에서 연결을 해제하면 이메일이나 전화로 다른 사용자가 당신을 찾을 수 없게 되고 다른 사람들을 초대할 수 없게 됩니다.</string>
+    <string name="settings_discovery_msisdn_title">전화번호로 찾을 수 있음</string>
+    <string name="settings_discovery_confirm_mail">%s(으)로 확인 이메일을 보냈습니다, 이메일을 확인하고 확인 링크를 클릭하세요</string>
+    <string name="settings_discovery_mail_pending">보류 중</string>
+
+    <string name="settings_discovery_enter_identity_server">새 ID 서버를 입력</string>
+    <string name="settings_discovery_bad_identity_server">ID 서버에 연결할 수 없음</string>
+    <string name="settings_discovery_please_enter_server">ID 서버 URL을 입력해주세요</string>
+    <string name="settings_discovery_no_terms_title">ID 서버가 서비스 약관이 없습니다</string>
+    <string name="settings_discovery_no_terms">선택한 ID 서버가 서비스 약관이 없습니다. 서비스의 소유자를 신뢰하는 경우에만 계속하세요</string>
+    <string name="settings_text_message_sent">%s(으)로 문자 메시지를 보냈습니다. 문자에 있는 확인 코드를 입력해주세요.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">현재 이메일 주소나 전화번호를 ID 서버 %s와 공유하고 있습니다. 공유하기를 중지하려면 %s(으)로 다시 연결해야 합니다.</string>
+    <string name="settings_agree_to_terms">ID 서버 (%s)의 서비스 약관에 동의하면 다른 사용자가 당신을 이메일 주소나 전화번호로 찾을 수 있게 됩니다.</string>
 </resources>

vector/src/main/res/values-lv/strings.xml

@@ -134,11 +134,6 @@
     <string name="auth_password_placeholder">Parole</string>
     <string name="auth_new_password_placeholder">Jauna parole</string>
     <string name="auth_user_name_placeholder">Lietotājvārds</string>
-    <string name="auth_add_email_message">Pievieno epasta adresi savam kontam, lai pārējiem dalībniekiem būtu iespējams Tevi atrast, kā arī lai Tev būtu iespēja mainīt paroli.</string>
-    <string name="auth_add_phone_message">Pievieno telefona numuru savam kontam, lai ļautu pārējiem dalībniekiem Tevi atrast.</string>
-    <string name="auth_add_email_phone_message">Pievieno savam kontam epasta adresi un/vai telefona numuru, lai ļautu pārējiem dalībniekiem Tevi atrast.
-
-Kā arī epasta adrese ļaus Tev atiestatīt paroli.</string>
     <string name="light_theme">Gaiša ādiņa</string>
     <string name="dark_theme">Tumša ādiņa</string>
     <string name="black_them">Melna ādiņa</string>
@@ -169,9 +164,6 @@ Kā arī epasta adrese ļaus Tev atiestatīt paroli.</string>
     <string name="option_take_photo">Uzņemt foto</string>
     <string name="option_take_video">Uzņemt video</string>
 
-    <string name="auth_add_email_and_phone_message">Pievieno kontam epasta adresi un telefona numuru, lai citi lietotāji var Tevi atrast.
-
-Epasta adrese arī ļaus Tev nepieciešamības gadījumā atjaunot paroli.</string>
     <string name="auth_email_placeholder">Epasta adrese</string>
     <string name="auth_opt_email_placeholder">Epasta adrese (papildus)</string>
     <string name="auth_phone_number_placeholder">Tālruņa #</string>

vector/src/main/res/values-nl/strings.xml

@@ -140,14 +140,6 @@
     <string name="auth_password_placeholder">Wachtwoord</string>
     <string name="auth_new_password_placeholder">Nieuw wachtwoord</string>
     <string name="auth_user_name_placeholder">Gebruikersnaam</string>
-    <string name="auth_add_email_message">Voeg een e-mailadres aan uw account toe zodat gebruikers u kunnen vinden en zodat u het wachtwoord kunt veranderen.</string>
-    <string name="auth_add_phone_message">Voeg een telefoonnummer aan uw account toe zodat gebruikers u kunnen vinden.</string>
-    <string name="auth_add_email_phone_message">Voeg een e-mailadres en/of telefoonnummer aan uw account toe zodat gebruikers u kunnen vinden.
-\n
-\nHet e-mailadres maakt het ook mogelijk om uw wachtwoord te veranderen.</string>
-    <string name="auth_add_email_and_phone_message">Voeg een e-mailadres en een telefoonnummer aan uw account toe zodat gebruikers u kunnen vinden.
-\n
-\nHet e-mailadres maakt het ook mogelijk om uw wachtwoord te veranderen.</string>
     <string name="auth_email_placeholder">E-mailadres</string>
     <string name="auth_opt_email_placeholder">E-mailadres (optioneel)</string>
     <string name="auth_phone_number_placeholder">Telefoonnummer</string>
@@ -1518,4 +1510,13 @@
     <string name="sas_error_m_user_error">Gebruikers komen niet overeen</string>
     <string name="sas_error_unknown">Onbekende fout</string>
 
+    <string name="none">Geen</string>
+    <string name="revoke">Intrekken</string>
+    <string name="disconnect">Verbinding verbreken</string>
+    <string name="review">Nakijken</string>
+    <string name="decline">Weigeren</string>
+
+    <string name="people_no_identity_server">Geen identiteitsserver geconfigureerd.</string>
+
+    <string name="call_failed_no_ice_title">Oproep mislukt door verkeerd geconfigureerde server</string>
 </resources>

vector/src/main/res/values-nn/strings.xml

@@ -173,10 +173,6 @@
     <string name="auth_password_placeholder">Åtgangsord</string>
     <string name="auth_new_password_placeholder">Nytt åtgangsord</string>
     <string name="auth_user_name_placeholder">Brukarnamn</string>
-    <string name="auth_add_email_message">Knyt ei epostadressa til brukaren din slik at folk kann finna deg, og du kan attendestilla åtgangsordet ditt.</string>
-    <string name="auth_add_phone_message">Knyt eit telefonnummer til brukaren din slik at andre brukarar kann finna deg.</string>
-    <string name="auth_add_email_phone_message">Knyt ei epostaddresse og/eller eit telefonnummer til brukaren din slik at andre brukarar kann finna deg. Epostadressa lèt deg au attendestilla åtgangsordet.</string>
-    <string name="auth_add_email_and_phone_message">Knyt ei epostadresse og eit telefonnummer til brukaren din slik at andre brukarar kann finna deg. Epostadressa lèt deg og attendestilla åtgangsordet.</string>
     <string name="auth_email_placeholder">Epostadressa</string>
     <string name="auth_opt_email_placeholder">Epostadressa (valfritt)</string>
     <string name="auth_phone_number_placeholder">Telefonnummer</string>

vector/src/main/res/values-pl/strings.xml

@@ -133,8 +133,6 @@
     <string name="auth_password_placeholder">Hasło</string>
     <string name="auth_new_password_placeholder">Nowe hasło</string>
     <string name="auth_user_name_placeholder">Nazwa użytkownika</string>
-    <string name="auth_add_email_message">Dodaj do konta adres e-mail, aby użytkownicy mogli Cię odnaleźć, oraz abyś mógł przywrócić swoje hasło.</string>
-    <string name="auth_add_phone_message">Dodaj numer telefonu, aby użytkownicy mogli Cię odnaleźć.</string>
     <string name="auth_email_placeholder">Adres e-mail</string>
     <string name="auth_opt_email_placeholder">Adres e-mail (nieobowiązkowy)</string>
     <string name="auth_phone_number_placeholder">Numer telefonu</string>
@@ -572,12 +570,6 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="option_take_photo">Zrób zdjęcie</string>
     <string name="option_take_video">Nagraj film</string>
 
-    <string name="auth_add_email_phone_message">Dodaj adres e-mail i/lub nr telefonu do swojego konta, aby umożliwić innym użytkownikom odnalezienie ciebie.
-\n
-\nAdres e-mail pozwoli Ci również zresetować hasło.</string>
-    <string name="auth_add_email_and_phone_message">Dodaj adres e-mail i nr telefonu do swojego konta, aby umożliwić innym użytkownikom odnalezienie ciebie.
-\n
-\nAdres e-mail pozwoli Ci również zresetować hasło.</string>
     <string name="auth_threepid_warning_message">Rejestracja jednocześnie za pomocą numeru telefonu i adresu e-mail nie jest obsługiwana dopóki nie pojawi się odpowiednie API. Tylko numer telefonu będzie brany pod uwagę.
 
 Możesz dodać adres e-mail do swojego profilu w ustawieniach.</string>

vector/src/main/res/values-pt-rBR/strings.xml

@@ -140,10 +140,6 @@
     <string name="auth_password_placeholder">Senha</string>
     <string name="auth_new_password_placeholder">Nova senha</string>
     <string name="auth_user_name_placeholder">Nome de usuário</string>
-    <string name="auth_add_email_message">"Adicione um endereço de e-mail à sua conta para permitir que outras pessoas achem você, e para que seja possível você redefinir sua senha."</string>
-    <string name="auth_add_phone_message">"Adicione um número de telefone à sua conta para permitir que outras pessoas achem você."</string>
-    <string name="auth_add_email_phone_message">"Adicione um endereço de e-mail e/ou um número de telefone à sua conta para que outras pessoas possam encontrar você.\n\nO e-mail também permite que você possa redefinir sua senha."</string>
-    <string name="auth_add_email_and_phone_message">"Adicione um endereço de e-mail e um número de telefone à sua conta para que outras pessoas possam encontrar você.\n\nO e-mail também permite que você possa redefinir sua senha."</string>
     <string name="auth_email_placeholder">Endereço de email</string>
     <string name="auth_opt_email_placeholder">Endereço de email (opcional)</string>
     <string name="auth_phone_number_placeholder">Número de telefone</string>

vector/src/main/res/values-pt/strings.xml

@@ -139,14 +139,6 @@
     <string name="auth_password_placeholder">Palavra-passe</string>
     <string name="auth_new_password_placeholder">Nova palavra-passe</string>
     <string name="auth_user_name_placeholder">Nome de utilizador</string>
-    <string name="auth_add_email_message">Adicione um endereço de e-mail à sua conta para permitir que outros utlizadores o encontrem, assim como para que seja possível redefinir a sua palavra-passe.</string>
-    <string name="auth_add_phone_message">Adicione um número de telefone à sua conta para permitir que outros utilizadores o encontrem.</string>
-    <string name="auth_add_email_phone_message">Adicione um endereço de e-mail e/ou um número de telefone à sua conta para permitir que outros utilizadores o encontrem.
-
-O endereço de e-mail também lhe permitirá redefinir sua senha.</string>
-    <string name="auth_add_email_and_phone_message">Adicione um endereço de e-mail e um número de telefone à sua conta para permitir que outros utilizadores o encontrem.
-
-O endereço de e-mail também lhe permitirá redefinir sua senha.</string>
     <string name="auth_email_placeholder">Endereço de e-mail</string>
     <string name="auth_opt_email_placeholder">Endereço de email (opcional)</string>
     <string name="auth_phone_number_placeholder">Número de telefone</string>

vector/src/main/res/values-ru/strings.xml

@@ -142,14 +142,6 @@
     <string name="auth_password_placeholder">Пароль</string>
     <string name="auth_new_password_placeholder">Новый пароль</string>
     <string name="auth_user_name_placeholder">Логин</string>
-    <string name="auth_add_email_message">Добавьте адрес электронной почты к вашему аккаунту, чтобы другие пользователи могли найти вас, а также, чтобы иметь возможность сбросить пароль.</string>
-    <string name="auth_add_phone_message">"Добавьте телефон к вашему аккаунту, чтобы другие пользователи могли найти вас."</string>
-    <string name="auth_add_email_phone_message">Добавьте электронную почту и/или телефон к вашему аккаунту, чтобы другие пользователи могли найти вас.
-
-Электронная почта также позволит вам при необходимости восстановить пароль.</string>
-    <string name="auth_add_email_and_phone_message">Добавьте email и телефон к вашему аккаунту, чтобы другие пользователи могли найти вас.
-
-Email также позволит вам при необходимости восстановить пароль.</string>
     <string name="auth_email_placeholder">Адрес электронной почты</string>
     <string name="auth_opt_email_placeholder">Адрес электронной почты (не обязательно)</string>
     <string name="auth_phone_number_placeholder">Номер телефона</string>
@@ -454,7 +446,7 @@ Email также позволит вам при необходимости во
     <string name="settings_background_sync">Синхронизация</string>
     <string name="settings_enable_background_sync">Включить фоновую синхронизацию</string>
     <string name="settings_set_sync_timeout">Таймаут синхронизации</string>
-    <string name="settings_set_sync_delay">Задержка между запросами</string>
+    <string name="settings_set_sync_delay">Задержка между каждой синхронизацией</string>
     <string name="settings_second">секунда</string>
     <string name="settings_seconds">секунд</string>
 
@@ -482,10 +474,10 @@ Email также позволит вам при необходимости во
     <string name="settings_pin_missed_notifications">Прикрепить комнаты с отключенными уведомлениями</string>
     <string name="settings_pin_unread_messages">Прикрепить комнаты с непрочитанными сообщениями</string>
     <string name="settings_devices_list">Устройства</string>
-    <string name="devices_details_dialog_title">Подробности о устройстве</string>
+    <string name="devices_details_dialog_title">Информация об устройстве</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Имя</string>
-    <string name="devices_details_device_name">Имя устройства</string>
+    <string name="devices_details_name_title">Общеизвестное имя</string>
+    <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">Для этой операции требуется дополнительная проверка подлинности.
@@ -619,9 +611,9 @@ Email также позволит вам при необходимости во
     <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>
-    <string name="encryption_information_device_id">ID устройства</string>
+    <string name="encryption_information_device_name">Публичное имя</string>
+    <string name="encryption_information_name">Публичное имя</string>
+    <string name="encryption_information_device_id">ID</string>
     <string name="encryption_information_device_key">Ключ устройства</string>
     <string name="encryption_information_verification">Проверка</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 отпечаток</string>
@@ -1593,7 +1585,7 @@ Email также позволит вам при необходимости во
 
     <string name="event_redacted_by_user_reason">Удаленное пользователем событие</string>
     <string name="event_redacted_by_admin_reason">Мероприятие, модерируемое администратором помещения</string>
-    <string name="last_edited_info_message">Последний раз редактировался %s на %s</string>
+    <string name="last_edited_info_message">Последний раз редактировался %1$s на %2$s</string>
 
 
     <string name="malformed_message">Некорректное событие, не может быть отображено</string>
@@ -1637,7 +1629,7 @@ Email также позволит вам при необходимости во
     <string name="settings_preferences">Установки</string>
     <string name="settings_security_and_privacy">Безопасность &amp; Конфиденциальность</string>
     <string name="settings_expert">Профессионал</string>
-    <string name="settings_push_rules">Нажать Правила</string>
+    <string name="settings_push_rules">Пуш-Правила</string>
     <string name="push_gateway_item_app_id">app_id:</string>
     <string name="push_gateway_item_push_key">push_key:</string>
     <string name="push_gateway_item_app_display_name">app_display_name:</string>
@@ -1661,15 +1653,15 @@ Email также позволит вам при необходимости во
 
     <string name="store_riotx_title">RiotX - Matrix клиент следующего поколения</string>
     <string name="store_riotx_short_description">Быстрый и легкий клиент для Matrix с новейшими фреймворками Android</string>
-    <string name="store_riotx_full_description">RiotX - это новый клиент для матричного протокола (Matrix.org): открытой сети для безопасной децентрализованной связи. RiotX - это полная перезапись Riot Android клиента, основанная на полной перезаписи Matrix Android SDK.
-\n
-\nОговорка: Это бета-версия. В настоящее время RiotX находится в активной разработке и содержит ограничения и (надеемся, не слишком много) ошибки. Мы будем рады любым отзывам!
-\n
-\nПоддержка RiotX: - Войти в существующую учетную запись - Создать комнату и присоединиться к общей комнате - Принять и отклонить приглашения - Список комнат пользователей - Просмотр сведений о комнате - Отправить текстовые сообщения - Отправить вложение - Читать и писать сообщения в зашифрованных комнатах - Криптографически: Резервное копирование клавиш E2E, предварительная проверка устройства, запрос и ответ на общий доступ к ключам - Нажмите уведомление - Светлые, темные и черные темы
-\n
-\nНе все функции RiotX пока реализованы в RiotX. Основные отсутствующие (и скоро появятся!) особенности: - Создание учетной записи - Настройки комнат (список членов комнат и т.д.) - Создание прямых чатов - Вызовы - Виджеты - .…</string>
+    <string name="store_riotx_full_description">RiotX - это новый клиент для матричного протокола (Matrix.org): открытой сети для безопасной децентрализованной связи. RiotX - это полная перезапись Riot Android клиента, основанная на полной перезаписи Matrix Android SDK. 
+\n 
+\nОговорка: Это бета-версия. В настоящее время RiotX находится в активной разработке и содержит ограничения и (надеемся, не слишком много) ошибки. Мы будем рады любым отзывам! 
+\n 
+\nПоддержка RiotX: - Войти в существующую учетную запись - Создать комнату и присоединиться к общедоступным комнатам - Принять и отклонить приглашения - Список комнат пользователей - Просмотр сведений о комнате - Отправить текстовые сообщения - Отправить вложение - Читать и писать сообщения в зашифрованных комнатах - Криптография: Резервное копирование клавиш E2E, предварительная проверка устройства, запрос и ответ на общий доступ к ключам - Нажмите уведомление - Светлые и черные темы 
+\n 
+\nНе все функции Riot пока реализованы в RiotX. Основные отсутствующие (и скоро появятся!) свойства: - Создание учетной записи - Настройки комнат (список членов комнат и т.д.) - Вызовы - Виджеты - .…</string>
 
-    <string name="room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в RiotX пока не поддерживается.</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в RiotX пока не поддерживается</string>
 
     <string name="bottom_action_people_x">Прямые сообщения</string>
 
@@ -1699,11 +1691,11 @@ Email также позволит вам при необходимости во
 
     <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="link_copied_to_clipboard">Ссылка скопирована в буфер обмена</string>
 
-    <string name="add_by_matrix_id">Добавить по matrix ID</string>
+    <string name="add_by_matrix_id">Добавить по Matrix ID</string>
     <string name="creating_direct_room">Создание комнаты…</string>
     <string name="direct_room_no_known_users">"Результат не найден, используйте добавить matrix ID  для поиска на сервере."</string>
     <string name="direct_room_start_search">Начните печатать, чтобы получить результат</string>
@@ -1713,4 +1705,91 @@ Email также позволит вам при необходимости во
 
     <string name="message_view_edit_history">Просмотреть историю изменений</string>
 
+    <string name="review">Обзор</string>
+    <string name="decline">Отклонить</string>
+
+    <string name="widget_integration_review_terms">Для продолжения Вам необходимо принять Условия данного сервиса.</string>
+
+    <string name="security_warning_identity_server">В предыдущих версиях Riot была ошибка безопасности, которая могла дать вашему серверу идентификации (%1$s) доступ к вашей учетной записи. Если вы доверяете %2$s, вы можете проигнорировать это; в противном случае, пожалуйста, выйдите из системы и войдите снова.
+\n
+\nПодробнее об этом читайте здесь:
+\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
+
+    <string name="settings_push_rules_no_rules">Пуш-правила не определены</string>
+    <string name="settings_push_gateway_no_pushers">Нет зарегистрированных пуш-шлюзов</string>
+
+    <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="read_at">Читать в</string>
+
+    <string name="none">Никто</string>
+    <string name="revoke">Отмена</string>
+    <string name="disconnect">Отключить</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 сервер, чтобы звонки работали надежно.
+\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_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_homeserver_not_found">Не удается связаться с домашним сервером по этому URL, пожалуйста, проверьте его</string>
+    <string name="settings_call_ringtone_use_default_stun">Разрешить резервный сервер помощи при вызове</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Оптимизирован для батареи</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Оптимизирован для работы в реальном времени</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Без фоновой синхронизации</string>
+    <string name="settings_background_sync_update_error">Не удалось обновить настройки.</string>
+
+
+    <string name="settings_set_workmanager_delay">Предпочтительный интервал синхронизации</string>
+    <string name="settings_discovery_category">Обнаружение</string>
+    <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">Riot будет синхронизироваться в фоновом режиме таким образом, чтобы сохранить ограниченные ресурсы устройства (батарея).
+\nВ зависимости от состояния ресурса вашего устройства, синхронизация может быть отложена операционной системой.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot будет синхронизироваться в фоновом режиме периодически в точное время (настраивается).
+\nЭто повлияет на использование радио и батареи, появится постоянное уведомление о том, что Riot прислушивается к событиям.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Вы не будете уведомлены о входящих сообщениях, когда приложение находится в фоновом режиме.</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nСинхронизация может быть отложена в зависимости от ресурсов (батареи) или состояния устройства (спящий режим).</string>
+    <string name="settings_discovery_manage">Управляйте настройками обнаружения.</string>
+    <string name="encryption_information_device_name_with_warning">Публичное имя (видимое для людей, с которыми вы общаетесь)</string>
+    <string name="device_name_warning">Публичное имя устройства видны людям, с которыми вы общаетесь</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="identity_server">Сервер идентификации</string>
+    <string name="disconnect_identity_server">Отключить идентификационный сервер</string>
+    <string name="add_identity_server">Настроить идентификационный сервер</string>
+    <string name="change_identity_server">Изменить идентификационный сервер</string>
+    <string name="settings_discovery_identity_server_info">В настоящее время вы используете %1$s для обнаружения и быть найденным вашими контактами.</string>
+    <string name="settings_discovery_identity_server_info_none">"Вы в настоящее время не используете идентификационный сервер. Чтобы обнаружить и быть найденным  вашими существующими контактами, настройте один из них ниже."</string>
+    <string name="settings_discovery_emails_title">Видимые адреса электронной почты</string>
+    <string name="settings_discovery_msisdn_title">Доступные номера телефонов</string>
+    <string name="settings_discovery_mail_pending">В ожидании</string>
+
+    <string name="settings_discovery_enter_identity_server">Введите новый сервер идентификации</string>
+    <string name="settings_discovery_bad_identity_server">Не удалось подключиться к серверу идентификации</string>
+    <string name="settings_discovery_please_enter_server">Пожалуйста, введите URL сервера идентификации</string>
+    <string name="settings_discovery_no_terms_title">Сервер идентификации не имеет условий предоставления услуг</string>
+    <string name="settings_discovery_no_mails">Параметры обнаружения появятся после добавления электронной почты.</string>
+    <string name="settings_discovery_no_msisdn">Параметры поиска появятся после добавления номера телефона.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Отключение от сервера идентификации будет означать, что другие пользователи не смогут обнаружить вас, и вы не сможете приглашать других по электронной почте или по телефону.</string>
+    <string name="settings_discovery_confirm_mail">Мы отправили вам электронное письмо с подтверждением на %s, проверьте вашу электронную почту и нажмите на ссылку для подтверждения</string>
+    <string name="settings_discovery_no_terms">Выбранный сервер идентификации не имеет условий обслуживания. Продолжить, только если вы доверяете владельцу службы</string>
+    <string name="settings_text_message_sent">Текстовое сообщение отправлено %s. Введите код проверки, который он содержит.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">В настоящее время вы делитесь адресами электронной почты или телефонными номерами на сервере идентификации %s. Вам нужно повторно подключиться к %s, чтобы прекратить делиться ими.</string>
+    <string name="settings_agree_to_terms">Примите Условия обслуживания сервера идентификации (%s), чтобы разрешить обнаружение по адресу электронной почты или номеру телефона.</string>
 </resources>

vector/src/main/res/values-sk/strings.xml

@@ -140,14 +140,6 @@
     <string name="auth_password_placeholder">Heslo</string>
     <string name="auth_new_password_placeholder">Nové heslo</string>
     <string name="auth_user_name_placeholder">Používateľské meno</string>
-    <string name="auth_add_email_message">Pridajte si k účtu emailovú adresu, aby vás ostatní ľahšie mohli nájsť, alebo aby ste si mohli obnoviť zabudnuté heslo.</string>
-    <string name="auth_add_phone_message">Pridajte si k účtu telefónne číslo, aby vás ostatní mohli ľahšie nájsť.</string>
-    <string name="auth_add_email_phone_message">Pridajte si k účtu emailovú adresu a/alebo číslo telefónu,aby vás ostatní mohli ľahšie nájsť.
-
-Emailová adresa vám tiež umožní obnoviť si zabudnuté heslo.</string>
-    <string name="auth_add_email_and_phone_message">Pridajte si k účtu emailovú adresu a číslo telefónu,aby vás ostatní mohli ľahšie nájsť.
-
-Emailová adresa vám tiež umožní obnoviť si zabudnuté heslo.</string>
     <string name="auth_email_placeholder">Emailová adresa</string>
     <string name="auth_opt_email_placeholder">Emailová adresa (nepovinné)</string>
     <string name="auth_phone_number_placeholder">Číslo telefónu</string>

vector/src/main/res/values-sq/strings.xml

@@ -138,7 +138,6 @@
     <string name="auth_password_placeholder">Fjalëkalim</string>
     <string name="auth_new_password_placeholder">Fjalëkalim i ri</string>
     <string name="auth_user_name_placeholder">Emër përdoruesi</string>
-    <string name="auth_add_phone_message">Shtoni te llogaria juaj një numër telefoni, që përdoruesit të mund t’ju zbulojnë.</string>
     <string name="auth_email_placeholder">Adresë email</string>
     <string name="auth_opt_email_placeholder">Adresë email (në daçi)</string>
     <string name="auth_phone_number_placeholder">Numër telefoni</string>
@@ -409,7 +408,7 @@
     <string name="settings_background_sync">Njëkohësim në prapaskenë</string>
     <string name="settings_enable_background_sync">Aktivizo njëkohësim në prapaskenë</string>
     <string name="settings_set_sync_timeout">Mbarim kohe për kërkesë njëkohësimi</string>
-    <string name="settings_set_sync_delay">Vonesë mes çdo kërkese</string>
+    <string name="settings_set_sync_delay">Vonesë mes çdo Njëkohësimi</string>
     <string name="settings_second">sekondë</string>
     <string name="settings_seconds">sekonda</string>
 
@@ -460,10 +459,10 @@
 
     <string name="settings_data_save_mode">Mënyrë ruajtjeje të dhënash</string>
 
-    <string name="devices_details_dialog_title">Hollësi pajisjeje</string>
+    <string name="devices_details_dialog_title">Të dhëna pajisjeje</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Emër</string>
-    <string name="devices_details_device_name">Emër Pajisjeje</string>
+    <string name="devices_details_name_title">Emër Publik</string>
+    <string name="devices_details_device_name">Përditësoni Emër Publik</string>
     <string name="devices_details_last_seen_title">Parë së fundi më</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_title">Mirëfilltësim</string>
@@ -573,9 +572,9 @@
     <string name="encryption_information_decryption_error">Gabim shfshehtëzimi</string>
 
     <string name="encryption_information_sender_device_information">Të dhëna pajisjeje dërguesi</string>
-    <string name="encryption_information_device_name">Emër pajisjeje</string>
-    <string name="encryption_information_name">Emër</string>
-    <string name="encryption_information_device_id">ID Pajisjeje</string>
+    <string name="encryption_information_device_name">Emër publik</string>
+    <string name="encryption_information_name">Emër publik</string>
+    <string name="encryption_information_device_id">ID</string>
     <string name="encryption_information_device_key">Kyç pajisjeje</string>
     <string name="encryption_information_verification">Verifikim</string>
     <string name="encryption_information_ed25519_fingerprint">Shenja gishtash Ed25519</string>
@@ -745,13 +744,6 @@
     <string name="logout">Dilni</string>
     <string name="option_send_voice">Dërgoni mesazh zanor</string>
 
-    <string name="auth_add_email_message">Shtoni te llogaria juaj një adresë email, për t’u dhënë mundësinë përdoruesve t’ju zbulojnë dhe që t’ju lejojë të ricaktoni fjalëkalimin.</string>
-    <string name="auth_add_email_phone_message">Shtoni te llogaria juaj një adresë email dhe/ose një numër telefoni, për t’u dhënë mundësinë përdoruesve t’ju zbulojnë.
-\n
-\nAdresa email do t’ju lejojë edhe të ricaktoni fjalëkalimin tuaj.</string>
-    <string name="auth_add_email_and_phone_message">Shtoni te llogaria juaj një adresë email dhe një numër telefoni, për t’u dhënë mundësinë përdoruesve t’ju zbulojnë.
-\n
-\nAdresa email do t’ju lejojë edhe të ricaktoni fjalëkalimin tuaj.</string>
     <string name="auth_threepid_warning_message">Regjistrimi me email dhe me numër telefoni njëherazi nuk mbulohet ende, deri sa të ketë API. Do të merret parasysh vetëm numri i telefonit.
 \n
 \nEmail-in tuaj mund ta shtoni te profili juaj, te rregullimet.</string>
@@ -1456,7 +1448,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="event_redacted_by_user_reason">Veprimtari e fshirë nga përdorues</string>
     <string name="event_redacted_by_admin_reason">Veprimtari e moderuar nga përgjegjës dhome</string>
-    <string name="last_edited_info_message">Përpunuar së fundi nga %s më %s</string>
+    <string name="last_edited_info_message">Përpunuar së fundi nga %1$s më %2$s</string>
 
 
     <string name="malformed_message">Veprimtari e keqformuar, s’mund të shfaqet</string>
@@ -1529,7 +1521,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 \n
 \nRiotX-i mbulon: • Hyrje në një llogari ekzistuese • Krijim dhome dhe pjesëmarrje në dhoma publike • Pranim dhe hedhje poshtë ftesash • Njohje të dhomave të përdoruesve • Parje hollësish dhome • Dërgim mesazhesh tekst • Dërgim bashkëngjitjesh • Lexim dhe shkrim mesazhesh në dhoma të fshehtëzuara • Kriptografi: kopjeruajtje kyçesh E2E, verifikim i thelluar pajisjesh, kërkesa dhe përgjigje për ndarje kyçesh • Njoftime push • Tema të Çelëta, të Errëta dhe të Zeza
 \n
-\nNë RiotX s’janë sendërtuar ende krejt veçoritë e Riot-it. Veçori kryesore që mungojnë (dhe që do të vijnë së shpejti!): • Krijim llogarish • Rregullime dhome (shfaqje anëtarësh dhome, etj.) • Krijim dhomash fjalosjeje të drejtpërdrejtë • Thirrje • Widget-es • …</string>
+\nNë RiotX s’janë sendërtuar ende krejt veçoritë e Riot-it. Veçori kryesore që mungojnë (dhe që do të vijnë së shpejti!): • Krijim llogarish • Rregullime dhome (shfaqje anëtarësh dhome, etj.) • Thirrje • Widget-es • …</string>
 
     <string name="settings_integration_manager">Përgjegjës Integrimesh</string>
 
@@ -1578,4 +1570,88 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="message_view_edit_history">Shihni Historik Përpunimesh</string>
 
+    <string name="review">Shqyrtojeni</string>
+    <string name="decline">Hidhe poshtw</string>
+
+    <string name="widget_integration_review_terms">Që të vazhdohet, lypset të pranoni Kushtet e këtij shërbimi.</string>
+
+    <string name="security_warning_identity_server">Versione të dikurshëm të Riot-it përmbanin një të metë sigurie, e cila mund t’i lejonte Shërbyesit tuaj të Identiteteve (%1$s) hyrje në llogarinë tuaj. Nëse i besoni %2$s, mund ta shpërfillni këtë sinjalizim; përndryshe dilni nga llogaria dhe ribëni hyrjen.
+\n
+\nLexoni më tepër hollësi këtu:
+\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
+
+    <string name="terms_of_service">Kushte Shërbimi</string>
+    <string name="review_terms">Shqyrtoni Kushtet</string>
+    <string name="terms_description_for_identity_server">Jini i zbulueshëm nga të tjerët</string>
+    <string name="terms_description_for_integration_manager">Përdorni robotë, ura, widget-e dhe paketa ngjitësish</string>
+
+    <string name="read_at">Lexoni te</string>
+
+    <string name="none">Asnjë</string>
+    <string name="revoke">Shfuqizoje</string>
+    <string name="disconnect">Shkëputu</string>
+    <string name="people_no_identity_server">S’ka shërbyes identitetesh të formësuar.</string>
+
+    <string name="call_failed_no_ice_title">Thirrja dështoi për shkak shërbyesi të keqformësuar</string>
+    <string name="call_failed_no_ice_description">Që thirrjet të funksionojnë në mënyrë të qëndrueshme, ju lutemi, kërkojini përgjegjësit të shërbyesit tuaj Home (%1$s) të formësojë një shërbyes TURN.
+\n
+\nNdryshe, mund të provoni të përdorni shërbyesin publik te %2$s, por kjo s’do të jetë edhe aq e qëndrueshme, dhe adresa juaj IP do të jetë e ditur për atë shërbyes. Këtë mund ta administroni edhe që nga Rregullimet.</string>
+    <string name="call_failed_no_ice_use_alt">Provoni të përdorni %s</string>
+    <string name="call_failed_dont_ask_again">Mos më pyet sërish</string>
+
+    <string name="auth_add_email_message_2">Caktoni një email për rimarrje llogarie, dhe më vonë të jetë i zbulueshëm (opsionale) nga persona që ju njohin.</string>
+    <string name="auth_add_phone_message_2">Caktoni një telefon, dhe më vonë të jetë i zbulueshëm (opsionale) nga persona që ju njohin.</string>
+    <string name="auth_add_email_phone_message_2">Caktoni një email për rimarrje llogarie. Përdoni email ose telefon që të jeni i zbulueshëm (opsionale) nga persona që ju njohin.</string>
+    <string name="auth_add_email_and_phone_message_2">Caktoni një email për rimarrje llogarie. Përdorni email ose telefon që të jeni i zbulueshëm (opsionale) nga persona që ju njohin.</string>
+    <string name="login_error_homeserver_not_found">S’kapet dot shërbyes Home te kjo URL, ju lutemi, kontrollojeni</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Do të përdoret %s si ndihmë kur shërbyesi juaj Home nuk ofron të tillë (gjatë thirrjes, adresa juaj IP do të ndahet me të tjerë)</string>
+    <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ë (Eksperimentale)</string>
+    <string name="settings_background_fdroid_sync_mode_battery">E optimizuar për baterinë</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Riot-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">Riot0-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 Riot-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>
+
+
+    <string name="settings_set_workmanager_delay">Interval i Parapëlqyer Njëkohësimesh</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nNjëkohësimi mund të shtyhet për më vonë, në varësi të burimeve (baterisë) ose gjendjes së pajisjes (dremitje).</string>
+    <string name="settings_discovery_manage">Administroni rregullimet tuaja për zbulime.</string>
+    <string name="encryption_information_device_name_with_warning">Emër publik (i dukshëm për persona me të cilët komunikoni)</string>
+    <string name="device_name_warning">Emri publik i një pajisjeje është i dukshëm për persona me të cilët komunikoni</string>
+    <string name="identity_server_not_defined">S’po përdorni ndonjë Shërbyes Identitetesh</string>
+    <string name="identity_server_not_defined_for_password_reset">S’ka shërbyes identitetesh të formësuar, kjo është e domosdoshme për ricaktimin e fjalëkalimit tuaj.</string>
+
+    <string name="error_user_already_logged_in">Duket se po rrekeni të lidheni me një tjetër shërbyes Home. Doni të bëhet dalja\?</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Që të përgjigjeni te rrjedha kohore, aktivizoni fërkimin</string>
+
+    <string name="identity_server">Shërbyes identitetesh</string>
+    <string name="disconnect_identity_server">Shkëpute shërbyesin e identiteteve</string>
+    <string name="add_identity_server">Formësoni shërbyes identitetesh</string>
+    <string name="change_identity_server">Ndryshoni shërbyes identitetesh</string>
+    <string name="settings_discovery_identity_server_info">Po përdorni %1$s për të zbuluar dhe për të qenë i zbulueshëm nga kontakte ekzistues që njihni.</string>
+    <string name="settings_discovery_identity_server_info_none">S’po përdorni ndonjë shërbyes identitetesh. Që të zbuloni dhe të jini i zbulueshëm nga kontakte ekzistuese që njihni, formësoni një të tillë më poshtë.</string>
+    <string name="settings_discovery_emails_title">Adresa email të zbulueshme</string>
+    <string name="settings_discovery_no_mails">Mundësitë rreth zbulimesh do të shfaqen sapo të keni shtuar një email.</string>
+    <string name="settings_discovery_no_msisdn">Mundësi zbulimesh do të shfaqen sapo të keni shtuar një numër telefoni.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Shkëputja prej shërbyesit tuaj të identiteteve do të thotë se s’do të jeni i zbulueshëm prej përdoruesish të tjerë dhe s’do të jeni në gjendje të ftoni të tjerë me email ose telefon.</string>
+    <string name="settings_discovery_msisdn_title">Numra telefoni të zbulueshëm</string>
+    <string name="settings_discovery_confirm_mail">Ju dërguam një email ripohimi te %s, hapeni dhe klikoni mbi lidhjen e ripohimit</string>
+    <string name="settings_discovery_mail_pending">Pezull</string>
+
+    <string name="settings_discovery_enter_identity_server">Jepni një shërbyes të ri identitetesh</string>
+    <string name="settings_discovery_bad_identity_server">S’u lidh dot te shërbyes identitetesh</string>
+    <string name="settings_discovery_please_enter_server">Ju lutemi, jepni URL-në e shërbyesit të identiteteve</string>
+    <string name="settings_discovery_no_terms_title">Shërbyesi i identiteteve s’ka kushte shërbimi</string>
+    <string name="settings_discovery_no_terms">Shërbyesi i identiteteve që keni zgjedhur nuk ka ndonjë kusht shërbimi. Vazhdoni vetëm nëse i zini besë të zotit të shërbimit</string>
+    <string name="settings_text_message_sent">Te %s u dërgua një mesazh tekst. Ju lutemi, jepni kodin e verifikimit që përmban ai.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">Hëpërhë, ndani me të tjerë adresa email ose numra telefoni te shërbyesi i identiteteve %s. Do të duhet të rilidheni me %s që të ndalni ndarjen e tyre.</string>
+    <string name="settings_agree_to_terms">Që të lejoni veten të jetë e zbulueshme nga adresë email apo numër telefoni, pajtohuni me Kushtet e Shërbimit të shërbyesit të identiteteve (%s).</string>
 </resources>

vector/src/main/res/values-te/strings.xml

@@ -252,7 +252,6 @@
     <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_prompt_resend">అన్నీ మళ్లీ పంపు</string>
-    <string name="auth_add_phone_message">వాడుకరులు మిమ్మల్ని కనుగొనడానికి మీ ఖాతాకు ఒక ఫోన్ నంబర్ను జోడించండి.</string>
     <string name="people_search_filter_text">మ్యాట్రిక్స్ వాడుకరులు మాత్రమే</string>
     <string name="room_prompt_cancel">అన్నింటినీ రద్దు చేయండి</string>
     <string name="room_resend_unsent_messages">పంపని సందేశాలను తిరిగి పంపండి</string>
@@ -460,7 +459,6 @@
 
     <string name="auth_send_reset_email">రీసెట్ ఈమెయిల్ పంపండి</string>
     <string name="auth_return_to_login">లాగిన్ తెరకి తిరిగి వెళ్లండి</string>
-    <string name="auth_add_email_message">ఒక ఈమెయిల్ చిరునామా ని జతచేస్తే వేరేవాళ్లు మిమ్మల్ని కనుక్కోవచ్చు, మరియు గుప్తపదాన్ని మార్చుకోవచ్చు</string>
     <string name="action_global_search">విశ్వాన్వేషణ</string>
     <string name="call_error_user_not_responding">అటు వైపు ఎవరు కాల్ ఎత్తలేదు</string>
     <string name="call_error_answered_elsewhere">కాల్ ఎక్కడో ఎత్తారు</string>
@@ -480,12 +478,6 @@
     <string name="send_bug_report_sent">బగ్ నివేదిక విజయవంతంగా పంపబడింది</string>
     <string name="send_bug_report_failed">లోపపు నివేదిక పంపబడదు (%s)</string>
     <string name="identity_url">గుర్తించిన సేవిక యు ఆర్ ఎల్</string>
-    <string name="auth_add_email_phone_message">వినియోగదారులు మిమ్మల్ని కనుగొనడానికి మిమ్మల్ని అనుమతించడానికి మీ ఖాతాకు ఇమెయిల్ చిరునామా మరియు / లేదా ఫోన్ నంబర్ను జోడించండి.
-\n
-\nఇమెయిల్ చిరునామా మీ పాస్ వర్డ్ ను మళ్ళీ రీసెట్ చేస్తుంది.</string>
-    <string name="auth_add_email_and_phone_message">వినియోగదారులు మిమ్మల్ని కనుగొనడానికి మిమ్మల్ని అనుమతించడానికి మీ ఖాతాకు ఇమెయిల్ చిరునామా మరియు / లేదా ఫోన్ నంబర్ను జోడించండి.
-\n
-\nఇమెయిల్ చిరునామా మీ పాస్ వర్డ్ ను మళ్ళీ రీసెట్ చేస్తుంది.</string>
     <string name="auth_use_server_options">కస్టమ్ సర్వర్ ఎంపికలు (ఆధునిక) ఉపయోగించండి</string>
     <string name="auth_reset_password_email_validation_message">%s కు ఒక ఇ-తపాలా పంపబడింది. మీరు కలిగి ఉన్న లింగికను మీరు అనుసరించిన తర్వాత, క్రింద నొక్కండి .</string>
     <string name="auth_reset_password_success_message">"మీ సాంకేతిక పదము  పునః ప్రారంభం చెయ్యబడింది.

vector/src/main/res/values-tr/strings.xml

@@ -176,8 +176,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="auth_add_email_message">Kullanıcıların seni rahatça bulabilmesi ve şifreni yeniden oluşturabilmen için bir e-posta hesabı ekle.</string>
-    <string name="auth_add_phone_message">Kullanıcıların seni rahatça bulabilmesi için bir telefon numarası ekle.</string>
     <string name="status_theme">Status.im Teması</string>
 
     <string name="title_activity_keys_backup_setup">Anahtar Yedekleme</string>
@@ -233,12 +231,6 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
 
     <string name="send_files_in">Gönder</string>
     <string name="identity_url">Kimlik Sunucusu URL\'si</string>
-    <string name="auth_add_email_phone_message">Kullanıcıların sizi bulmasını sağlamak için hesabınıza bir e-posta adresi ve/veya telefon numarası ekleyin.
-
-Ayrıca e-posta adresi, şifrenizi sıfırlamanıza da olanak tanır.</string>
-    <string name="auth_add_email_and_phone_message">Kullanıcıların sizi bulmasını sağlamak için hesabınıza bir e-posta adresi ve/veya telefon numarası ekleyin.
-
-Ayrıca e-posta adresi, şifrenizi sıfırlamanıza da olanak tanır.</string>
     <string name="auth_email_placeholder">E-posta adresi</string>
     <string name="auth_opt_email_placeholder">E-posta adresi (isteğe bağlı)</string>
     <string name="auth_phone_number_placeholder">Telefon numarası</string>

vector/src/main/res/values-uk/strings.xml

@@ -154,10 +154,6 @@
     <string name="auth_password_placeholder">Пароль</string>
     <string name="auth_new_password_placeholder">Новий пароль</string>
     <string name="auth_user_name_placeholder">Логін</string>
-    <string name="auth_add_email_message">"Додайте email адресу, щоб дати користувачам знайти себе та отримати змогу скинути свій пароль."</string>
-    <string name="auth_add_phone_message">"Додайте номер телефону, щоб інші користувачі могли вас знайти."</string>
-    <string name="auth_add_email_phone_message">"Додайте email адресу та/або номер телефону до вашого облікового запису, щоб інші користувачі могли вас знайти.\n\nEmail адреса також дасть вам змогу скидати пароль."</string>
-    <string name="auth_add_email_and_phone_message">"Додайте email адресу та номер телефону до вашого облікового запису, щоб інші користувачі могли вас знайти.\n\nEmail адреса також дасть вам змогу скидати пароль."</string>
     <string name="auth_email_placeholder">Email адреса</string>
     <string name="auth_opt_email_placeholder">Email адреса (oдодаткова)</string>
     <string name="auth_phone_number_placeholder">Номер телефону</string>

vector/src/main/res/values-zh-rCN/strings.xml

@@ -204,14 +204,6 @@
 
     <string name="option_take_photo_video">拍摄照片或视频</string>
 
-    <string name="auth_add_email_message">为您的账户添加一个电子邮箱地址以便其他用户发现您，同时可让您重置密码。</string>
-    <string name="auth_add_phone_message">为您的账户添加一个手机号码以便其他用户发现您。</string>
-    <string name="auth_add_email_phone_message">添加一个电子邮箱地址和/或手机号码到您的账户来让用户发现您。
-
-电子邮箱地址也可以让您重设您的密码。</string>
-    <string name="auth_add_email_and_phone_message">添加一个电子邮箱地址和手机号码到您的账户来让用户发现您。
-
-电子邮箱地址也可以让您重设您的密码。</string>
     <string name="auth_repeat_password_placeholder">重复密码</string>
     <string name="auth_use_server_options">使用自定义服务器选项（高级）</string>
     <string name="auth_email_validation_message">请检查您的电子邮箱以继续注册</string>

vector/src/main/res/values-zh-rTW/strings.xml

@@ -159,14 +159,6 @@
     <string name="auth_password_placeholder">密碼</string>
     <string name="auth_new_password_placeholder">新密碼</string>
     <string name="auth_user_name_placeholder">使用者名稱</string>
-    <string name="auth_add_email_message">輸入電子郵件位址來讓其他人找到您，以及方便您重設密碼。</string>
-    <string name="auth_add_phone_message">新增電話號碼來讓其他人找到您。</string>
-    <string name="auth_add_email_phone_message">新增電子郵件位址或電話號碼來讓其他人找到您。
-
-電子郵件位址也可以用來重設密碼。</string>
-    <string name="auth_add_email_and_phone_message">新增電子郵件位址或電話號碼來讓其他人找到您。
-
-電子郵件位址也可以用來重設密碼。</string>
     <string name="auth_email_placeholder">電子郵件地址</string>
     <string name="auth_opt_email_placeholder">電子郵件位址（選擇性）</string>
     <string name="auth_phone_number_placeholder">電話號碼</string>
@@ -520,7 +512,7 @@
     <string name="settings_background_sync">後臺同步</string>
     <string name="settings_enable_background_sync">開啓後臺同步</string>
     <string name="settings_set_sync_timeout">同步請求超時</string>
-    <string name="settings_set_sync_delay">每次同步請求的延遲</string>
+    <string name="settings_set_sync_delay">每次同步間的延遲</string>
     <string name="settings_second">秒</string>
     <string name="settings_seconds">秒</string>
 
@@ -569,10 +561,10 @@
 
     <string name="settings_data_save_mode">節省流量模式</string>
 
-    <string name="devices_details_dialog_title">裝置資料</string>
+    <string name="devices_details_dialog_title">裝置資訊</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">名稱</string>
-    <string name="devices_details_device_name">裝置名稱</string>
+    <string name="devices_details_name_title">公開名稱</string>
+    <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">此操作需要額外的身份驗證。
@@ -711,9 +703,9 @@
     <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>
-    <string name="encryption_information_device_id">裝置 ID</string>
+    <string name="encryption_information_device_name">公開名稱</string>
+    <string name="encryption_information_name">公開名稱</string>
+    <string name="encryption_information_device_id">ID</string>
     <string name="encryption_information_device_key">裝置金鑰</string>
     <string name="encryption_information_verification">驗證</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 指紋</string>
@@ -1451,7 +1443,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="event_redacted_by_user_reason">由使用者刪除的活動</string>
     <string name="event_redacted_by_admin_reason">由聊天室管理員審核的活動</string>
-    <string name="last_edited_info_message">最後編輯由 %s 於 %s</string>
+    <string name="last_edited_info_message">最後編輯由 %1$s 於 %2$s</string>
 
 
     <string name="malformed_message">活動格式錯誤，無法顯示</string>
@@ -1530,7 +1522,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n
 \nRiotX 支援：• 登入到既有的帳號 • 建立聊天室與加入公開聊天室 • 接受與回絕邀請 • 列出使用者聊天室 • 檢視聊天室詳細資訊 • 傳送文字訊息 • 傳送附件 • 讀取與編寫已加密的聊天室 • 加密：E2E 金鑰備份、進階裝置驗證、金鑰分享請求與回應 • 推送通知 • 亮、暗與黑色主題
 \n
-\n不是所有 Riot 的功能都已在 RiotX 中實作。主要缺少（會在稍後到來！）的功能：• 建立帳號 • 聊天室設定（列出聊天室成員等） • 直接聊天室建立 • 通話 • 小工具 • …</string>
+\n不是所有 Riot 的功能都已在 RiotX 中實作。主要缺少（會在稍後到來！）的功能：• 建立帳號 • 聊天室設定（列出聊天室成員等） • 通話 • 小工具 • …</string>
 
     <string name="bottom_action_people_x">直接訊息</string>
 
@@ -1577,4 +1569,88 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="message_view_edit_history">檢視編輯歷史</string>
 
+    <string name="review">審閱</string>
+    <string name="decline">婉拒</string>
+
+    <string name="widget_integration_review_terms">要繼續，您必須接受此服務的條款。</string>
+
+    <string name="security_warning_identity_server">先前版本的 Riot 有一個安全性問題，讓您的身份識別伺服器 (%1$s) 存取您的帳號。如果您信任 %2$s，您可以忽略這個；否則請登出再登入。
+\n
+\n在此閱讀更多詳細資訊：
+\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
+
+    <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="read_at">閱讀於</string>
+
+    <string name="none">無</string>
+    <string name="revoke">撤銷</string>
+    <string name="disconnect">斷線</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 伺服器以讓通話正常運作。
+\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_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_homeserver_not_found">無法在此 URL 找到家伺服器，請檢查</string>
+    <string name="settings_call_ringtone_use_default_stun">允許汰退呼叫協助伺服器</string>
+    <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">為電池最佳化</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Riot 將會在背景同步以節省裝置的有限資源（電池）。
+\n取決於您裝置的資源狀態，作業系統可能會延遲同步。</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">為即時作業最佳化</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot 將會精準地定期在背景同步（可設定）。
+\n這會影響到網路與電池的使用，並會顯示指出 Riot 正在監聽某事件的永久通知。</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>
+
+
+    <string name="settings_set_workmanager_delay">偏好同步間隔</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\n取決於資源（電池）或裝置狀態（休眠），同步可能會被延遲。</string>
+    <string name="settings_discovery_category">探索</string>
+    <string name="settings_discovery_manage">管理您的探索設定。</string>
+    <string name="encryption_information_device_name_with_warning">公開名稱（您通訊的對象可見）</string>
+    <string name="device_name_warning">裝置的公開名稱對您通訊的對象可見</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="identity_server">身份識別伺服器</string>
+    <string name="disconnect_identity_server">取消連線到身份識別伺服器</string>
+    <string name="add_identity_server">設定身份識別伺服器</string>
+    <string name="change_identity_server">變更身份識別伺服器</string>
+    <string name="settings_discovery_identity_server_info">您正在使用 %1$s 來探索與被您認識的既有聯絡人探索。</string>
+    <string name="settings_discovery_identity_server_info_none">您目前並未使用身份識別伺服器。要探索與被您認識的聯絡人探索，請在下方設定一個。</string>
+    <string name="settings_discovery_emails_title">可探索的電子郵件地址</string>
+    <string name="settings_discovery_no_mails">在您新增電子郵件後，探索選項將會出現。</string>
+    <string name="settings_discovery_no_msisdn">在您新增電話號碼後，探索選項將會出現。</string>
+    <string name="settings_discovery_disconnect_identity_server_info">與您的身份識別伺服器斷線代鰾您無法被其他使用者探索，且您將無法透過電子郵件或電話邀請其他人。</string>
+    <string name="settings_discovery_msisdn_title">可探索的電話號碼</string>
+    <string name="settings_discovery_confirm_mail">我們將會傳送確認電子郵件到 %s 給您，請檢查您的電子郵件並在確認連結上點選</string>
+    <string name="settings_discovery_mail_pending">擱置中</string>
+
+    <string name="settings_discovery_enter_identity_server">輸入新的身份識別伺服器</string>
+    <string name="settings_discovery_bad_identity_server">無法連線到身份識別伺服器</string>
+    <string name="settings_discovery_please_enter_server">請輸入身份識別伺服器 URL</string>
+    <string name="settings_discovery_no_terms_title">身份識別伺服器無服務條款</string>
+    <string name="settings_discovery_no_terms">您選擇的身份識別伺服器沒有任何服務條款。僅在您信任服務擁有者時才繼續</string>
+    <string name="settings_text_message_sent">文字訊息已傳送給 %s。請輸入其中包含的驗證碼。</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">您目前正在身份識別伺服器 %s 上分享電子郵件地址或電話號碼。您將必須重新連線到 %s 以停止分享它們。</string>
+    <string name="settings_agree_to_terms">同意身份識別伺服器 (%s) 的服務條款以允許您被透過電子郵件地址或電話號碼探索。</string>
 </resources>

vector/src/main/res/values/strings.xml

@@ -5,6 +5,8 @@
 
     <string name="resources_language">en</string>
     <string name="resources_country_code">US</string>
+    <!-- Note to translators: Possible values: Latn or Cyrl -->
+    <string name="resources_script">Latn</string>
 
     <!-- theme -->
     <string name="light_theme">Light Theme</string>
@@ -72,6 +74,9 @@
     <string name="view_decrypted_source">View Decrypted Source</string>
     <string name="delete">Delete</string>
     <string name="rename">Rename</string>
+    <string name="none">None</string>
+    <string name="revoke">Revoke</string>
+    <string name="disconnect">Disconnect</string>
     <string name="report_content">Report content</string>
     <string name="active_call">Active call</string>
     <!-- First param will be replace by the value of ongoing_conference_call_voice, and second one by the value of ongoing_conference_call_video -->
@@ -147,6 +152,7 @@
     <string name="no_conversation_placeholder">No conversations</string>
     <string name="no_contact_access_placeholder">You didn’t allow Riot to access your local contacts</string>
     <string name="no_result_placeholder">No results</string>
+    <string name="people_no_identity_server">No identity server configured.</string>
 
     <!-- Rooms fragment -->
     <string name="rooms_header">Rooms</string>
@@ -200,6 +206,10 @@
     <string name="start_new_chat_prompt_msg">Are you sure that you want to start a new chat with %s?</string>
     <string name="start_voice_call_prompt_msg">Are you sure that you want to start a voice call?</string>
     <string name="start_video_call_prompt_msg">Are you sure that you want to start a video call?</string>
+    <string name="call_failed_no_ice_title">Call failed due to misconfigured server</string>
+    <string name="call_failed_no_ice_description">Please ask the administrator of your homeserver (%1$s) to configure a TURN server in order for calls to work reliably.\n\nAlternatively, you can try to use the public server at %2$s, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings."</string>
+    <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="option_send_files">Send files</string>
     <string name="option_send_sticker">Send sticker</string>
@@ -226,10 +236,10 @@
     <string name="auth_password_placeholder">Password</string>
     <string name="auth_new_password_placeholder">New password</string>
     <string name="auth_user_name_placeholder">User name</string>
-    <string name="auth_add_email_message">"Add an email address to your account to let users discover you, and let you reset password."</string>
-    <string name="auth_add_phone_message">"Add a phone number to your account to let users discover you."</string>
-    <string name="auth_add_email_phone_message">"Add an email address and/or a phone number to your account to let users discover you.\n\nEmail address will also let you reset your password."</string>
-    <string name="auth_add_email_and_phone_message">"Add an email address and a phone number to your account to let users discover you.\n\nEmail address will also let you reset your password."</string>
+    <string name="auth_add_email_message_2">"Set an email for account recovery, and later to be optionally discoverable by people who know you."</string>
+    <string name="auth_add_phone_message_2">"Set a phone, and later to be optionally discoverable by people who know you."</string>
+    <string name="auth_add_email_phone_message_2">"Set an email for account recovery. Use later email or phone to be optionally discoverable by people who know you."</string>
+    <string name="auth_add_email_and_phone_message_2">"Set an email for account recovery. Use later email or phone to be optionally discoverable by people who know you."</string>
     <string name="auth_email_placeholder">Email address</string>
     <string name="auth_opt_email_placeholder">Email address (optional)</string>
     <string name="auth_phone_number_placeholder">Phone number</string>
@@ -274,6 +284,7 @@
     <string name="login_error_unable_register_mail_ownership">Unable to register : email ownership failure</string>
     <string name="login_error_invalid_home_server">Please enter a valid URL</string>
     <string name="login_error_unknown_host">This URL is not reachable, please check it</string>
+    <string name="login_error_homeserver_not_found">Cannot reach a homeserver at this URL, please check it</string>
     <string name="login_error_ssl_handshake">Your device is using an outdated TLS security protocol, vulnerable to attack, for your security you will not be able to connect</string>
     <string name="login_mobile_device">Mobile</string>
 
@@ -334,6 +345,8 @@
     <!-- Call settings screen -->
     <string name="settings_call_category">Calls</string>
     <string name="settings_call_ringtone_use_riot_ringtone">Use default Riot 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 offers one (your IP address will be shared during a call)</string>
     <string name="settings_call_ringtone_title">Incoming call ringtone</string>
     <string name="settings_call_ringtone_dialog_title">Select ringtone for calls:</string>
 
@@ -369,9 +382,6 @@
     <string name="permissions_rationale_msg_contacts">Riot 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">Riot 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>
 
     <!-- medias slider string -->
@@ -399,7 +409,7 @@
     <string name="room_preview_try_join_an_unknown_room">You are trying to access %s. Would you like to join in order to participate in the discussion?</string>
     <string name="room_preview_try_join_an_unknown_room_default">a room</string>
     <string name="room_preview_room_interactions_disabled">This is a preview of this room. Room interactions have been disabled.</string>
-
+    <string name="invite_no_identity_server_error">Add an identity server in your settings to perform this action.</string>
     <!-- Chat creation -->
     <string name="room_creation_title">New Chat</string>
     <string name="room_creation_add_member">Add member</string>
@@ -726,10 +736,22 @@
     <string name="settings_messages_sent_by_bot">Messages sent by bot</string>
 
     <string name="settings_background_sync">Background synchronization</string>
+    <string name="settings_background_fdroid_sync_mode">Background Sync Mode (Experimental)</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimized for battery</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Riot 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">Riot 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 riot 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>
+
+
     <string name="settings_start_on_boot">Start on boot</string>
     <string name="settings_enable_background_sync">Enable background sync</string>
     <string name="settings_set_sync_timeout">Sync request timeout</string>
-    <string name="settings_set_sync_delay">Delay between each request</string>
+    <string name="settings_set_workmanager_delay">Preferred Sync Interval</string>
+    <string name="settings_set_workmanager_delay_summary">%s\nThe sync might be deferred depending on the resources (battery) or state of the device (sleep).</string>
+    <string name="settings_set_sync_delay">Delay between each Sync</string>
     <string name="settings_second">second</string>
     <string name="settings_seconds">seconds</string>
 
@@ -779,8 +801,8 @@
 
     <string name="settings_deactivate_account_section">Deactivate account</string>
     <string name="settings_deactivate_my_account">Deactivate my account</string>
-
-    <!-- startup -->
+    <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">Riot 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>
@@ -800,10 +822,10 @@
     <string name="settings_data_save_mode">Data save mode</string>
     <string name="settings_data_save_mode_summary">Data save mode applies a specific filter so presence updates and typing notifications are filtered out.</string>
 
-    <string name="devices_details_dialog_title">Device details</string>
+    <string name="devices_details_dialog_title">Device information</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Name</string>
-    <string name="devices_details_device_name">Device Name</string>
+    <string name="devices_details_name_title">Public Name</string>
+    <string name="devices_details_device_name">Update Public Name</string>
     <string name="devices_details_last_seen_title">Last seen</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_text">This operation requires additional authentication.\nTo continue, please enter your password.</string>
@@ -968,9 +990,11 @@
     <string name="encryption_information_decryption_error">Decryption error</string>
 
     <string name="encryption_information_sender_device_information">Sender device information</string>
-    <string name="encryption_information_device_name">Device name</string>
-    <string name="encryption_information_name">Name</string>
-    <string name="encryption_information_device_id">Device ID</string>
+    <string name="encryption_information_device_name">Public name</string>
+    <string name="encryption_information_device_name_with_warning">Public name (visible to people you communicate with)</string>
+    <string name="device_name_warning">"A device's public name is visible to people you communicate with"</string>
+    <string name="encryption_information_name">Public name</string>
+    <string name="encryption_information_device_id">ID</string>
     <string name="encryption_information_device_key">Device key</string>
     <string name="encryption_information_verification">Verification</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 fingerprint</string>
@@ -1472,9 +1496,14 @@ Why choose Riot.im?
     <string name="sas_error_m_user_error">User mismatch</string>
     <string name="sas_error_unknown">Unknown Error</string>
 
+    <!-- Identity server -->
+    <string name="identity_server_not_defined">You are not using any Identity Server</string>
+    <string name="identity_server_not_defined_for_password_reset">No identity server is configured, it is required to reset your password.</string>
 
     <string name="security_warning_identity_server">"Previous versions of Riot had a security bug which could give your Identity Server (%1$s) access to your account. If you trust %2$s, you can ignore this; otherwise please logout and login again.\n\nRead more details here:\nhttps://medium.com/@RiotChat/36b4792ea0d6"</string>
 
+    <string name="error_user_already_logged_in">It looks like you’re trying to connect to another homeserver. Do you want to sign out?</string>
+
     <!-- String for RiotX -->
     <string name="edit">Edit</string>
     <string name="reply">Reply</string>
@@ -1502,7 +1531,7 @@ Why choose Riot.im?
 
     <string name="event_redacted_by_user_reason">Event deleted by user</string>
     <string name="event_redacted_by_admin_reason">Event moderated by room admin</string>
-    <string name="last_edited_info_message">Last edited by %s on %s</string>
+    <string name="last_edited_info_message">Last edited by %1$s on %2$s</string>
 
 
     <string name="malformed_message">Malformed event, cannot display</string>
@@ -1599,7 +1628,6 @@ RiotX supports:
 Not all features in Riot are implemented in RiotX yet. Main missing (and coming soon!) features:
 • Account creation
 • Room settings (list room members, etc.)
-• Creation of direct chat rooms
 • Calls
 • Widgets
 • …"</string>
@@ -1656,4 +1684,89 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
 
     <string name="read_at">Read at</string>
 
+
+    <string name="identity_server">Identity server</string>
+    <string name="disconnect_identity_server">Disconnect identity server</string>
+    <string name="add_identity_server">Configure identity server</string>
+    <string name="change_identity_server">Change identity server</string>
+    <string name="settings_discovery_identity_server_info">You are currently using %1$s to discover and be discoverable by existing contacts you know.</string>
+    <string name="settings_discovery_identity_server_info_none">You are not currently using an identity server. To discover and be discoverable by existing contacts you know, configure one below.</string>
+    <string name="settings_discovery_emails_title">Discoverable email addresses</string>
+    <string name="settings_discovery_no_mails">Discovery options will appear once you have added an email.</string>
+    <string name="settings_discovery_no_msisdn">Discovery options will appear once you have added a phone number.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Disconnecting from your identity server will mean you won’t be discoverable by other users and you won’t be able to invite others by email or phone.</string>
+    <string name="settings_discovery_msisdn_title">Discoverable phone numbers</string>
+    <string name="settings_discovery_confirm_mail">We sent you a confirm email to %s, check your email and click on the confirmation link</string>
+    <string name="settings_discovery_mail_pending">Pending</string>
+
+    <string name="settings_discovery_enter_identity_server">Enter a new identity server</string>
+    <string name="settings_discovery_bad_identity_server">Could not connect to identity server</string>
+    <string name="settings_discovery_please_enter_server">Please enter the identity server url</string>
+    <string name="settings_discovery_no_terms_title">Identity server has no terms of services</string>
+    <string name="settings_discovery_no_terms">The identity server you have chosen does not have any terms of services. Only continue if you trust the owner of the service</string>
+    <string name="settings_text_message_sent">A text message has been sent to %s. Please enter the verification code it contains.</string>
+
+    <string name="settings_discovery_disconnect_with_bound_pid">You are currently sharing email addresses or phone numbers on the identity server %s. You will need to reconnect to %s to stop sharing them.</string>
+    <string name="settings_agree_to_terms">Agree to the identity server (%s) Terms of Service to allow yourself to be discoverable by email address or phone number.</string>
+
+    <string name="labs_allow_extended_logging">Enable verbose logs.</string>
+    <string name="labs_allow_extended_logging_summary">Verbose logs will help developers by providing more logs when you send a RageShake. Even when enabled, the application does not log message contents or any other private data.</string>
+
+
+    <string name="error_terms_not_accepted">Please retry once you have accepted the terms and conditions of your homeserver.</string>
+
+    <string name="error_network_timeout">Looks like the server is taking to long to respond, this can be caused by either poor connectivity or an error with our servers. Please try again in a while.</string>
+
+    <string name="send_attachment">Send attachment</string>
+
+    <string name="a11y_open_drawer">Open the navigation drawer</string>
+    <string name="a11y_create_menu_open">Open the create room menu</string>
+    <string name="a11y_create_menu_close">Close the create room menu…</string>
+    <string name="a11y_create_direct_message">Create a new direct conversation</string>
+    <string name="a11y_create_room">Create a new room</string>
+    <string name="a11y_close_keys_backup_banner">Close keys backup banner</string>
+    <string name="a11y_show_password">Show password</string>
+    <string name="a11y_hide_password">Hide password</string>
+    <string name="a11y_jump_to_bottom">Jump to bottom</string>
+
+    <!-- Read receipts list a11y -->
+    <string name="two_and_some_others_read">%1$s, %2$s and %3$d others read</string>
+    <string name="three_users_read">%1$s, %2$s and %3$s read</string>
+    <string name="two_users_read">%1$s and %2$s read</string>
+    <string name="one_user_read">%s read</string>
+    <plurals name="fallback_users_read">
+        <item quantity="one">1 user read</item>
+        <item quantity="other">%d users read</item>
+    </plurals>
+
+    <string name="error_file_too_big">"The file '%1$s' (%2$s) is too large to upload. The limit is %3$s."</string>
+
+    <string name="error_attachment">"An error occurred while retrieving the attachment."</string>
+    <string name="attachment_type_file">"File"</string>
+    <string name="attachment_type_contact">"Contact"</string>
+    <string name="attachment_type_camera">"Camera"</string>
+    <string name="attachment_type_audio">"Audio"</string>
+    <string name="attachment_type_gallery">"Gallery"</string>
+    <string name="attachment_type_sticker">"Sticker"</string>
+    <string name="error_handling_incoming_share">Couldn\'t handle share data</string>
+
+    <string name="report_content_spam">"It's spam"</string>
+    <string name="report_content_inappropriate">"It's inappropriate"</string>
+    <string name="report_content_custom">"Custom report"</string>
+    <string name="report_content_custom_title">"Report this content"</string>
+    <string name="report_content_custom_hint">"Reason for reporting this content"</string>
+    <string name="report_content_custom_submit">"REPORT"</string>
+    <string name="block_user">"BLOCK USER"</string>
+
+    <string name="content_reported_title">"Content reported"</string>
+    <string name="content_reported_content">"This content was reported.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
+    <string name="content_reported_as_spam_title">"Reported as spam"</string>
+    <string name="content_reported_as_spam_content">"This content was reported as spam.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
+    <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 block him to hide his messages"</string>
+
+    <string name="permissions_rationale_msg_keys_backup_export">Riot 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>
+
 </resources>

vector/src/main/res/values/strings_riotX.xml

@@ -2,65 +2,6 @@
 <resources>
 
     <!-- Strings not defined in Riot -->
-    <string name="labs_allow_extended_logging">Enable verbose logs.</string>
-    <string name="labs_allow_extended_logging_summary">Verbose logs will help developers by providing more logs when you send a RageShake. Even when enabled, the application does not log message contents or any other private data.</string>
 
 
-    <string name="error_terms_not_accepted">Please retry once you have accepted the terms and conditions of your homeserver.</string>
-
-    <!-- This one is already defined in Riot, but not yet synced-->
-    <string name="error_user_already_logged_in">It looks like you’re trying to connect to another homeserver. Do you want to sign out?</string>
-
-    <string name="error_network_timeout">Looks like the server is taking to long to respond, this can be caused by either poor connectivity or an error with our servers. Please try again in a while.</string>
-
-    <string name="send_attachment">Send attachment</string>
-
-    <string name="a11y_open_drawer">Open the navigation drawer</string>
-    <string name="a11y_create_menu_open">Open the create room menu</string>
-    <string name="a11y_create_menu_close">Close the create room menu…</string>
-    <string name="a11y_create_direct_message">Create a new direct conversation</string>
-    <string name="a11y_create_room">Create a new room</string>
-    <string name="a11y_close_keys_backup_banner">Close keys backup banner</string>
-    <string name="a11y_show_password">Show password</string>
-    <string name="a11y_hide_password">Hide password</string>
-    <string name="a11y_jump_to_bottom">Jump to bottom</string>
-
-    <!-- Read receipts list a11y -->
-    <string name="two_and_some_others_read">%1$s, %2$s and %3$d others read</string>
-    <string name="three_users_read">%1$s, %2$s and %3$s read</string>
-    <string name="two_users_read">%1$s and %2$s read</string>
-    <string name="one_user_read">%s read</string>
-    <plurals name="fallback_users_read">
-        <item quantity="one">1 user read</item>
-        <item quantity="other">%d users read</item>
-    </plurals>
-
-    <string name="error_file_too_big">"The file '%1$s' (%2$s) is too large to upload. The limit is %3$s."</string>
-
-    <string name="error_attachment">"An error occurred while retrieving the attachment."</string>
-    <string name="attachment_type_file">"File"</string>
-    <string name="attachment_type_contact">"Contact"</string>
-    <string name="attachment_type_camera">"Camera"</string>
-    <string name="attachment_type_audio">"Audio"</string>
-    <string name="attachment_type_gallery">"Gallery"</string>
-    <string name="attachment_type_sticker">"Sticker"</string>
-    <string name="error_handling_incoming_share">Couldn\'t handle share data</string>
-
-    <string name="report_content_spam">"It's spam"</string>
-    <string name="report_content_inappropriate">"It's inappropriate"</string>
-    <string name="report_content_custom">"Custom report"</string>
-    <string name="report_content_custom_title">"Report this content"</string>
-    <string name="report_content_custom_hint">"Reason for reporting this content"</string>
-    <string name="report_content_custom_submit">"REPORT"</string>
-    <string name="block_user">"BLOCK USER"</string>
-
-    <string name="content_reported_title">"Content reported"</string>
-    <string name="content_reported_content">"This content was reported.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
-    <string name="content_reported_as_spam_title">"Reported as spam"</string>
-    <string name="content_reported_as_spam_content">"This content was reported as spam.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
-    <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 block him to hide his messages"</string>
-
-    <string name="permissions_rationale_msg_keys_backup_export">Riot 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>
-
 </resources>