diff --git a/presentation/src/main/res/values-ar-rSA/strings.xml b/presentation/src/main/res/values-ar-rSA/strings.xml
index 6df0e4675..33799525b 100644
--- a/presentation/src/main/res/values-ar-rSA/strings.xml
+++ b/presentation/src/main/res/values-ar-rSA/strings.xml
@@ -105,7 +105,6 @@
 	<string name="screen_cloud_connections_title">اختر المسار</string>
 	<string name="screen_cloud_connections_no_connections">انقر هنا لإضافة مسار</string>
 	<string name="screen_cloud_error_webdav_not_supported">لا يبدو أن الخادم متوافق مع WebDAV</string>
-	<string name="screen_cloud_local_default_storage_title">ذاكرة التخزين الافتراضية</string>
 	<string name="screen_cloud_local_error_no_content_provider">لا توجد مواقع إضافية متاحة.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">الرابط</string>
diff --git a/presentation/src/main/res/values-ca-rES/strings.xml b/presentation/src/main/res/values-ca-rES/strings.xml
index 31c4acd5e..a32500daf 100644
--- a/presentation/src/main/res/values-ca-rES/strings.xml
+++ b/presentation/src/main/res/values-ca-rES/strings.xml
@@ -108,8 +108,6 @@
 	<string name="screen_cloud_connections_title">Trieu una destinació</string>
 	<string name="screen_cloud_connections_no_connections">Feu clic aquí per afegir destinacions</string>
 	<string name="screen_cloud_error_webdav_not_supported">El servidor no sembla que sigui compatible amb WebDAV</string>
-	<string name="screen_cloud_local_custom_storage_title">Ubicacions personalitzades</string>
-	<string name="screen_cloud_local_default_storage_title">Emmagatzematge predefinit</string>
 	<string name="screen_cloud_local_error_no_content_provider">No hi ha ubicacions addicionals disponibles.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
diff --git a/presentation/src/main/res/values-cs-rCZ/strings.xml b/presentation/src/main/res/values-cs-rCZ/strings.xml
index 2d816fa94..af019c9d8 100644
--- a/presentation/src/main/res/values-cs-rCZ/strings.xml
+++ b/presentation/src/main/res/values-cs-rCZ/strings.xml
@@ -112,8 +112,6 @@
 	<string name="screen_cloud_connections_title">Vyberte umístění</string>
 	<string name="screen_cloud_connections_no_connections">Klikněte zde pro přidání umístění</string>
 	<string name="screen_cloud_error_webdav_not_supported">Server není kompatibilní s WebDAV</string>
-	<string name="screen_cloud_local_custom_storage_title">Vlastní umístění</string>
-	<string name="screen_cloud_local_default_storage_title">Výchozí úložiště</string>
 	<string name="screen_cloud_local_error_no_content_provider">Nejsou k dispozici žádná další umístění.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
diff --git a/presentation/src/main/res/values-de-rDE/strings.xml b/presentation/src/main/res/values-de-rDE/strings.xml
index 92223621c..4b53c23fa 100644
--- a/presentation/src/main/res/values-de-rDE/strings.xml
+++ b/presentation/src/main/res/values-de-rDE/strings.xml
@@ -16,7 +16,7 @@
 	<string name="error_cloud_already_exists">Cloud existiert bereits.</string>
 	<string name="error_activity_not_found">Installiere eine App, die diesen Dateityp unterstützt.</string>
 	<string name="error_server_not_found">Server nicht gefunden.</string>
-	<string name="error_device_policy_manager_not_found">Bitte öffne die Einstellungen und setze den Sperrbildschirm von Hand</string>
+	<string name="error_device_policy_manager_not_found">Bitte öffne die Einstellungen Deines Geräts und stell die Bildschirmsperre von Hand ein</string>
 	<string name="error_export_illegal_file_name">Export fehlgeschlagen. Versuche, Sonderzeichen aus den Dateinamen zu entfernen und erneut zu exportieren.</string>
 	<string name="error_name_contains_invalid_characters">Keine Sonderzeichen möglich.</string>
 	<string name="error_names_contains_invalid_characters">Dateinamen können keine Sonderzeichen enthalten.</string>
@@ -41,6 +41,7 @@
 	<string name="permission_message_export_file">Zum Exportieren von Dateien benötigt Cryptomator Speicherzugriff</string>
 	<string name="permission_message_upload_file">Zum Hochladen von Dateien benötigt Cryptomator Speicherzugriff</string>
 	<string name="permission_message_share_file">Zum Teilen von Dateien benötigt Cryptomator Speicherzugriff</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator hat die Berechtigung zum Zugriff auf diesen Ort verloren. Bitte wähle diesen Ordner erneut aus, um die Berechtigung wiederherzustellen.</string>
 	<string name="snack_bar_action_title_settings">Einstellungen</string>
 	<string name="snack_bar_action_title_search">Suche</string>
 	<string name="snack_bar_action_title_search_previous">Vorheriges</string>
@@ -115,8 +116,6 @@
 	<string name="screen_cloud_connections_title">Ort auswählen</string>
 	<string name="screen_cloud_connections_no_connections">Hier klicken um einen neuen Ort hinzufügen</string>
 	<string name="screen_cloud_error_webdav_not_supported">Server scheint nicht WebDAV-kompatibel zu sein</string>
-	<string name="screen_cloud_local_custom_storage_title">Benutzerdefinierte Orte</string>
-	<string name="screen_cloud_local_default_storage_title">Standard-Speicher</string>
 	<string name="screen_cloud_local_error_no_content_provider">Weitere Orte sind nicht verfügbar.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
@@ -290,6 +289,10 @@
 	<string name="dialog_app_is_obscured_info_title">App wird verdeckt</string>
 	<string name="dialog_app_is_obscured_info_hint">Eine App zeigt etwas über Cryptomator an (z.B. ein Blaulichtfilter oder eine Nachtmodus-App). Aus Sicherheitsgründen ist Cryptomator deaktiviert.\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">Wie Cryptomator aktiviert werden kann</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Schließen</string>
+	<string name="dialog_vaults_removed_during_migration_title">Bitte Tresore für die %1s-Cloud erneut hinzufügen</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Während der Migration auf diese App-Version müssen wir folgende Tresore aus der App entfernen:\n%2s \n\nDiese Tresore werden nicht aus der Cloud entfernt, sondern nur aus dieser App. Entschuldigung für die Unannehmlichkeiten. Füge diese Tresore bitte erneut hinzu, um weiter mit ihnen zu arbeiten.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Tresor ist Wurzelverzeichnis der Cloud-Verbindung</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Erstelle eine neue Cloud-Verbindung, wo du mindestens den übergeordneten Ordner dieses Tresors als Wurzelverzeichnis auswählst, um diesen Tresor hinzuzufügen.</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">Dies ist eine Sicherheitsfunktion, die andere Anwendungen daran hindert, Nutzer zu ungewollten Aktionen zu verleiten.\n\nDurch Deaktivieren bestätigst du, dass du dir <a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">der Risiken bewusst</a> bist.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Bist du dir sicher, dass du die Cloud-Verbindung entfernen möchtest?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Dieser Vorgang wird die Cloud-Verbindung und alle zugehörigen Tresore löschen.</string>
diff --git a/presentation/src/main/res/values-el-rGR/strings.xml b/presentation/src/main/res/values-el-rGR/strings.xml
index 52c677929..6c1efe0b8 100644
--- a/presentation/src/main/res/values-el-rGR/strings.xml
+++ b/presentation/src/main/res/values-el-rGR/strings.xml
@@ -41,6 +41,7 @@
 	<string name="permission_message_export_file">Το Cryptomator χρειάζεται πρόσβαση στον αποθηκευτικό χώρο για την εξαγωγή αρχείων</string>
 	<string name="permission_message_upload_file">Το Cryptomator χρειάζεται πρόσβαση στον αποθηκευτικό χώρο για μεταφόρτωση αρχείων</string>
 	<string name="permission_message_share_file">Το Cryptomator χρειάζεται πρόσβαση στον αποθηκευτικό χώρο για κοινή χρήση αρχείων</string>
+	<string name="permission_revoked_re_request_permission">Το Cryptomator έχει χάσει την άδεια πρόσβασης σε αυτήν την τοποθεσία. Παρακαλώ επιλέξτε ξανά αυτόν το φάκελο για να επαναφέρετε το δικαίωμα.</string>
 	<string name="snack_bar_action_title_settings">Ρυθμίσεις</string>
 	<string name="snack_bar_action_title_search">Αναζήτηση</string>
 	<string name="snack_bar_action_title_search_previous">Προηγούμενο</string>
@@ -115,8 +116,6 @@
 	<string name="screen_cloud_connections_title">Επιλέξτε μια τοποθεσία</string>
 	<string name="screen_cloud_connections_no_connections">Κάντε κλικ εδώ για να προσθέσετε τοποθεσίες</string>
 	<string name="screen_cloud_error_webdav_not_supported">Ο διακομιστής δεν φαίνεται να είναι συμβατός με WebDAV</string>
-	<string name="screen_cloud_local_custom_storage_title">Προσαρμοσμένες τοποθεσίες</string>
-	<string name="screen_cloud_local_default_storage_title">Προεπιλεγμένος χώρος αποθήκευσης</string>
 	<string name="screen_cloud_local_error_no_content_provider">Δεν υπάρχουν διαθέσιμες πρόσθετες τοποθεσίες.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
