diff --git a/CHANGELOG.md b/CHANGELOG.md
index f615b9c27953..50541b9173ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 3.23.0 (December 1, 2022)
+
+- File actions menu redesign
+- Allow adding shortcuts to Home screen (@newhinton)
+- Many bugfixes and performance optimizations
+
+Minimum: NC 16 Server, Android 6.0 Marshmallow
+
+For a full list, please see https://github.com/nextcloud/android/milestone/74
+
 ## 3.22.3 (November 3, 2022)
 
 - Bug fixes
diff --git a/app/build.gradle b/app/build.gradle
index 604d47264f40..b905874f39a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -84,7 +84,7 @@ android {
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 32
+        targetSdkVersion 31
 
         buildConfigField 'boolean', 'CI', ciBuild.toString()
         buildConfigField 'boolean', 'RUNTIME_PERF_ANALYSIS', perfAnalysis.toString()
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index df68dfa71693..26d6194a3fa7 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -242,6 +242,7 @@
     <string name="end_to_end_encryption_folder_not_empty">هذا المجلد غير فارغ.</string>
     <string name="end_to_end_encryption_generating_keys">جار توليد مفاتيح جديدة…</string>
     <string name="end_to_end_encryption_keywords_description">12 كلمة سويةً تكون رقم سري قوّي جداً، تجعلك أنت فقط ترى وتستخدم ملفاتك المشفرة. أرجو كتابتها والإحتفاظ بها في مكانٍّ آمن.</string>
+    <string name="end_to_end_encryption_not_enabled">التشفير من طرف إلى طرف آخر معطل من الخادم.</string>
     <string name="end_to_end_encryption_passphrase_title">إحفظ الـ12 كلمة السرية للتشفير</string>
     <string name="end_to_end_encryption_password">كلمة السر…</string>
     <string name="end_to_end_encryption_retrieving_keys">جارٍ جلب المفاتيح…</string>
diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml
index 3fe2e7d2e65d..1b11ad99db82 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -551,6 +551,7 @@
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
     <string name="prefs_daily_backup_summary">Daily backup of your calendar &amp; contacts</string>
+    <string name="prefs_e2e_active">End-to-end encryption is set up!</string>
     <string name="prefs_e2e_mnemonic">E2E mnemonic</string>
     <string name="prefs_e2e_no_device_credentials">To show mnemonic please enable device credentials.</string>
     <string name="prefs_enable_media_scan_notifications">Show media scan notifications</string>
@@ -562,6 +563,7 @@
     <string name="prefs_instant_behaviour_title">Original file will be…</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Store in subfolders based on year and month</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Use subfolders</string>
+    <string name="prefs_keys_exist">Add end-to-end encryption to this client</string>
     <string name="prefs_license">License</string>
     <string name="prefs_lock">App passcode</string>
     <string name="prefs_lock_device_credentials_enabled">Device credentials enabled</string>
@@ -573,6 +575,7 @@
     <string name="prefs_manage_accounts">Manage accounts</string>
     <string name="prefs_recommend">Recommend to a friend</string>
     <string name="prefs_remove_e2e">Remove encryption locally</string>
+    <string name="prefs_setup_e2e">Set up end-to-end encryption</string>
     <string name="prefs_show_hidden_files">Show hidden files</string>
     <string name="prefs_sourcecode">Get source code</string>
     <string name="prefs_storage_path">Data storage folder</string>
@@ -600,6 +603,8 @@
     <string name="reload">Reload</string>
     <string name="remote">(remote)</string>
     <string name="remote_file_fetch_failed">Failed to find file!</string>
+    <string name="remove_e2e">You can remove end-to-end encryption locally on this client</string>
+    <string name="remove_e2e_message">You can remove end-to-end encryption locally on this client. The encrypted files will remain on server, but will not be synced to this computer any longer.</string>
     <string name="remove_fail_msg">Deletion failed</string>
     <string name="remove_notification_failed">Failed to remove notification.</string>
     <string name="remove_push_notification">Remove</string>
@@ -643,6 +648,7 @@
     <string name="set_picture_as">Use picture as</string>
     <string name="set_status">Set status</string>
     <string name="set_status_message">Set status message</string>
+    <string name="setup_e2e">During setup of end-to-end encryption, you will receive a random 12 word mnemonic, which you will need to open your files on other devices. This will only be stored on this device, and can be shown again in this screen. Please note it down in a secure place!</string>
     <string name="share">Share</string>
     <string name="share_copy_link">Share &amp; Copy Link</string>
     <string name="share_dialog_title">Sharing</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index cbb07d6ed1ff..5c71c73028e0 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -249,6 +249,7 @@
     <string name="end_to_end_encryption_folder_not_empty">Папката не е празна.</string>
     <string name="end_to_end_encryption_generating_keys">Генериране на нови ключове...</string>
     <string name="end_to_end_encryption_keywords_description">Всички 12 думи заедно правят много силна парола, позволявайки само Вие да преглеждате и използвате вашите криптирани файлове. Моля запишете я и я пазете на сигурно място.</string>
+    <string name="end_to_end_encryption_not_enabled">Криптиране End-to-end е забранено на сървъра.</string>
     <string name="end_to_end_encryption_passphrase_title">Запишете паролата си за криптиране от 12 думи</string>
     <string name="end_to_end_encryption_password">Парола…</string>
     <string name="end_to_end_encryption_retrieving_keys">Извличане на ключове...</string>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 569c54b055f2..881674c2995a 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -219,6 +219,7 @@
     <string name="end_to_end_encryption_folder_not_empty">N\'eo ket goullo an teuliad.</string>
     <string name="end_to_end_encryption_generating_keys">O krouiñ un alc\'hwez nevez...</string>
     <string name="end_to_end_encryption_keywords_description">Assamblez e vez krouet ur ger-tremen krev gant an 12 ger, aotrea ac\'hanoc\'h nemet ken da gwelet ha implij ar rouadennoù ha restroù sifret. Mar-plij, skrivit ha gouarnit anezha en ul lec\'h sur.</string>
+    <string name="end_to_end_encryption_not_enabled">Ar sifradur penn-kil-ha-troad disaotret war ar servijour.</string>
     <string name="end_to_end_encryption_passphrase_title">Notennit ho frazenn-guzh sifrañ a 12 ger</string>
     <string name="end_to_end_encryption_password">Ger-tremen</string>
     <string name="end_to_end_encryption_retrieving_keys">O adtapout an alc\'hwaz...</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 9cbbea53071a..914d3d5df5dc 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -242,6 +242,7 @@
     <string name="end_to_end_encryption_folder_not_empty">Aquesta carpeta no és buida.</string>
     <string name="end_to_end_encryption_generating_keys">S\'estan generant claus noves…</string>
     <string name="end_to_end_encryption_keywords_description">Les 12 paraules juntes fan una contrasenya molt dificil, fent que només vos ho pugueu veure i fer servir els fitxers xifrats. Anoteu-la i deseu-la en un lloc segur.</string>
+    <string name="end_to_end_encryption_not_enabled">El xifrat de punta a punta està desactivat al servidor.</string>
     <string name="end_to_end_encryption_passphrase_title">Anoteu la vostra contrasenya de 12 paraules</string>
     <string name="end_to_end_encryption_password">Contrasenya…</string>
     <string name="end_to_end_encryption_retrieving_keys">S\'estan recuperant les claus…</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 270d4e11f194..3f92e3670991 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -551,6 +551,7 @@
     <string name="prefs_category_general">Obecné</string>
     <string name="prefs_category_more">Více</string>
     <string name="prefs_daily_backup_summary">Každodenní záloha vašeho kalendáře a kontaktů</string>
+    <string name="prefs_e2e_active">Šifrování mezi koncovými body je nastaveno!</string>
     <string name="prefs_e2e_mnemonic">E2E mnemotechnické</string>
     <string name="prefs_e2e_no_device_credentials">Pro zobrazení mnemotechnické, zapněte přihlašovací údaje zařízení.</string>
     <string name="prefs_enable_media_scan_notifications">Zobrazit upozornění ze skenování médií</string>
@@ -562,6 +563,7 @@
     <string name="prefs_instant_behaviour_title">Původní soubor bude…</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Ukládat v podsložkách podle roku a měsíce</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Používat podsložky</string>
+    <string name="prefs_keys_exist">Přidat do tohoto klienta šifrování mezi koncovými body</string>
     <string name="prefs_license">Licence</string>
     <string name="prefs_lock">Přístupový kód aplikace</string>
     <string name="prefs_lock_device_credentials_enabled">Přihlašovací údaje zařízení zapnuté</string>
@@ -573,6 +575,7 @@
     <string name="prefs_manage_accounts">Spravovat účty</string>
     <string name="prefs_recommend">Doporučit kamarádovi</string>
     <string name="prefs_remove_e2e">Odebrat šifrování lokálně</string>
+    <string name="prefs_setup_e2e">Nastavit šifrování mezi koncovými body</string>
     <string name="prefs_show_hidden_files">Zobrazit skryté soubory</string>
     <string name="prefs_sourcecode">Získat zdrojové kódy</string>
     <string name="prefs_storage_path">Složka úložiště</string>
@@ -600,6 +603,8 @@
     <string name="reload">Načíst znovu</string>
     <string name="remote">(vzdálené)</string>
     <string name="remote_file_fetch_failed">Nepodařilo se najít soubor!</string>
+    <string name="remove_e2e">Na tomto klientovi je možné šifrování mezi koncovými body odebrat lokálně</string>
+    <string name="remove_e2e_message">Na tomto klientovi je možné odebrat šifrování mezi koncovými body. Šifrované soubory zůstanou na serveru, ale už nadále nebudou synchronizovány s tímto počítačem.</string>
     <string name="remove_fail_msg">Odstranění se nezdařilo</string>
     <string name="remove_notification_failed">Upozornění se nepodařilo odebrat.</string>
     <string name="remove_push_notification">Odebrat</string>
@@ -643,6 +648,7 @@
     <string name="set_picture_as">Použít obrázek jako</string>
     <string name="set_status">Nastavit stav</string>
     <string name="set_status_message">Nastavit stavovou zprávu</string>
+    <string name="setup_e2e">V průběhu nastavování šifrování mezi koncovými body obdržíte 12 slovnou mnemotechnickou frázi, které bude zapotřebí pro otevírání souborů na ostatních zařízeních. Ta bude uložena pouze na tomto zařízení a je možné ji na této obrazovce znovu zobrazit. Prosím poznamenejte si jí na bezpečné místo!</string>
     <string name="share">Sdílet</string>
     <string name="share_copy_link">Sdílet a zkopírovat odkaz</string>
     <string name="share_dialog_title">Sdílení</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c84ab06fb80e..1679f78367d8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -551,6 +551,7 @@
     <string name="prefs_category_general">Allgemein</string>
     <string name="prefs_category_more">Mehr</string>
     <string name="prefs_daily_backup_summary">Tägliche Sicherung Ihrer Kalender &amp; Kontakte</string>
+    <string name="prefs_e2e_active">Ende-zu-Ende-Verschlüsselung ist eingerichtet!</string>
     <string name="prefs_e2e_mnemonic">E2E-Gedächtnisstütze</string>
     <string name="prefs_e2e_no_device_credentials">Um die Gedächtnisstütze anzuzeigen, aktivieren Sie bitte Geräte-Zugangsdaten</string>
     <string name="prefs_enable_media_scan_notifications">Benachrichtigungen der Mediensuche anzeigen</string>
@@ -562,6 +563,7 @@
     <string name="prefs_instant_behaviour_title">Originaldatei wird…</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">In Unterordnern speichern, basierend auf Jahr und Monat</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Unterordner benutzen</string>
+    <string name="prefs_keys_exist">Diesem Client Ende-zu-Ende-Verschlüsselung hinzufügen</string>
     <string name="prefs_license">Lizenz</string>
     <string name="prefs_lock">App-PIN</string>
     <string name="prefs_lock_device_credentials_enabled">Geräte-Anmeldedaten aktiviert</string>
@@ -573,6 +575,7 @@
     <string name="prefs_manage_accounts">Konten verwalten</string>
     <string name="prefs_recommend">Einem Freund empfehlen</string>
     <string name="prefs_remove_e2e">Verschlüsselung lokal entfernen</string>
+    <string name="prefs_setup_e2e">Ende-zu-Ende-Verschlüsselung einrichten</string>
     <string name="prefs_show_hidden_files">Versteckte Dateien anzeigen</string>
     <string name="prefs_sourcecode">Zum Programmcode</string>
     <string name="prefs_storage_path">Speicherordner</string>
@@ -600,6 +603,8 @@
     <string name="reload">Neu laden</string>
     <string name="remote">(entfernt)</string>
     <string name="remote_file_fetch_failed">Datei nicht gefunden!</string>
+    <string name="remove_e2e">Sie können die Ende-zu-Ende-Verschlüsselung lokal auf diesem Client entfernen</string>
+    <string name="remove_e2e_message">Sie können die Ende-zu-Ende-Verschlüsselung lokal auf diesem Client entfernen. Die verschlüsselten Dateien bleiben auf dem Server, werden aber nicht mehr mit diesem Computer synchronisiert.</string>
     <string name="remove_fail_msg">Löschung fehlgeschlagen</string>
     <string name="remove_notification_failed">Entfernen der Benachrichtigungen fehlgeschlagen.</string>
     <string name="remove_push_notification">Entfernen</string>
@@ -643,6 +648,7 @@
     <string name="set_picture_as">Nutze Bild als</string>
     <string name="set_status">Status setzen</string>
     <string name="set_status_message">Statusnachricht setzen</string>
+    <string name="setup_e2e">Während der Einrichtung der Ende-zu-Ende-Verschlüsselung erhalten Sie eine zufällige 12-Wörter-Gedächtnisstütze, die Sie benötigen, um Ihre Dateien auf anderen Geräten zu öffnen. Diese wird nur auf diesem Gerät gespeichert und kann in diesem Bildschirm erneut angezeigt werden. Bitte notieren Sie es an einem sicheren Ort!</string>
     <string name="share">Teilen</string>
     <string name="share_copy_link">Teilen &amp; Link kopieren</string>
     <string name="share_dialog_title">Teilen</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index f1eb51558a89..41679eb4690a 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -248,7 +248,7 @@
     <string name="end_to_end_encryption_folder_not_empty">Ez a mappa nem üres.</string>
     <string name="end_to_end_encryption_generating_keys">Új kulcsok előállítása…</string>
     <string name="end_to_end_encryption_keywords_description">A 12 szó együtt nagyon erős jelszót alkot, amivel megtekintheti és használhatja a titkosított fájljait. Kérjük írja le, és őrizze biztonságos helyen.</string>
-    <string name="end_to_end_encryption_not_enabled">A végpontok közötti titkosítás ki van kapcsolva a kiszolgálón.</string>
+    <string name="end_to_end_encryption_not_enabled">A végpontok közti titkosítás ki van kapcsolva a kiszolgálón.</string>
     <string name="end_to_end_encryption_passphrase_title">Jegyezze fel a 12 szavas titkosítási kulcsát</string>
     <string name="end_to_end_encryption_password">Jelszó…</string>
     <string name="end_to_end_encryption_retrieving_keys">Kulcsok begyűjtése…</string>
@@ -551,6 +551,7 @@
     <string name="prefs_category_general">Általános</string>
     <string name="prefs_category_more">Több</string>
     <string name="prefs_daily_backup_summary">Napi biztonsági mentés a naptáráról és a névjegyeiről</string>
+    <string name="prefs_e2e_active">A végpontok közti titkosítás beállítva!</string>
     <string name="prefs_e2e_mnemonic">E2E mnemonikus kód</string>
     <string name="prefs_e2e_no_device_credentials">A mnenomikus kód megjelenítéséhez engedélyezze az eszköz hitelesítését.</string>
     <string name="prefs_enable_media_scan_notifications">Média keresési értesítések megjelenítése</string>
@@ -562,6 +563,7 @@
     <string name="prefs_instant_behaviour_title">Az eredeti fájl…</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Tárolás év és hónap szerinti almappákban</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Almappák használata</string>
+    <string name="prefs_keys_exist">Végpontok közti titkosítás hozzáadása ehhez a klienshez</string>
     <string name="prefs_license">Licenc</string>
     <string name="prefs_lock">Alkalmazás számkód</string>
     <string name="prefs_lock_device_credentials_enabled">Eszközhitelesítő-adatok engedélyezve</string>
@@ -573,6 +575,7 @@
     <string name="prefs_manage_accounts">Fiókok kezelése</string>
     <string name="prefs_recommend">Ajánlás egy barátnak</string>
     <string name="prefs_remove_e2e">Titkosítás eltávolítása helyileg</string>
+    <string name="prefs_setup_e2e">Végpontok közti titkosítás beállítása</string>
     <string name="prefs_show_hidden_files">Rejtett fájlok megjelenítése</string>
     <string name="prefs_sourcecode">Forráskód beszerzése</string>
     <string name="prefs_storage_path">Adattároló mappa</string>
@@ -600,6 +603,8 @@
     <string name="reload">Újratöltés</string>
     <string name="remote">(távoli)</string>
     <string name="remote_file_fetch_failed">A fájl nem található.</string>
+    <string name="remove_e2e">Helyileg eltávolíthatja a végpontok közti titkosítást ennél a kliensnél</string>
+    <string name="remove_e2e_message">Helyileg eltávolíthatja a végpontok közti titkosítást ennél a kliensnél. A titkosított fájlok továbbra is a kiszolgálón maradnak, de már nem lesznek szinkronizálva erre a számítógépre.</string>
     <string name="remove_fail_msg">Törlés sikertelen</string>
     <string name="remove_notification_failed">Az értesítés eltávolítása sikertelen.</string>
     <string name="remove_push_notification">Eltávolítás</string>
@@ -643,6 +648,7 @@
     <string name="set_picture_as">Kép használata mint</string>
     <string name="set_status">Állapot beállítása</string>
     <string name="set_status_message">Állapotüzenet beállítása</string>
+    <string name="setup_e2e">A végpontok közti titkosítás beállítása során kap egy 12 véletlenszerű szóból álló mnemonikus kódot, amelyre akkor lesz szüksége, ha más eszközökön akarja megnyitni a fájlokat. Ez csak ezen az eszközön lesz tárolva, és újra megjeleníthető ezen a képernyőn. Jegyezze le, és tárolja biztonságos helyen!</string>
     <string name="share">Megosztás</string>
     <string name="share_copy_link">Megosztás és hivatkozás másolása</string>
     <string name="share_dialog_title">Megosztás</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index d752cf6f885a..9591be631d40 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -14,6 +14,7 @@
     <string name="action_send_share">שליחה/שיתוף</string>
     <string name="action_switch_grid_view">תצוגת טבלה</string>
     <string name="action_switch_list_view">תצוגת רשימה</string>
+    <string name="actionbar_calendar_contacts_restore">שחזור אנשי קשר ולוח שנה</string>
     <string name="actionbar_copy">העתק</string>
     <string name="actionbar_mkdir">תיקייה חדשה</string>
     <string name="actionbar_move">העברה</string>
@@ -25,6 +26,7 @@
     <string name="actionbar_sort">מיון</string>
     <string name="active_user">משתמש פעיל</string>
     <string name="activities_no_results_headline">אין פעילות עדיין</string>
+    <string name="activities_no_results_message">אין אירועים כמו תוספות, שינויים ושיתופים עדיין.</string>
     <string name="activity_chooser_send_file_title">שליחה</string>
     <string name="activity_chooser_title">שליחת קישור אל…</string>
     <string name="activity_icon">פעילות</string>
@@ -33,6 +35,7 @@
     <string name="add_to_cloud">הוספה אל %1$s</string>
     <string name="advanced_settings">הגדרות מתקדמות</string>
     <string name="allow_resharing">לאפשר שיתוף מחדש</string>
+    <string name="app_widget_description">מצג וידג׳ט אחד מלוח הבקרה</string>
     <string name="appbar_search_in">חפש ב %s</string>
     <string name="associated_account_not_found">לא נמצא חשבון משויך!</string>
     <string name="auth_access_failed">גישה נכשלה: %1$s</string>
@@ -75,6 +78,7 @@
     <string name="avatar">תמונה מייצגת</string>
     <string name="away">לא פה</string>
     <string name="backup_settings">הגדרות גיבוי</string>
+    <string name="backup_title">גיבוי אנשי קשר ולוח שנה</string>
     <string name="battery_optimization_close">סגירה</string>
     <string name="battery_optimization_disable">השבתה</string>
     <string name="battery_optimization_message">יתכן שבמכשיר שלך מופעל מיטוב סוללה. שליחה אוטומטית עובדת כראוי רק אם היישומון הזה לא נכלל בהגדרה זו.</string>
@@ -143,7 +147,9 @@
     <string name="confirmation_remove_folders_alert">למחוק את הפריטים הנבחרים ואת תוכנם?</string>
     <string name="confirmation_remove_local">מקומי בלבד</string>
     <string name="conflict_dialog_error">שגיאה ביצירת תיבת דו־שיח סתירה!</string>
+    <string name="conflict_local_file">קובץ מקומי</string>
     <string name="conflict_message_description">בבחירה של שתי הגרסאות, יתווסף מספר בסוף שמו של הקובץ המקומי.</string>
+    <string name="conflict_server_file">קובץ בשרת</string>
     <string name="contactlist_item_icon">סמן משתמש לרשימת אנשי קשר</string>
     <string name="contactlist_no_permission">לא ניתנה הרשאה, שום דבר לא עבר ייבוא.</string>
     <string name="contacts">אנשי קשר</string>
@@ -161,6 +167,7 @@
     <string name="copy_move_to_encrypted_folder_not_supported">נכון לעכשיו, אין תמיכה בהעתקה/העברה לתיקייה מוצפנת.</string>
     <string name="copy_to">העתק אל…</string>
     <string name="could_not_download_image">לא ניתן להוריד את התמונה המלאה</string>
+    <string name="could_not_retrieve_shares">לא ניתן למשוך את השיתופים</string>
     <string name="could_not_retrieve_url">לא ניתן לקבל כתובת</string>
     <string name="create">יצירה</string>
     <string name="create_dir_fail_msg">לא ניתן ליצור תיקייה</string>
@@ -173,6 +180,7 @@
     <string name="creates_rich_workspace">יוצר פרטי תיקייה</string>
     <string name="credentials_disabled">פרטי גישה מושבתים</string>
     <string name="daily_backup">גיבוי יומי</string>
+    <string name="data_to_back_up">נתונים לגיבוי</string>
     <string name="date_unknown">לא ידוע</string>
     <string name="default_credentials_wrong">פרטי הגישה שגויים</string>
     <string name="delete_account">הסרת חשבון</string>
@@ -180,11 +188,14 @@
     <string name="delete_entries">מחיקת רשומות</string>
     <string name="delete_link">מחק קישור</string>
     <string name="deselect_all">ביטול בחירה</string>
+    <string name="destination_filename">שם קובץ היעד</string>
     <string name="dev_version_new_version_available">קיימת גרסה חדשה</string>
     <string name="dev_version_no_information_available">אין מידע זמין.</string>
     <string name="dev_version_no_new_version_available">לא קיימת גרסה חדשה.</string>
     <string name="dialog_close">סגירה</string>
+    <string name="did_not_check_for_dupes">לא התבצעה בדיקת כפילויות.</string>
     <string name="digest_algorithm_not_available">אלגוריתם digest זה אינו זמין במכשיר הטלפון החכם שלך.</string>
+    <string name="direct_login_failed">כניסה דרך קישור ישיר נכשלה!</string>
     <string name="disable_new_media_folder_detection_notifications">השבתה</string>
     <string name="dismiss">התעלמות</string>
     <string name="dismiss_notification_description">התעלמות מהתראה</string>
@@ -259,6 +270,7 @@
     <string name="etm_migrations">נדידות (שדרוגי יישומים)</string>
     <string name="etm_preferences">העדפות</string>
     <string name="etm_title">מצב בדיקת מהנדסים</string>
+    <string name="etm_transfer">העברת קבצים</string>
     <string name="etm_transfer_type">העברה</string>
     <string name="etm_transfer_type_download">הורדה</string>
     <string name="etm_transfer_type_upload">העלאה</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 3c841085f7d7..6ce8b94b7ff8 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -551,6 +551,7 @@
     <string name="prefs_category_general">一般</string>
     <string name="prefs_category_more">更多</string>
     <string name="prefs_daily_backup_summary">您日曆及通訊錄的每日備份</string>
+    <string name="prefs_e2e_active">端到端加密設置完畢！</string>
     <string name="prefs_e2e_mnemonic">端到端助記碼</string>
     <string name="prefs_e2e_no_device_credentials">裝置若要顯示助記碼請啟用裝置身分驗證。</string>
     <string name="prefs_enable_media_scan_notifications">顯示媒體掃描通知</string>
@@ -562,6 +563,7 @@
     <string name="prefs_instant_behaviour_title">原始的檔案將會…</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">依據年月存在子資料夾內</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">使用子資料夾</string>
+    <string name="prefs_keys_exist">向此客戶端添加端到端加密</string>
     <string name="prefs_license">授權</string>
     <string name="prefs_lock">App 通行碼</string>
     <string name="prefs_lock_device_credentials_enabled">裝置身分驗證已啟動</string>
@@ -573,6 +575,7 @@
     <string name="prefs_manage_accounts">管理賬戶</string>
     <string name="prefs_recommend">向朋友推薦</string>
     <string name="prefs_remove_e2e">移除近端加密</string>
+    <string name="prefs_setup_e2e">設置端對端加密</string>
     <string name="prefs_show_hidden_files">顯示隱藏檔案</string>
     <string name="prefs_sourcecode">取得原始碼</string>
     <string name="prefs_storage_path">資料儲存資料夾</string>
@@ -600,6 +603,8 @@
     <string name="reload">重新載入</string>
     <string name="remote">﹙遠端﹚</string>
     <string name="remote_file_fetch_failed">找不到檔案！</string>
+    <string name="remove_e2e">您可以在此客戶端上本地刪除端到端加密</string>
+    <string name="remove_e2e_message">您可以在此客戶端上本地刪除端到端加密。加密檔案將保留在伺服器上，但不會再同步到此電腦。</string>
     <string name="remove_fail_msg">刪除失敗</string>
     <string name="remove_notification_failed">移除通知失敗</string>
     <string name="remove_push_notification">移除</string>
@@ -643,6 +648,7 @@
     <string name="set_picture_as">使用圖片作為</string>
     <string name="set_status">設定狀態</string>
     <string name="set_status_message">設定狀態訊息</string>
+    <string name="setup_e2e">在設置端到端加密期間，您將收到一個隨機的 12 字助記碼，您需要在其他設備上打開文件。這將僅存儲在此設備上，並且可以在此屏幕中再次顯示。請記在安全的地方！</string>
     <string name="share">分享</string>
     <string name="share_copy_link">分享並複製連結</string>
     <string name="share_dialog_title">分享</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c0e283b5c34c..d34da9bbeaaf 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -551,6 +551,7 @@
     <string name="prefs_category_general">一般</string>
     <string name="prefs_category_more">更多</string>
     <string name="prefs_daily_backup_summary">每日備份您的日曆與聯絡人</string>
+    <string name="prefs_e2e_active">端到端加密已設定完成！</string>
     <string name="prefs_e2e_mnemonic">端到端加密助記碼</string>
     <string name="prefs_e2e_no_device_credentials">裝置若要顯示助記碼請啟用裝置憑證。</string>
     <string name="prefs_enable_media_scan_notifications">顯示媒體掃描通知</string>
@@ -562,6 +563,7 @@
     <string name="prefs_instant_behaviour_title">原始的檔案將會……</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">依據年月存在子資料夾內</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">使用子資料夾</string>
+    <string name="prefs_keys_exist">新增端到端加密到此客戶端</string>
     <string name="prefs_license">授權</string>
     <string name="prefs_lock">應用程式通行碼</string>
     <string name="prefs_lock_device_credentials_enabled">裝置憑證已啟用</string>
@@ -573,6 +575,7 @@
     <string name="prefs_manage_accounts">管理帳號</string>
     <string name="prefs_recommend">推薦給朋友</string>
     <string name="prefs_remove_e2e">移除本機加密</string>
+    <string name="prefs_setup_e2e">設定端到端加密</string>
     <string name="prefs_show_hidden_files">顯示隱藏檔案</string>
     <string name="prefs_sourcecode">取得原始碼</string>
     <string name="prefs_storage_path">資料儲存資料夾</string>
@@ -600,6 +603,8 @@
     <string name="reload">重新載入</string>
     <string name="remote">(remote)</string>
     <string name="remote_file_fetch_failed">找不到檔案！</string>
+    <string name="remove_e2e">您可以在此客戶端上本機移除端到端加密</string>
+    <string name="remove_e2e_message">您可以在此客戶端上移除本機端到端加密。已加密的檔案將會保留在伺服器上，但不會再同步到此電腦。</string>
     <string name="remove_fail_msg">刪除失敗</string>
     <string name="remove_notification_failed">移除通知失敗</string>
     <string name="remove_push_notification">移除</string>
@@ -643,6 +648,7 @@
     <string name="set_picture_as">使用圖片作為</string>
     <string name="set_status">設定狀態</string>
     <string name="set_status_message">設定狀態訊息</string>
+    <string name="setup_e2e">在設定端到端加密期間，您將會收到一個隨機的 12 字助記字串，您需要這個字串才能在其他裝置上開啟檔案。這將只會儲存在此裝置上，並可以在此畫面中再次顯示。請記在安全的地方！</string>
     <string name="share">分享</string>
     <string name="share_copy_link">分享並複製連結</string>
     <string name="share_dialog_title">分享</string>