diff --git a/build.gradle b/build.gradle
index 162bbb3d..157c6d16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
 		androidVersionCode = getVersionCode()
-		androidVersionName = '1.6.0-beta5'
+		androidVersionName = '1.6.0-SNAPSHOT'
 	}
 	repositories {
 		mavenCentral()
diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavCloudContentRepository.kt b/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavCloudContentRepository.kt
index 304ffd3d..b0258418 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavCloudContentRepository.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavCloudContentRepository.kt
@@ -198,12 +198,16 @@ internal class WebDavCloudContentRepository(private val cloud: WebDavCloud, conn
 			try {
 				webDavImpl.read(file, data, progressAware)
 			} catch (e: BackendException) {
-				if (ExceptionUtil.contains(e, NotFoundException::class.java)) {
-					throw NoSuchCloudFileException(file.name)
-				} else if (e is IOException) {
-					throw FatalBackendException(e)
-				} else if (e is FatalBackendException) {
-					throw e
+				when {
+					ExceptionUtil.contains(e, NotFoundException::class.java) -> {
+						throw NoSuchCloudFileException(file.name)
+					}
+					e is IOException -> {
+						throw FatalBackendException(e)
+					}
+					else -> {
+						throw e
+					}
 				}
 			} catch (e: IOException) {
 				if (ExceptionUtil.contains(e, NotFoundException::class.java)) {
diff --git a/lib/pcloud-sdk-java b/lib/pcloud-sdk-java
index 4226c0b1..b2db8926 160000
--- a/lib/pcloud-sdk-java
+++ b/lib/pcloud-sdk-java
@@ -1 +1 @@
-Subproject commit 4226c0b1297a12dc5937b2d3eae7962f146cf683
+Subproject commit b2db89269e8e4059a7415e0364e427e71682700d
diff --git a/lib/subsampling-scale-image-view b/lib/subsampling-scale-image-view
index c3d912cd..917b8f6f 160000
--- a/lib/subsampling-scale-image-view
+++ b/lib/subsampling-scale-image-view
@@ -1 +1 @@
-Subproject commit c3d912cd86e5a7d7b4b627c83ba84276712a215a
+Subproject commit 917b8f6f7089a5abeaf7fc254cc7e6fffe571104
diff --git a/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt b/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
index 630b07bc..120870fc 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
@@ -120,6 +120,17 @@ class CryptomatorApp : MultiDexApplication(), HasComponent<ApplicationComponent>
 		}, BIND_AUTO_CREATE)
 	}
 
+	fun startAutoUpload() {
+		val sharedPreferencesHandler = SharedPreferencesHandler(applicationContext())
+		if(sharedPreferencesHandler.usePhotoUpload()) {
+			val vault = applicationComponent.vaultRepository().load(sharedPreferencesHandler.photoUploadVault())
+			if(vault.isUnlocked) {
+				val cloud = applicationComponent.cloudRepository().decryptedViewOf(vault)
+				applicationContext().startService(AutoUploadService.startAutoUploadIntent(applicationContext(), cloud))
+			}
+		}
+	}
+
 	private fun setupLogging() {
 		setupLoggingFramework()
 		setup()
diff --git a/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt b/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt
index adb07a36..4e67acd6 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt
@@ -24,6 +24,7 @@ import org.cryptomator.domain.exception.vaultconfig.VaultKeyInvalidException
 import org.cryptomator.domain.exception.vaultconfig.VaultVersionMismatchException
 import org.cryptomator.presentation.R
 import org.cryptomator.presentation.ui.activity.view.View
+import org.cryptomator.presentation.util.ResourceHelper
 import java.util.ArrayList
 import java.util.Collections
 import javax.inject.Inject
@@ -52,8 +53,20 @@ class ExceptionHandlers @Inject constructor(private val context: Context, defaul
 		staticHandler(HashMismatchUpdateCheckException::class.java, R.string.error_hash_mismatch_update)
 		staticHandler(GeneralUpdateErrorException::class.java, R.string.error_general_update)
 		staticHandler(SSLHandshakePreAndroid5UpdateCheckException::class.java, R.string.error_general_update)
-		staticHandler(VaultVersionMismatchException::class.java, R.string.error_vault_version_mismatch)
-		staticHandler(VaultKeyInvalidException::class.java, R.string.error_vault_key_invalid)
+		staticHandler(
+			VaultVersionMismatchException::class.java, String.format(
+				ResourceHelper.getString(R.string.error_vault_version_mismatch),
+				ResourceHelper.getString(R.string.vault_cryptomator),
+				ResourceHelper.getString(R.string.masterkey_cryptomator)
+			)
+		)
+		staticHandler(
+			VaultKeyInvalidException::class.java, String.format(
+				ResourceHelper.getString(R.string.error_vault_key_invalid),
+				ResourceHelper.getString(R.string.vault_cryptomator),
+				ResourceHelper.getString(R.string.masterkey_cryptomator)
+			)
+		)
 		staticHandler(VaultConfigLoadException::class.java, R.string.error_vault_config_loading)
 		staticHandler(UnsupportedMasterkeyLocationException::class.java, R.string.error_masterkey_location_not_supported)
 		staticHandler(NoSuchBucketException::class.java, R.string.error_no_such_bucket)
diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java b/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
index a56c9050..452934c7 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
@@ -212,7 +212,7 @@ public class AutoUploadService extends Service {
 	public void onCreate() {
 		super.onCreate();
 		Timber.tag("AutoUploadService").d("created");
-		notification = new AutoUploadNotification(this, 5);
+		notification = new AutoUploadNotification(this, 0);
 	}
 
 	@Override
diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt b/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
index f70972bb..d9d1e929 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
@@ -13,6 +13,7 @@ import android.net.Uri
 import android.os.Handler
 import android.provider.MediaStore
 import org.cryptomator.domain.exception.FatalBackendException
+import org.cryptomator.presentation.CryptomatorApp
 import org.cryptomator.presentation.R
 import org.cryptomator.presentation.util.FileUtil
 import org.cryptomator.presentation.util.ResourceHelper
@@ -38,6 +39,8 @@ class PhotoContentJob : JobService() {
 
 		runningParams = params
 
+		var filesCaptured = false
+
 		params.triggeredContentAuthorities?.let {
 			if (params.triggeredContentUris != null) {
 				val ids = getIds(params)
@@ -49,6 +52,8 @@ class PhotoContentJob : JobService() {
 								fileUtil.addImageToAutoUploads(dir)
 								Timber.tag("PhotoContentJob").i("Added file to UploadList")
 								Timber.tag("PhotoContentJob").d(String.format("Added file to UploadList %s", dir))
+
+								filesCaptured = true
 							} catch (e: FatalBackendException) {
 								Timber.tag("PhotoContentJob").e(e, "Failed to add image to auto upload list")
 							} catch (e: SecurityException) {
@@ -65,6 +70,10 @@ class PhotoContentJob : JobService() {
 			}
 		} ?: Timber.tag("PhotoContentJob").w("No photos content")
 
+		if(filesCaptured && SharedPreferencesHandler(applicationContext).usePhotoUploadInstant()) {
+			(application as CryptomatorApp).startAutoUpload()
+		}
+
 		handler.post(worker)
 		return false
 	}
diff --git a/presentation/src/main/res/values-ar-rSA/strings.xml b/presentation/src/main/res/values-ar-rSA/strings.xml
index d8520549..6df0e467 100644
--- a/presentation/src/main/res/values-ar-rSA/strings.xml
+++ b/presentation/src/main/res/values-ar-rSA/strings.xml
@@ -1,55 +1,368 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- # app -->
+	<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_no_network_connection">لا يوجد اتصال بالشبكة</string>
+	<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_no_such_file">ملف غير موجود.</string>
+	<string name="error_vault_has_been_locked">تم قفل المخزن.</string>
+	<string name="error_cloud_already_exists">موفر الخدمة السحابية موجود مسبقاً.</string>
+	<string name="error_activity_not_found">الرجاء تحميل تطبيق يمكنه فتح هذا الملف.</string>
+	<string name="error_server_not_found">لم يتم العثور على الخادم.</string>
+	<string name="error_export_illegal_file_name">فشل التصدير. حاول إزالة الأحرف الخاصة من أسماء الملفات وتصديرها مرة أخرى.</string>
+	<string name="error_name_contains_invalid_characters">لا يمكن أن يحتوي علي رموز خاصة.</string>
+	<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_hash_mismatch_update">فشل التحقق من التحديث. التجزئة المحسوبة لا تتطابق مع الملف المرفوع</string>
+	<string name="error_update_no_internet">فشل التحقق من التحديث. لا يوجد اتصال بالإنترنت.</string>
+	<string name="error_biometric_auth_aborted">تم إلغاء استخدام البصمة في عملية التوثيق</string>
+	<string name="error_vault_config_loading">خطأ عام أثناء تحميل إعدادات المخزن</string>
+	<string name="error_file_not_found_after_opening_using_3party">بعد إعادة التبديل الي Cryptomator لم يعد الملف المحلي موجود. لايمكن نشر التعديلات الي موفر الخدمة السحابية.</string>
+	<string name="error_masterkey_location_not_supported">موقع المفتاح الرئيسي غير مدعوم بعد</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">ذاكرة التخزين المحلية</string>
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<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="snack_bar_action_title_settings">الإعدادات</string>
+	<string name="snack_bar_action_title_search">بحث</string>
+	<string name="snack_bar_action_title_search_previous">السابق</string>
 	<string name="snack_bar_action_title_search_next">التالي</string>
+	<string name="snack_bar_action_title_sort">ترتيب</string>
+	<string name="snack_bar_action_title_sort_az">أ ← ي</string>
+	<string name="snack_bar_action_title_sort_za">ي ← أ</string>
+	<string name="snack_bar_action_title_sort_newest">الأحدث أولاً</string>
+	<string name="snack_bar_action_title_sort_oldest">الأقدم أولاً</string>
+	<string name="snack_bar_action_title_sort_biggest">الأكبر حجماً اولاً</string>
+	<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_action_add_existing_vault">إضافة مخزن موجود مسبقاً</string>
 	<string name="screen_vault_list_vault_action_delete">حذف</string>
+	<string name="screen_vault_list_vault_creation_hint">أنقر هنا لإنشاء مخزن جديد</string>
+	<string name="screen_vault_list_change_password_successful">تم تغيير كلمة السر بنجاح</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">مخزن</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">اختر ملف المفتاح الرئيسي</string>
+	<string name="screen_file_browser_create_new_vault_button_text">ضع هنا</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_file_info_label_date">تم التعديل منذ %1$s</string>
+	<string name="screen_file_browser_share_intent_chooser_title">مشاركة مع</string>
+	<string name="screen_file_browser_share_destination_title">اختر الوجهة</string>
 	<string name="screen_file_browser_share_button_text">اختر</string>
+	<string name="screen_file_browser_nothing_to_share">لايوجد شي للمشاركة</string>
+	<string name="screen_file_browser_actions_title">إضافة الي %1$s</string>
+	<string name="screen_file_browser_action_create_folder">إنشاء مجلد</string>
+	<string name="screen_file_browser_action_create_new_text_file">إنشاء ملف نصي</string>
+	<string name="screen_file_browser_action_upload_files">رفع الملفات</string>
+	<string name="screen_file_browser_upload_files_chooser_title">ملفات</string>
+	<string name="screen_file_browser_msg_file_exported">تم تصدير الملف</string>
+	<string name="screen_file_browser_msg_files_exported">تم تصدير الملفات</string>
+	<string name="screen_file_browser_nothing_to_export">لا يوجد شيء للتصدير</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">فشل إنشاء مجلد التحميل</string>
+	<string name="screen_file_browser_node_action_share">مشاركة</string>
+	<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_node_action_open_with_text">فتح بواسطة &#8230;</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">اختر العناصر</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d تم اختيارها</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_message">لايوجد اتصال</string>
+	<string name="screen_file_browser_no_connection_button_text">اعد المحاولة</string>
 	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">تم الحفظ بنجاح</string>
 	<!-- ## screen: share files -->
+	<string name="screen_share_files_title">حفظ %1$s إلي&#8230;</string>
+	<string name="screen_share_files_content_text">نص</string>
+	<string name="screen_share_files_content_file">ملف</string>
+	<string name="screen_share_files_content_files">ملفات</string>
+	<string name="screen_share_files_msg_filenames_must_be_unique">اسم الملف يجب أن لا يتكرر، الرجاء إعادة تسمية الملفات المكررة.</string>
+	<string name="screen_share_files_section_location">حفظ إلي</string>
+	<string name="screen_share_files_save_button_text">حفظ</string>
+	<string name="screen_share_files_msg_success">اكتملت عملية التشفير</string>
 	<!-- ## screen: choose cloud service -->
+	<string name="screen_choose_cloud_service_title">الخدمات السحابية</string>
 	<!-- ## screen: cloud connections -->
+	<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>
+	<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>
+	<string name="screen_webdav_settings_msg_url_is_invalid">الرابط غير صحيح.</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">اسم المستخدم لا يمكن ان يكون فارغ.</string>
+	<string name="screen_webdav_settings_msg_password_must_not_be_empty">لا يمكن أن تكون كلمة المرور فارغة.</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">الاسم المعروض</string>
+	<string name="screen_s3_settings_access_key_label">مفتاح الوصول</string>
+	<string name="screen_s3_settings_secret_key_label">المفتاح السري</string>
+	<string name="screen_s3_settings_endpoint_label">نقطة الوصول</string>
+	<string name="screen_s3_settings_region_label">المنطقة</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">إسم العرض لا يمكن أن يكون فارغاً</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">مفتاح الوصول لا يمكن أن يكون فارغاً</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">المفتاح السري لا يمكن أن يكون فارغاً</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">نقطة الوصول أو المنطقة لا يمكن أن تكون فارغة</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_msg_password_mismatch">كلمة المرور لا تطابقة إعادة كلمة المرور.</string>
 	<string name="screen_set_password_button_text">تم</string>
+	<string name="screen_set_password_hint">هام: إذا نسيت كلمة المرور الخاصة بك، لا توجد طريقة لاستعادة بياناتك.</string>
+	<string name="screen_set_password_retype_password_label">إعادة كلمة المرور</string>
+	<string name="screen_set_password_strength_indicator_0">ضعيف جدا لإنشاء المخزن</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_biometric_auth">إستخدام البصمة</string>
+	<string name="screen_settings_activate_biometric_auth">تنشيط توثيق البصمة</string>
+	<string name="screen_settings_confirm_face_unlock">تأكيد فتح الوجه (إذا كان متوفراً)</string>
+	<string name="screen_settings_secure_screen">حظر لقطات الشاشة</string>
+	<string name="screen_settings_secure_screen_summary">حظر لقطات الشاشة في قائمة التطبيقات الحديثة وداخل التطبيق</string>
+	<string name="screen_settings_section_search">بحث</string>
+	<string name="screen_settings_live_search">بحث مباشر</string>
+	<string name="screen_settings_live_search_summary">تحديث نتائج البحث أثناء إدخال الإستعلام</string>
+	<string name="screen_settings_section_auto_lock">قفل تلقائي</string>
+	<string name="screen_settings_auto_lock_timeout">أقفال بعد</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">عند تعطيل الشاشة</string>
+	<string name="screen_settings_section_auto_photo_upload">تحميل تلقائي للصورة</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">إختر المخزن للتحميل</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">تفعيل</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">التقاط الصور في الخلفية وبمجرد فتح المخزن المحدد، ابدأ في التحميل</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">تحميل فوري</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">تحميل مباشرة إذا تم إلغاء قفل المخزن</string>
+	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">تحميل فقط باستخدام WIFI</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">تحميل ملفات الفيديو</string>
+	<string name="screen_settings_auto_photo_upload_title">حفظ الملفات الرفع التلقائي إلى&#8230;</string>
+	<string name="screen_settings_website_label">الموقع الإلكتروني</string>
+	<string name="screen_settings_twitter_label">تابعنا علي منصة تويتر</string>
+	<string name="screen_settings_facebook_label">سجل اعجابك لصفحة فيسبوك</string>
+	<string name="screen_settings_section_legal">قانوني</string>
+	<string name="screen_settings_licenses_label">التراخيص</string>
+	<string name="screen_settings_license_terms_label">شروط الترخيص</string>
+	<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_label">ارسال ملفات السجل</string>
+	<string name="screen_settings_error_report_failed">فشل الإرسال</string>
+	<string name="screen_settings_section_version">الإصدارة</string>
+	<string name="screen_settings_advanced_settings">إعدادات متقدمة</string>
+	<string name="screen_settings_background_unlock_preparation_label">تسريع فتح القفل</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">تنزيل إعدادات المخزن في الخلفية أثناء مطالبته بإدخال كلمة المرور أو البصمة</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files">أبقه فاتح</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_webdav_connections">اتصالات WebDAV</string>
+	<string name="screen_cloud_settings_pcloud_connections">اتصالات pCloud</string>
+	<string name="screen_cloud_settings_s3_connections">اتصالات S3</string>
+	<string name="screen_cloud_settings_local_storage_locations">مواقع التخزين المحلية</string>
+	<string name="screen_cloud_settings_log_in_to">تسجيل الدخول إلى</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">تسجيل خروج من</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">تعذر المصادقة على %1$s.</string>
+	<string name="screen_update_pcloud_connections_title">تحديث بيانات اعتماد pCloud</string>
 	<!-- ## screen: insecure android version info -->
 	<!-- # dialogs -->
 	<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>
+	<string name="dialog_change_password_msg_password_mismatch">كلمة المرور الجديدة يجب أن تتطابق مع تأكيد كلمة المرور.</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">المخزن %1$s غير موجود</string>
 	<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">الملف المسمى \'%1$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_some_files_exist">استبدال الموجود</string>
+	<string name="dialog_replace_positive_button_single_file_exists">إستبدال</string>
+	<string name="dialog_replace_msg_single_file_exists">الملف \'%1$s\' موجود مسبقاً. هل تريد استبداله؟</string>
+	<string name="dialog_replace_msg_all_files_exists">الملفات موجودة مسبقاً. هل تريد استبدالها؟</string>
+	<string name="dialog_replace_title_single_file_exists">استبدال الملف؟</string>
+	<string name="dialog_replace_title_multiple_files_exist">استبدال الملفات؟</string>
+	<string name="dialog_unable_to_share_title">غير قادر علي مشاركة الملفات</string>
+	<string name="dialog_unable_to_share_message">لم تقم بإعداد أي خزانات. الرجاء إنشاء خزانة جديدة مع تطبيق Cryptomator أولاً.</string>
+	<string name="dialog_unable_to_share_positive_button">موافق</string>
+	<string name="dialog_unable_to_share_negative_button">إنشاء المخزن</string>
+	<string name="dialog_filetype_not_supported_title">لا يمكن فتح %1$s</string>
+	<string name="dialog_filetype_not_supported_message">الرجاء تحميل تطبيق يمكنه فتح هذا الملف أو هل ترغب في الحفظ على جهازك؟</string>
+	<string name="dialog_rename_vault_title">إعادة تسمية المخزن</string>
+	<string name="dialog_rename_node_folder_title">إعادة تسمية مجلد</string>
+	<string name="dialog_rename_node_file_title">إعادة تسمية ملف</string>
+	<string name="dialog_unsaved_changes_title">لديك تغييرات غير محفوظة</string>
+	<string name="dialog_unsaved_changes_message">هل فعلا تود الخروج بدون حفظ ؟</string>
+	<string name="dialog_unsaved_changes_discard">تجاهل</string>
+	<string name="dialog_file_name_placeholder">text.txt</string>
+	<string name="dialog_delete_vault_message">هل أنت متأكد من أنك تريد حذف هذا المخزن؟</string>
+	<string name="dialog_delete_vault_hint">سيؤدي هذا الإجراء فقط إلى إزالة المخزن من هذه القائمة وعدم حذفه فعلياً من الذاكرة.</string>
+	<string name="dialog_upload_file_title">جاري التحميل&#8230;</string>
+	<string name="dialog_upload_file_remaining">ملف %1$d من %2$d</string>
+	<string name="dialog_export_file_title">تصدير (%1$d/%2$d)</string>
+	<string name="dialog_progress_please_wait">الرجاء الإنتظار&#8230;</string>
+	<string name="dialog_progress_creating_folder">جاري إنشاء مجلد&#8230;</string>
+	<string name="dialog_progress_creating_text_file">جاري إنشاء ملف نصي&#8230;</string>
+	<string name="action_progress_authentication">المصادقة&#8230;</string>
+	<string name="action_progress_renaming">جاري تسمية&#8230;</string>
+	<string name="action_progress_deleting">جاري حذف&#8230;</string>
+	<string name="dialog_progress_unlocking_vault">جاري فتح مخزن&#8230;</string>
+	<string name="dialog_progress_change_password">جاري تغير كلمة المرور&#8230;</string>
+	<string name="dialog_progress_creating_vault">جاري إنشاء المخزن&#8230;</string>
+	<string name="dialog_progress_upload_file">جاري التحميل&#8230;</string>
+	<string name="dialog_progress_download_file">جارٍ التنزيل&#8230;</string>
+	<string name="dialog_progress_encryption">جاري التشفير&#8230;</string>
+	<string name="dialog_progress_decryption">جاري فك التشفير&#8230;</string>
+	<string name="action_progress_moving">جاري النقل&#8230;</string>
 	<string name="dialog_lock_vault">قفل</string>
+	<string name="dialog_accept_ssl_certificate_title">شهادة ال SSL غير صالحة</string>
+	<string name="dialog_accept_ssl_certificate_hint">شهادة SSL غير صالحة. هل تريد أن تثق بها على أي حال؟</string>
+	<string name="dialog_accept_ssl_certificate_details">تفاصيل</string>
+	<string name="dialog_accept_ssl_certificate_security_checkbox">قد يشكل ذلك خطرا أمنياً، وأنا أعرف ما أفعله.</string>
+	<string name="dialog_http_security_hint">استخدام HTTP غير آمن. نوصي باستخدام HTTPS بدلاً من ذلك. إذا كنت تعرف المخاطر، يمكنك الاستمرار مع HTTP.</string>
+	<string name="dialog_http_security_checkbox">تغيير إلى HTTPS</string>
+	<string name="dialog_http_security_title">إستخدام HTTPS؟</string>
+	<string name="dialog_no_screen_lock_hint">لم يتم تعيين قفل الشاشة. لتخزين بيانات الاعتماد الخاصة بك بطريقة آمنة،الرجاء تعيين نمط أو كلمة مرور.</string>
+	<string name="dialog_no_screen_lock_title">تعيين قفل الشاشة؟</string>
+	<string name="dialog_no_screen_lock_checkbox">تعيين قفل الشاشة</string>
+	<string name="dialog_no_biometric_auth_set_up_title">لم يتم إعداد المصادقة الأساسية في النظام</string>
+	<string name="dialog_no_biometric_auth_set_up_message">قم بتسجيل اصبع/وجه واحد على الأقل لاستخدام هذه الخدمة.</string>
+	<string name="dialog_debug_mode_disclaimer_hint">في هذا الوضع، يمكن كتابة البيانات الحساسة إلى ملف تسجيل على جهازك (على سبيل المثال أسماء الملفات والمسارات). كلمة المرور، ملفات تعريف الارتباط، إلخ. مستبعدة صراحة.\n\nتذكر تعطيل وضع التصحيح في أقرب وقت ممكن.</string>
+	<string name="dialog_debug_mode_disclaimer_title">انتباه</string>
+	<string name="dialog_debug_mode_positive_button">تفعيل</string>
+	<string name="dialog_disable_app_obscured_disclaimer_hint">هذا الإعداد هو ميزة أمنية ويمنع التطبيقات الأخرى من خداع المستخدمين لفعل أشياء لا يريدون القيام بها.\n\nبتعطيليها, أنت تؤكد أنك <a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">على علم بالمخاطر</a>.</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_title">التطبيق غامض</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">إغلاق</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>
+	<string name="dialog_confirm_delete_multiple_title">حذف %1$d عناصر؟</string>
+	<string name="dialog_confirm_delete_multiple_message">هل أنت متأكد من أنك تريد حذف هذه العناصر؟</string>
+	<string name="dialog_confirm_delete_file_message">هل أنت متأكد من أنك تريد حذف هذا الملف؟</string>
+	<string name="dialog_confirm_delete_folder_message">سيؤدي هذا إلى حذف جميع محتويات المجلد. هل أنت متأكد من أنك تريد حذف هذا المجلد؟</string>
+	<string name="dialog_biometric_auth_key_invalidated_title">تم تعطيل خاصية البصمة</string>
+	<string name="dialog_biometric_auth_key_invalidated_message">لأنه تم تعطيل المفتاح ، تم تعطيل خاصية البصمة. لإعادة التفعيل ،الرجاء فتح إعدادات Cryptomator.</string>
+	<string name="dialog_enter_license_title">إدخال الترخيص</string>
+	<string name="dialog_enter_license_decline_button">خروج</string>
+	<string name="dialog_license_confirmation_title">تأكيد الترخيص</string>
+	<string name="dialog_update_available_title">تحديث جديد متوفّر</string>
+	<string name="dialog_update_available_update">حدّث الآن</string>
+	<string name="dialog_update_available_download_site">انتقل إلى صفحة التحميل</string>
+	<string name="dialog_update_available_cancel">لاحقاً</string>
 	<string name="dialog_sym_link_back_button">رجوع</string>
+	<string name="dialog_pcloud_credentials_updated_title">تم تحديث وثائق تفويض \'%1$s\'</string>
+	<string name="dialog_pcloud_credentials_updated">إذا كنت ترغب في إضافة حساب pCloud جديد، انقر على هذا الرابط <a href="https://www.pcloud.com">www.pcloud. om</a>، قم بتسجيل الخروج من الحساب الحالي وانقر مرة أخرى على \'+\' في هذا التطبيق لإنشاء اتصال سحابي جديد.</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
+	<string name="file_size_zero">0 ك. ب</string>
+	<string name="file_size_unit_bytes">ب</string>
+	<string name="file_size_unit_kilo_bytes">ك. ب</string>
+	<string name="file_size_unit_mega_bytes">م. ب</string>
+	<string name="file_size_unit_giga_bytes">ق. ب</string>
+	<string name="file_size_unit_tera_bytes">ت. ب</string>
 	<!-- ## date helper -->
+	<string name="time_unit_seconds_sg">ثانية</string>
+	<string name="time_unit_seconds_pl">ثواني</string>
+	<string name="time_unit_minutes_sg">دقيقة</string>
+	<string name="time_unit_minutes_pl">دقائق</string>
+	<string name="time_unit_hours_sg">ساعة</string>
+	<string name="time_unit_hours_pl">ساعات</string>
+	<string name="time_unit_days_sg">يوم</string>
+	<string name="time_unit_days_pl">أيام</string>
+	<string name="time_unit_weeks_sg">أسبوع</string>
+	<string name="time_unit_weeks_pl">أسابيع</string>
+	<string name="time_unit_months_sg">شهر</string>
+	<string name="time_unit_months_pl">أشهر</string>
+	<string name="time_unit_years_sg">سنة</string>
+	<string name="time_unit_years_pl">سنوات</string>
 	<!-- ## biometric authentication -->
+	<string name="dialog_biometric_auth_title">إستخدام البصمة</string>
+	<string name="dialog_biometric_auth_message">قم بتسجيل الدخول بإستخدام البصمة</string>
+	<string name="dialog_biometric_auth_use_password">إستخدم كلمة مرور المخزن</string>
+	<string name="dialog_unable_to_auto_upload_files_title">غير قادر علي تحميل الملفات تلقائياً</string>
 	<!-- notification -->
+	<string name="notification_unlocked">تم فتح المخزن: %1$d</string>
+	<string name="notification_timeout">قفل تلقائي في %1$s</string>
+	<string name="notification_lock_all">قفل الكل</string>
+	<string name="notification_cancel_auto_upload">إلغاء التحميل</string>
+	<string name="notification_auto_upload_title">رفع الصور التلقائي يعمل</string>
+	<string name="notification_auto_upload_message">جاري الرفع %1d/%2d</string>
+	<string name="notification_auto_upload_finished_title">رفع الصور التلقائي تم</string>
+	<string name="notification_auto_upload_finished_message">%1$d صورة تم رفعها الي المخزن</string>
+	<string name="notification_auto_upload_failed_title">رفع الصور التلقائي فشل</string>
+	<string name="notification_auto_upload_failed_general_error">حدث خطأ عام أثناء الرفع.</string>
+	<string name="notification_auto_upload_failed_due_to_folder_not_exists">المجلد المحدد للرفع لم يعد متوفرًا. اذهب إلى الإعدادات واختيار واحد جديد</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">تم قفل المخزن اثناء الرفع، الرجاء قم بفتحه لمتابعة الرفع</string>
+	<string name="notification_open_writable_file_title">فتح ملف قابل للكتابة</string>
+	<string name="notification_open_writable_file_message">سوف يبقى المخزن مفتوحاً حتي يتم التعديل</string>
+	<string name="notification_update_check_finished_latest">تم تثبيت آخر إصدارة</string>
+	<string name="screen_settings_lru_cache">ذاكرة التخزين المؤقت</string>
+	<string name="screen_settings_lru_cache_size">إجمالي حجم ذاكرة التخزين المؤقت</string>
+	<string name="screen_settings_clear_lru_cache_size">مسح بيانات الذاكرة المؤقتة</string>
+	<string name="screen_settings_lru_cache_changed__restart_toast">سيتم تطبيق التغييرات عند إعادة تشغيل التطبيق</string>
+	<string name="screen_settings_license">مسجل لـ</string>
+	<string name="screen_settings_license_mail">%1$s</string>
+	<string name="dialog_settings_update_check_interval_title">الفاصل الزمني للتحديث</string>
+	<string name="screen_settings_check_updates">بحث عن تحديثات</string>
+	<string name="screen_settings_last_check_updates">اخر بحث %1$s</string>
+	<string name="dialog_cache_size_title">حجم ذاكرة التخزين المؤقت لكل سحابة</string>
 	<!-- lock timeout names -->
+	<string name="lock_timeout_instant">فوري</string>
+	<string name="lock_timeout_1m">دقيقة</string>
+	<string name="lock_timeout_2m">دقيقتان</string>
+	<string name="lock_timeout_5m">5 دقائق</string>
+	<string name="lock_timeout_10m">١٠ دقائق</string>
+	<string name="lock_timeout_never">ابداً</string>
 	<!-- cache size names -->
+	<string name="cache_size_50m">50 م. ب</string>
+	<string name="cache_size_100m">100 م. ب</string>
+	<string name="cache_size_250m">250 م. ب</string>
+	<string name="cache_size_500m">500 م. ب</string>
+	<string name="cache_size_1000m">1 ج. ب</string>
+	<string name="cache_size_5000m">5 ق. ب</string>
 	<!-- screen scheme mode names -->
+	<string name="screen_settings_style_mode">الشكل</string>
+	<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>
diff --git a/presentation/src/main/res/values-ca-rES/strings.xml b/presentation/src/main/res/values-ca-rES/strings.xml
index 1c48867c..31c4acd5 100644
--- a/presentation/src/main/res/values-ca-rES/strings.xml
+++ b/presentation/src/main/res/values-ca-rES/strings.xml
@@ -16,7 +16,7 @@
 	<string name="error_cloud_already_exists">Núvol ja existent.</string>
 	<string name="error_activity_not_found">Descarregueu un aplicació que pugui obrir aquest fitxer.</string>
 	<string name="error_server_not_found">No s\'ha trobat el servidor.</string>
-	<string name="error_device_policy_manager_not_found">Obriu la configuració dels vostres dispositius i establiu el bloqueig de pantalla a mà</string>
+	<string name="error_device_policy_manager_not_found">Si us plau, aneu als ajustos del dispositiu i establiu el blocatge de la pantalla manualment</string>
 	<string name="error_export_illegal_file_name">Ha fallat l\'exportació. Proveu a eliminar caràcters especials dels noms dels fitxers i torneu a exportar.</string>
 	<string name="error_name_contains_invalid_characters">No pot tenir caràcters especials.</string>
 	<string name="error_names_contains_invalid_characters">Els noms dels fitxers no poden tenir caràctes especials.</string>
@@ -24,11 +24,8 @@
 	<string name="error_general_update">Ha fallat la comprovació d\'actualització. S\'ha produït un error general.</string>
 	<string name="error_hash_mismatch_update">Ha fallat la comprovació d\'actualització. La suma de comprovació no coincideix amb la del fitxer pujat</string>
 	<string name="error_update_no_internet">Ha fallat la comprovació d\'actualització. No hi ha connexió a Internet.</string>
-	<string name="error_failed_to_decrypt_webdav_password">Error desxifrant la contrasenya WebDAV, torneu a afegir-la a la configuració</string>
-	<string name="error_play_services_not_available">Serveis de Google Play no instal·lats</string>
 	<string name="error_biometric_auth_aborted">Autenticació biomètrica avortada</string>
-	<string name="error_vault_version_mismatch">La versió especificada a vault.cryptomator és diferent de la masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator no coincideix amb aquesta masterkey.cryptomator</string>
+	<string name="error_vault_version_mismatch">La versió especificada a %1$s és diferent a la de %2$s</string>
 	<string name="error_vault_config_loading">Error general carregant la configuració de la caixa forta</string>
 	<string name="error_file_not_found_after_opening_using_3party">El fitxer local ja no és present després de tornar a canviar a Cryptomator. Els possibles canvis no és poden propagar cap al núvol.</string>
 	<string name="error_no_such_bucket">No existeix el cubell</string>
@@ -187,6 +184,7 @@
 	<string name="screen_settings_section_version">Versió</string>
 	<string name="screen_settings_advanced_settings">Configuració avançada</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Manté desblocat</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Manté les caixes fortes desblocades quan s\'editen els fitxers</string>
 	<!-- ## screen: cloud settings -->
 	<string name="screen_cloud_settings_webdav_connections">Connexions WebDAV</string>
 	<string name="screen_cloud_settings_pcloud_connections">connexions pCloud</string>
@@ -213,7 +211,12 @@
 	<string name="dialog_existing_file_title">El fitxer ja existeix</string>
 	<string name="dialog_existing_file_positive_button">Substitueix</string>
 	<string name="dialog_existing_file_message">Ja existeix un fitxer anomenat \'%1$s\'.</string>
+	<string name="dialog_replace_positive_button_all_files_exist">Substitueix-ho tot</string>
 	<string name="dialog_replace_positive_button_single_file_exists">Substitueix</string>
+	<string name="dialog_replace_msg_single_file_exists">Ja existeix un fitxer anomenat \'%1$s\'. Voleu sobreescriure\'l?</string>
+	<string name="dialog_replace_msg_all_files_exists">Els fitxers ja existeixen. Voleu sobreescriure\'ls?</string>
+	<string name="dialog_replace_msg_some_files_exists">%1$d fitxers ja existeixen. Voleu sobreescriure\'ls?</string>
+	<string name="dialog_replace_title_single_file_exists">Voleu substituir el fitxer?</string>
 	<string name="dialog_replace_title_multiple_files_exist">Voleu substituir els fitxers?</string>
 	<string name="dialog_unable_to_share_title">No es poden compartir fitxers</string>
 	<string name="dialog_unable_to_share_positive_button">D\'acord</string>
@@ -261,6 +264,11 @@
 	<!-- # 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">segon</string>
 	<string name="time_unit_seconds_pl">segons</string>
diff --git a/presentation/src/main/res/values-cs-rCZ/strings.xml b/presentation/src/main/res/values-cs-rCZ/strings.xml
index eb2e5276..2d816fa9 100644
--- a/presentation/src/main/res/values-cs-rCZ/strings.xml
+++ b/presentation/src/main/res/values-cs-rCZ/strings.xml
@@ -16,7 +16,6 @@
 	<string name="error_cloud_already_exists">Cloud již existuje.</string>
 	<string name="error_activity_not_found">Stáhněte si prosím aplikaci, která umí otevřít tento soubor.</string>
 	<string name="error_server_not_found">Server nenalezen.</string>
-	<string name="error_device_policy_manager_not_found">Otevřete prosím nastavení zařízení a nastavte zámek obrazovky ručně</string>
 	<string name="error_export_illegal_file_name">Export se nezdařil. Zkuste odstranit speciální znaky z názvů souborů a znovu exportovat.</string>
 	<string name="error_name_contains_invalid_characters">Nesmí obsahovat speciální znaky.</string>
 	<string name="error_names_contains_invalid_characters">Názvy souborů nesmí obsahovat speciální znaky.</string>
@@ -24,11 +23,7 @@
 	<string name="error_general_update">Kontrola aktualizací se nezdařila. Došlo k obecné chybě.</string>
 	<string name="error_hash_mismatch_update">Kontrola aktualizace se nezdařila. Hash neodpovídá nahranému souboru</string>
 	<string name="error_update_no_internet">Kontrola aktualizací se nezdařila. Žádné připojení k internetu.</string>
-	<string name="error_failed_to_decrypt_webdav_password">Dešifrování WebDAV hesla se nezdařilo, přidejte prosím znovu v nastavení</string>
-	<string name="error_play_services_not_available">Služba Google Play nebyla instalována</string>
 	<string name="error_biometric_auth_aborted">Ověření pomocí otisků prstů selhalo</string>
-	<string name="error_vault_version_mismatch">Verze uvedená v vault.cryptomator je jiná než v masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator se neshoduje s tímto masterkey.cryptomator</string>
 	<string name="error_vault_config_loading">Obecná chyba při načítání konfigurace trezoru</string>
 	<string name="error_file_not_found_after_opening_using_3party">Místní soubor již není přítomen po přepnutí zpět na Cryptomator. Možné změny nelze promítnout zpět do cloudu.</string>
 	<string name="error_no_such_bucket">Bucket neexistuje</string>
@@ -178,6 +173,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Vyberte trezor pro nahrání</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Aktivovat</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Zachytit obrázky na pozadí a jakmile je vybraný trezor odemčen, spustit nahrávání</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Nahrát okamžitě</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Nahrát ihned, pokud je trezor odemčen</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Nahrát pouze pomocí WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Nahrát videa</string>
 	<string name="screen_settings_auto_photo_upload_title">Uložit automaticky nahrávané soubory do&#8230;</string>
@@ -222,7 +219,6 @@
 	<string name="dialog_change_password_msg_password_mismatch">Hesla se neshodují.</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_title">Trezor %1$s nebyl nalezen</string>
-	<string name="dialog_vault_not_found_message">Trezor byl přejmenován, přesunut nebo smazán. Odstraňte tento trezor a přidejte jej znovu pro pokračování. Odstranit nyní?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Odstranit</string>
 	<string name="dialog_existing_file_title">Soubor již existuje</string>
 	<string name="dialog_existing_file_positive_button">Nahradit</string>
diff --git a/presentation/src/main/res/values-de-rDE/strings.xml b/presentation/src/main/res/values-de-rDE/strings.xml
index b26305d3..92223621 100644
--- a/presentation/src/main/res/values-de-rDE/strings.xml
+++ b/presentation/src/main/res/values-de-rDE/strings.xml
@@ -25,10 +25,10 @@
 	<string name="error_hash_mismatch_update">Update-Überprüfung fehlgeschlagen. Berechnete Prüfsumme entspricht nicht der der hochgeladenen Datei</string>
 	<string name="error_update_no_internet">Prüfung auf Aktualisierungen fehlgeschlagen. Keine Internetverbindung.</string>
 	<string name="error_failed_to_decrypt_webdav_password">Beim entschlüsseln des WebDAV-Passworts trat ein Fehler auf. Bitte in den Einstellungen erneut festlegen.</string>
-	<string name="error_play_services_not_available">Die Play Services sind nicht installiert</string>
+	<string name="error_play_services_not_available">Die Google Play Services sind nicht installiert</string>
 	<string name="error_biometric_auth_aborted">Biometrischer Login abgebrochen</string>
-	<string name="error_vault_version_mismatch">Die in der vault.cryptomator-Datei angegebene Version ist nicht identisch mit jener der masterkey.cryptomator-Datei</string>
-	<string name="error_vault_key_invalid">vault.cryptomator-Datei stimmt nicht mit der masterkey.cryptomator-Datei überein</string>
+	<string name="error_vault_version_mismatch">Die in der %1$s-Datei angegebene Version ist nicht identisch mit jener der %2$s-Datei</string>
+	<string name="error_vault_key_invalid">%1$s-Datei stimmt nicht mit der %2$s-Datei überein</string>
 	<string name="error_vault_config_loading">Allgemeiner Fehler beim Laden der Tresorkonfiguration</string>
 	<string name="error_file_not_found_after_opening_using_3party">Lokale Datei ist nach dem Zurückwechseln zu Cryptomator nicht mehr vorhanden. Mögliche Änderungen können nicht in die Cloud übertragen werden.</string>
 	<string name="error_no_such_bucket">Bucket existiert nicht</string>
@@ -176,6 +176,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Tresor auswählen für das Hochladen</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Aktivieren</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Bilder im Hintergrund aufnehmen und sobald der ausgewählte Tresor entsperrt ist, Upload automatisch starten</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Sofort hochladen</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Sofort hochladen, wenn der Tresor entsperrt ist</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Nur mit WLAN hochladen</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Videos hochladen</string>
 	<string name="screen_settings_auto_photo_upload_title">Bilder abspeichern in&#8230;</string>
diff --git a/presentation/src/main/res/values-el-rGR/strings.xml b/presentation/src/main/res/values-el-rGR/strings.xml
index 03d43c18..52c67792 100644
--- a/presentation/src/main/res/values-el-rGR/strings.xml
+++ b/presentation/src/main/res/values-el-rGR/strings.xml
@@ -16,7 +16,7 @@
 	<string name="error_cloud_already_exists">Το Cloud υπάρχει ήδη.</string>
 	<string name="error_activity_not_found">Κάντε λήψη μιας εφαρμογής που μπορεί να ανοίξει αυτό το αρχείο.</string>
 	<string name="error_server_not_found">Ο διακομιστής δεν βρέθηκε.</string>
-	<string name="error_device_policy_manager_not_found">Ανοίξτε τις ρυθμίσεις των συσκευών σας και ορίστε το κλείδωμα οθόνης με το χέρι</string>
+	<string name="error_device_policy_manager_not_found">Ανοίξτε τις ρυθμίσεις της συσκευής σας και ορίστε το κλείδωμα οθόνης με το χέρι</string>
 	<string name="error_export_illegal_file_name">Η εξαγωγή απέτυχε. Προσπαθήστε να αφαιρέσετε ειδικούς χαρακτήρες από τα ονόματα αρχείων και να εξαγάγετε ξανά.</string>
 	<string name="error_name_contains_invalid_characters">Δεν μπορεί να περιέχει ειδικούς χαρακτήρες.</string>
 	<string name="error_names_contains_invalid_characters">Τα ονόματα αρχείων δεν μπορούν να περιέχουν ειδικούς χαρακτήρες.</string>
@@ -24,11 +24,11 @@
 	<string name="error_general_update">Ο έλεγχος ενημέρωσης απέτυχε. Παρουσιάστηκε γενικό σφάλμα.</string>
 	<string name="error_hash_mismatch_update">Ο έλεγχος ενημέρωσης απέτυχε. Ο υπολογισμός hash δεν ταιριάζει με το μεταφορτωμένο αρχείο</string>
 	<string name="error_update_no_internet">Ο έλεγχος ενημέρωσης απέτυχε. Δεν υπάρχει σύνδεση στο διαδίκτυο.</string>
-	<string name="error_failed_to_decrypt_webdav_password">Αποτυχία αποκρυπτογράφησης κωδικού πρόσβασης WebDAV. προσθέστε ξανά στις ρυθμίσεις</string>
-	<string name="error_play_services_not_available">Οι Play Services δεν είναι εγκατεστημένες</string>
+	<string name="error_failed_to_decrypt_webdav_password">Αποτυχία αποκρυπτογράφησης κωδικού πρόσβασης WebDAV, προσθέστε ξανά στις ρυθμίσεις</string>
+	<string name="error_play_services_not_available">Οι Υπηρεσίες Google Play δεν έχουν εγκατασταθεί</string>
 	<string name="error_biometric_auth_aborted">Η βιομετρική πιστοποίηση ματαιώθηκε</string>
-	<string name="error_vault_version_mismatch">Η έκδοση που καθορίζεται στη vault.cryptomator είναι διαφορετική από το masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator δεν ταιριάζει με αυτό το masterkey.cryptomator</string>
+	<string name="error_vault_version_mismatch">Η έκδοση που καθορίστηκε στο %1$s είναι διαφορετική από %2$s</string>
+	<string name="error_vault_key_invalid">%1$s δεν ταιριάζει με αυτό %2$s</string>
 	<string name="error_vault_config_loading">Γενικό σφάλμα κατά τη φόρτωση της ρύθμισης κρύπτης</string>
 	<string name="error_file_not_found_after_opening_using_3party">Το τοπικό αρχείο δεν υπάρχει πλέον μετά την επιστροφή στο Cryptomator. Οι πιθανές αλλαγές δεν μπορούν να μεταδοθούν πίσω στο cloud.</string>
 	<string name="error_no_such_bucket">Δεν υπάρχει τέτοιος κάδος</string>
@@ -176,6 +176,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Επιλογή κρύπτης για μεταφόρτωση</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Ενεργοποίηση</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Λήψη εικόνων στο παρασκήνιο και μόλις ξεκλειδωθεί η επιλεγμένη κρύπτη, έναρξη μεταφόρτωσης</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Ανέβασμα κατευθείαν</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Ανεβάστε απευθείας αν η κρύπτη είναι ξεκλείδωτη</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Μεταφόρτωση μόνο χρησιμοποιώντας WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Μεταφόρτωση βίντεο</string>
 	<string name="screen_settings_auto_photo_upload_title">Αποθήκευση αυτόματης μεταφόρτωσης αρχείων στο&#8230;</string>
@@ -220,7 +222,7 @@
 	<string name="dialog_change_password_msg_password_mismatch">Ο νέος κωδικός πρόσβασης δεν ταιριάζει με τον κωδικό πρόσβασης που πληκτρολογήθηκε.</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_title">Η κρύπτη %1$s δεν βρέθηκε</string>
-	<string name="dialog_vault_not_found_message">Η κρύπτη μετονομάστηκε, μετακινήθηκε ή διαγράφηκε. Αφαιρέστε αυτή τη φόρμα και προσθέστε την ξανά για να συνεχίσετε. Αφαίρεση τώρα;</string>
+	<string name="dialog_vault_not_found_message">Η κρύπτη μετονομάστηκε, μετακινήθηκε ή διαγράφηκε. Αφαιρέστε αυτή την κρύπτη από την λίστα και προσθέστε την ξανά για να συνεχίσετε. Αφαίρεση τώρα;</string>
 	<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>
diff --git a/presentation/src/main/res/values-es-rES/strings.xml b/presentation/src/main/res/values-es-rES/strings.xml
index 3d9f1a57..16143f6c 100644
--- a/presentation/src/main/res/values-es-rES/strings.xml
+++ b/presentation/src/main/res/values-es-rES/strings.xml
@@ -16,7 +16,7 @@
 	<string name="error_cloud_already_exists">La nube ya existe.</string>
 	<string name="error_activity_not_found">Por favor, descarga una aplicación que pueda abrir este archivo.</string>
 	<string name="error_server_not_found">Servidor no encontrado.</string>
-	<string name="error_device_policy_manager_not_found">Abra los ajustes de sus dispositivos y establezca el bloqueo de pantalla a mano</string>
+	<string name="error_device_policy_manager_not_found">Abra los ajustes de su dispositivo y establezca el bloqueo de pantalla manualmente</string>
 	<string name="error_export_illegal_file_name">Exportación fallida. Intente eliminar los caracteres especiales de los nombres de archivo y vuelva a exportar.</string>
 	<string name="error_name_contains_invalid_characters">No puede contener caracteres especiales.</string>
 	<string name="error_names_contains_invalid_characters">Los nombres de archivo no pueden contener caracteres especiales.</string>
@@ -24,11 +24,11 @@
 	<string name="error_general_update">Error al comprobar la actualización. Ocurrió un error general.</string>
 	<string name="error_hash_mismatch_update">Error al comprobar la actualización. El hash calculado no coincide con el archivo cargado</string>
 	<string name="error_update_no_internet">Error al comprobar la actualización. Sin conexión a Internet.</string>
-	<string name="error_failed_to_decrypt_webdav_password">No se pudo descifrar la contraseña de WebDAV, vuelva a agregarla en la configuración</string>
-	<string name="error_play_services_not_available">Play Services no instalado</string>
+	<string name="error_failed_to_decrypt_webdav_password">No se pudo descifrar la contraseña de WebDAV, vuelva a agregarla en los ajustes</string>
+	<string name="error_play_services_not_available">Los Servicios de Google Play no están instalados</string>
 	<string name="error_biometric_auth_aborted">Autenticación biométrica abortada</string>
-	<string name="error_vault_version_mismatch">La versión especificada en vault.cryptomator es diferente de masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator no coincide con ésta masterkey.cryptomator</string>
+	<string name="error_vault_version_mismatch">La versión especificada en %1$s es diferente de %2$s</string>
+	<string name="error_vault_key_invalid">%1$s no coincide con este %2$s</string>
 	<string name="error_vault_config_loading">Error general al cargar la configuración de la bóveda</string>
 	<string name="error_file_not_found_after_opening_using_3party">El archivo local ya no está presente después de volver a Cryptomator. Los posibles cambios no se pueden propagar a la nube.</string>
 	<string name="error_no_such_bucket">No hay tal cubeta</string>
@@ -176,6 +176,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Elegir bóveda para cargar</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Activar</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Captura las imágenes en segundo plano y una vez desbloqueada la bóveda seleccionada, inicia la carga</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Cargar al instante</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Cargar directamente si la bóveda está desbloqueada</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Cargar solo usando WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Cargar videos</string>
 	<string name="screen_settings_auto_photo_upload_title">Guardar archivos de carga automática en&#8230;</string>
diff --git a/presentation/src/main/res/values-fr-rFR/strings.xml b/presentation/src/main/res/values-fr-rFR/strings.xml
index c3c52bec..61ff0e1e 100644
--- a/presentation/src/main/res/values-fr-rFR/strings.xml
+++ b/presentation/src/main/res/values-fr-rFR/strings.xml
@@ -16,7 +16,6 @@
 	<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>
@@ -24,11 +23,7 @@
 	<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">Le mot de passe WebDAV n\'a pas été déchiffré, veuillez l\'ajouter une nouvelle fois dans les paramètres</string>
-	<string name="error_play_services_not_available">Services Google play non 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 vault.cryptomator est différente de masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator ne correspond pas à ce masterkey.cryptomator</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>
@@ -220,7 +215,6 @@
 	<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>
diff --git a/presentation/src/main/res/values-hi-rIN/strings.xml b/presentation/src/main/res/values-hi-rIN/strings.xml
index 4586bc11..6c5b4ef4 100644
--- a/presentation/src/main/res/values-hi-rIN/strings.xml
+++ b/presentation/src/main/res/values-hi-rIN/strings.xml
@@ -1,24 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- # app -->
+	<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_no_network_connection">नेटवर्क कनेक्शन नहीं है</string>
+	<string name="error_invalid_passphrase">गलत कूटशब्द!</string>
+	<string name="error_file_or_folder_exists">दस्तावेज आथ्वा फ़ोल्डर उपलब्ध नहीं है</string>
+	<string name="error_no_such_file">दस्तावेज उपलब्ध नहीं है</string>
+	<string name="error_server_not_found">सर्वर नहीं मिला।</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<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>
 	<string name="snack_bar_action_title_search_next">अगला</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">क्रिप्टोमेटर में जोड़ें</string>
+	<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_share_button_text">चुनें</string>
+	<string name="screen_file_browser_action_create_new_text_file">नया दस्तावेज बनाए</string>
+	<string name="screen_file_browser_upload_files_chooser_title">दस्तावेज</string>
+	<string name="screen_file_browser_msg_file_exported">दस्तावेज निर्यात हुआ</string>
+	<string name="screen_file_browser_msg_files_exported">दस्तावेज निर्यात हुए</string>
+	<string name="screen_file_browser_nothing_to_export">निर्यात करने के लिए कुछ भी नहीं</string>
+	<string name="screen_file_browser_node_action_share">साझा करें</string>
+	<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_node_action_open_with_text">&#8230; से खोलें</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">आइटम का चयन करें</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d चयनित</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_message">संपर्क नहीं</string>
+	<string name="screen_file_browser_no_connection_button_text">पुन: प्रयास करें</string>
 	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">सफलतापूर्वक सहेजा गया</string>
 	<!-- ## screen: share files -->
+	<string name="screen_share_files_title">दस्तावेज %1$s को &#8230; सहेजा गया</string>
+	<string name="screen_share_files_content_text">टेक्स्ट</string>
+	<string name="screen_share_files_content_file">दस्तावेज</string>
+	<string name="screen_share_files_content_files">दस्तावेज</string>
+	<string name="screen_share_files_msg_filenames_must_be_unique">दस्तावेज के नाम अलग होने चाहिए! कृपया नाम बदल कर सहेजें!</string>
+	<string name="screen_share_files_section_location">सहेजने का स्थान</string>
+	<string name="screen_share_files_save_button_text">सहेजें</string>
 	<!-- ## screen: choose cloud service -->
 	<!-- ## screen: cloud connections -->
 	<!-- ## screen: webdav settings -->
+	<string name="screen_webdav_settings_username_label">उपयोगकर्ता नाम</string>
 	<string name="screen_webdav_settings_password_label">पासवर्ड</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_region_label">क्षेत्र</string>
 	<!-- ## screen: enter vault name -->
 	<!-- ## screen: set password -->
 	<string name="screen_set_password_button_text">हो गया</string>
@@ -27,6 +69,7 @@
 	<string name="screen_set_password_strength_indicator_3">मजबूत</string>
 	<!-- ## screen: settings -->
 	<string name="screen_settings_section_general">सामान्य</string>
+	<string name="screen_settings_section_search">खोज करें</string>
 	<!-- ## screen: cloud settings -->
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
@@ -35,6 +78,7 @@
 	<string name="dialog_button_cancel">रद्द करें</string>
 	<string name="dialog_enter_password_positive_button">अनलॉक करें</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_positive_button_text">हटाएँ</string>
 	<string name="dialog_lock_vault">लॉक करें</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">बंद करें</string>
 	<string name="dialog_sym_link_back_button">पीछे जाएं</string>
diff --git a/presentation/src/main/res/values-hu-rHU/strings.xml b/presentation/src/main/res/values-hu-rHU/strings.xml
index 054a204b..45ef4920 100644
--- a/presentation/src/main/res/values-hu-rHU/strings.xml
+++ b/presentation/src/main/res/values-hu-rHU/strings.xml
@@ -16,7 +16,6 @@
 	<string name="error_cloud_already_exists">A felhő már létezik.</string>
 	<string name="error_activity_not_found">Kérjük, töltsön le egy alkalmazást, amely képes megnyitni ezt a fájlt.</string>
 	<string name="error_server_not_found">Szerver nem található.</string>
-	<string name="error_device_policy_manager_not_found">Kérjük, nyissa meg a készülék beállításait, és állítsa be a képernyőzárat kézzel</string>
 	<string name="error_export_illegal_file_name">Az exportálás sikertelen. Próbálja meg eltávolítani a speciális karaktereket a fájlnevekből és exportálja újra.</string>
 	<string name="error_name_contains_invalid_characters">Nem tartalmazhat speciális karaktereket.</string>
 	<string name="error_names_contains_invalid_characters">A fájl neve nem tartalmazhat speciális karaktereket.</string>
diff --git a/presentation/src/main/res/values-it-rIT/strings.xml b/presentation/src/main/res/values-it-rIT/strings.xml
index ee82a5c0..5430db9c 100644
--- a/presentation/src/main/res/values-it-rIT/strings.xml
+++ b/presentation/src/main/res/values-it-rIT/strings.xml
@@ -16,7 +16,7 @@
 	<string name="error_cloud_already_exists">Il Cloud esiste già.</string>
 	<string name="error_activity_not_found">Scarica un\'app che possa aprire questo file.</string>
 	<string name="error_server_not_found">Server non trovato.</string>
-	<string name="error_device_policy_manager_not_found">Aprire le impostazioni dei dispositivi e impostare il blocco schermo a mano</string>
+	<string name="error_device_policy_manager_not_found">Si prega di aprire le impostazioni del dispositivo e impostare il blocco schermo a mano</string>
 	<string name="error_export_illegal_file_name">Esportazione non riuscita. Prova a rimuovere i caratteri speciali dai nomi dei file ed esportare di nuovo.</string>
 	<string name="error_name_contains_invalid_characters">Non può contenere caratteri speciali.</string>
 	<string name="error_names_contains_invalid_characters">I nomi dei file non possono contenere caratteri speciali.</string>
@@ -24,11 +24,9 @@
 	<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">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 vault.cryptomator è diversa da masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator non corrisponde a questa masterkey.cryptomator</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>
 	<string name="error_vault_config_loading">Errore generale durante il caricamento della configurazione della cassaforte</string>
 	<string name="error_file_not_found_after_opening_using_3party">Il file locale non è più presente dopo essere tornato a Cryptomator. Le eventuali modifiche non possono essere riprodotte nel cloud.</string>
 	<string name="error_no_such_bucket">Nessun secchio simile</string>
@@ -176,6 +174,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Scegli cassaforte per il caricamento</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Attiva</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Cattura immagini in background e una volta sbloccata la cassaforte selezionata, avvia il caricamento</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Caricamento istantaneo</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Carica direttamente se la cassaforte è sbloccata</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Carica utilizzando solo WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Carica video</string>
 	<string name="screen_settings_auto_photo_upload_title">Salva i file caricati automaticamente in&#8230;</string>
diff --git a/presentation/src/main/res/values-ja-rJP/strings.xml b/presentation/src/main/res/values-ja-rJP/strings.xml
index 11b47fc0..511dd5b8 100644
--- a/presentation/src/main/res/values-ja-rJP/strings.xml
+++ b/presentation/src/main/res/values-ja-rJP/strings.xml
@@ -25,10 +25,10 @@
 	<string name="error_hash_mismatch_update">更新の確認に失敗しました。ハッシュ値がアップロードされたファイルと一致しません。</string>
 	<string name="error_update_no_internet">更新の確認に失敗しました。インターネット接続がありません。</string>
 	<string name="error_failed_to_decrypt_webdav_password">WebDAV パスワードの復号に失敗しました。設定を再度追加してください</string>
-	<string name="error_play_services_not_available">Play Services がインストールされていません</string>
+	<string name="error_play_services_not_available">Google Play Services がインストールされていません</string>
 	<string name="error_biometric_auth_aborted">生体認証が中断されました</string>
-	<string name="error_vault_version_mismatch">Vault.cryptomator 内で指定されたバージョンと masterkey.cryptomator の情報が異なります</string>
-	<string name="error_vault_key_invalid">vault.cryptomator が masterkey.cryptomator と一致しません</string>
+	<string name="error_vault_version_mismatch">%1$s で指定されたバージョンが %2$s と異なります</string>
+	<string name="error_vault_key_invalid">%1$s はこの %2$s と一致しません</string>
 	<string name="error_vault_config_loading">金庫の設定を読み込み中に失敗しました</string>
 	<string name="error_no_such_bucket">Bucket がありません</string>
 	<string name="error_masterkey_location_not_supported">自由に Masterkey の場所を設定することはまだできません</string>
@@ -156,6 +156,7 @@
 	<string name="screen_settings_activate_biometric_auth">生体認証を有効にする</string>
 	<string name="screen_settings_confirm_face_unlock">顔認証のロック解除 (利用できる場合)</string>
 	<string name="screen_settings_block_app_when_obscured">他のアプリが重なるときにアプリを停止</string>
+	<string name="screen_settings_block_app_when_obscured_summary">入力をブロックし、偽のユーザー インターフェイスを表示する</string>
 	<string name="screen_settings_secure_screen">スクリーンショットをブロック</string>
 	<string name="screen_settings_secure_screen_summary">アプリ内や「最近使ったアプリ」でスクリーンショットを表示しない</string>
 	<string name="screen_settings_section_search">検索</string>
@@ -170,6 +171,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">アップロードする金庫を選択</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">有効</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">バックグラウンドで画像を取得し、選択された金庫が解錠されるとアップロードを開始します</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">インスタントをアップロード</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">金庫が解錠されているときに直接アップロード</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">WIFI を使用しているときのみアップロード</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">ビデオをアップロード</string>
 	<string name="screen_settings_auto_photo_upload_title">&#8230; へのファイルの自動アップロードを保存</string>
@@ -271,6 +274,8 @@
 	<string name="dialog_no_screen_lock_title">画面ロックを設定しますか?</string>
 	<string name="dialog_no_screen_lock_checkbox">画面ロックを設定</string>
 	<string name="dialog_no_biometric_auth_set_up_title">システムに基本的な認証が設定されていません</string>
+	<string name="dialog_no_biometric_auth_set_up_message">このサービスを利用するには少なくとも 1 つの指紋/顔を登録してください。</string>
+	<string name="dialog_debug_mode_disclaimer_hint">このモードでは、デバイスのログファイルに機密情報が書き込まれることがあります(例: ファイル名やパス)。パスワードや cookie 等は除外されます。\n\n できるだけ早くデバッグ モードを無効化をすることを忘れないでください。</string>
 	<string name="dialog_debug_mode_disclaimer_title">注意</string>
 	<string name="dialog_debug_mode_positive_button">有効</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">この設定は安全のための機能です。他のアプリがユーザーを騙してしまうことを防ぎます。\n\n無効にすることで、 <a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">リスクを認識していること</a> に留意する必要があります。</string>
@@ -287,6 +292,7 @@
 	<string name="dialog_confirm_delete_file_message">本当にこのファイルを削除してもよろしいですか?</string>
 	<string name="dialog_confirm_delete_folder_message">この操作はフォルダーの内容をすべて削除します。本当にこのフォルダーを削除してもよろしいですか?</string>
 	<string name="dialog_biometric_auth_key_invalidated_title">生体認証機能が無効になりました</string>
+	<string name="dialog_biometric_auth_key_invalidated_message">鍵が無効になったため、生体認証が無効になりました。再度有効にするには、Cryptomator 設定を開いてください。</string>
 	<string name="dialog_enter_license_title">有効なライセンスを入力してください</string>
 	<string name="dialog_enter_license_content">Google Play Store を使用せずに Cryptomator をインストールしたことを検出しました。有効なライセンスを購入してください:  <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">入力されたライセンスが無効です。正しく入力されていることを確認してください。</string>
diff --git a/presentation/src/main/res/values-ko-rKR/strings.xml b/presentation/src/main/res/values-ko-rKR/strings.xml
index 6926d244..2d66a615 100644
--- a/presentation/src/main/res/values-ko-rKR/strings.xml
+++ b/presentation/src/main/res/values-ko-rKR/strings.xml
@@ -13,37 +13,76 @@
 	<string name="error_vault_already_exists">Vault가 이미 존재합니다.</string>
 	<string name="error_no_such_file">파일이 존재하지 않습니다.</string>
 	<string name="error_vault_has_been_locked">Vault가 잠겼습니다.</string>
+	<string name="error_cloud_already_exists">클라우드가 이미 존재합니다.</string>
+	<string name="error_activity_not_found">이 파일을 열 수 있는 애플리케이션을 다운로드해주세요.</string>
 	<string name="error_server_not_found">서버를 찾을 수 없습니다</string>
+	<string name="error_export_illegal_file_name">내보내기 실패. 파일명에서 특수문자를 없앤 뒤 다시 내보내기를 해보세요.</string>
+	<string name="error_name_contains_invalid_characters">특수문자는 포함할 수 없습니다.</string>
+	<string name="error_names_contains_invalid_characters">파일명에 특수 문자는 포함할 수 없습니다.</string>
+	<string name="error_vault_name_contains_invalid_characters">Vault 이름은 특수문자를 포함할 수 없습니다.</string>
+	<string name="error_general_update">업데이트 확인 실패. 에러가 발생했습니다.</string>
+	<string name="error_hash_mismatch_update">업데이트 확인 실패. 업로드된 파일과 해쉬값이 일치하지 않습니다.</string>
+	<string name="error_update_no_internet">업데이트 확인 실패. 인터넷에 연결되지 않았습니다.</string>
+	<string name="error_failed_to_decrypt_webdav_password">WebDAV 비밀번호를 복호화하는데 실패했습니다. 다시 설정해주세요.</string>
+	<string name="error_play_services_not_available">Google Play 서비스가 설치되지 않았습니다</string>
+	<string name="error_biometric_auth_aborted">생체 인증 취소됨</string>
+	<string name="error_vault_version_mismatch">%1$s에 기록된 버전이 %2$s에 기록된 버전과 다릅니다</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">로컬 저장소</string>
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<string name="permission_message_export_file">파일을 내보내기 위해 저장소 접근 권한이 필요합니다.</string>
+	<string name="permission_message_upload_file">파일을 업로드하기 위해 저장소 접근 권한이 필요합니다.</string>
+	<string name="permission_message_share_file">파일을 공유하기 위해 저장소 접근 권한이 필요합니다.</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>
 	<string name="snack_bar_action_title_search_next">다음</string>
+	<string name="snack_bar_action_title_sort">정렬</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">최신순</string>
+	<string name="snack_bar_action_title_sort_oldest">등록순</string>
+	<string name="snack_bar_action_title_sort_biggest">큰 파일순</string>
+	<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">새 Vault 생성</string>
+	<string name="screen_vault_list_action_add_existing_vault">기존 Vault 추가</string>
 	<string name="screen_vault_list_vault_action_delete">제거</string>
+	<string name="screen_vault_list_vault_creation_hint">여기를 클릭하여 새 Vault를 생성하세요</string>
+	<string name="screen_vault_list_change_password_successful">비밀번호 변경 성공</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Vault</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">마스터키 파일 선택</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">Vault 이름: %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_file_info_label_date">%1$s 전 변경됨</string>
+	<string name="screen_file_browser_share_intent_chooser_title">공유 대상</string>
+	<string name="screen_file_browser_share_destination_title">위치 선택</string>
 	<string name="screen_file_browser_share_button_text">선택</string>
+	<string name="screen_file_browser_nothing_to_share">공유할 내용 없음</string>
 	<string name="screen_file_browser_actions_title">%1$s에 추가</string>
 	<string name="screen_file_browser_action_create_folder">폴더 생성</string>
 	<string name="screen_file_browser_action_create_new_text_file">텍스트 파일 생성</string>
 	<string name="screen_file_browser_action_upload_files">파일 업로드</string>
 	<string name="screen_file_browser_upload_files_chooser_title">파일</string>
+	<string name="screen_file_browser_msg_file_exported">파일 내보내기 완료</string>
+	<string name="screen_file_browser_msg_files_exported">파일 내보내기 완료</string>
+	<string name="screen_file_browser_nothing_to_export">내보낼 대상 없음</string>
 	<string name="screen_file_browser_msg_creating_download_dir_failed">다운로드 디렉터리 생성에 실패하였습니다</string>
 	<string name="screen_file_browser_node_action_share">공유하기</string>
 	<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_node_action_open_with_text">&#8230; 으로 열기</string>
 	<string name="screen_file_browser_selection_mode_title_zero_elements">아이템 선택</string>
 	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d 항목 선택됨</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_message">연결 없음</string>
@@ -58,24 +97,57 @@
 	<string name="screen_share_files_save_button_text">저장</string>
 	<string name="screen_share_files_msg_success">암호화 완료</string>
 	<!-- ## screen: choose cloud service -->
+	<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>
 	<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">URL을 입력해주세요.</string>
+	<string name="screen_webdav_settings_msg_url_is_invalid">URL이 유효 하지 않습니다.</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">사용자명을 입력해주세요.</string>
+	<string name="screen_webdav_settings_msg_password_must_not_be_empty">비밀번호를 입력해주세요.</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">표시 이름</string>
 	<string name="screen_s3_settings_access_key_label">액세스 키</string>
+	<string name="screen_s3_settings_secret_key_label">비밀키</string>
+	<string name="screen_s3_settings_endpoint_label">엔드포인트</string>
+	<string name="screen_s3_settings_region_label">지역</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">표시 이름은 비워둘 수 없습니다</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">액세스 키를 입력해주세요</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">비밀 키를 입력해주세요</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">엔드포인트 또는 지역은 비워둘 수 없습니다</string>
 	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_msg_name_empty">Vault 이름을 입력해주세요.</string>
+	<string name="screen_enter_vault_name_vault_label">Vault 이름</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_msg_password_mismatch">비밀번호가 일치하지 않습니다</string>
 	<string name="screen_set_password_button_text">완료</string>
 	<string name="screen_set_password_hint">중요: 만약 비밀번호를 잊어버린 경우, 데이터를 복구 할 방법이 없습니다.</string>
+	<string name="screen_set_password_retype_password_label">비밀번호 재입력</string>
+	<string name="screen_set_password_strength_indicator_0">Vault를 만들기에 매우 나쁨</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_biometric_auth">생체 인증</string>
+	<string name="screen_settings_activate_biometric_auth">생체 인증 활성화</string>
+	<string name="screen_settings_confirm_face_unlock">얼굴인식 잠금해제 적용 (가능한 경우)</string>
+	<string name="screen_settings_secure_screen">스크린샷 차단</string>
+	<string name="screen_settings_secure_screen_summary">최근 사용 목록과 앱 내부에서 스크린샷 차단</string>
+	<string name="screen_settings_section_search">검색</string>
+	<string name="screen_settings_live_search">실시간 검색</string>
+	<string name="screen_settings_live_search_summary">검색내용 입력중 검색결과 업데이트</string>
+	<string name="screen_settings_glob_search">glob 패턴을 이용하여 검색</string>
+	<string name="screen_settings_glob_search_summary">alice.*.jpg와 같이 glob 패턴 매칭 사용</string>
 	<string name="screen_settings_section_auto_lock">자동 잠금</string>
 	<string name="screen_settings_auto_lock_timeout">다음 시간 이후 잠금</string>
 	<string name="screen_settings_auto_lock_on_screen_lock">화면이 꺼졌을 때</string>
@@ -84,16 +156,32 @@
 	<string name="screen_settings_section_auto_photo_upload_toggle">활성화</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Wi-Fi 상태에서만 업로드</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">Facebook에서 좋아요 누르기</string>
 	<string name="screen_settings_section_legal">법적 사항</string>
 	<string name="screen_settings_licenses_label">라이센스</string>
 	<string name="screen_settings_license_terms_label">라이센스 약관</string>
 	<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_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>
+	<string name="screen_settings_background_unlock_preparation_label">잠금해제 가속</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files">잠금해제유지</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_webdav_connections">WebDAV 연결</string>
+	<string name="screen_cloud_settings_pcloud_connections">pCloud 연결</string>
+	<string name="screen_cloud_settings_s3_connections">S3 연결</string>
+	<string name="screen_cloud_settings_local_storage_locations">로컬 저장소 위치</string>
+	<string name="screen_cloud_settings_log_in_to">로그인</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">로그아웃</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_update_pcloud_connections_title">pCloud 자격증명 업데이트</string>
 	<!-- ## screen: insecure android version info -->
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">취소</string>
@@ -101,30 +189,131 @@
 	<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>
+	<string name="dialog_change_password_msg_password_mismatch">비밀번호가 일치하지 않습니다</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_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_some_files_exist">중복 파일 덮어쓰기</string>
 	<string name="dialog_replace_positive_button_single_file_exists">교체</string>
+	<string name="dialog_replace_title_single_file_exists">파일을 덮어쓰겠습니까?</string>
+	<string name="dialog_replace_title_multiple_files_exist">파일을 덮어쓰겠습니까?</string>
+	<string name="dialog_unable_to_share_title">파일을 공유할 수 없습니다</string>
+	<string name="dialog_unable_to_share_message">현재 Vault가 존재하지 않습니다. 먼저 Cryptomator 앱으로 Vault를 생성하세요.</string>
 	<string name="dialog_unable_to_share_positive_button">OK</string>
+	<string name="dialog_unable_to_share_negative_button">Vault 만들기</string>
+	<string name="dialog_filetype_not_supported_title">%1$s을(를) 열 수 없습니다.</string>
+	<string name="dialog_filetype_not_supported_message">이 파일을 열 수 있는 앱을 설치해주세요. 아니면 이 파일을 기기에 저장하시겠습니까?</string>
+	<string name="dialog_rename_vault_title">Vault 이름 바꾸기</string>
+	<string name="dialog_rename_node_folder_title">폴더 이름 바꾸기</string>
+	<string name="dialog_rename_node_file_title">파일 이름 바꾸기</string>
+	<string name="dialog_unsaved_changes_title">저장되지 않은 변경사항이 있습니다</string>
+	<string name="dialog_unsaved_changes_message">저장하지 않고 종료하시겠습니까?</string>
 	<string name="dialog_unsaved_changes_discard">취소</string>
 	<string name="dialog_file_name_placeholder">text.txt</string>
 	<string name="dialog_delete_vault_message">이 Vault를 정말로 제거하시겠습니까?</string>
 	<string name="dialog_upload_file_title">&#8230; 업로드 중</string>
+	<string name="dialog_progress_please_wait">잠시 기다려주세요&#8230;</string>
+	<string name="dialog_progress_creating_folder">폴더 만드는 중&#8230;</string>
+	<string name="dialog_progress_creating_text_file">텍스트 파일 만드는 중&#8230;</string>
+	<string name="action_progress_authentication">인증 중&#8230;</string>
+	<string name="action_progress_deleting">삭제 중&#8230;</string>
+	<string name="dialog_progress_unlocking_vault">Vault 잠금해제 중&#8230;</string>
+	<string name="dialog_progress_change_password">비밀번호 변경 중&#8230;</string>
+	<string name="dialog_progress_creating_vault">Vault 생성 중&#8230;</string>
 	<string name="dialog_progress_upload_file">&#8230; 업로드 중</string>
+	<string name="dialog_progress_download_file">다운로드 중&#8230;</string>
+	<string name="dialog_progress_encryption">암호화 중&#8230;</string>
+	<string name="dialog_progress_decryption">복호화 중&#8230;</string>
+	<string name="action_progress_moving">이동 중&#8230;</string>
 	<string name="dialog_lock_vault">잠금</string>
+	<string name="dialog_accept_ssl_certificate_title">유효하지 않은 SSL 인증서</string>
+	<string name="dialog_accept_ssl_certificate_hint">SSL 인증서가 유효하지 않습니다. 인증서를 신뢰하고 계속 진행하겠습니까?</string>
+	<string name="dialog_accept_ssl_certificate_details">세부정보</string>
+	<string name="dialog_accept_ssl_certificate_security_checkbox">이는 보안 문제를 야기할 수 있습니다. 나는 지금 나의 행동을 이해합니다.</string>
+	<string name="dialog_http_security_hint">HTTP 사용은 안전하지 않습니다. HTTPS 사용을 권장합니다. HTTP 사용으로 야기될 문제를 숙지하고 있다면, HTTP를 사용할 수 있습니다.</string>
+	<string name="dialog_http_security_checkbox">HTTPS로 변경</string>
+	<string name="dialog_http_security_title">HTTPS를 사용하겠습니가?</string>
+	<string name="dialog_no_screen_lock_hint">화면 잠금 설정이 되어있지 않습니다. 자격증명을 안전하게 보호하기 위해 패턴이나 비밀번호를 설정하세요.</string>
+	<string name="dialog_no_screen_lock_title">화면 잠금 설정을 하시겠습니까?</string>
+	<string name="dialog_no_screen_lock_checkbox">화면 잠금 설정</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_sym_link_back_button">뒤로</string>
+	<string name="dialog_confirm_delete_multiple_title">%1$d개의 파일을 삭제하시겠습니까?</string>
+	<string name="dialog_enter_license_title">유효한 라이선스를 입력하세요</string>
+	<string name="dialog_enter_license_content">Google Play 스토어를 이용하지 않고 Cryptomator가 설치되었음을 감지했습니다. 유효한 라이선스를 입력해주세요. 라이선스는 <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a>에서 구매가능합니다.</string>
+	<string name="dialog_enter_license_not_valid_content">입력된 라이선스는 유효하지 않습니다. 다시한번 확인해주세요.</string>
+	<string name="dialog_enter_license_no_content">라이선스가 입력되지 않았습니다. 유효한 라이선스를 입력해주세요.</string>
+	<string name="dialog_enter_license_decline_button">종료</string>
+	<string name="dialog_license_confirmation_title">라이선스 확인</string>
+	<string name="dialog_update_available_title">업데이트가 출시되었습니다</string>
+	<string name="dialog_update_available_update">지금 업데이트 하기</string>
+	<string name="dialog_update_available_download_site">다운로드 페이지로 가기</string>
+	<string name="dialog_update_available_cancel">다음에 하기</string>
+	<string name="dialog_download_update_title">다운로드중</string>
+	<string name="dialog_download_update_message">최신 버전의 Cryptomator 다운로드중</string>
+	<string name="dialog_sym_link_back_button">이전</string>
+	<string name="dialog_pcloud_credentials_updated_title">\'%1$s\' 자격증명 업데이트됨</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
+	<string name="file_size_unit_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">초</string>
 	<string name="time_unit_minutes_pl">분</string>
+	<string name="time_unit_days_pl">일</string>
+	<string name="time_unit_weeks_sg">주</string>
+	<string name="time_unit_weeks_pl">주</string>
+	<string name="time_unit_months_sg">달</string>
+	<string name="time_unit_months_pl">달</string>
+	<string name="time_unit_years_sg">년</string>
+	<string name="time_unit_years_pl">년</string>
 	<!-- ## biometric authentication -->
+	<string name="dialog_biometric_auth_title">생체인증 로그인</string>
+	<string name="dialog_biometric_auth_message">생체인증정보로 로그인하세요</string>
+	<string name="dialog_biometric_auth_use_password">Vault 비밀번호 사용하기</string>
 	<!-- notification -->
+	<string name="notification_lock_all">모두 잠그기</string>
+	<string name="notification_cancel_auto_upload">업로드 취소</string>
+	<string name="notification_auto_upload_title">자동 사진 업로드중</string>
+	<string name="notification_update_check_finished_latest">최신 버전 설치됨</string>
+	<string name="screen_settings_lru_cache">캐시</string>
+	<string name="screen_settings_lru_cache_toggle_summary">최근의 사용한 암호화된 파일을 기기에 저장한 후 나중에 파일을 다시 열 때 재사용합니다</string>
+	<string name="screen_settings_lru_cache_size">총 캐시 크기</string>
+	<string name="screen_settings_clear_lru_cache_size">캐시 지우기</string>
+	<string name="screen_settings_lru_cache_changed__restart_toast">변경사항은 앱 재시작 후 적용됩니다</string>
+	<string name="dialog_settings_update_check_interval_title">업데이트 확인 주기</string>
+	<string name="screen_settings_check_updates">업데이트 확인</string>
+	<string name="dialog_cache_size_title">클라우드당 캐시 크기</string>
 	<!-- lock timeout names -->
+	<string name="lock_timeout_5m">5분</string>
+	<string name="lock_timeout_10m">10분</string>
+	<string name="lock_timeout_never">잠그지 않음</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">스타일</string>
+	<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>
diff --git a/presentation/src/main/res/values-nl-rNL/strings.xml b/presentation/src/main/res/values-nl-rNL/strings.xml
index 04de0473..bc6bbad7 100644
--- a/presentation/src/main/res/values-nl-rNL/strings.xml
+++ b/presentation/src/main/res/values-nl-rNL/strings.xml
@@ -9,71 +9,397 @@
 	<string name="error_no_network_connection">Geen netwerkverbinding</string>
 	<string name="error_invalid_passphrase">Fout wachtwoord</string>
 	<string name="error_file_or_folder_exists">Een bestand of map bestaat reeds.</string>
-	<string name="error_vault_version_not_supported">Niet-ondersteunde Vault. Deze Vault is gemaakt met een andere versie van Cryptomator.</string>
-	<string name="error_vault_already_exists">Vault bestaat reeds.</string>
+	<string name="error_vault_version_not_supported">Niet-ondersteunde kluis. Deze kluis is gemaakt met een andere versie van Cryptomator.</string>
+	<string name="error_vault_already_exists">Kluis bestaat reeds.</string>
 	<string name="error_no_such_file">Bestand bestaat niet.</string>
 	<string name="error_vault_has_been_locked">Vault is vergrendeld.</string>
 	<string name="error_cloud_already_exists">Cloud bestaat reeds.</string>
 	<string name="error_activity_not_found">Download een app die dit bestand kan openen.</string>
 	<string name="error_server_not_found">Server niet gevonden.</string>
+	<string name="error_device_policy_manager_not_found">Open de instellingen van uw apparaat en stel de schermvergrendeling met de hand in</string>
+	<string name="error_export_illegal_file_name">Exporteren is mislukt. Verwijder speciale tekens uit de bestandsnamen en probeer opnieuw.</string>
+	<string name="error_name_contains_invalid_characters">Kan geen speciale tekens bevatten.</string>
+	<string name="error_names_contains_invalid_characters">Bestandsnamen mogen geen speciale tekens bevatten.</string>
+	<string name="error_vault_name_contains_invalid_characters">Kluisnaam mag geen speciale tekens bevatten.</string>
+	<string name="error_general_update">Update controle mislukt. Algemene fout opgetreden.</string>
+	<string name="error_hash_mismatch_update">Update controle mislukt. Berekende hash komt niet overeen met het geüploade bestand</string>
+	<string name="error_update_no_internet">Update controle mislukt. Geen internetverbinding.</string>
+	<string name="error_failed_to_decrypt_webdav_password">Fout bij het decoderen van WebDAV wachtwoord, voeg dit opnieuw toe in de instellingen</string>
+	<string name="error_play_services_not_available">Google Play Services niet geïnstalleerd</string>
+	<string name="error_biometric_auth_aborted">Biometrische authenticatie geannuleerd</string>
+	<string name="error_vault_version_mismatch">Versie gespecificeerd in %1$s is anders dan %2$s</string>
+	<string name="error_vault_key_invalid">%1$s komt niet overeen met deze %2$s</string>
+	<string name="error_vault_config_loading">Algemene fout tijdens het laden van de kluisconfiguratie</string>
+	<string name="error_file_not_found_after_opening_using_3party">Lokaal bestand is niet meer aanwezig na het terugschakelen naar Cryptomator. Mogelijke wijzigingen kunnen niet worden verzonden naar de cloud.</string>
+	<string name="error_no_such_bucket">Deze bucket is niet gevonden</string>
+	<string name="error_masterkey_location_not_supported">Aangepaste Masterkey-locatie nog niet ondersteund</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">Lokale opslag</string>
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<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="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>
 	<string name="snack_bar_action_title_search_next">Volgende</string>
+	<string name="snack_bar_action_title_sort">Sorteren</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">Nieuwste eerst</string>
+	<string name="snack_bar_action_title_sort_oldest">Oudste eerst</string>
+	<string name="snack_bar_action_title_sort_biggest">Grootste eerst</string>
+	<string name="snack_bar_action_title_sort_smallest">Kleinste eerst</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">Toevoegen aan Cryptomator</string>
+	<string name="screen_vault_list_action_create_new_vault">Nieuwe kluis aanmaken</string>
+	<string name="screen_vault_list_action_add_existing_vault">Bestaande kluis toevoegen</string>
 	<string name="screen_vault_list_vault_action_delete">Verwijderen</string>
+	<string name="screen_vault_list_vault_creation_hint">Klik hier om een nieuwe kluis aan te maken</string>
+	<string name="screen_vault_list_change_password_successful">Wachtwoord succesvol gewijzigd</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Kluis</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">Selecteer het Masterkey-bestand</string>
+	<string name="screen_file_browser_create_new_vault_button_text">Plaats hier</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">Kluis naam: %1$s</string>
+	<plurals name="screen_file_browser_subtitle_move">
+		<item quantity="one">Verplaats %1$s naar</item>
+		<item quantity="other">%2$d items verplaatsen naar</item>
+	</plurals>
+	<string name="screen_file_browser_move_button_text">Verplaatsen</string>
+	<string name="screen_file_browser_msg_empty_folder">Lege map</string>
+	<string name="screen_file_browser_file_info_label_date">%1$s geleden gewijzigd</string>
+	<string name="screen_file_browser_share_intent_chooser_title">Delen met</string>
+	<string name="screen_file_browser_share_destination_title">Kies een bestemming</string>
 	<string name="screen_file_browser_share_button_text">Kies</string>
+	<string name="screen_file_browser_nothing_to_share">Niets om te delen</string>
+	<string name="screen_file_browser_actions_title">Toevoegen aan %1$s</string>
+	<string name="screen_file_browser_action_create_folder">Map aanmaken</string>
+	<string name="screen_file_browser_action_create_new_text_file">Maak tekstbestand</string>
+	<string name="screen_file_browser_action_upload_files">Bestanden uploaden</string>
+	<string name="screen_file_browser_upload_files_chooser_title">Bestanden</string>
+	<string name="screen_file_browser_msg_file_exported">Bestand geëxporteerd</string>
+	<string name="screen_file_browser_msg_files_exported">Geëxporteerde bestanden</string>
+	<string name="screen_file_browser_nothing_to_export">Niets te exporteren</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">Aanmaken download map mislukt</string>
+	<string name="screen_file_browser_node_action_share">Delen</string>
+	<string name="screen_file_browser_node_action_rename">Wijzig naam</string>
 	<string name="screen_file_browser_node_action_edit_text">Bewerken</string>
+	<string name="screen_file_browser_node_action_export">Exporteren</string>
+	<string name="screen_file_browser_node_action_delete">Verwijderen</string>
+	<string name="screen_file_browser_node_action_open_with_text">Openen met&#8230;</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">Selecteer items</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d geselecteerd</string>
 	<string name="screen_file_browser_select_items">Selecteer</string>
+	<string name="screen_file_browser_select_all_items">Alles selecteren</string>
+	<string name="screen_file_browser_refresh_items">Vernieuwen</string>
+	<string name="screen_file_browser_no_connection_message">Geen verbinding</string>
+	<string name="screen_file_browser_no_connection_button_text">Opnieuw proberen</string>
 	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">Succesvol opgeslagen</string>
 	<!-- ## screen: share files -->
+	<string name="screen_share_files_title">%1$s opslaan in&#8230;</string>
+	<string name="screen_share_files_content_text">tekst</string>
+	<string name="screen_share_files_content_file">bestand</string>
+	<string name="screen_share_files_content_files">bestanden</string>
+	<string name="screen_share_files_msg_filenames_must_be_unique">Bestandsnamen moeten uniek zijn, hernoem de duplicaten.</string>
+	<string name="screen_share_files_section_location">Opslaglocatie</string>
+	<string name="screen_share_files_save_button_text">Opslaan</string>
+	<string name="screen_share_files_msg_success">Versleuteling voltooid</string>
 	<!-- ## screen: choose cloud service -->
+	<string name="screen_choose_cloud_service_title">Cloud service</string>
 	<!-- ## screen: cloud connections -->
+	<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>
 	<string name="screen_webdav_settings_username_label">Gebruikersnaam</string>
 	<string name="screen_webdav_settings_password_label">Wachtwoord</string>
+	<string name="screen_webdav_settings_done_button_text">Verbinden</string>
+	<string name="screen_webdav_settings_msg_url_must_not_be_empty">URL mag niet leeg zijn.</string>
+	<string name="screen_webdav_settings_msg_url_is_invalid">URL is ongeldig.</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">Gebruikersnaam mag niet leeg zijn.</string>
+	<string name="screen_webdav_settings_msg_password_must_not_be_empty">Wachtwoord mag niet leeg zijn.</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">Weergavenaam</string>
+	<string name="screen_s3_settings_access_key_label">Toegangs code</string>
+	<string name="screen_s3_settings_secret_key_label">Geheime code</string>
+	<string name="screen_s3_settings_bucket_label">Bestaande Bucket</string>
+	<string name="screen_s3_settings_endpoint_label">Endpoint</string>
+	<string name="screen_s3_settings_region_label">Regio</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">Weergavenaam mag niet leeg zijn</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">Toegangs code mag niet leeg zijn</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">Geheime code mag niet leeg zijn</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Bucketveld mag niet leeg zijn</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Eindpunt of regio kan niet leeg zijn</string>
 	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_msg_name_empty">Kluis naam mag niet leeg zijn.</string>
+	<string name="screen_enter_vault_name_vault_label">Kluis naam</string>
 	<string name="screen_enter_vault_name_button_text">Maak</string>
 	<!-- ## screen: set password -->
+	<string name="screen_set_password_title">Wachtwoord instellen</string>
+	<string name="screen_set_password_msg_password_mismatch">Wachtwoord komt niet overeen met het opnieuw ingevoerde wachtwoord.</string>
 	<string name="screen_set_password_button_text">Klaar</string>
 	<string name="screen_set_password_hint">BELANGRIJK: Als u uw wachtwoord vergeet, is er geen manier om uw gegevens te herstellen.</string>
+	<string name="screen_set_password_retype_password_label">Herhaal wachtwoord</string>
+	<string name="screen_set_password_strength_indicator_0">Te zwak om een kluis aan te maken</string>
 	<string name="screen_set_password_strength_indicator_1">Zwak</string>
 	<string name="screen_set_password_strength_indicator_2">Redelijk</string>
 	<string name="screen_set_password_strength_indicator_3">Sterk</string>
+	<string name="screen_set_password_strength_indicator_4">Zeer Sterk</string>
 	<!-- ## screen: settings -->
 	<string name="screen_settings_section_general">Algemeen</string>
+	<string name="screen_settings_cloud_settings_label">Clouddiensten</string>
+	<string name="screen_settings_biometric_auth">Biometrische authenticatie</string>
+	<string name="screen_settings_activate_biometric_auth">Biometrische authenticatie activeren</string>
+	<string name="screen_settings_confirm_face_unlock">Bevestig gezichtsontgrendeling (indien beschikbaar)</string>
+	<string name="screen_settings_block_app_when_obscured">Blokkeer app wanneer verborgen</string>
+	<string name="screen_settings_block_app_when_obscured_summary">Blokkeer het onderscheppen van de invoer en het weergeven van een valse gebruikersinterface</string>
+	<string name="screen_settings_secure_screen">Schermafbeeldingen blokkeren</string>
+	<string name="screen_settings_secure_screen_summary">Blokkeer het maken van schermafbeeldingen in de app als in de lijst van recent gebruikte apps</string>
+	<string name="screen_settings_section_search">Zoeken</string>
+	<string name="screen_settings_live_search">Live zoeken</string>
+	<string name="screen_settings_live_search_summary">Zoekresultaten bijwerken tijdens het invoeren</string>
+	<string name="screen_settings_glob_search">Zoek met behulp van glob patroon</string>
+	<string name="screen_settings_glob_search_summary">Gebruik glob patroon overeenkomsten zoals alice.*.jpg</string>
+	<string name="screen_settings_section_auto_lock">Automatisch vergrendelen</string>
+	<string name="screen_settings_auto_lock_timeout">Vergrendel na</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">Wanneer scherm is uitgeschakeld</string>
+	<string name="screen_settings_section_auto_photo_upload">Foto\'s automatisch uploaden</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">Kies kluis voor uploaden</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">Activeren</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Bewaar afbeeldingen op de achtergrond en begin met uploaden zodra de geselecteerde kluis is ontgrendeld</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Meteen uploaden</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Meteen uploaden als de kluis ontgrendeld is</string>
+	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Enkel uploaden via WIFI</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">Video\'s uploaden</string>
+	<string name="screen_settings_auto_photo_upload_title">Automatisch te uploaden bestanden opslaan in&#8230;</string>
+	<string name="screen_settings_website_label">Cryptomator website</string>
+	<string name="screen_settings_twitter_label">Volg ons op Twitter</string>
+	<string name="screen_settings_facebook_label">Vind ons leuk op Facebook</string>
+	<string name="screen_settings_section_legal">Juridisch</string>
+	<string name="screen_settings_licenses_label">Licenties</string>
+	<string name="screen_settings_license_terms_label">Licentievoorwaarden</string>
+	<string name="screen_settings_section_support">Ondersteuning</string>
+	<string name="screen_settings_contact_label">Hulp vragen</string>
+	<string name="screen_settings_debug_mode_label">Foutopsporingsmodus</string>
+	<string name="screen_settings_error_report_label">Logbestand versturen</string>
+	<string name="screen_settings_error_report_failed">Verzenden mislukt</string>
+	<string name="screen_settings_security_label">Beveiligingstips</string>
+	<string name="screen_settings_section_version">Versie</string>
+	<string name="screen_settings_advanced_settings">Geavanceerde opties</string>
+	<string name="screen_settings_background_unlock_preparation_label">Ontgrendelen versnellen</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">Download kluisconfiguratie op de achtergrond wanneer gevraagd wordt om het wachtwoord of biometrische authenticatie in te voeren</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files">Ontgrendeld houden</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Houd kluizen ontgrendeld tijdens het bewerken van bestanden</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_webdav_connections">WebDAV verbindingen</string>
+	<string name="screen_cloud_settings_pcloud_connections">pCloud verbindingen</string>
+	<string name="screen_cloud_settings_s3_connections">S3 verbindingen</string>
+	<string name="screen_cloud_settings_local_storage_locations">Lokale opslaglocaties</string>
+	<string name="screen_cloud_settings_log_in_to">Inloggen bij</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">Uitloggen van</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">%1$s kon niet worden geverifieerd.</string>
+	<string name="screen_update_pcloud_connections_title">PCloud inloggegevens bijwerken</string>
 	<!-- ## screen: insecure android version info -->
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Annuleren</string>
 	<string name="dialog_enter_password_positive_button">Ontgrendel</string>
+	<string name="dialog_change_password_old_password_label">Oud wachtwoord</string>
+	<string name="dialog_change_password_new_password_label">Nieuw wachtwoord</string>
+	<string name="dialog_change_password">Wijzig wachtwoord</string>
+	<string name="dialog_change_password_msg_old_password_empty">Het oude wachtwoord kan niet leeg zijn.</string>
+	<string name="dialog_change_password_msg_new_password_empty">Nieuw wachtwoord kan niet leeg zijn.</string>
+	<string name="dialog_change_password_msg_password_mismatch">Nieuw wachtwoord komt niet overeen met het opnieuw ingevoerde wachtwoord.</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">Kluis %1$s niet gevonden</string>
+	<string name="dialog_vault_not_found_message">De kluis is hernoemd, verplaatst of verwijderd. Verwijder deze kluis uit de lijst en voeg opnieuw toe om verder te gaan. Nu verwijderen?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Verwijderen</string>
+	<string name="dialog_existing_file_title">Bestand bestaat al</string>
+	<string name="dialog_existing_file_positive_button">Vervangen</string>
+	<string name="dialog_existing_file_message">Een bestand met de naam \'%1$s\' bestaat al.</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">Bestaande overslaan</string>
+	<string name="dialog_replace_positive_button_all_files_exist">Vervang alles</string>
+	<string name="dialog_replace_positive_button_some_files_exist">Vervang bestaande</string>
+	<string name="dialog_replace_positive_button_single_file_exists">Vervangen</string>
+	<string name="dialog_replace_msg_single_file_exists">Een bestand met de naam \'%1$s\' bestaat al. Wilt u het vervangen?</string>
+	<string name="dialog_replace_msg_all_files_exists">Alle bestanden bestaan al. Wil je ze vervangen?</string>
+	<string name="dialog_replace_msg_some_files_exists">%1$d bestanden bestaan al. Wil je ze vervangen?</string>
+	<string name="dialog_replace_title_single_file_exists">Bestand vervangen?</string>
+	<string name="dialog_replace_title_multiple_files_exist">Bestanden vervangen?</string>
+	<string name="dialog_unable_to_share_title">Kan bestanden niet delen</string>
+	<string name="dialog_unable_to_share_message">U heeft nog geen kluis ingesteld. Maak eerst een nieuwe kluis aan met de Cryptomator-app.</string>
 	<string name="dialog_unable_to_share_positive_button">Ok</string>
+	<string name="dialog_unable_to_share_negative_button">Kluis aanmaken</string>
+	<string name="dialog_filetype_not_supported_title">Kan %1$s niet openen</string>
+	<string name="dialog_filetype_not_supported_message">Download een app die dit bestand kan openen of wil je dit bestand op je apparaat opslaan?</string>
+	<string name="dialog_rename_vault_title">Kluis hernoemen</string>
+	<string name="dialog_rename_node_folder_title">Map hernoemen</string>
+	<string name="dialog_rename_node_file_title">Bestandsnaam wijzigen</string>
+	<string name="dialog_unsaved_changes_title">Je hebt niet-opgeslagen wijzigingen</string>
+	<string name="dialog_unsaved_changes_message">Wilt u afsluiten zonder op te slaan?</string>
+	<string name="dialog_unsaved_changes_discard">Negeren</string>
+	<string name="dialog_file_name_placeholder">tekst.txt</string>
+	<string name="dialog_delete_vault_message">Ben je zeker dat je deze kluis wilt verwijderen?</string>
+	<string name="dialog_delete_vault_hint">Deze actie zal de kluis alleen uit deze lijst verwijderen en nergens anders.</string>
+	<string name="dialog_upload_file_title">Uploaden&#8230;</string>
+	<string name="dialog_upload_file_remaining">Bestand %1$d van %2$d</string>
+	<string name="dialog_export_file_title">Exporteren (%1$d/%2$d)</string>
+	<string name="dialog_progress_please_wait">Een ogenblik geduld&#8230;</string>
+	<string name="dialog_progress_creating_folder">Map aanmaken&#8230;</string>
+	<string name="dialog_progress_creating_text_file">Tekstbestand aanmaken&#8230;</string>
+	<string name="action_progress_authentication">Authenticatie&#8230;</string>
+	<string name="action_progress_renaming">Hernoemen&#8230;</string>
+	<string name="action_progress_deleting">Verwijderen&#8230;</string>
+	<string name="dialog_progress_unlocking_vault">Kluis ontgrendelen&#8230;</string>
+	<string name="dialog_progress_change_password">Wachtwoord wijzigen&#8230;</string>
+	<string name="dialog_progress_creating_vault">Kluis aanmaken&#8230;</string>
+	<string name="dialog_progress_upload_file">Uploaden&#8230;</string>
+	<string name="dialog_progress_download_file">Downloaden&#8230;</string>
+	<string name="dialog_progress_encryption">Versleutelen&#8230;</string>
+	<string name="dialog_progress_decryption">Decoderen&#8230;</string>
+	<string name="action_progress_moving">Verplaatsen&#8230;</string>
 	<string name="dialog_lock_vault">Vergrendel</string>
+	<string name="dialog_accept_ssl_certificate_title">Ongeldig SSL-certificaat</string>
+	<string name="dialog_accept_ssl_certificate_hint">Het SSL-certificaat is ongeldig. Wilt u het toch vertrouwen?</string>
+	<string name="dialog_accept_ssl_certificate_details">Details</string>
+	<string name="dialog_accept_ssl_certificate_security_checkbox">Dit kan een veiligheidsrisico zijn. Ik weet wat ik doe.</string>
+	<string name="dialog_http_security_hint">Het gebruik van HTTP is onveilig. We raden aan om in plaats daarvan HTTPS te gebruiken. Als u de risico\'s weet, kunt u doorgaan met HTTP.</string>
+	<string name="dialog_http_security_checkbox">Verander naar HTTPS</string>
+	<string name="dialog_http_security_title">HTTPS gebruiken?</string>
+	<string name="dialog_no_screen_lock_hint">Er is geen schermvergrendeling ingesteld. Om uw gegevens veilig op te slaan, klik OK om een patroon of wachtwoord in te stellen.</string>
+	<string name="dialog_no_screen_lock_title">Schermvergrendeling instellen?</string>
+	<string name="dialog_no_screen_lock_checkbox">Schermvergrendeling instellen</string>
+	<string name="dialog_no_biometric_auth_set_up_title">Geen basisauthenticatie ingesteld in het systeem</string>
+	<string name="dialog_no_biometric_auth_set_up_message">Gebruik ten minste één vinger/gezicht om deze service te gebruiken.</string>
+	<string name="dialog_debug_mode_disclaimer_hint">In deze modus kunnen gevoelige gegevens naar een logbestand op je apparaat geschreven worden (bijv. bestandsnamen en paden). Wachtwoorden, cookies, etc. worden expliciet uitgesloten.\n\nVergeet niet om de foutopsporingsmodus zo snel mogelijk uit te schakelen.</string>
+	<string name="dialog_debug_mode_disclaimer_title">Aandacht</string>
+	<string name="dialog_debug_mode_positive_button">Inschakelen</string>
+	<string name="dialog_disable_app_obscured_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/#block-app-when-obscured"> bewust bent van de risico\'s</a>.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_title">Aandacht</string>
+	<string name="dialog_disable_app_obscured_positive_button">Uitschakelen</string>
+	<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_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>
+	<string name="dialog_confirm_delete_multiple_title">Verwijder %1$d items?</string>
+	<string name="dialog_confirm_delete_multiple_message">Weet u zeker dat u deze items wilt verwijderen?</string>
+	<string name="dialog_confirm_delete_file_message">Weet u zeker dat u dit bestand wilt verwijderen?</string>
+	<string name="dialog_confirm_delete_folder_message">Dit zal alle inhoud van de map verwijderen. Weet u zeker dat u deze map wilt verwijderen?</string>
+	<string name="dialog_biometric_auth_key_invalidated_title">Biometrische authenticatie functie gedeactiveerd</string>
+	<string name="dialog_biometric_auth_key_invalidated_message">Omdat de sleutel niet geldig is, is de biometrische authenticatie functie gedeactiveerd. Open de Cryptomator instellingen om deze opnieuw in te schakelen.</string>
+	<string name="dialog_enter_license_title">Geef een geldige licentie op</string>
+	<string name="dialog_enter_license_content">U heeft Cryptomator gedownload zonder Google Play Store te gebruiken. Geef een geldige licentie in. Een geldige licentie kan worden gekocht op <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
+	<string name="dialog_enter_license_not_valid_content">De opgegeven licentie is niet geldig. Zorg ervoor dat u deze correct hebt ingevoerd.</string>
+	<string name="dialog_enter_license_no_content">Geen licentie ingegeven. Voer een geldige licentie in.</string>
+	<string name="dialog_enter_license_decline_button">Afsluiten</string>
+	<string name="dialog_license_confirmation_title">Licentie bevestiging</string>
+	<string name="dialog_license_confirmation_message">Bedankt %1$s voor het ingeven van uw geldige licentie.</string>
+	<string name="dialog_update_available_title">Update beschikbaar</string>
+	<string name="dialog_update_available_message">Werk Cryptomator bij naar de laatste versie. Door op OK te drukken, downloaden we de app op de achtergrond en vragen we je om deze te installeren.</string>
+	<string name="dialog_update_available_update">Nu bijwerken</string>
+	<string name="dialog_update_available_download_site">Ga naar Download pagina</string>
+	<string name="dialog_update_available_cancel">Later</string>
+	<string name="dialog_download_update_title">Bezig met downloaden</string>
+	<string name="dialog_download_update_message">Laatste versie van Cryptomator downloaden</string>
+	<string name="dialog_sym_link_title">Map is een symbolische link</string>
+	<string name="dialog_sym_link_message">U kunt niet naar deze symbolische link navigeren</string>
 	<string name="dialog_sym_link_back_button">Terug</string>
+	<string name="dialog_no_dir_file_title">Kan de inhoud van de map niet laden</string>
 	<string name="dialog_no_dir_file_message">Cloud map \'%1$s\' heeft geen geldig sleutelbestand. Het kan zijn dat de map op een ander apparaat is aangemaakt en nog niet volledig is gesynchroniseerd met de cloud. Controleer in de cloud of het volgende bestand bestaat en niet leeg is:\n%2$s</string>
+	<string name="dialog_no_more_images_to_display">Geen afbeeldingen meer om weer te geven&#8230;</string>
+	<string name="dialog_pcloud_credentials_updated_title">Gebruiksgegevens van \'%1$s\' bijgewerkt</string>
+	<string name="dialog_pcloud_credentials_updated">Als je een nieuwe pCloud account probeerde toe te voegen, klik dan op deze url <a href="https://www.pcloud.com">www.pcloud. om</a>, log de huidige account uit en klik opnieuw op de \'+\' in deze app om een nieuwe cloud verbinding te maken.</string>
+	<string name="permission_snackbar_auth_local_vault">Cryptomator heeft toegang tot opslag nodig om lokale kluizen te kunnen gebruiken</string>
+	<string name="permission_snackbar_auth_auto_upload">Cryptomator heeft toegang tot opslag nodig om automatisch uploaden van foto\'s te kunnen gebruiken</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
+	<string name="file_size_zero">Nul 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">seconde</string>
+	<string name="time_unit_seconds_pl">seconden</string>
+	<string name="time_unit_minutes_sg">minuut</string>
 	<string name="time_unit_minutes_pl">minuten</string>
+	<string name="time_unit_hours_sg">uur</string>
+	<string name="time_unit_hours_pl">uren</string>
+	<string name="time_unit_days_sg">dag</string>
+	<string name="time_unit_days_pl">dagen</string>
+	<string name="time_unit_weeks_sg">week</string>
+	<string name="time_unit_weeks_pl">weken</string>
+	<string name="time_unit_months_sg">maand</string>
+	<string name="time_unit_months_pl">maanden</string>
+	<string name="time_unit_years_sg">jaar</string>
+	<string name="time_unit_years_pl">jaren</string>
 	<!-- ## biometric authentication -->
+	<string name="dialog_biometric_auth_title">Biometrische login</string>
+	<string name="dialog_biometric_auth_message">Ontgrendelen met uw biometrische gegevens</string>
+	<string name="dialog_biometric_auth_use_password">Kluis wachtwoord gebruiken</string>
+	<string name="dialog_unable_to_auto_upload_files_title">Kan bestanden niet automatisch uploaden</string>
 	<!-- notification -->
+	<string name="notification_unlocked">Kluizen ontgrendeld: %1$d</string>
+	<string name="notification_timeout">Automatisch vergrendelen in %1$s</string>
+	<string name="notification_lock_all">Alles vergrendelen</string>
+	<string name="notification_cancel_auto_upload">Upload annuleren</string>
+	<string name="notification_auto_upload_title">Automatische foto upload actief</string>
+	<string name="notification_auto_upload_message">Uploaden %1d/%2d</string>
+	<string name="notification_auto_upload_finished_title">Automatische foto\'s uploaden voltooid</string>
+	<string name="notification_auto_upload_finished_message">%1$d afbeeldingen geüpload naar de kluis</string>
+	<string name="notification_auto_upload_failed_title">Automatische foto\'s uploaden mislukt</string>
+	<string name="notification_auto_upload_failed_general_error">Algemene fout opgetreden tijdens het uploaden.</string>
+	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Geselecteerde map voor uploaden is niet meer beschikbaar. Ga naar instellingen en kies een nieuwe</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">Kluis vergrendeld tijdens het uploaden, heropen de kluis om door te gaan</string>
+	<string name="notification_open_writable_file_title">Open schrijfbaar bestand</string>
+	<string name="notification_open_writable_file_message">Kluis blijft ontgrendeld tot het bewerken voltooid is</string>
+	<string name="notification_update_check_finished_latest">Laatste versie geïnstalleerd</string>
+	<string name="screen_settings_lru_cache">Cache</string>
+	<string name="screen_settings_lru_cache_toggle_summary">Bewaar recent geopende bestanden versleuteld en lokaal op het apparaat voor later hergebruik</string>
+	<string name="screen_settings_lru_cache_size">Totale cache grootte</string>
+	<string name="screen_settings_clear_lru_cache_size">Cache leegmaken</string>
+	<string name="screen_settings_lru_cache_changed__restart_toast">Wijzigingen worden toegepast bij het opnieuw opstarten van de app</string>
+	<string name="screen_settings_license">Geregistreerd voor</string>
+	<string name="screen_settings_license_mail">%1$s</string>
+	<string name="dialog_settings_update_check_interval_title">Update interval</string>
+	<string name="screen_settings_check_updates">Controleren op updates</string>
+	<string name="screen_settings_last_check_updates">Laatst uitgevoerd %1$s</string>
+	<string name="dialog_cache_size_title">Cachegrootte per Cloud</string>
 	<!-- lock timeout names -->
+	<string name="lock_timeout_instant">Onmiddellijk</string>
+	<string name="lock_timeout_1m">1 minuut</string>
+	<string name="lock_timeout_2m">2 minuten</string>
+	<string name="lock_timeout_5m">5 minuten</string>
+	<string name="lock_timeout_10m">10 minuten</string>
+	<string name="lock_timeout_never">Nooit</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">Stijl</string>
+	<string name="follow_system">Automatisch (systeemthema)</string>
 	<string name="light">Licht</string>
 	<string name="dark">Donker</string>
 	<!-- update interval names -->
+	<string name="update_interval_1d">Een keer per dag</string>
+	<string name="update_interval_1w">Een keer per week</string>
+	<string name="update_interval_1m">Een keer per maand</string>
 </resources>
diff --git a/presentation/src/main/res/values-pl-rPL/strings.xml b/presentation/src/main/res/values-pl-rPL/strings.xml
index f6c2223b..f6e210ce 100644
--- a/presentation/src/main/res/values-pl-rPL/strings.xml
+++ b/presentation/src/main/res/values-pl-rPL/strings.xml
@@ -24,11 +24,11 @@
 	<string name="error_general_update">Błąd sprawdzania aktualizacji. Wystąpił błąd ogólny.</string>
 	<string name="error_hash_mismatch_update">Błąd sprawdzania aktualizacji. Obliczony hash nie pasuje do pobranego pliku</string>
 	<string name="error_update_no_internet">Błąd sprawdzania aktualizacji. Brak połączenia z Internetem.</string>
-	<string name="error_failed_to_decrypt_webdav_password">Nie udało się odszyfrować hasła WebDAV, proszę dodać je w ustawieniach</string>
+	<string name="error_failed_to_decrypt_webdav_password">Błąd odszyfrowania hasła WebDAV, proszę dodać je ponownie w ustawieniach</string>
 	<string name="error_play_services_not_available">Usługi Google Play nie są zainstalowane</string>
 	<string name="error_biometric_auth_aborted">Przerwano biometryczną autoryzację</string>
-	<string name="error_vault_version_mismatch">Wersja w vault.cryptomator niezgodna z wersją w masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator nie pasuje do tego masterkey.cryptomator</string>
+	<string name="error_vault_version_mismatch">Wersja zapisana w %1$s różni się od tej w %2$s</string>
+	<string name="error_vault_key_invalid">%1$s nie pasuje do tego %2$s</string>
 	<string name="error_vault_config_loading">Ogólny błąd podczas ładowania konfiguracji sejfu</string>
 	<string name="error_file_not_found_after_opening_using_3party">Lokalny plik nie jest już obecny po przełączeniu się z powrotem na Cryptomator. Możliwe zmiany nie mogą być przeniesione z powrotem do chmury.</string>
 	<string name="error_no_such_bucket">Nie ma takiego bucketu</string>
@@ -178,6 +178,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Wybierz sejf do przesłania</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Aktywuj</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Przechwytuj zdjęcia w tle i po odblokowaniu wybranego sejfu rozpocznij przesyłanie</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Prześlij natychmiast</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Prześlij bezpośrednio przy odblokowanym sejfie</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Prześlij tylko przy użyciu WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Prześlij filmy</string>
 	<string name="screen_settings_auto_photo_upload_title">Zapisz automatycznie przesyłane pliki w&#8230;</string>
@@ -222,7 +224,7 @@
 	<string name="dialog_change_password_msg_password_mismatch">Hasła nie zgadzają się.</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_title">Sejfu %1$s nie odnaleziono</string>
-	<string name="dialog_vault_not_found_message">Sejf został przeniesiony, usunięty albo zmieniono jego nazwę. Należy usunąć ten sejf z listy i dodać go ponownie. Chcesz to zrobić teraz?</string>
+	<string name="dialog_vault_not_found_message">Sejf został przeniesiony, usunięty albo zmieniono jego nazwę. Usuń ten sejf z listy i dodaj go ponownie. Usunąć teraz?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Usuń</string>
 	<string name="dialog_existing_file_title">Plik już istnieje</string>
 	<string name="dialog_existing_file_positive_button">Zastąp</string>
diff --git a/presentation/src/main/res/values-pt-rBR/strings.xml b/presentation/src/main/res/values-pt-rBR/strings.xml
index d18ca43c..eda9c8db 100644
--- a/presentation/src/main/res/values-pt-rBR/strings.xml
+++ b/presentation/src/main/res/values-pt-rBR/strings.xml
@@ -16,7 +16,7 @@
 	<string name="error_cloud_already_exists">O provedor de nuvem já existe.</string>
 	<string name="error_activity_not_found">Por favor, faça o download de um aplicativo que possa abrir este arquivo.</string>
 	<string name="error_server_not_found">Servidor não encontrado.</string>
-	<string name="error_device_policy_manager_not_found">Por favor, abra as configurações do seu dispositivo e configure o bloqueio de tela manualmente</string>
+	<string name="error_device_policy_manager_not_found">Por favor, abra as configurações do dispositivo e defina o bloqueio de tela manualmente</string>
 	<string name="error_export_illegal_file_name">Falha na exportação. Tente remover caracteres especiais dos nomes de arquivo e exporte novamente.</string>
 	<string name="error_name_contains_invalid_characters">Não pode conter caracteres especiais.</string>
 	<string name="error_names_contains_invalid_characters">Nomes de arquivo não podem conter caracteres especiais.</string>
@@ -24,11 +24,11 @@
 	<string name="error_general_update">Verificação da atualização falhou. Erro geral ocorreu.</string>
 	<string name="error_hash_mismatch_update">Falha ao verificar a atualização. Hash calculado não coincide com o arquivo enviado</string>
 	<string name="error_update_no_internet">Falha ao verificar atualização. Nenhuma conexão com a internet.</string>
-	<string name="error_failed_to_decrypt_webdav_password">Falha ao descriptografar a senha WebDAV, por favor adicione nas configurações novamente</string>
-	<string name="error_play_services_not_available">Play Services não instalado</string>
+	<string name="error_failed_to_decrypt_webdav_password">Falha ao descriptografar a senha WebDAV, por favor adicione novamente nas configurações</string>
+	<string name="error_play_services_not_available">Serviços do Google Play não instalados</string>
 	<string name="error_biometric_auth_aborted">Autenticação biométrica abortada</string>
-	<string name="error_vault_version_mismatch">Versão especificada em vault.cryptomator é diferente do masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator não coincide com este masterkey.cryptomator</string>
+	<string name="error_vault_version_mismatch">Versão especificada em %1$s é diferente de %2$s</string>
+	<string name="error_vault_key_invalid">%1$s não coincide com este %2$s</string>
 	<string name="error_vault_config_loading">Erro geral ao carregar a configuração do cofre</string>
 	<string name="error_file_not_found_after_opening_using_3party">O arquivo local não está mais presente depois de voltar ao Cryptomator. Possíveis alterações não podem ser propagadas de volta para o provedor de nuvem.</string>
 	<string name="error_no_such_bucket">Não existe tal bucket no nome de domínio</string>
@@ -176,6 +176,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Escolher cofre para upload</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Ativar</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Capture imagens em segundo plano e assim que o cofre selecionado for desbloqueado, inicie o upload</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Upload instantâneo</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Envie diretamente se o cofre estiver desbloqueado</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Fazer upload apenas usando o WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Upload de vídeos</string>
 	<string name="screen_settings_auto_photo_upload_title">Salvar upload automático de arquivos em&#8230;</string>
@@ -220,7 +222,7 @@
 	<string name="dialog_change_password_msg_password_mismatch">A nova senha não corresponde à senha digitada.</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_title">Cofre %1$s não encontrado</string>
-	<string name="dialog_vault_not_found_message">O cofre foi renomeado, movido ou excluído. Remova este formulário de cofre e adicione-o novamente para prosseguir. Remover agora?</string>
+	<string name="dialog_vault_not_found_message">O cofre foi renomeado, movido ou excluído. Remova este cofre da lista e adicione-o novamente para prosseguir. Remover agora?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Remover</string>
 	<string name="dialog_existing_file_title">O arquivo já existe</string>
 	<string name="dialog_existing_file_positive_button">Substituir</string>
diff --git a/presentation/src/main/res/values-ro-rRO/strings.xml b/presentation/src/main/res/values-ro-rRO/strings.xml
index 37d1fd6b..4da26b64 100644
--- a/presentation/src/main/res/values-ro-rRO/strings.xml
+++ b/presentation/src/main/res/values-ro-rRO/strings.xml
@@ -16,7 +16,6 @@
 	<string name="error_cloud_already_exists">Acest cloud există deja.</string>
 	<string name="error_activity_not_found">Vă rugăm să descărcați o aplicație care poate deschide acest fișier.</string>
 	<string name="error_server_not_found">Serverul nu a fost găsit.</string>
-	<string name="error_device_policy_manager_not_found">Deschideți setările dispozitivelor dvs. și setați blocarea ecranului manual</string>
 	<string name="error_export_illegal_file_name">Exportul a eșuat. Încercați să eliminați caracterele speciale din numele fișierelor și să exportați din nou.</string>
 	<string name="error_name_contains_invalid_characters">Nu poate să conțină caractere speciale.</string>
 	<string name="error_names_contains_invalid_characters">Numele fișierelor nu pot conține caractere speciale.</string>
@@ -24,11 +23,7 @@
 	<string name="error_general_update">Verificarea actualizării a eșuat. A apărut o eroare generală.</string>
 	<string name="error_hash_mismatch_update">Verificarea actualizării a eșuat. Hash-ul calculat nu se potrivește cu fișierul încărcat</string>
 	<string name="error_update_no_internet">Verificarea actualizării a eșuat. Nu există conexiune la internet.</string>
-	<string name="error_failed_to_decrypt_webdav_password">Nu s-a reușit decriptarea parolei WebDAV, vă rugăm să o introduceți din nou în setări</string>
-	<string name="error_play_services_not_available">Serviciile Play nu sunt instalate</string>
 	<string name="error_biometric_auth_aborted">Autentificare biometrică anulată</string>
-	<string name="error_vault_version_mismatch">Versiunea specificată în vault.cryptomator este diferită de masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator nu se potrivește cu acest masterkey.cryptomator</string>
 	<string name="error_vault_config_loading">Eroare generală în timpul încărcării configurației seifului</string>
 	<string name="error_file_not_found_after_opening_using_3party">Fișierul local nu mai este prezent după ce s-a trecut înapoi la Cryptomator. Modificările posibile nu pot fi propagate înapoi în cloud.</string>
 	<string name="error_no_such_bucket">Nu există așa găleată</string>
@@ -221,7 +216,6 @@
 	<string name="dialog_change_password_msg_password_mismatch">Parola nouă nu se potrivește cu parola reintrodusă.</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_title">Seiful %1$s nu a fost găsit</string>
-	<string name="dialog_vault_not_found_message">Seiful a fost redenumit, mutat sau şters. Ştergeţi acest seif format din listă şi adăugaţi-l din nou pentru a continua. Ștergeți acum?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Șterge</string>
 	<string name="dialog_existing_file_title">Fişierul există deja</string>
 	<string name="dialog_existing_file_positive_button">Înlocuiește</string>
diff --git a/presentation/src/main/res/values-ru-rRU/strings.xml b/presentation/src/main/res/values-ru-rRU/strings.xml
index 11315e63..eec15f64 100644
--- a/presentation/src/main/res/values-ru-rRU/strings.xml
+++ b/presentation/src/main/res/values-ru-rRU/strings.xml
@@ -24,11 +24,11 @@
 	<string name="error_general_update">Не удалось проверить наличие обновления. Общая ошибка.</string>
 	<string name="error_hash_mismatch_update">Не удалось проверить обновление. Вычисленный хеш не соответствует отправленному файлу.</string>
 	<string name="error_update_no_internet">Ошибка проверки обновления. Нет подключения к Интернету.</string>
-	<string name="error_failed_to_decrypt_webdav_password">Не удалось расшифровать пароль WebDAV, добавьте его в настройках</string>
-	<string name="error_play_services_not_available">Сервисы Google Play не установлены</string>
+	<string name="error_failed_to_decrypt_webdav_password">Не удалось расшифровать пароль WebDAV, добавьте его заново в настройках</string>
+	<string name="error_play_services_not_available">Не установлены сервисы Google Play</string>
 	<string name="error_biometric_auth_aborted">Биометрическая аутентификация прервана</string>
-	<string name="error_vault_version_mismatch">Указанная в vault.cryptomator версия отличается от masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator не совпадает с этим masterkey.cryptomator</string>
+	<string name="error_vault_version_mismatch">Версия, указанная в %1$s, отличается от %2$s</string>
+	<string name="error_vault_key_invalid">%1$s не совпадает с %2$s</string>
 	<string name="error_vault_config_loading">Общая ошибка при загрузке конфигурации хранилища</string>
 	<string name="error_file_not_found_after_opening_using_3party">Локальный файл больше не существует после переключения на Cryptomator. Возможные изменения не могут быть переданы обратно в облако.</string>
 	<string name="error_no_such_bucket">Нет такого бакета</string>
@@ -178,6 +178,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Выберите хранилище для отправки</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Включено</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Захватывать изображения в фоновом режиме и начинать отправку при разблокировании выбранного хранилища</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Мгновенная отправка</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Загружать напрямую, если хранилище разблокировано</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Только по Wi-Fi</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Отправка видео</string>
 	<string name="screen_settings_auto_photo_upload_title">Сохранять автозагруженные файлы в&#8230;</string>
diff --git a/presentation/src/main/res/values-sk-rSK/strings.xml b/presentation/src/main/res/values-sk-rSK/strings.xml
index d15c5e74..b86458a8 100644
--- a/presentation/src/main/res/values-sk-rSK/strings.xml
+++ b/presentation/src/main/res/values-sk-rSK/strings.xml
@@ -16,7 +16,7 @@
 	<string name="error_cloud_already_exists">Cloud už existuje.</string>
 	<string name="error_activity_not_found">Prosím stiahnite takú aplikáciu ktorá dokáže otvoriť tento súbor.</string>
 	<string name="error_server_not_found">Server nenájdený.</string>
-	<string name="error_device_policy_manager_not_found">Prosím otvorte nastavenia zaridení a nastavte uzamykanie obrazovky ručne</string>
+	<string name="error_device_policy_manager_not_found">Prosím otvorte nastavenia zaridenia a nastavte uzamykanie obrazovky ručne</string>
 	<string name="error_export_illegal_file_name">Export neúspešný. Pokúste sa odstrániť špeciálne znaky z názvov súborov a exportujte znovu.</string>
 	<string name="error_name_contains_invalid_characters">Nemôže obsahovať špeciálne znaky.</string>
 	<string name="error_names_contains_invalid_characters">Názvy súborov nesmú obsahovať špecálne znaky.</string>
@@ -25,10 +25,10 @@
 	<string name="error_hash_mismatch_update">Kontrola aktualizácie zlyhala. Vypočítaný hash nekorešponduje s nahratým súborom</string>
 	<string name="error_update_no_internet">Kontrola aktualizácie zlyhala. Neexistuje spojenie s internetom.</string>
 	<string name="error_failed_to_decrypt_webdav_password">Dešifrovanie WebDAV hesla zlyhalo, prosím o znovu zadanie v nastaveniach</string>
-	<string name="error_play_services_not_available">Služby prehrávania nie sú inštalované</string>
+	<string name="error_play_services_not_available">Služby Google Play nie sú inštalované</string>
 	<string name="error_biometric_auth_aborted">Biometrická autentikácia prerušená</string>
-	<string name="error_vault_version_mismatch">Verzia špecifikovaná v trezore.cryptomator-a je odlišná od hlavného kľúča.cryptomator-a</string>
-	<string name="error_vault_key_invalid">trezor.cryptomator-a nesúhlasí s hlavným kľúčom.cryptomator-a</string>
+	<string name="error_vault_version_mismatch">Verzia definovaná v %1$s je odlišná od %2$s</string>
+	<string name="error_vault_key_invalid">%1$s nezodpovedá s týmto %2$s</string>
 	<string name="error_vault_config_loading">Chyba počas zavádzania konfigurácie trezora</string>
 	<string name="error_file_not_found_after_opening_using_3party">Lokálny súbor nie je viac prezentovaný po prepnutí naspäť do Cryptomator-a. Možné zmeny sa neprenesú späť do cloudu.</string>
 	<string name="error_no_such_bucket">Žiadna taká nádoba</string>
@@ -178,6 +178,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Vybrať trezor pre nahratie</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Aktivovať</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Zachyť obrázky na pozadí a keď je zvolený trezor odomknutý, začni nahrávať</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Nahrať okamžite</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Nahrať priamo keď je trezor odomknutý</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Nahrať iba s použitím Wi-Fi</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Nahrať videá</string>
 	<string name="screen_settings_auto_photo_upload_title">Uložiť auto ukladanie súborov do&#8230;</string>
@@ -222,7 +224,7 @@
 	<string name="dialog_change_password_msg_password_mismatch">Nové heslo nie je totožné s prepisovaným heslom.</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_title">Súbor %1$s nenájdený</string>
-	<string name="dialog_vault_not_found_message">Trezor bol premenovaný, premiestnený alebo zmazaný. Odstrániť tento trezor zo zoznamu a pridať ho znovu. Odstrániť teraz?</string>
+	<string name="dialog_vault_not_found_message">Trezor bol premenovaný, premiestnený alebo zmazaný. Odstránte tento trezor zo zoznamu a pridajte ho znovu. Odstrániť teraz?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Odstrániť</string>
 	<string name="dialog_existing_file_title">Súbor už existuje</string>
 	<string name="dialog_existing_file_positive_button">Nahradiť</string>
@@ -317,6 +319,7 @@
 	<string name="dialog_sym_link_message">Nemožno prejsť na túto symbolickú linku</string>
 	<string name="dialog_sym_link_back_button">Späť</string>
 	<string name="dialog_no_dir_file_title">Nie je možné načítať obsah adresára</string>
+	<string name="dialog_no_dir_file_message">Cloudový adresár \'%1$s\' nemá platný adresárový súbor. Tento aresár mohol byť vytvorený iným zariadením a doposiať nebol plne synchronizovaný do cloudu. Prosím skontrolujte v cloude či nasledujúci súbor existuje a nie je prázdny:\n%2$s</string>
 	<string name="dialog_no_more_images_to_display">Niet už viac obrázkov k zobrazeniu&#8230;</string>
 	<string name="dialog_pcloud_credentials_updated_title">Prístupy k %1$s aktualizované</string>
 	<string name="dialog_pcloud_credentials_updated">Ak zamýšlate pridať nový pCloud účet, kliknite na tento link <a href="https://www.pcloud.com">www.pcloud.com</a>, odhláste sa zo súčasného účtu a opätovne kliknite na \'+\' v tejto aplikácii pre vytvorenie nového cloudového pripojenia.</string>
diff --git a/presentation/src/main/res/values-sv-rSE/strings.xml b/presentation/src/main/res/values-sv-rSE/strings.xml
index 93f490ed..69211145 100644
--- a/presentation/src/main/res/values-sv-rSE/strings.xml
+++ b/presentation/src/main/res/values-sv-rSE/strings.xml
@@ -16,7 +16,7 @@
 	<string name="error_cloud_already_exists">Konto finns redan.</string>
 	<string name="error_activity_not_found">Ladda ner en app som kan öppna denna fil.</string>
 	<string name="error_server_not_found">Servern hittades inte.</string>
-	<string name="error_device_policy_manager_not_found">Öppna enhetsinställningar och ställ in skärmlåset manuellt</string>
+	<string name="error_device_policy_manager_not_found">Öppna enhetsinställningarna och ställ in skärmlåset för manuellt</string>
 	<string name="error_export_illegal_file_name">Exporten misslyckades. Försök att ta bort specialtecken från filnamn och exportera igen.</string>
 	<string name="error_name_contains_invalid_characters">Får inte innehålla specialtecken.</string>
 	<string name="error_names_contains_invalid_characters">Filnamn får inte innehålla specialtecken.</string>
@@ -24,11 +24,11 @@
 	<string name="error_general_update">Uppdateringskontrollen misslyckades. Allmänt fel uppstod.</string>
 	<string name="error_hash_mismatch_update">Uppdateringskontrollen misslyckades. Beräknad hash matchar inte den uppladdade filen</string>
 	<string name="error_update_no_internet">Uppdateringskontrollen misslyckades. Ingen internetanslutning.</string>
-	<string name="error_failed_to_decrypt_webdav_password">Det gick inte att dekryptera WebDAV lösenord, vänligen ange på nytt i inställningar</string>
-	<string name="error_play_services_not_available">Google Play Services inte installerad</string>
+	<string name="error_failed_to_decrypt_webdav_password">Misslyckades att dekryptera WebDAV-lösenordet, lägg till det igen i inställningarna</string>
+	<string name="error_play_services_not_available">Google Play Services är inte installerat</string>
 	<string name="error_biometric_auth_aborted">Biometrisk autentisering avbruten</string>
-	<string name="error_vault_version_mismatch">Angiven version i vault.cryptomator är annan än masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator matchar inte med denna masterkey.cryptomator</string>
+	<string name="error_vault_version_mismatch">Version som anges i %1$s är annan än %2$s</string>
+	<string name="error_vault_key_invalid">%1$s matchar inte med %2$s</string>
 	<string name="error_vault_config_loading">Allmänt fel vid inläsning av valvkonfiguration</string>
 	<string name="error_file_not_found_after_opening_using_3party">Lokal fil finns inte längre efter att ha bytt tillbaka till Cryptomator. Eventuella ändringar kan inte synkas tillbaka till molnet.</string>
 	<string name="error_no_such_bucket">Ingen sådan bucket</string>
@@ -176,6 +176,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Välj valv för uppladdning</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Aktivera</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Registrerar bilder i bakgrunden och när det valda valvet är upplåst, startas uppladdning</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Ladda upp omedelbart</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Ladda upp direkt om valvet är upplåst</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Ladda endast upp med WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Ladda upp video</string>
 	<string name="screen_settings_auto_photo_upload_title">Spara automatiskt uppladdade filer till&#8230;</string>
diff --git a/presentation/src/main/res/values-tr-rTR/strings.xml b/presentation/src/main/res/values-tr-rTR/strings.xml
index 8abc426a..459b1b6d 100644
--- a/presentation/src/main/res/values-tr-rTR/strings.xml
+++ b/presentation/src/main/res/values-tr-rTR/strings.xml
@@ -16,7 +16,7 @@
 	<string name="error_cloud_already_exists">Bulut zaten var.</string>
 	<string name="error_activity_not_found">Lütfen bu dosyayı açabilen bir uygulama edinin.</string>
 	<string name="error_server_not_found">Sunucu bulunamadı.</string>
-	<string name="error_device_policy_manager_not_found">Lütfen cihaz ayarlarınızı açın ve ekran kilidini manuel ayarlayın</string>
+	<string name="error_device_policy_manager_not_found">Lütfen cihaz ayarlarınızı açın ve ekran kilidini elle ayarlayın</string>
 	<string name="error_export_illegal_file_name">Dışa aktarma başarısız oldu. Özel karakterleri dosya adlarından kaldırmayı ve tekrar dışa aktarmayı deneyin.</string>
 	<string name="error_name_contains_invalid_characters">Özel karakterler içeremez.</string>
 	<string name="error_names_contains_invalid_characters">Dosya adları özel karakterler içeremez.</string>
@@ -24,11 +24,11 @@
 	<string name="error_general_update">Genel bir hata oluştu ve güncelleme kontrolü başarısız oldu.</string>
 	<string name="error_hash_mismatch_update">Güncelleme kontrolü başarısız. Hesaplanan hash değeri ile yüklenen dosyanın ki eşleşmiyor</string>
 	<string name="error_update_no_internet">Güncelleme kontrolü başarısız oldu. İnternet bağlantısı yok.</string>
-	<string name="error_failed_to_decrypt_webdav_password">WebDAV şifresi çözülemedi, lütfen ayarlara yeniden ekleyin</string>
-	<string name="error_play_services_not_available">Play Hizmetleri yüklü değil</string>
+	<string name="error_failed_to_decrypt_webdav_password">WebDAV parolasının şifresi çözülemedi, lütfen ayarlarda yeniden ekleyin</string>
+	<string name="error_play_services_not_available">Google Play Hizmetleri yüklenmedi</string>
 	<string name="error_biometric_auth_aborted">Biyometrik kimlik doğrulama iptal edildi</string>
-	<string name="error_vault_version_mismatch">Belirtilen vault.cryptomator versiyonu, masterkey.cryptomator versiyonundan farklı</string>
-	<string name="error_vault_key_invalid">vault.cryptomator masterkey.cryptomator ile eşleşmiyor</string>
+	<string name="error_vault_version_mismatch">%1$s içinde belirtilen sürüm %2$s\'den farklı</string>
+	<string name="error_vault_key_invalid">%1$s, bu %2$s ile eşleşmiyor</string>
 	<string name="error_vault_config_loading">Cüzdan ayarlarını yüklerken genel hata</string>
 	<string name="error_file_not_found_after_opening_using_3party">Cryptomator geri döndükten sonra, lokal dosya artık mevcut olmaz. Muhtemel değişiklikler bulutta tekrar oluşturulamaz.</string>
 	<string name="error_no_such_bucket">Böyle bir kova yok</string>
@@ -176,6 +176,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Yükleme için kasa seçin</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Etkinleştir</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Arka planda görüntüleri yakalayın ve seçilen kasanın kilidi açıldığında yüklemeye başlayın</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Anlık yükleyin</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Kasanın kilidi açıksa doğrudan yükleyin</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Yalnızca WIFI kullanarak yükle</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Videoları yükle</string>
 	<string name="screen_settings_auto_photo_upload_title">Otomatik yükleme&#8230;</string>
@@ -220,7 +222,7 @@
 	<string name="dialog_change_password_msg_password_mismatch">Yeni parola, parola tekrarı ile eşleşmiyor.</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_title">%1$s kasası bulunamadı</string>
-	<string name="dialog_vault_not_found_message">Kasa yeniden adlandırılmış, taşınmış veya silinmiş olabilir. Bu kasayı listeden çıkarın ve devam etmek için tekrar ekleyin. Şimdi kaldırılsın mı?</string>
+	<string name="dialog_vault_not_found_message">Kasa yeniden adlandırıldı, taşındı veya silindi. Bu kasayı listeden kaldırın ve devam etmek için tekrar ekleyin. Şimdi kaldırılsın mı?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Kaldır</string>
 	<string name="dialog_existing_file_title">Dosya zaten mevcut</string>
 	<string name="dialog_existing_file_positive_button">Değiştir</string>
diff --git a/presentation/src/main/res/values-zh-rCN/strings.xml b/presentation/src/main/res/values-zh-rCN/strings.xml
index 591a0d9b..129be34c 100644
--- a/presentation/src/main/res/values-zh-rCN/strings.xml
+++ b/presentation/src/main/res/values-zh-rCN/strings.xml
@@ -25,10 +25,10 @@
 	<string name="error_hash_mismatch_update">更新检查失败，计算出的 HASH 值与上传的文件不匹配</string>
 	<string name="error_update_no_internet">更新检查失败，无网络连接</string>
 	<string name="error_failed_to_decrypt_webdav_password">解密 WebDAV 密码失败，请在设置中重新添加</string>
-	<string name="error_play_services_not_available">Play 服务未安装</string>
+	<string name="error_play_services_not_available">Google Play 服务未安装</string>
 	<string name="error_biometric_auth_aborted">生物识别认证已中止</string>
-	<string name="error_vault_version_mismatch">vault.cryptomator 中指定的版本与 masterkey.cryptomator 不同</string>
-	<string name="error_vault_key_invalid">vault.cryptomator 与此 masterkey.cryptomator 不匹配</string>
+	<string name="error_vault_version_mismatch">%1$s 中指定的版本与 %2$s 中的不同</string>
+	<string name="error_vault_key_invalid">%1$s 与此 %2$s 不匹配</string>
 	<string name="error_vault_config_loading">加载保险库配置时发生常规错误</string>
 	<string name="error_file_not_found_after_opening_using_3party">切换回 Cryptomator 后，本地文件不再存在。期间所做更改无法传回云端</string>
 	<string name="error_no_such_bucket">没有这样的 bucket</string>
@@ -175,6 +175,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">选择目标保险库</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">激活</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">后台感知图片，一旦目标保险库解锁即开始上传</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">实时上传</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">解锁保险库后直接上传</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">仅限 WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">上传视频</string>
 	<string name="screen_settings_auto_photo_upload_title">保存自动上传文件到&#8230;</string>
diff --git a/presentation/src/main/res/values-zh-rTW/strings.xml b/presentation/src/main/res/values-zh-rTW/strings.xml
index 0f45a298..5f6a8241 100644
--- a/presentation/src/main/res/values-zh-rTW/strings.xml
+++ b/presentation/src/main/res/values-zh-rTW/strings.xml
@@ -16,7 +16,6 @@
 	<string name="error_cloud_already_exists">雲端硬碟已經存在。</string>
 	<string name="error_activity_not_found">請下載行動裝置應用程式來打開這個檔案。</string>
 	<string name="error_server_not_found">找不到伺服器。</string>
-	<string name="error_device_policy_manager_not_found">請打開你的裝置設定，再手動設定螢幕鎖定。</string>
 	<string name="error_export_illegal_file_name">資料匯出失敗。請把檔案名稱中的特殊字元刪除後，再重新匯出資料。</string>
 	<string name="error_name_contains_invalid_characters">不能含有特殊字元。</string>
 	<string name="error_names_contains_invalid_characters">檔案名稱不能含有特殊字元。</string>
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index 29db747a..8a87b0b0 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -6,6 +6,8 @@
 	<!-- # app -->
 	<string name="app_name" translatable="false">Cryptomator</string>
 	<string name="download_subdirectory_name" translatable="false">@string/app_name</string>
+	<string name="vault_cryptomator" translatable="false">vault.cryptomator</string>
+	<string name="masterkey_cryptomator" translatable="false">masterkey.cryptomator</string>
 	<string name="share_with_label">Encrypt</string>
 
 	<!-- # error messages -->
@@ -22,7 +24,7 @@
 	<string name="error_cloud_already_exists">Cloud already exists.</string>
 	<string name="error_activity_not_found">Please download an app that can open this file.</string>
 	<string name="error_server_not_found">Server not found.</string>
-	<string name="error_device_policy_manager_not_found">Please open your devices settings and set the screen lock by hand</string>
+	<string name="error_device_policy_manager_not_found">Please open your device settings and set the screen lock by hand</string>
 	<string name="error_export_illegal_file_name">Export failed. Try to remove special characters from file names and export again.</string>
 	<string name="error_name_contains_invalid_characters">Can\'t contain special characters.</string>
 	<string name="error_names_contains_invalid_characters">File names can\'t contain special characters.</string>
@@ -30,11 +32,11 @@
 	<string name="error_general_update">Update check failed. General error occurred.</string>
 	<string name="error_hash_mismatch_update">Update check failed. Calculated hash doesn\'t match the uploaded file</string>
 	<string name="error_update_no_internet">Update check failed. No internet connection.</string>
-	<string name="error_failed_to_decrypt_webdav_password">Failed to decrypt WebDAV password, please re add in settings</string>
-	<string name="error_play_services_not_available">Play Services not installed</string>
+	<string name="error_failed_to_decrypt_webdav_password">Failed to decrypt WebDAV password, please re-add in settings</string>
+	<string name="error_play_services_not_available">Google Play Services not installed</string>
 	<string name="error_biometric_auth_aborted">Biometric authentication aborted</string>
-	<string name="error_vault_version_mismatch">Version specified in vault.cryptomator is different to masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator does not match with this masterkey.cryptomator</string>
+	<string name="error_vault_version_mismatch">Version specified in %1$s is different to %2$s</string>
+	<string name="error_vault_key_invalid">%1$s does not match with this %2$s</string>
 	<string name="error_vault_config_loading">General error while loading the vault config</string>
 	<string name="error_file_not_found_after_opening_using_3party">Local file isn\'t present anymore after switching back to Cryptomator. Possible changes cannot be propagated back to the cloud.</string>
 	<string name="error_no_such_bucket">No such bucket</string>
@@ -242,6 +244,8 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">Choose vault for upload</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Activate</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Capture images in the background and once the selected vault is unlocked, start upload</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Upload instant</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Upload directly if the vault is unlocked</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Upload only using WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Upload videos</string>
 
@@ -313,7 +317,7 @@
 
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_title">Vault %1$s not found</string>
-	<string name="dialog_vault_not_found_message">The vault has been renamed, moved or deleted. Remove this vault form the list and add it again to proceed. Remove now?</string>
+	<string name="dialog_vault_not_found_message">The vault has been renamed, moved or deleted. Remove this vault from the list and add it again to proceed. Remove now?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Remove</string>
 
 	<string name="dialog_existing_file_title">File already exists</string>
diff --git a/presentation/src/main/res/xml/preferences.xml b/presentation/src/main/res/xml/preferences.xml
index c1c98343..be07dbd7 100644
--- a/presentation/src/main/res/xml/preferences.xml
+++ b/presentation/src/main/res/xml/preferences.xml
@@ -105,6 +105,12 @@
 			android:summary="@string/screen_settings_section_auto_photo_upload_toggle_summary"
 			android:title="@string/screen_settings_section_auto_photo_upload_toggle" />
 
+		<androidx.preference.SwitchPreferenceCompat
+			android:defaultValue="true"
+			android:key="photoUploadInstant"
+			android:summary="@string/screen_settings_section_auto_photo_upload_toggle_instant_upload_summary"
+			android:title="@string/screen_settings_section_auto_photo_upload_toggle_instant_upload" />
+
 		<androidx.preference.SwitchPreferenceCompat
 			android:defaultValue="true"
 			android:key="photoUploadOnlyUsingWifi"
diff --git a/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt b/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt
index cff1080c..eedee837 100644
--- a/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt
+++ b/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt
@@ -129,14 +129,18 @@ constructor(context: Context) : SharedPreferences.OnSharedPreferenceChangeListen
 		defaultSharedPreferences.clear()
 	}
 
-	fun autoPhotoUploadOnlyUsingWifi(): Boolean {
-		return defaultSharedPreferences.getValue(PHOTO_UPLOAD_ONLY_USING_WIFI)
-	}
-
 	fun usePhotoUpload(): Boolean {
 		return defaultSharedPreferences.getValue(PHOTO_UPLOAD, false)
 	}
 
+	fun usePhotoUploadInstant(): Boolean {
+		return defaultSharedPreferences.getValue(PHOTO_UPLOAD_INSTANT, true)
+	}
+
+	fun autoPhotoUploadOnlyUsingWifi(): Boolean {
+		return defaultSharedPreferences.getValue(PHOTO_UPLOAD_ONLY_USING_WIFI)
+	}
+
 	fun photoUploadVault(): Long {
 		return defaultSharedPreferences.getValue(PHOTO_UPLOAD_VAULT, 0)
 	}
@@ -249,6 +253,7 @@ constructor(context: Context) : SharedPreferences.OnSharedPreferenceChangeListen
 		const val SECURE_SCREEN = "secureScreen"
 		const val SCREEN_STYLE_MODE = "screenStyleMode"
 		const val PHOTO_UPLOAD = "photoUpload"
+		const val PHOTO_UPLOAD_INSTANT = "photoUploadInstant"
 		const val PHOTO_UPLOAD_ONLY_USING_WIFI = "photoUploadOnlyUsingWifi"
 		const val PHOTO_UPLOAD_VAULT = "photoUploadVault"
 		const val PHOTO_UPLOAD_FOLDER = "photoUploadFolder"