@@ -290,6 +289,10 @@
 	<string name="dialog_app_is_obscured_info_title">Η εφαρμογή αποκρύπτεται</string>
 	<string name="dialog_app_is_obscured_info_hint">Μια άλλη εφαρμογή εμφανίζει κάτι πάνω από το Cryptomator (π.χ. ένα φίλτρο μπλε φωτός ή μια εφαρμογή νυχτερινής λειτουργίας). Για λόγους ασφαλείας, το Cryptomator είναι απενεργοποιημένο.\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">Πώς να ενεργοποιήσετε το Cryptomator</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Κλείσιμο</string>
+	<string name="dialog_vaults_removed_during_migration_title">Παρακαλώ προσθέστε ξανά κρύπτες για %1s cloud</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Κατά τη μετάβαση σε αυτήν την έκδοση της εφαρμογής, πρέπει να αφαιρέσουμε τις ακόλουθες κρύπτες από την εφαρμογή:\n%2s\n\nΑυτές οι κρύπτες δεν έχουν αφαιρεθεί από το cloud αλλά μόνο από αυτήν την εφαρμογή. Λυπούμαστε για την ταλαιπωρία και παρακαλούμε προσθέστε ξανά αυτές τις κρύπτες για να συνεχίσετε να εργάζεστε μαζί τους.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Η κρύπτη είναι ριζικός φάκελος της σύνδεσης cloud</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Δημιουργήστε μια νέα σύνδεση στο cloud όπου επιλέγετε τουλάχιστον τον γονικό φάκελο αυτού του φακέλου κρύπτης ως ριζικό κατάλογο για να προσθέσετε αυτή την κρύπτη.</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">Αυτή η ρύθμιση είναι μια λειτουργία ασφαλείας και αποτρέπει άλλες εφαρμογές από το να ξεγελάσουν τους χρήστες να κάνουν πράγματα που δεν θέλουν να κάνουν.\n\nΜε την απενεργοποίηση, επιβεβαιώνετε ότι γνωρίζετε <a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">τους κινδύνους</a>.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτή τη σύνδεση cloud;</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Αυτή η ενέργεια θα αφαιρέσει τη σύνδεση στο cloud και όλες οι κρύπτες αυτού του cloud.</string>
diff --git a/presentation/src/main/res/values-es-rES/strings.xml b/presentation/src/main/res/values-es-rES/strings.xml
index 16143f6cb..d11569c25 100644
--- a/presentation/src/main/res/values-es-rES/strings.xml
+++ b/presentation/src/main/res/values-es-rES/strings.xml
@@ -41,6 +41,7 @@
 	<string name="permission_message_export_file">Cryptomator necesita acceso al almacenamiento para exportar archivos.</string>
 	<string name="permission_message_upload_file">Cryptomator necesita acceso al almacenamiento para subir archivos.</string>
 	<string name="permission_message_share_file">Cryptomator necesita acceso al almacenamiento para compartir archivos.</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator ha perdido permiso para acceder a esta ubicación. Seleccione esta carpeta de nuevo para restaurar el permiso.</string>
 	<string name="snack_bar_action_title_settings">Configuración</string>
 	<string name="snack_bar_action_title_search">Buscar</string>
 	<string name="snack_bar_action_title_search_previous">Anterior</string>
@@ -115,8 +116,6 @@
 	<string name="screen_cloud_connections_title">Elegir ubicación</string>
 	<string name="screen_cloud_connections_no_connections">Haz clic aquí para añadir ubicaciones</string>
 	<string name="screen_cloud_error_webdav_not_supported">El servidor no parece ser compatible con WebDAV</string>
-	<string name="screen_cloud_local_custom_storage_title">Ubicaciones personalizadas</string>
-	<string name="screen_cloud_local_default_storage_title">Almacenamiento predeterminado</string>
 	<string name="screen_cloud_local_error_no_content_provider">No hay ubicaciones extra disponibles.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
@@ -290,6 +289,10 @@
 	<string name="dialog_app_is_obscured_info_title">La aplicación está oscura</string>
 	<string name="dialog_app_is_obscured_info_hint">Otra aplicación muestra algo en la parte superior de Cryptomator (por ejemplo, un filtro de luz azul o una aplicación en modo nocturno). Por razones de seguridad, Cryptomator está desactivado.\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">Cómo activar Cryptomator</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Cerrar</string>
+	<string name="dialog_vaults_removed_during_migration_title">Vuelva a añadir bóvedas para la nube %1s</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Mientras se migra a esta versión de la aplicación, necesitamos eliminar las siguientes bóvedas de la aplicación:\n%2s \n\nEsas bóvedas no se eliminan de la nube sino sólo de esta aplicación. Lamentamos las molestias, por favor añada de nuevo estas bóvedas para seguir trabajando con ellas.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">La bóveda es la carpeta raíz de la conexión a la nube</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Crear una conexión nueva en la nube donde seleccione al menos la carpeta padre de esta carpeta de bóveda como directorio raíz para añadir esta bóveda.</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">Esta opción es una función de seguridad y evita que otras aplicaciones engañen a los usuarios para que hagan cosas que no quieren hacer.\n\nAl desactivar, confirma que es <a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">consciente de los riesgos</a>.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">\"¿Estás seguro de que quieres eliminar esta conexión de nube?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Esta acción eliminará la conexión de nube y todas las cajas fuertes de esta nube.</string>
diff --git a/presentation/src/main/res/values-fil-rPH/strings.xml b/presentation/src/main/res/values-fil-rPH/strings.xml
new file mode 100644
index 000000000..4c5ee108e
--- /dev/null
+++ b/presentation/src/main/res/values-fil-rPH/strings.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- # app -->
+	<string name="share_with_label">I-encrypt</string>
+	<!-- # error messages -->
+	<string name="error_generic">Nagkaroon ng error</string>
+	<string name="error_authentication_failed">Bigo ang pagpapatunay</string>
+	<string name="error_authentication_failed_re_authenticate">Bigo ang pagtutunay, maaaring maglogin gamit ang %1$s</string>
+	<string name="error_no_network_connection">Walang koneksyon sa network</string>
+	<string name="error_invalid_passphrase">Mali ang password</string>
+	<string name="error_vault_version_not_supported">Hindi suportado ang vault na ito. Ang vault na ito ay ginawa gamit ang ibang bersyon ng Cryptomator.</string>
+	<string name="error_vault_already_exists">Umiiral na ang vault na ito.</string>
+	<string name="error_no_such_file">Ang file na ito ay hindi pa umiiral.</string>
+	<string name="error_vault_has_been_locked">Naisara na ang vault.</string>
+	<string name="error_activity_not_found">Magdownload ng app na kayang buksan ang file na ito.</string>
+	<string name="error_server_not_found">Hindi mahanap ang server.</string>
+	<string name="error_device_policy_manager_not_found">Maaaring buksan ang device settings at sariling itakda ang screen lock</string>
+	<string name="error_name_contains_invalid_characters">Hindi maaring maglagay ng espesyal na mga karakter.</string>
+	<string name="error_names_contains_invalid_characters">Hindi maaaring lagyan ng espesyal na karakter ang pangalan ng file.</string>
+	<string name="error_vault_name_contains_invalid_characters">Hindi maaaring lagyan ng espesyal na karakter ang pangalan ng file.</string>
+	<string name="error_play_services_not_available">Hindi naka-install ang Google Play Services</string>
+	<string name="error_biometric_auth_aborted">Kinansela ang biometric authentication</string>
+	<string name="error_no_such_bucket">Hindi matagpuan ang bucket na ito</string>
+	<string name="error_masterkey_location_not_supported">Hindi pa suportado ang custom Masterkey location</string>
+	<!-- # clouds -->
+	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">Local storage</string>
+	<!-- # permission -->
+	<!-- ## permission messages -->
+	<string name="snack_bar_action_title_settings">Settings</string>
+	<string name="snack_bar_action_title_search">Hanapin</string>
+	<string name="snack_bar_action_title_search_previous">Nakaraan</string>
+	<string name="snack_bar_action_title_search_next">Sunod</string>
+	<string name="snack_bar_action_title_sort_az">A - Z</string>
+	<string name="snack_bar_action_title_sort_za">Z - A</string>
+	<string name="snack_bar_action_title_sort_newest">Bago muna</string>
+	<string name="snack_bar_action_title_sort_oldest">Luma muna</string>
+	<string name="snack_bar_action_title_sort_biggest">Pinakamalaki muna</string>
+	<string name="snack_bar_action_title_sort_smallest">Pinakamaliit muna</string>
+	<!-- # screens -->
+	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">Idagdag sa Cryptomator</string>
+	<string name="screen_vault_list_action_create_new_vault">Gumawa ng bagong vault</string>
+	<string name="screen_vault_list_action_add_existing_vault">Magdagdag ng umiiral na vault</string>
+	<string name="screen_vault_list_vault_action_delete">Tanggalin</string>
+	<string name="screen_vault_list_vault_creation_hint">Pindutin dito para gumawa ng bagong vault</string>
+	<string name="screen_vault_list_change_password_successful">Matagumpay na napalitan ang password</string>
+	<!-- # screen: file browser -->
+	<string name="screen_file_browser_default_title">Vault</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">Piliin ang masterkey file</string>
+	<string name="screen_file_browser_create_new_vault_button_text">Ilagay dito</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">Pangalan ng vault: %1$s</string>
+	<string name="screen_file_browser_share_intent_chooser_title">Ibahagi kay</string>
+	<string name="screen_file_browser_share_destination_title">Pumili ng destinasyon</string>
+	<string name="screen_file_browser_share_button_text">Pumili</string>
+	<string name="screen_file_browser_nothing_to_share">Walang maibabahagi</string>
+	<string name="screen_file_browser_actions_title">Idagdag sa %1$s</string>
+	<string name="screen_file_browser_action_create_folder">Gumawa ng folder</string>
+	<string name="screen_file_browser_action_create_new_text_file">Gumawa ng text file</string>
+	<string name="screen_file_browser_action_upload_files">I-upload ang mga files</string>
+	<string name="screen_file_browser_upload_files_chooser_title">Files</string>
+	<string name="screen_file_browser_msg_file_exported">Na-export na ang file</string>
+	<string name="screen_file_browser_msg_files_exported">Na-export na ang mga files</string>
+	<string name="screen_file_browser_node_action_share">Ibahagi</string>
+	<string name="screen_file_browser_node_action_rename">Baguhin ang pangalan</string>
+	<string name="screen_file_browser_node_action_edit_text">I-edit</string>
+	<string name="screen_file_browser_node_action_export">I-export</string>
+	<string name="screen_file_browser_node_action_delete">Burahin</string>
+	<string name="screen_file_browser_node_action_open_with_text">Buksan gamit ang &#8230;</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d ang nakapili</string>
+	<string name="screen_file_browser_select_items">Piliin</string>
+	<string name="screen_file_browser_select_all_items">Piliin lahat</string>
+	<string name="screen_file_browser_refresh_items">I-refresh</string>
+	<string name="screen_file_browser_no_connection_message">Walang koneksyon</string>
+	<!-- ## screen: text editor -->
+	<!-- ## screen: share files -->
+	<string name="screen_share_files_content_files">files</string>
+	<string name="screen_share_files_msg_filenames_must_be_unique">Natatangi dapat ang pangalan ng mga files, maaari lamang na palitan ang mga may kapareho.</string>
+	<string name="screen_share_files_section_location">I-save ang lokasyon</string>
+	<string name="screen_share_files_save_button_text">I-save</string>
+	<!-- ## screen: choose cloud service -->
+	<!-- ## screen: cloud connections -->
+	<string name="screen_cloud_connections_title">Piliin ang location</string>
+	<string name="screen_cloud_connections_no_connections">Pindutin dito upang magdagdag ng lugar</string>
+	<!-- ## screen: webdav settings -->
+	<string name="screen_webdav_settings_url_port_label">URL</string>
+	<string name="screen_webdav_settings_username_label">Username</string>
+	<string name="screen_webdav_settings_password_label">Password</string>
+	<string name="screen_webdav_settings_done_button_text">Kumonekta</string>
+	<string name="screen_webdav_settings_msg_url_must_not_be_empty">Hindi maaaring walang laman ang URL.</string>
+	<string name="screen_webdav_settings_msg_url_is_invalid">Hindi tama ang URL.</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">Hindi maaaring walang laman ang username.</string>
+	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_region_label">Rehiyon</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Hindi maaaring walang laman ang bucket</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Hindi maaaring walang laman ang endpoint o ang rehiyon</string>
+	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_msg_name_empty">Hindi maaaring walang pangalan ang vault.</string>
+	<string name="screen_enter_vault_name_vault_label">Pangalan ng Vault</string>
+	<string name="screen_enter_vault_name_button_text">Gumawa</string>
+	<!-- ## screen: set password -->
+	<string name="screen_set_password_title">Itakda ang password</string>
+	<string name="screen_set_password_msg_password_mismatch">Hindi nagtugma ang bagong password sa ni-retype na password.</string>
+	<string name="screen_set_password_button_text">Tapos na</string>
+	<string name="screen_set_password_hint">IMPORTANTE: Walang paraan para maisalba ang iyong datos kapag nakalimutan ang iyong password.</string>
+	<string name="screen_set_password_retype_password_label">Muling ilagay ang password</string>
+	<string name="screen_set_password_strength_indicator_0">Masyadong mahina para gumawa ng vault</string>
+	<string name="screen_set_password_strength_indicator_1">Mahina</string>
+	<string name="screen_set_password_strength_indicator_2">Patas</string>
+	<string name="screen_set_password_strength_indicator_3">Malakas</string>
+	<string name="screen_set_password_strength_indicator_4">Higit na malakas</string>
+	<!-- ## screen: settings -->
+	<string name="screen_settings_section_general">Pangkalahatan</string>
+	<string name="screen_settings_cloud_settings_label">Cloud services</string>
+	<string name="screen_settings_biometric_auth">Biometric authentication</string>
+	<string name="screen_settings_section_search">Hanapin</string>
+	<string name="screen_settings_auto_lock_timeout">I-lock pagkatapos ng</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">Kapag ang screen ay disabled</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">Pumili ng vault pang upload</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">I-activate</string>
+	<string name="screen_settings_twitter_label">Sundan kami sa Twitter</string>
+	<string name="screen_settings_facebook_label">I-like kami sa Facebook</string>
+	<string name="screen_settings_section_legal">Ligal</string>
+	<string name="screen_settings_licenses_label">Mga Lisensya</string>
+	<string name="screen_settings_section_support">Suporta</string>
+	<string name="screen_settings_contact_label">Humingi ng tulong</string>
+	<string name="screen_settings_debug_mode_label">Debug mode</string>
+	<string name="screen_settings_error_report_label">Ipadala ang log file</string>
+	<string name="screen_settings_security_label">Mga pahiwatig ng seguridad</string>
+	<string name="screen_settings_section_version">Bersyon</string>
+	<string name="screen_settings_advanced_settings">Mga advanced na setting</string>
+	<string name="screen_settings_background_unlock_preparation_label">Pabilisin ang pag-unlock</string>
+	<!-- ## screen: cloud settings -->
+	<!-- ## screen: licenses -->
+	<!-- ## screen: authenticate cloud -->
+	<!-- ## screen: insecure android version info -->
+	<!-- # dialogs -->
+	<string name="dialog_button_cancel">Kanselahin</string>
+	<string name="dialog_enter_password_positive_button">I-unlock</string>
+	<string name="dialog_change_password_new_password_label">Bagong Password</string>
+	<string name="dialog_change_password">Palitan ang password</string>
+	<string name="dialog_change_password_msg_old_password_empty">Hindi maaaring walang laman ang lumang password field.</string>
+	<string name="dialog_change_password_msg_new_password_empty">Hindi maaaring walang laman ang bagong password field.</string>
+	<string name="dialog_change_password_msg_password_mismatch">Hindi nagtugma ang bagong password sa ni-retype na password.</string>
+	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_positive_button_text">Tanggalin</string>
+	<string name="dialog_existing_file_title">Mayroon na ng file na ito</string>
+	<string name="dialog_existing_file_positive_button">Palitan</string>
+	<string name="dialog_existing_file_message">Umiiral na ang file na may pangalang \'%1$s\'.</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">Laktawan ang umiiral</string>
+	<string name="dialog_replace_positive_button_all_files_exist">Palitan lahat</string>
+	<string name="dialog_replace_positive_button_some_files_exist">Palitan ang umiiral</string>
+	<string name="dialog_replace_positive_button_single_file_exists">Palitan</string>
+	<string name="dialog_replace_msg_single_file_exists">Umiiral na ang file na may pangalang \'%1$s\'. Nais mo bang palitan ito?</string>
+	<string name="dialog_replace_msg_all_files_exists">Ang lahat ng files ay umiiral na. Nais mo bang palitan ang mga ito?</string>
+	<string name="dialog_replace_title_single_file_exists">Palitan ang file?</string>
+	<string name="dialog_replace_title_multiple_files_exist">Palitan ang mga file?</string>
+	<string name="dialog_unable_to_share_positive_button">OK</string>
+	<string name="dialog_unable_to_share_negative_button">Gumawa ng bagong vault</string>
+	<string name="dialog_filetype_not_supported_message">Mag-download ng app na kayang buksan ang file na ito o nais mo bang i-save sa iyong device?</string>
+	<string name="dialog_rename_vault_title">Palitan ang pangalan ng vault</string>
+	<string name="dialog_rename_node_folder_title">Palitan ang pangalan ng folder</string>
+	<string name="dialog_rename_node_file_title">Palitan ang pangalan ng file</string>
+	<string name="dialog_unsaved_changes_title">Mayroon kang hindi na i-save na pagbabago</string>
+	<string name="dialog_unsaved_changes_discard">Ibaliwala</string>
+	<string name="dialog_delete_vault_message">Sigurado ka ba na nais mong alisin ang vault?</string>
+	<string name="dialog_delete_vault_hint">Ang aksyon na ito ay aalisin lamang ang vault sa listahan at hindi ito buburahin.</string>
+	<string name="dialog_progress_please_wait">Pakihintay&#8230;</string>
+	<string name="dialog_progress_encryption">Ineencrypt&#8230;</string>
+	<string name="dialog_progress_decryption">Dinedecrypt&#8230;</string>
+	<string name="dialog_lock_vault">I-lock</string>
+	<string name="dialog_accept_ssl_certificate_title">Hindi wasto ang SSL certificate</string>
+	<string name="dialog_accept_ssl_certificate_hint">Hindi wasto ang SSL certificate. Nais mo paring pagkatiwalaan?</string>
+	<string name="dialog_accept_ssl_certificate_details">Mga detalye</string>
+	<string name="dialog_accept_ssl_certificate_security_checkbox">Maaaring panganib ito sa seguridad. Alam ko ang ginagawa ko.</string>
+	<string name="dialog_http_security_hint">Ang pag-gamit ng HTTP ay hindi ligtas. Kung alam mo ang mga panganib, maaari kang tumuloy gamit ang HTTP.</string>
+	<string name="dialog_http_security_checkbox">Gawing HTTPS</string>
+	<string name="dialog_http_security_title">Gamiting ang HTTPS?</string>
+	<string name="dialog_debug_mode_disclaimer_title">Atensyon</string>
+	<string name="dialog_debug_mode_positive_button">I-enable</string>
+	<string name="dialog_disable_app_obscured_disclaimer_hint">Ang setting na ito ay isang security feature at pinipigilan ang ibang mga apps sa lokohin ang mga gumagamit na gawin ang mga hindi nila gustong gawin.\n\nSa pag-alis nito, kinukumpirma mo na <a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured"> alam mo ang mga panganib</a>.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_title">Atensyon</string>
+	<string name="dialog_app_is_obscured_info_neutral_button">Isara</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_message">Sigurado ka bang gusto mong tanggalin itong cloud connection?</string>
+	<string name="dialog_confirm_delete_multiple_message">Sigurado ka bang gusto mong burahin ang mga ito?</string>
+	<string name="dialog_confirm_delete_file_message">Sigurado ka bang gusto mong burahin ang file na ito?</string>
+	<string name="dialog_confirm_delete_folder_message">Buburahin nito ang lahat ng laman ng folder. Sigurado ka ba na gusto mong burahin ang folder na ito?</string>
+	<string name="dialog_biometric_auth_key_invalidated_title">Ang biometric authentication feature ay na deactivate na</string>
+	<string name="dialog_biometric_auth_key_invalidated_message">Dahil wala nang bisa ang susi na ito, deactivated na ang biometric authentication feature. Upang paganahin muli, buksan ang settings ng Cryptomator.</string>
+	<string name="dialog_enter_license_title">Magbigay ng wastong lisensya</string>
+	<string name="dialog_enter_license_content">Natuklasan namin na ang nakainstall mong Cryptomator ay hind nanggaling sa Google Play Store. Maaari lamang na magbigay ng wastong lisensya na mabibili sa <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
+	<string name="dialog_enter_license_not_valid_content">Ang lisensyang binigay ay hindi wasto. Siguraduhing tama ang iyong pagkakalagay.</string>
+	<string name="dialog_enter_license_decline_button">I-sara</string>
+	<string name="dialog_license_confirmation_message">Salamat %1$s sa pagbigay ng wastong lisensya.</string>
+	<string name="dialog_update_available_update">I-update ngayon</string>
+	<string name="dialog_update_available_cancel">Mamaya</string>
+	<string name="dialog_sym_link_title">Ang folder na ito ay isang symbolic link</string>
+	<string name="dialog_sym_link_message">Hindi maaaring puntahan ang symbolic link na ito</string>
+	<string name="dialog_sym_link_back_button">Bumalik</string>
+	<!-- # error reports -->
+	<!-- # misc -->
+	<!-- ## file size helper -->
+	<string name="file_size_zero">Zero kB</string>
+	<string name="file_size_unit_bytes">bytes</string>
+	<string name="file_size_unit_kilo_bytes">kB</string>
+	<string name="file_size_unit_mega_bytes">MB</string>
+	<string name="file_size_unit_giga_bytes">GB</string>
+	<string name="file_size_unit_tera_bytes">TB</string>
+	<!-- ## date helper -->
+	<string name="time_unit_seconds_sg">segundo</string>
+	<string name="time_unit_seconds_pl">segundo</string>
+	<string name="time_unit_minutes_sg">minuto</string>
+	<string name="time_unit_minutes_pl">minuto</string>
+	<string name="time_unit_hours_sg">oras</string>
+	<string name="time_unit_hours_pl">oras</string>
+	<string name="time_unit_days_sg">araw</string>
+	<string name="time_unit_days_pl">araw</string>
+	<string name="time_unit_weeks_sg">linggo</string>
+	<string name="time_unit_weeks_pl">linggo</string>
+	<string name="time_unit_months_sg">buwan</string>
+	<string name="time_unit_months_pl">buwan</string>
+	<string name="time_unit_years_sg">taon</string>
+	<string name="time_unit_years_pl">taon</string>
+	<!-- ## biometric authentication -->
+	<string name="dialog_biometric_auth_title">Biometric login</string>
+	<string name="dialog_biometric_auth_message">Mag-log in gamit ang iyong biometric credential</string>
+	<string name="dialog_biometric_auth_use_password">Gamitin ang vault password</string>
+	<!-- notification -->
+	<string name="notification_unlocked">Vaults na na-unlock: %1$d</string>
+	<string name="notification_timeout">Autolock in %1$s</string>
+	<string name="notification_lock_all">I-lock lahat</string>
+	<string name="notification_cancel_auto_upload">Ikansela ang pag-upload</string>
+	<string name="notification_auto_upload_message">Uploading %1d/%2d</string>
+	<string name="screen_settings_lru_cache">Cache</string>
+	<string name="screen_settings_lru_cache_size">Kabuuang laki ng cache</string>
+	<string name="screen_settings_clear_lru_cache_size">Linisin ang Cache</string>
+	<string name="screen_settings_lru_cache_changed__restart_toast">Ang mga pagbabago ay makikita pagkatapos ng pag-restart ng app</string>
+	<!-- lock timeout names -->
+	<string name="lock_timeout_1m">1 minuto</string>
+	<string name="lock_timeout_2m">2 minuto</string>
+	<string name="lock_timeout_5m">5 minuto</string>
+	<string name="lock_timeout_10m">10 minuto</string>
+	<string name="lock_timeout_never">Hindi kailanman</string>
+	<!-- cache size names -->
+	<string name="cache_size_50m">50 MB</string>
+	<string name="cache_size_100m">100 MB</string>
+	<string name="cache_size_250m">250 MB</string>
+	<string name="cache_size_500m">500 MB</string>
+	<string name="cache_size_1000m">1 GB</string>
+	<string name="cache_size_5000m">5 GB</string>
+	<!-- screen scheme mode names -->
+	<string name="screen_settings_style_mode">Estilo</string>
+	<string name="follow_system">Awtomatico (sundan ang system)</string>
+	<string name="light">Light</string>
+	<string name="dark">Dark</string>
+	<!-- update interval names -->
+	<string name="update_interval_1d">Isang beses sa isang araw</string>
+	<string name="update_interval_1w">Isang beses sa isang linggo</string>
+	<string name="update_interval_1m">Isang beses sa isang buwan</string>
+</resources>
diff --git a/presentation/src/main/res/values-fr-rFR/strings.xml b/presentation/src/main/res/values-fr-rFR/strings.xml
index 61ff0e1eb..85bcb0935 100644
--- a/presentation/src/main/res/values-fr-rFR/strings.xml
+++ b/presentation/src/main/res/values-fr-rFR/strings.xml
@@ -16,6 +16,7 @@
 	<string name="error_cloud_already_exists">Cloud existant.</string>
 	<string name="error_activity_not_found">Veuillez télécharger une application qui peut ouvrir ce fichier.</string>
 	<string name="error_server_not_found">Serveur introuvable.</string>
+	<string name="error_device_policy_manager_not_found">Veuillez ouvrir les paramètres de votre appareil et régler le verrouillage de l\'écran à la main</string>
 	<string name="error_export_illegal_file_name">L\'exportation a échoué. Essayez de supprimer les caractères spéciaux des noms de fichiers et d\'exporter à nouveau.</string>
 	<string name="error_name_contains_invalid_characters">Ne peut pas contenir de caractères spéciaux.</string>
 	<string name="error_names_contains_invalid_characters">Les noms de fichiers ne peuvent pas contenir de caractères spéciaux.</string>
@@ -23,7 +24,11 @@
 	<string name="error_general_update">La vérification de la mise à jour a échoué. Une erreur générale s\'est produite.</string>
 	<string name="error_hash_mismatch_update">La vérification de la mise à jour a échoué. Le hachage calculé ne correspond pas au fichier téléchargé</string>
 	<string name="error_update_no_internet">La vérification de la mise à jour a échoué. Pas de connexion Internet.</string>
+	<string name="error_failed_to_decrypt_webdav_password">Echec lors du déchiffrement du mot de passe WebDAV, veuillez l\'ajouter une nouvelle fois dans les paramètres</string>
+	<string name="error_play_services_not_available">Les services Google Play ne sont pas installés</string>
 	<string name="error_biometric_auth_aborted">Authentification biométrique avortée</string>
+	<string name="error_vault_version_mismatch">La version spécifiée dans %1$s est différente de %2$s</string>
+	<string name="error_vault_key_invalid">%1$s ne correspond pas à ce %2$s</string>
 	<string name="error_vault_config_loading">Erreur générale lors du chargement de la configuration du coffre</string>
 	<string name="error_file_not_found_after_opening_using_3party">Le fichier local n\'est plus présent après le retour à Cryptomator. Les éventuels modifications ne peuvent être propagées au nuage.</string>
 	<string name="error_no_such_bucket">Aucun compartiment de ce type</string>
@@ -36,6 +41,7 @@
 	<string name="permission_message_export_file">Cryptomator a besoin de l\'accès au stockage pour exporter des fichiers</string>
 	<string name="permission_message_upload_file">Cryptomateur a besoin de l\'accès au stockage pour téléverser des fichiers</string>
 	<string name="permission_message_share_file">Cryptomator a besoin de l\'accès au stockage pour partager des fichiers</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator n\'a plus accès à cet emplacement. Merci de resélectionner ce répertoire pour restaurer les droits d\'accès.</string>
 	<string name="snack_bar_action_title_settings">Paramètres</string>
 	<string name="snack_bar_action_title_search">Rechercher</string>
 	<string name="snack_bar_action_title_search_previous">Précédent</string>
@@ -110,8 +116,6 @@
 	<string name="screen_cloud_connections_title">Choisissez l\'emplacement</string>
 	<string name="screen_cloud_connections_no_connections">Cliquez ici pour ajouter des emplacements</string>
 	<string name="screen_cloud_error_webdav_not_supported">Le serveur ne semble pas compatible avec WebDAV</string>
-	<string name="screen_cloud_local_custom_storage_title">Emplacements personnalisés</string>
-	<string name="screen_cloud_local_default_storage_title">Stockage par défaut</string>
 	<string name="screen_cloud_local_error_no_content_provider">Aucun emplacement supplémentaire disponible.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
@@ -171,6 +175,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Choisir un coffre-fort pour le téléversement</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Activer</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Capturez les images en arrière-plan et une fois que le coffre-fort sélectionné est déverrouillé, lancez le téléversement</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Télécharger instantanément</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Télécharger directement si le coffre est déverrouillé</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Téléverser sur réseau WIFI uniquement</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Téléversement des vidéos</string>
 	<string name="screen_settings_auto_photo_upload_title">Enregistrer les fichiers téléverser automatiquement dans&#8230;</string>
@@ -215,6 +221,7 @@
 	<string name="dialog_change_password_msg_password_mismatch">Le nouveau mot de passe ne correspond pas au mot de passe retapé.</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_title">Coffre-fort %1$s introuvable</string>
+	<string name="dialog_vault_not_found_message">Le coffre-fort a été renommé, déplacé ou supprimé. Supprimez ce coffre-fort de la liste et ajoutez-le à nouveau pour continuer. Supprimer maintenant ?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Supprimer</string>
 	<string name="dialog_existing_file_title">Le fichier existe déjà</string>
 	<string name="dialog_existing_file_positive_button">Remplacer</string>
@@ -282,6 +289,10 @@
 	<string name="dialog_app_is_obscured_info_title">\'application est masquée</string>
 	<string name="dialog_app_is_obscured_info_hint">Une autre application affiche quelque chose au-dessus de Cryptomator (par exemple, un filtre de lumière bleue ou une application forçant le mode nuit). Pour des raisons de sécurité, Cryptomator est désactivé.\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">Comment activer Cryptomator</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Fermer</string>
+	<string name="dialog_vaults_removed_during_migration_title">Veuillez rajouter les coffres pour le cloud %1s</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Lors de la migration vers cette version de l\'application, nous devons supprimer les coffres suivants de l\'application :\n%2s \n\nCes coffres ne sont pas retirés du cloud mais seulement de cette application. Désolé pour le désagrément et veuillez rajouter ces coffres pour continuer à les utiliser.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Le coffre est le dossier racine de la connexion cloud</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Créez une nouvelle connexion cloud où vous sélectionnerez au moins le dossier parent de ce dossier de coffre comme répertoire racine pour ajouter ce coffre.</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">Ce paramètre est une fonction de sécurité qui empêche les autres applications de tromper les utilisateurs en leur faisant faire des choses qu\'ils ne veulent pas faire.\n\nEn le désactivant, vous confirmez que vous êtes <a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">conscients des risques</a>.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Êtes-vous sûr de vouloir supprimer cette connexion au cloud?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Cette action retirera l\'accès à ce cloud et à tous les coffre-fort de celui-ci.</string>
diff --git a/presentation/src/main/res/values-hu-rHU/strings.xml b/presentation/src/main/res/values-hu-rHU/strings.xml
index 45ef49205..16168718c 100644
--- a/presentation/src/main/res/values-hu-rHU/strings.xml
+++ b/presentation/src/main/res/values-hu-rHU/strings.xml
@@ -61,8 +61,6 @@
 	<string name="screen_cloud_connections_title">Válasszon helyt</string>
 	<string name="screen_cloud_connections_no_connections">Kattintson ide a hely hozzáadásához</string>
 	<string name="screen_cloud_error_webdav_not_supported">A kiszolgáló nem tűnik WebDAV kompatibilisnek</string>
-	<string name="screen_cloud_local_custom_storage_title">Egyedi helyek</string>
-	<string name="screen_cloud_local_default_storage_title">Alapértelmezett tároló</string>
 	<string name="screen_cloud_local_error_no_content_provider">További helyszínek nem állnak rendelkezésre.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">ULR</string>
diff --git a/presentation/src/main/res/values-it-rIT/strings.xml b/presentation/src/main/res/values-it-rIT/strings.xml
index 5430db9c4..1c93c3746 100644
--- a/presentation/src/main/res/values-it-rIT/strings.xml
+++ b/presentation/src/main/res/values-it-rIT/strings.xml
@@ -24,6 +24,8 @@
 	<string name="error_general_update">Controllo dell\'aggiornamento non riuscito. Si è verificato un errore generale.</string>
 	<string name="error_hash_mismatch_update">Controllo di aggiornamento non riuscito. L\'hash calcolato non corrisponde al file caricato</string>
 	<string name="error_update_no_internet">Controllo aggiornamento non riuscito. Nessuna connessione internet.</string>
+	<string name="error_failed_to_decrypt_webdav_password">Impossibile decrittografare la password WebDAV, aggiungere nuovamente nelle impostazioni</string>
+	<string name="error_play_services_not_available">Google Play Services non installati</string>
 	<string name="error_biometric_auth_aborted">Autenticazione biometrica interrotta</string>
 	<string name="error_vault_version_mismatch">La versione specificata in %1$s è diversa da %2$s</string>
 	<string name="error_vault_key_invalid">%1$s non corrisponde a questo %2$s</string>
@@ -113,8 +115,6 @@
 	<string name="screen_cloud_connections_title">Scegli una posizione</string>
 	<string name="screen_cloud_connections_no_connections">Clicca qui per aggiungere posizioni</string>
 	<string name="screen_cloud_error_webdav_not_supported">Il server non sembra essere compatibile con WebDAV</string>
-	<string name="screen_cloud_local_custom_storage_title">Posizioni personalizzate</string>
-	<string name="screen_cloud_local_default_storage_title">Archiviazione predefinita</string>
 	<string name="screen_cloud_local_error_no_content_provider">Nessuna posizione aggiuntiva disponibile.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
diff --git a/presentation/src/main/res/values-ja-rJP/strings.xml b/presentation/src/main/res/values-ja-rJP/strings.xml
index 511dd5b84..fb872a013 100644
--- a/presentation/src/main/res/values-ja-rJP/strings.xml
+++ b/presentation/src/main/res/values-ja-rJP/strings.xml
@@ -110,8 +110,6 @@
 	<string name="screen_cloud_connections_title">接続先を選択</string>
 	<string name="screen_cloud_connections_no_connections">ここをタップして場所を追加する</string>
 	<string name="screen_cloud_error_webdav_not_supported">サーバーに WebDAV との互換性がありません</string>
-	<string name="screen_cloud_local_custom_storage_title">その他の保存先</string>
-	<string name="screen_cloud_local_default_storage_title">デフォルトの保存先</string>
 	<string name="screen_cloud_local_error_no_content_provider">追加の利用できる保存先はありません。</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
diff --git a/presentation/src/main/res/values-ko-rKR/strings.xml b/presentation/src/main/res/values-ko-rKR/strings.xml
index 2d66a6157..b1ce8743c 100644
--- a/presentation/src/main/res/values-ko-rKR/strings.xml
+++ b/presentation/src/main/res/values-ko-rKR/strings.xml
@@ -100,7 +100,6 @@
 	<string name="screen_choose_cloud_service_title">클라우드 서비스</string>
 	<!-- ## screen: cloud connections -->
 	<string name="screen_cloud_connections_title">위치 선택</string>
-	<string name="screen_cloud_local_default_storage_title">기본 저장소</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">사용자명</string>
diff --git a/presentation/src/main/res/values-mk-rMK/strings.xml b/presentation/src/main/res/values-mk-rMK/strings.xml
new file mode 100644
index 000000000..0c5cc3282
--- /dev/null
+++ b/presentation/src/main/res/values-mk-rMK/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- # app -->
+	<!-- # error messages -->
+	<!-- # clouds -->
+	<!-- ## cloud names -->
+	<!-- # permission -->
+	<!-- ## permission messages -->
+	<!-- # screens -->
+	<!-- # screen: vault list -->
+	<!-- # screen: file browser -->
+	<!-- ## screen: text editor -->
+	<!-- ## screen: share files -->
+	<!-- ## screen: choose cloud service -->
+	<!-- ## screen: cloud connections -->
+	<!-- ## screen: webdav settings -->
+	<!-- ## screen: s3 settings -->
+	<!-- ## screen: enter vault name -->
+	<!-- ## screen: set password -->
+	<!-- ## screen: settings -->
+	<!-- ## screen: cloud settings -->
+	<!-- ## screen: licenses -->
+	<!-- ## screen: authenticate cloud -->
+	<!-- ## screen: insecure android version info -->
+	<!-- # dialogs -->
+	<!-- Vault not found -->
+	<!-- # error reports -->
+	<!-- # misc -->
+	<!-- ## file size helper -->
+	<!-- ## date helper -->
+	<!-- ## biometric authentication -->
+	<!-- notification -->
+	<!-- lock timeout names -->
+	<!-- cache size names -->
+	<!-- screen scheme mode names -->
+	<!-- update interval names -->
+</resources>
diff --git a/presentation/src/main/res/values-nl-rNL/strings.xml b/presentation/src/main/res/values-nl-rNL/strings.xml
index bc6bbad74..892e28197 100644
--- a/presentation/src/main/res/values-nl-rNL/strings.xml
+++ b/presentation/src/main/res/values-nl-rNL/strings.xml
@@ -41,6 +41,7 @@
 	<string name="permission_message_export_file">Cryptomator heeft toegang tot opslag nodig om bestanden te exporteren</string>
 	<string name="permission_message_upload_file">Cryptomator heeft toegang tot opslag nodig om bestanden te uploaden</string>
 	<string name="permission_message_share_file">Cryptomator heeft toegang tot opslag nodig om bestanden te delen</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator heeft geen toegang meer tot deze locatie. Selecteer de map opnieuw om de toegangsrechten te herstellen.</string>
 	<string name="snack_bar_action_title_settings">Instellingen</string>
 	<string name="snack_bar_action_title_search">Zoeken</string>
 	<string name="snack_bar_action_title_search_previous">Vorige</string>
@@ -115,8 +116,6 @@
 	<string name="screen_cloud_connections_title">Kies een locatie</string>
 	<string name="screen_cloud_connections_no_connections">Klik hier om locaties toe te voegen</string>
 	<string name="screen_cloud_error_webdav_not_supported">Server lijkt niet WebDAV compatibel te zijn</string>
-	<string name="screen_cloud_local_custom_storage_title">Aangepaste locaties</string>
-	<string name="screen_cloud_local_default_storage_title">Standaard opslag</string>
 	<string name="screen_cloud_local_error_no_content_provider">Geen extra locaties beschikbaar.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
@@ -290,6 +289,8 @@
 	<string name="dialog_app_is_obscured_info_title">App is naar de achtergrond gewezen</string>
 	<string name="dialog_app_is_obscured_info_hint">Een andere app toont iets bovenop Cryptomator (bijv. een blauw lichtfilter of nachtmodus). Om veiligheidsredenen is Cryptomator uitgeschakeld.\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">Hoe kunt u Cryptomator inschakelen</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Sluiten</string>
+	<string name="dialog_vaults_removed_during_migration_title">Voeg de kluis voor %1\'s cloud opnieuw toe</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Kluis is hoofdmap van de cloud-verbinding</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">Deze instelling is een beveiligingsfunctie en voorkomt dat andere apps gebruikers misleiden.\n\nDoor deze instelling uit te schakelen bevestig je dat je <a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security"> bewust bent van de risico\'s</a>.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Weet je zeker dat je deze cloud verbinding wilt verwijderen?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Deze actie zal de cloud-verbinding en alle kluizen van deze cloud verwijderen.</string>
diff --git a/presentation/src/main/res/values-pl-rPL/strings.xml b/presentation/src/main/res/values-pl-rPL/strings.xml
index f6e210ce9..598e1e471 100644
--- a/presentation/src/main/res/values-pl-rPL/strings.xml
+++ b/presentation/src/main/res/values-pl-rPL/strings.xml
@@ -41,6 +41,7 @@
 	<string name="permission_message_export_file">Cryptomator potrzebuje dostępu do pamięci masowej do eksportu plików</string>
 	<string name="permission_message_upload_file">Cryptomator potrzebuje dostępu do pamięci masowej, aby przesłać pliki</string>
 	<string name="permission_message_share_file">Cryptomator potrzebuje dostępu do pamięci masowej, aby udostępniać pliki</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator stracił uprawnienia do dostępu do tej lokalizacji. Wybierz ten katalog ponownie, aby przywrócić uprawnienia.</string>
 	<string name="snack_bar_action_title_settings">Ustawienia</string>
 	<string name="snack_bar_action_title_search">Szukaj</string>
 	<string name="snack_bar_action_title_search_previous">Poprzedni</string>
@@ -117,8 +118,6 @@
 	<string name="screen_cloud_connections_title">Wybierz lokalizację</string>
 	<string name="screen_cloud_connections_no_connections">Kliknij tutaj, aby dodać nową lokalizację</string>
 	<string name="screen_cloud_error_webdav_not_supported">Serwer wydaje się być niekompatybilny z WebDAV</string>
-	<string name="screen_cloud_local_custom_storage_title">Niestandardowe lokalizacje</string>
-	<string name="screen_cloud_local_default_storage_title">Pamięć domyślna</string>
 	<string name="screen_cloud_local_error_no_content_provider">Brak dodatkowych lokalizacji.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
@@ -292,6 +291,10 @@
 	<string name="dialog_app_is_obscured_info_title">Aplikacja jest zasłonięta inną</string>
 	<string name="dialog_app_is_obscured_info_hint">Inna aplikacja jest wyświetlana nad Cryptomatorem (na przykład filtr niebieskiego światła, tryb nocny). Dla twojego bezpieczeństwa Cryptomator jest wyłączony.\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">Jak ponownie włączyć aplikację. </a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Zamknij</string>
+	<string name="dialog_vaults_removed_during_migration_title">Proszę ponownie dodać sejfy dla chmury %1s</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Podczas migracji do tej wersji aplikacji musimy usunąć następujące sejfy z aplikacji:\n%2s \n\nTe sejfy nie są usuwane z chmury, ale tylko z tej aplikacji. Przepraszamy za niedogodności. Dodaj ponownie te sejfy, aby dalej z nich korzystać.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Sejf jest głównym folderem w połączonej chmurze</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Utwórz nowe połączenie z chmurą, gdzie wybierzesz przynajmniej folder nadrzędny tego sejfu jako główny katalog, aby dodać ten sejf.</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">To ustawienie jest funkcją bezpieczeństwa i uniemożliwia innym aplikacjom oszukiwanie użytkowników do robienia rzeczy, których nie chcą robić.\n\nWyłączając je potwierdzasz, że jesteś <a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">świadomy ryzyka</a>.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Czy na pewno chcesz usunąć to połączenie z serwerem chmury?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Ta akcja usunie połączenie z usługą chmury i wszystkimi sejfami w tej chmurze.</string>
diff --git a/presentation/src/main/res/values-pt-rBR/strings.xml b/presentation/src/main/res/values-pt-rBR/strings.xml
index eda9c8db5..c0f431cb3 100644
--- a/presentation/src/main/res/values-pt-rBR/strings.xml
+++ b/presentation/src/main/res/values-pt-rBR/strings.xml
@@ -115,8 +115,6 @@
 	<string name="screen_cloud_connections_title">Selecionar um local</string>
 	<string name="screen_cloud_connections_no_connections">Clique aqui para adicionar locais</string>
 	<string name="screen_cloud_error_webdav_not_supported">O servidor não parece ser compatível com WebDAV</string>
-	<string name="screen_cloud_local_custom_storage_title">Locais personalizados</string>
-	<string name="screen_cloud_local_default_storage_title">Armazenamento padrão</string>
 	<string name="screen_cloud_local_error_no_content_provider">Não há localizações adicionais disponíveis.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
diff --git a/presentation/src/main/res/values-ro-rRO/strings.xml b/presentation/src/main/res/values-ro-rRO/strings.xml
index 4da26b64c..68547ab6f 100644
--- a/presentation/src/main/res/values-ro-rRO/strings.xml
+++ b/presentation/src/main/res/values-ro-rRO/strings.xml
@@ -111,8 +111,6 @@
 	<string name="screen_cloud_connections_title">Alegeți o locație</string>
 	<string name="screen_cloud_connections_no_connections">Faceți clic aici pentru a adăuga locații</string>
 	<string name="screen_cloud_error_webdav_not_supported">Serverul nu pare să fie compatibil cu WebDAV</string>
-	<string name="screen_cloud_local_custom_storage_title">Locații personalizate</string>
-	<string name="screen_cloud_local_default_storage_title">Spațiu de stocare prestabilit</string>
 	<string name="screen_cloud_local_error_no_content_provider">Nu există locații suplimentare disponibile.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">Adresa URL</string>
diff --git a/presentation/src/main/res/values-ru-rRU/strings.xml b/presentation/src/main/res/values-ru-rRU/strings.xml
index eec15f649..2072069b2 100644
--- a/presentation/src/main/res/values-ru-rRU/strings.xml
+++ b/presentation/src/main/res/values-ru-rRU/strings.xml
@@ -41,6 +41,7 @@
 	<string name="permission_message_export_file">У Cryptomator должен быть доступ к хранилищу для экспорта файлов</string>
 	<string name="permission_message_upload_file">У Cryptomator должен быть доступ к хранилищу для отправки файлов</string>
 	<string name="permission_message_share_file">У Cryptomator должен быть доступ к хранилищу для обмена файлами</string>
+	<string name="permission_revoked_re_request_permission">У Cryptomator больше нет прав доступа к этому местоположению. Выберите эту папку ещё раз, чтобы восстановить права.</string>
 	<string name="snack_bar_action_title_settings">Настройки</string>
 	<string name="snack_bar_action_title_search">Поиск</string>
 	<string name="snack_bar_action_title_search_previous">Назад</string>
@@ -117,8 +118,6 @@
 	<string name="screen_cloud_connections_title">Выберите местоположение</string>
 	<string name="screen_cloud_connections_no_connections">Нажмите, чтобы добавить места</string>
 	<string name="screen_cloud_error_webdav_not_supported">Похоже, сервер не совместим с WebDAV</string>
-	<string name="screen_cloud_local_custom_storage_title">Другие места</string>
-	<string name="screen_cloud_local_default_storage_title">Хранилище по умолчанию</string>
 	<string name="screen_cloud_local_error_no_content_provider">Нет дополнительных мест.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
@@ -292,6 +291,10 @@
 	<string name="dialog_app_is_obscured_info_title">Приложение скрыто</string>
 	<string name="dialog_app_is_obscured_info_hint">Другое приложение отображает что-то поверх Cryptomator (например синий световой фильтр или ночной режим). В целях безопасности Cryptomator отключён.\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">Как включить Cryptomator</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Закрыть</string>
+	<string name="dialog_vaults_removed_during_migration_title">Добавьте хранилища заново для облака %1s</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Во время переноса в эту версию приложения необходимо удалить следующие хранилища из приложения:\n%2s \n\nЭти хранилища не удаляются из облака, а только из приложения. Извините за неудобства и добавьте снова эти хранилища, чтобы продолжить работу с ними.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Хранилище - это корневая папка подключения к облаку</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Создайте новое облачное соединение, в котором вы выберете по крайней мере родительскую папку этой папки хранилища в качестве корневой папки для добавления этого хранилища.</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">Эта настройка связана с безопасностью, она не позволяет другим приложениям обманом вынуждать пользователей делать то, что им не нужно.\n\nОтключив, вы подтверждаете, что <a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">знаете о рисках</a>.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Вы действительно хотите удалить это облачное соединение?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Это действие удалит облако и все хранилища в нём.</string>
diff --git a/presentation/src/main/res/values-sk-rSK/strings.xml b/presentation/src/main/res/values-sk-rSK/strings.xml
index b86458a8e..887d98b6c 100644
--- a/presentation/src/main/res/values-sk-rSK/strings.xml
+++ b/presentation/src/main/res/values-sk-rSK/strings.xml
@@ -41,6 +41,7 @@
 	<string name="permission_message_export_file">Cryptomator vyžaduje prístup k úložisku pre export súborov</string>
 	<string name="permission_message_upload_file">Cryptomator vyžaduje prístup k úložisku pre nahratie súborov</string>
 	<string name="permission_message_share_file">Cryptomator vyžaduje prístup k úložisku pre zdieľanie súborov</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator stratil oprávnia k prístupu tejto lokality. Prosím vyberte tento akresár znovu pre obnovenie povoleni.</string>
 	<string name="snack_bar_action_title_settings">Nastavenia</string>
 	<string name="snack_bar_action_title_search">Hľadať</string>
 	<string name="snack_bar_action_title_search_previous">Predošlý</string>
@@ -117,8 +118,6 @@
 	<string name="screen_cloud_connections_title">Vybrať umiestnenie</string>
 	<string name="screen_cloud_connections_no_connections">Kliknite sem pre pridanie umiestnení</string>
 	<string name="screen_cloud_error_webdav_not_supported">Server zdá sa byť WebDAV kompatibilný</string>
-	<string name="screen_cloud_local_custom_storage_title">Vlastné umiestnenia</string>
-	<string name="screen_cloud_local_default_storage_title">Predvolené úložisko</string>
 	<string name="screen_cloud_local_error_no_content_provider">Ďalšie úložiská nie sú dostupné.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
@@ -292,6 +291,10 @@
 	<string name="dialog_app_is_obscured_info_title">Aplikácia je zatmavená</string>
 	<string name="dialog_app_is_obscured_info_hint">Ďalšia aplikácia zobrazuje niečo na vrchu Cryptomator-a (ako napr. modré svetlo alebo nočný režim). Z bezpečnostných dôvodov je Cryptomator zakázaný.\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">Ako povoliť Cryptomator</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Zavrieť</string>
+	<string name="dialog_vaults_removed_during_migration_title">Prosím zadajte znovu trezory pre %1s cloud</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Počas migrácie na túto verziu aplikácie potrebujeme odstrániť nasledujúce trezory z aplikácie:\n%2s \n\n Tieto trezory nebudú odstránené z clodu ale len z tejto aplikácie. Prepáčte za nepohodlie a prosím znovu zadajte trezory pre pokračovanie ich používania.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Trezor je koreňovým adresárom cloudového spojenia</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Vytvorte nové cloudové pripojenie kde vyberiete minimálne nadradený adresár tohto trezora ako koreňový adresár pre pridanie tohot trezora.</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">Toto nastavenie je bezpečnostná vlastnosť a zabraňuje ostatným aplikáciám klamať užívateľov robiť veci čo nechcú robiť.\n\nVypnutím súhlasíte s tým že<a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">ste si vedomí rizika</a>.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Ste si istý že chcete odstrániť toto cloudové pripojenie?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Táto akcia odstráni pripojenie cloudu a všetky trezory tohto cloudu.</string>
diff --git a/presentation/src/main/res/values-sv-rSE/strings.xml b/presentation/src/main/res/values-sv-rSE/strings.xml
index 69211145e..f096f3ea9 100644
--- a/presentation/src/main/res/values-sv-rSE/strings.xml
+++ b/presentation/src/main/res/values-sv-rSE/strings.xml
@@ -115,8 +115,6 @@
 	<string name="screen_cloud_connections_title">Välj en plats</string>
 	<string name="screen_cloud_connections_no_connections">Klicka här för att lägga till platser</string>
 	<string name="screen_cloud_error_webdav_not_supported">Servern verkar inte vara WebDAV-kompatibel</string>
-	<string name="screen_cloud_local_custom_storage_title">Anpassad plats</string>
-	<string name="screen_cloud_local_default_storage_title">Förvald lagring</string>
 	<string name="screen_cloud_local_error_no_content_provider">Inga ytterligare platser tillgängliga.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
diff --git a/presentation/src/main/res/values-tr-rTR/strings.xml b/presentation/src/main/res/values-tr-rTR/strings.xml
index 459b1b6da..b337552a1 100644
--- a/presentation/src/main/res/values-tr-rTR/strings.xml
+++ b/presentation/src/main/res/values-tr-rTR/strings.xml
@@ -115,8 +115,6 @@
 	<string name="screen_cloud_connections_title">Bir yer seçin</string>
 	<string name="screen_cloud_connections_no_connections">Konum eklemek için buraya tıklayın</string>
 	<string name="screen_cloud_error_webdav_not_supported">Sunucu WebDAV uyumlu görünmüyor</string>
-	<string name="screen_cloud_local_custom_storage_title">Özel konumlar</string>
-	<string name="screen_cloud_local_default_storage_title">Varsayılan depolama</string>
 	<string name="screen_cloud_local_error_no_content_provider">Kullanılabilir ek konum yok.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
diff --git a/presentation/src/main/res/values-zh-rCN/strings.xml b/presentation/src/main/res/values-zh-rCN/strings.xml
index 129be34c6..2589a2db9 100644
--- a/presentation/src/main/res/values-zh-rCN/strings.xml
+++ b/presentation/src/main/res/values-zh-rCN/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- # app -->
-	<string name="share_with_label">加密</string>
+	<string name="share_with_label">加密保存</string>
 	<!-- # error messages -->
-	<string name="error_generic">出错了</string>
-	<string name="error_authentication_failed">验证失败</string>
-	<string name="error_authentication_failed_re_authenticate">身份验证失败，请通过 %1$s 登录</string>
+	<string name="error_generic">突发一个错误</string>
+	<string name="error_authentication_failed">身份授权失败</string>
+	<string name="error_authentication_failed_re_authenticate">身份验证失败，请使用 %1$s 登录</string>
 	<string name="error_no_network_connection">无网络连接</string>
 	<string name="error_invalid_passphrase">密码错误</string>
 	<string name="error_file_or_folder_exists">文件(夹)已存在</string>
@@ -41,6 +41,7 @@
 	<string name="permission_message_export_file">Cryptomator 需要存储权限以导出文件</string>
 	<string name="permission_message_upload_file">Cryptomator 需要存储权限以上传文件</string>
 	<string name="permission_message_share_file">Cryptomator 需要存储权限以共享文件</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator 已失去此位置的访问权限，请重新选择此文件夹以恢复。</string>
 	<string name="snack_bar_action_title_settings">设置</string>
 	<string name="snack_bar_action_title_search">搜索</string>
 	<string name="snack_bar_action_title_search_previous">上一个</string>
@@ -54,8 +55,8 @@
 	<string name="snack_bar_action_title_sort_smallest">大小 (升序)</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
-	<string name="screen_vault_list_actions_title">添加到 Cryptomator</string>
-	<string name="screen_vault_list_action_create_new_vault">新建保险库</string>
+	<string name="screen_vault_list_actions_title">添加到加密器</string>
+	<string name="screen_vault_list_action_create_new_vault">添加新保险库</string>
 	<string name="screen_vault_list_action_add_existing_vault">添加现有保险库</string>
 	<string name="screen_vault_list_vault_action_delete">删除</string>
 	<string name="screen_vault_list_vault_creation_hint">点击此处新建一个保险库</string>
@@ -114,8 +115,6 @@
 	<string name="screen_cloud_connections_title">请选择位置</string>
 	<string name="screen_cloud_connections_no_connections">点击此处添加位置</string>
 	<string name="screen_cloud_error_webdav_not_supported">服务器似乎不兼容 WebDAV</string>
-	<string name="screen_cloud_local_custom_storage_title">自定义位置</string>
-	<string name="screen_cloud_local_default_storage_title">默认存储</string>
 	<string name="screen_cloud_local_error_no_content_provider">无可用其他位置</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
@@ -289,6 +288,10 @@
 	<string name="dialog_app_is_obscured_info_title">应用被遮蔽</string>
 	<string name="dialog_app_is_obscured_info_hint">另一应用正遮罩在 Cryptomator 之上 (例如蓝色光滤镜或夜间模式应用)。出于安全考虑，Cryptomator 已禁用\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">如何启用 Cryptomator</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">关闭</string>
+	<string name="dialog_vaults_removed_during_migration_title">请重新添加 %1s 的保险库</string>
+	<string name="dialog_vaults_removed_during_migration_hint">在进行应用版本迁移前，我们需要从应用中移除下列保险库：\n%2s \n\n这些保险库并不会从云端移除，仅仅是针对当前应用版本，抱歉给您带来不便，请重新添加这些保险库以便继续使之生效。</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">保险库是云端的根文件夹</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">创建一个新的云端连接时，您需要选择这个保险库文件夹的父文件夹作为根目录来添加这个保险库。</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">此为一项安全功能，可防止其他应用诱使用户做出错误操作\n\n如果禁用，即表示您了解<a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">其中风险</a></string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">您确定要移除此云连接吗？</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">此操作将移除云连接以及与之相关的所有保险库</string>
@@ -395,8 +398,8 @@
 	<!-- screen scheme mode names -->
 	<string name="screen_settings_style_mode">主题</string>
 	<string name="follow_system">自动 (跟随系统)</string>
-	<string name="light">亮色</string>
-	<string name="dark">暗色</string>
+	<string name="light">浅色</string>
+	<string name="dark">深色</string>
 	<!-- update interval names -->
 	<string name="update_interval_1d">每天一次</string>
 	<string name="update_interval_1w">每周一次</string>
diff --git a/presentation/src/main/res/values-zh-rTW/strings.xml b/presentation/src/main/res/values-zh-rTW/strings.xml
index 5f6a82418..2211f3b73 100644
--- a/presentation/src/main/res/values-zh-rTW/strings.xml
+++ b/presentation/src/main/res/values-zh-rTW/strings.xml
@@ -10,7 +10,7 @@
 	<string name="error_invalid_passphrase">密碼錯誤</string>
 	<string name="error_file_or_folder_exists">該檔案或資料夾已存在。</string>
 	<string name="error_vault_version_not_supported">不支援的加密檔案庫。這個加密檔案庫是用其它版本的 Cryptomator 所建立的。</string>
-	<string name="error_vault_already_exists">保險箱已經存在。</string>
+	<string name="error_vault_already_exists">加密檔案庫已經存在。</string>
 	<string name="error_no_such_file">檔案不存在。</string>
 	<string name="error_vault_has_been_locked">加密檔案庫已鎖定。</string>
 	<string name="error_cloud_already_exists">雲端硬碟已經存在。</string>
@@ -21,6 +21,8 @@
 	<string name="error_names_contains_invalid_characters">檔案名稱不能含有特殊字元。</string>
 	<string name="error_vault_name_contains_invalid_characters">加密檔案庫的名稱不能含有特殊字元。</string>
 	<string name="error_general_update">檢查更新失敗。發生一般錯誤。</string>
+	<string name="error_play_services_not_available">尚未安裝 Google Play 服務。</string>
+	<string name="error_no_such_bucket">沒有該儲存貯體</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<string name="cloud_names_local_storage">本機儲存空間</string>
@@ -45,6 +47,7 @@
 	<string name="screen_vault_list_vault_action_delete">移除</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">加密檔案庫</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">加密檔案庫名稱：%1$s</string>
 	<string name="screen_file_browser_move_button_text">移動</string>
 	<string name="screen_file_browser_msg_empty_folder">清空資料夾</string>
 	<string name="screen_file_browser_share_intent_chooser_title">分享對象</string>
@@ -62,6 +65,9 @@
 	<string name="screen_file_browser_node_action_rename">重新命名</string>
 	<string name="screen_file_browser_node_action_edit_text">編輯</string>
 	<string name="screen_file_browser_node_action_export">匯出</string>
+	<string name="screen_file_browser_node_action_delete">刪除</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">選擇項目</string>
+	<string name="screen_file_browser_select_items">選擇</string>
 	<string name="screen_file_browser_select_all_items">選擇全部</string>
 	<string name="screen_file_browser_refresh_items">重新整理</string>
 	<string name="screen_file_browser_no_connection_button_text">重試</string>
@@ -79,9 +85,9 @@
 	<!-- ## screen: cloud connections -->
 	<string name="screen_cloud_connections_title">選擇位置</string>
 	<string name="screen_cloud_connections_no_connections">點擊此處新增位置</string>
-	<string name="screen_cloud_local_custom_storage_title">自訂位置</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">網址</string>
+	<string name="screen_webdav_settings_username_label">帳號名稱</string>
 	<string name="screen_webdav_settings_password_label">密碼</string>
 	<string name="screen_webdav_settings_done_button_text">連線</string>
 	<string name="screen_webdav_settings_msg_url_must_not_be_empty">網址不能為空白</string>
@@ -92,18 +98,26 @@
 	<string name="screen_s3_settings_display_name_label">顯示名稱</string>
 	<string name="screen_s3_settings_region_label">區域</string>
 	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_msg_name_empty">加密檔案庫名稱不可留空。</string>
+	<string name="screen_enter_vault_name_vault_label">加密檔案庫名稱</string>
+	<string name="screen_enter_vault_name_button_text">創建</string>
 	<!-- ## screen: set password -->
+	<string name="screen_set_password_title">設定密碼</string>
 	<string name="screen_set_password_button_text">完成</string>
 	<string name="screen_set_password_strength_indicator_1">弱</string>
 	<string name="screen_set_password_strength_indicator_2">一般</string>
 	<string name="screen_set_password_strength_indicator_3">強</string>
+	<string name="screen_set_password_strength_indicator_4">非常強</string>
 	<!-- ## screen: settings -->
 	<string name="screen_settings_section_general">一般</string>
 	<string name="screen_settings_cloud_settings_label">雲端服務</string>
 	<string name="screen_settings_section_search">搜尋</string>
 	<string name="screen_settings_live_search">即時搜尋</string>
+	<string name="screen_settings_section_auto_lock">自動鎖定</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">當螢幕被鎖定</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">啟動</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">上傳影片</string>
+	<string name="screen_settings_website_label">Cryptomator 網站</string>
 	<string name="screen_settings_twitter_label">在 Twitter 上追蹤我們</string>
 	<string name="screen_settings_facebook_label">在臉書上給我們點讚</string>
 	<string name="screen_settings_section_legal">法律</string>
@@ -111,6 +125,8 @@
 	<string name="screen_settings_section_support">技術支援</string>
 	<string name="screen_settings_contact_label">請求協助</string>
 	<string name="screen_settings_debug_mode_label">除錯模式</string>
+	<string name="screen_settings_error_report_failed">發送失敗</string>
+	<string name="screen_settings_security_label">安全提示</string>
 	<string name="screen_settings_section_version">版本</string>
 	<string name="screen_settings_advanced_settings">進階設定</string>
 	<!-- ## screen: cloud settings -->
@@ -122,15 +138,32 @@
 	<string name="dialog_button_cancel">取消</string>
 	<string name="dialog_enter_password_positive_button">解鎖</string>
 	<string name="dialog_change_password_old_password_label">舊密碼</string>
+	<string name="dialog_change_password_new_password_label">新密碼</string>
+	<string name="dialog_change_password">更改密碼</string>
+	<string name="dialog_change_password_msg_old_password_empty">舊密碼不可留空。</string>
+	<string name="dialog_change_password_msg_new_password_empty">新密碼不可留空。</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_positive_button_text">移除</string>
 	<string name="dialog_existing_file_title">檔案已經存在</string>
 	<string name="dialog_existing_file_positive_button">取代</string>
+	<string name="dialog_existing_file_message">名稱為「%s」的檔案已經存在。</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">跳過已存在項目</string>
 	<string name="dialog_replace_positive_button_all_files_exist">全部取代</string>
 	<string name="dialog_replace_positive_button_single_file_exists">取代</string>
 	<string name="dialog_unable_to_share_positive_button">確認</string>
+	<string name="dialog_unable_to_share_negative_button">新建加密檔案庫</string>
+	<string name="dialog_unsaved_changes_discard">放棄</string>
+	<string name="action_progress_deleting">正在删除&#8230;</string>
+	<string name="dialog_progress_download_file">正在下載&#8230;</string>
 	<string name="dialog_lock_vault">鎖定</string>
+	<string name="dialog_debug_mode_disclaimer_title">注意</string>
+	<string name="dialog_debug_mode_positive_button">啟用</string>
+	<string name="dialog_disable_app_obscured_disclaimer_title">注意</string>
+	<string name="dialog_disable_app_obscured_positive_button">禁用</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">關閉</string>
+	<string name="dialog_update_available_title">有可用更新</string>
+	<string name="dialog_update_available_update">現在更新</string>
+	<string name="dialog_update_available_cancel">以後再說</string>
 	<string name="dialog_sym_link_back_button">上一頁</string>
 	<!-- # error reports -->
 	<!-- # misc -->
@@ -139,10 +172,15 @@
 	<string name="time_unit_minutes_pl">分鐘</string>
 	<!-- ## biometric authentication -->
 	<!-- notification -->
+	<string name="screen_settings_check_updates">檢查更新</string>
 	<!-- lock timeout names -->
 	<!-- cache size names -->
 	<!-- screen scheme mode names -->
+	<string name="follow_system">自動（跟隨系統）</string>
 	<string name="light">亮色</string>
 	<string name="dark">暗色</string>
 	<!-- update interval names -->
+	<string name="update_interval_1d">每日一次</string>
+	<string name="update_interval_1w">每週一次</string>
+	<string name="update_interval_1m">每月一次</string>
 </resources>