Merge branch 'release/1.7.2'

2022-03-29 20:31:57 +02:00 · 2022-03-29 20:31:57 +02:00 · c4ba93e797
commit c4ba93e797
parent 360af85d33 45e0569129
63 changed files with 787 additions and 160 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -10,17 +10,17 @@ GEM
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.554.0)
-    aws-sdk-core (3.126.1)
+    aws-partitions (1.571.0)
+    aws-sdk-core (3.130.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-kms (1.54.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-kms (1.55.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.112.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-s3 (1.113.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
    aws-sigv4 (1.4.0)
@ -40,8 +40,8 @@ GEM
    dotenv (2.7.6)
    ed25519 (1.3.0)
    emoji_regex (3.2.3)
-    excon (0.91.0)
-    faraday (1.9.3)
+    excon (0.92.1)
+    faraday (1.10.0)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@ -70,7 +70,7 @@ GEM
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
    fastimage (2.2.6)
-    fastlane (2.204.3)
+    fastlane (2.205.1)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@ -109,13 +109,13 @@ GEM
      xcodeproj (>= 1.13.0, < 2.0.0)
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-aws_s3 (2.0.3)
+    fastlane-plugin-aws_s3 (2.1.0)
      apktools (~> 0.7)
      aws-sdk-s3 (~> 1)
      mime-types (~> 3.3)
    fastlane-plugin-get_version_name (0.2.2)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.16.0)
+    google-apis-androidpublisher_v3 (0.17.0)
      google-apis-core (>= 0.4, < 2.a)
    google-apis-core (0.4.2)
      addressable (~> 2.5, >= 2.5.1)
@ -135,8 +135,8 @@ GEM
    google-cloud-core (1.6.0)
      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
    google-cloud-errors (1.2.0)
    google-cloud-storage (1.36.1)
      addressable (~> 2.8)
@ -146,8 +146,8 @@ GEM
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.1.1)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.1.2)
+      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
@ -157,7 +157,7 @@ GEM
    http-cookie (1.0.4)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    jmespath (1.6.0)
+    jmespath (1.6.1)
    json (2.6.1)
    jwt (2.3.0)
    memoist (0.16.2)
@ -188,9 +188,9 @@ GEM
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    security (0.1.3)
-    signet (0.16.0)
+    signet (0.16.1)
      addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    simctl (1.6.8)
@ -207,7 +207,7 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.1)
    unicode-display_width (1.8.0)
    webrick (1.7.0)
    word_wrap (1.0.0)
--- a/build.gradle
+++ b/build.gradle
@ -8,7 +8,7 @@ buildscript {
 		google()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.1.1'
+		classpath 'com.android.tools.build:gradle:7.1.2'
 		classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
 		classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@ -39,7 +39,7 @@ allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
 		androidVersionCode = getVersionCode()
-		androidVersionName = '1.7.1'
+		androidVersionName = '1.7.2'
 	}
 	repositories {
 		mavenCentral()
--- a/buildsystem/dependencies.gradle
+++ b/buildsystem/dependencies.gradle
@ -42,7 +42,7 @@ ext {
 	rxAndroidVersion = '2.1.1'
 	rxBindingVersion = '2.2.0'

-	daggerVersion = '2.40.5'
+	daggerVersion = '2.41'

 	gsonVersion = '2.9.0'

@ -69,17 +69,17 @@ ext {

 	googleApiServicesVersion = 'v3-rev20220110-1.32.1'
 	googlePlayServicesVersion = '19.2.0'
-	googleClientVersion = '1.33.2' // keep in sync with https://github.com/SailReal/google-http-java-client
+	googleClientVersion = '1.33.4' // keep in sync with https://github.com/SailReal/google-http-java-client
 	/*
 		update using https://github.com/SailReal/google-http-java-client with `mvn clean install`,
 		copying `google-http-client-*.jar` and `google-http-client-android-*.jar` into the lib folder of this project
 	 */
-	trackingFreeGoogleCLientVersion = '1.41.4'
+	trackingFreeGoogleCLientVersion = '1.41.5'

-	msgraphVersion = '5.14.0'
-	msgraphAuthVersion = '2.2.3'
+	msgraphVersion = '5.17.0'
+	msgraphAuthVersion = '3.0.2'

-	minIoVersion = '8.3.6'
+	minIoVersion = '8.3.7'
 	staxVersion = '1.2.0' // needed for minIO

 	commonsCodecVersion = '1.15'
@ -90,7 +90,7 @@ ext {

 	jUnitVersion = '5.8.2'
 	assertJVersion = '1.7.1'
-	mockitoVersion = '4.3.1'
+	mockitoVersion = '4.4.0'
 	mockitoKotlinVersion = '4.0.0'
 	hamcrestVersion = '1.3'
 	dexmakerVersion = '1.0'
--- a/data/src/main/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProvider.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProvider.kt
@ -19,6 +19,7 @@ import org.cryptomator.domain.Vault
 import org.cryptomator.domain.exception.BackendException
 import org.cryptomator.domain.exception.CancellationException
 import org.cryptomator.domain.exception.FatalBackendException
+import org.cryptomator.domain.exception.vaultconfig.MissingVaultConfigFileException
 import org.cryptomator.domain.exception.vaultconfig.UnsupportedMasterkeyLocationException
 import org.cryptomator.domain.repository.CloudContentRepository
 import org.cryptomator.domain.usecases.ProgressAware
@ -204,10 +205,16 @@ class MasterkeyCryptoCloudProvider(
 	}

 	private fun assertLegacyVaultVersionIsSupported(version: Int) {
-		if (version < CryptoConstants.MIN_VAULT_VERSION) {
-			throw UnsupportedVaultFormatException(version, CryptoConstants.MIN_VAULT_VERSION)
-		} else if (version > CryptoConstants.MAX_VAULT_VERSION_WITHOUT_VAULT_CONFIG) {
-			throw UnsupportedVaultFormatException(version, CryptoConstants.MAX_VAULT_VERSION_WITHOUT_VAULT_CONFIG)
+		when {
+			version < CryptoConstants.MIN_VAULT_VERSION -> {
+				throw UnsupportedVaultFormatException(version, CryptoConstants.MIN_VAULT_VERSION)
+			}
+			version == CryptoConstants.DEFAULT_MASTERKEY_FILE_VERSION -> {
+				throw MissingVaultConfigFileException()
+			}
+			version > CryptoConstants.MAX_VAULT_VERSION_WITHOUT_VAULT_CONFIG -> {
+				throw UnsupportedVaultFormatException(version, CryptoConstants.MAX_VAULT_VERSION_WITHOUT_VAULT_CONFIG)
+			}
 		}
 	}

--- a/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageAccessFrameworkNodeFactory.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageAccessFrameworkNodeFactory.kt
@ -63,7 +63,7 @@ internal object LocalStorageAccessFrameworkNodeFactory {
 			getNodePath(parent, documentFile.name),  //
 			documentFile.length(),  //
 			Date(documentFile.lastModified()),  //
-			DocumentsContract.getTreeDocumentId(documentFile.uri),  //
+			DocumentsContract.getDocumentId(documentFile.uri),  //
 			documentFile.uri.toString()
 		)
 	}
--- a/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveClientFactory.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveClientFactory.kt
@ -6,7 +6,6 @@ import com.microsoft.graph.httpcore.HttpClients
 import com.microsoft.graph.requests.GraphServiceClient
 import org.cryptomator.data.cloud.okhttplogging.HttpLoggingInterceptor
 import org.cryptomator.data.util.NetworkTimeout
-import org.cryptomator.util.SharedPreferencesHandler
 import org.cryptomator.util.crypto.CredentialCryptor
 import java.net.URL
 import java.util.concurrent.CompletableFuture
@ -19,7 +18,7 @@ class OnedriveClientFactory private constructor() {

 	companion object {

-		fun createInstance(context: Context, encryptedToken: String, sharedPreferencesHandler: SharedPreferencesHandler): GraphServiceClient<Request> {
+		fun createInstance(context: Context, encryptedToken: String): GraphServiceClient<Request> {
 			val tokenAuthenticationProvider = object : BaseAuthenticationProvider() {
 				val token = CompletableFuture.completedFuture(CredentialCryptor.getInstance(context).decrypt(encryptedToken))
 				override fun getAuthorizationTokenAsync(requestUrl: URL): CompletableFuture<String> {
--- a/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt
@ -4,7 +4,7 @@ import android.content.Context
 import com.microsoft.graph.core.GraphErrorCodes
 import com.microsoft.graph.http.GraphServiceException
 import com.microsoft.graph.requests.GraphServiceClient
-import com.microsoft.identity.common.exception.ClientException
+import com.microsoft.identity.common.java.exception.ClientException
 import org.cryptomator.data.cloud.InterceptingCloudContentRepository
 import org.cryptomator.domain.OnedriveCloud
 import org.cryptomator.domain.exception.BackendException
--- a/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepositoryFactory.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepositoryFactory.java
@ -33,6 +33,6 @@ public class OnedriveCloudContentRepositoryFactory implements CloudContentReposi
 	@Override
 	public CloudContentRepository<OnedriveCloud, OnedriveNode, OnedriveFolder, OnedriveFile> cloudContentRepositoryFor(Cloud cloud) {
 		OnedriveCloud onedriveCloud = (OnedriveCloud) cloud;
-		return new OnedriveCloudContentRepository(onedriveCloud, context, OnedriveClientFactory.Companion.createInstance(context, onedriveCloud.accessToken(), sharedPreferencesHandler));
+		return new OnedriveCloudContentRepository(onedriveCloud, context, OnedriveClientFactory.Companion.createInstance(context, onedriveCloud.accessToken()));
 	}
 }
--- a/data/src/test/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProviderTest.kt
+++ b/data/src/test/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProviderTest.kt
@ -6,7 +6,6 @@ import org.cryptomator.cryptolib.api.Cryptor
 import org.cryptomator.cryptolib.api.CryptorProvider
 import org.cryptomator.cryptolib.api.FileNameCryptor
 import org.cryptomator.cryptolib.api.Masterkey
-import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException
 import org.cryptomator.data.cloud.crypto.BackupFileIdSuffixGenerator.generate
 import org.cryptomator.data.cloud.crypto.MasterkeyCryptoCloudProvider.UnlockTokenImpl
 import org.cryptomator.data.cloud.crypto.VaultConfig.VaultConfigBuilder
@ -19,6 +18,7 @@ import org.cryptomator.domain.CloudType
 import org.cryptomator.domain.UnverifiedVaultConfig
 import org.cryptomator.domain.Vault
 import org.cryptomator.domain.exception.BackendException
+import org.cryptomator.domain.exception.vaultconfig.MissingVaultConfigFileException
 import org.cryptomator.domain.repository.CloudContentRepository
 import org.cryptomator.domain.usecases.ProgressAware
 import org.cryptomator.domain.usecases.cloud.DataSource
@ -207,7 +207,7 @@ internal class MasterkeyCryptoCloudProviderTest {
 	@DisplayName("unlockLegacyUsingNewVault(\"foo\")")
 	fun testUnlockLegacyVaultUsingVaultFormat8() {
 		val unlockToken: UnlockToken = UnlockTokenImpl(vault, masterkeyV8.toByteArray(StandardCharsets.UTF_8))
-		Assertions.assertThrows(UnsupportedVaultFormatException::class.java) { inTest.unlock(unlockToken, Optional.absent(), "foo", { false }) }
+		Assertions.assertThrows(MissingVaultConfigFileException::class.java) { inTest.unlock(unlockToken, Optional.absent(), "foo", { false }) }
 	}

 	@DisplayName("changePassword(\"foo\")")
--- a/domain/src/main/java/org/cryptomator/domain/exception/license/DesktopSupporterCertificateException.java
+++ b/domain/src/main/java/org/cryptomator/domain/exception/license/DesktopSupporterCertificateException.java
@ -0,0 +1,9 @@
+package org.cryptomator.domain.exception.license;
+
+public class DesktopSupporterCertificateException extends LicenseNotValidException {
+
+	public DesktopSupporterCertificateException(final String license) {
+		super(license);
+	}
+
+}
--- a/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/MissingVaultConfigFileException.java
+++ b/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/MissingVaultConfigFileException.java
@ -0,0 +1,6 @@
+package org.cryptomator.domain.exception.vaultconfig;
+
+import org.cryptomator.domain.exception.BackendException;
+
+public class MissingVaultConfigFileException extends BackendException {
+}
--- a/domain/src/main/java/org/cryptomator/domain/usecases/DoLicenseCheck.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/DoLicenseCheck.java
@ -4,6 +4,7 @@ import com.google.common.io.BaseEncoding;

 import org.cryptomator.domain.exception.BackendException;
 import org.cryptomator.domain.exception.FatalBackendException;
+import org.cryptomator.domain.exception.license.DesktopSupporterCertificateException;
 import org.cryptomator.domain.exception.license.LicenseNotValidException;
 import org.cryptomator.domain.exception.license.NoLicenseAvailableException;
 import org.cryptomator.domain.repository.UpdateCheckRepository;
@ -20,10 +21,19 @@ import java.security.spec.X509EncodedKeySpec;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.SignatureException;

@UseCase
 public class DoLicenseCheck {

+	private static final String ANDROID_PUB_KEY = "MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBcnb81CfNeL3qBVFMx/yRfm1Y1yib" + //
+			"ajIJkV1s82AQt+mOl4+Kub64wq1OCgBVwWUlKwqgnyF39nmkoXEjakRPFngBzg2J" + //
+			"zo4UR0B7OYmn0uGf3K+zQfxKnNMxGVPtlzE8j9Nqz/dm2YvYLLVwvTSDQX/GaxoP" + //
+			"/EH84Hupw2wuU7qAaFU=";
+	private static final String DESKTOP_SUPPORTER_CERTIFICATE_PUB_KEY = "MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQB7NfnqiZbg2KTmoflmZ71PbXru7oW" + //
+			"fmnV2yv3eDjlDfGruBrqz9TtXBZV/eYWt31xu1osIqaT12lKBvZ511aaAkIBeOEV" + //
+			"gwcBIlJr6kUw7NKzeJt7r2rrsOyQoOG2nWc/Of/NBqA3mIZRHk5Aq1YupFdD26QE" + //
+			"r0DzRyj4ixPIt38CQB8=";
 	private final UpdateCheckRepository updateCheckRepository;
 	private String license;

@ -34,17 +44,13 @@ public class DoLicenseCheck {

 	public LicenseCheck execute() throws BackendException {
 		license = useLicenseOrRetrieveFromDb(license);
-
 		try {
-			final Claims claims = Jwts //
-					.parserBuilder() //
-					.setSigningKey(getPublicKey()) //
-					.build() //
-					.parseClaimsJws(license) //
-					.getBody();
-
+			final Claims claims = Jwts.parserBuilder().setSigningKey(getPublicKey(ANDROID_PUB_KEY)).build().parseClaimsJws(license).getBody();
 			return claims::getSubject;
 		} catch (JwtException | FatalBackendException e) {
+			if (e instanceof SignatureException && isDesktopSupporterCertificate(license)) {
+				throw new DesktopSupporterCertificateException(license);
+			}
 			throw new LicenseNotValidException(license);
 		} catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
 			throw new FatalBackendException(e);
@ -56,28 +62,29 @@ public class DoLicenseCheck {
 			updateCheckRepository.setLicense(license);
 		} else {
 			license = updateCheckRepository.getLicense();
-
 			if (license == null) {
 				throw new NoLicenseAvailableException();
 			}
 		}
-
 		return license;
 	}

-	private ECPublicKey getPublicKey() throws NoSuchAlgorithmException, InvalidKeySpecException {
-		final byte[] publicKey = BaseEncoding //
-				.base64() //
-				.decode("MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBcnb81CfNeL3qBVFMx/yRfm1Y1yib" + //
-						"ajIJkV1s82AQt+mOl4+Kub64wq1OCgBVwWUlKwqgnyF39nmkoXEjakRPFngBzg2J" + //
-						"zo4UR0B7OYmn0uGf3K+zQfxKnNMxGVPtlzE8j9Nqz/dm2YvYLLVwvTSDQX/GaxoP" + //
-						"/EH84Hupw2wuU7qAaFU=");
-
-		Key key = KeyFactory.getInstance("EC").generatePublic(new X509EncodedKeySpec(publicKey));
+	private ECPublicKey getPublicKey(String publicKey) throws NoSuchAlgorithmException, InvalidKeySpecException {
+		final X509EncodedKeySpec keySpec = new X509EncodedKeySpec(BaseEncoding.base64().decode(publicKey));
+		Key key = KeyFactory.getInstance("EC").generatePublic(keySpec);
 		if (key instanceof ECPublicKey) {
 			return (ECPublicKey) key;
 		} else {
 			throw new FatalBackendException("Key not an EC public key.");
 		}
 	}
+
+	private boolean isDesktopSupporterCertificate(String license) {
+		try {
+			Jwts.parserBuilder().setSigningKey(getPublicKey(DESKTOP_SUPPORTER_CERTIFICATE_PUB_KEY)).build().parseClaimsJws(license);
+			return true;
+		} catch (JwtException | NoSuchAlgorithmException | InvalidKeySpecException e) {
+			return false;
+		}
+	}
 }
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@ -306,4 +306,61 @@ platform :android do |options|
      upload_assets: ["fastlane/release/Cryptomator-#{version}_fdroid_signed.apk", "fastlane/release/Cryptomator-#{version}_signed.apk"]
    )
  end
+
+  desc "Dry run - check tracking added for all flavors"
+  lane :dryRun do |options|
+    gradle(task: "clean")
+
+    gradle(
+      task: "assemble",
+      build_type: "Release",
+      flavor: "playstore",
+      print_command: false,
+      properties: {
+        "android.injected.signing.store.file" => ENV["SIGNING_KEYSTORE_PATH"],
+        "android.injected.signing.store.password" => ENV["SIGNING_KEYSTORE_PASSWORD"],
+        "android.injected.signing.key.alias" => ENV["SIGNING_KEY_ALIAS"],
+        "android.injected.signing.key.password" => ENV["SIGNING_KEY_PASSWORD"],
+      }
+    )
+
+    checkTrackingAddedInDependencyUsingIzzyScript(alpha:options[:alpha], beta:options[:beta], flavor: 'playstore')
+    checkTrackingAddedInDependencyUsingExodus(alpha:options[:alpha], beta:options[:beta], flavor: 'playstore')
+
+    gradle(task: "clean")
+
+    gradle(
+      task: "assemble",
+      build_type: "Release",
+      flavor: "apkstore",
+      print_command: false,
+      properties: {
+        "android.injected.signing.store.file" => ENV["SIGNING_KEYSTORE_PATH"],
+        "android.injected.signing.store.password" => ENV["SIGNING_KEYSTORE_PASSWORD"],
+        "android.injected.signing.key.alias" => ENV["SIGNING_KEY_ALIAS"],
+        "android.injected.signing.key.password" => ENV["SIGNING_KEY_PASSWORD"],
+      }
+    )
+
+    checkTrackingAddedInDependencyUsingIzzyScript(alpha:options[:alpha], beta:options[:beta], flavor: 'apkstore')
+    checkTrackingAddedInDependencyUsingExodus(alpha:options[:alpha], beta:options[:beta], flavor: 'apkstore')
+
+    gradle(task: "clean")
+
+    gradle(
+      task: "assemble",
+      build_type: "Release",
+      flavor: "fdroid",
+      print_command: false,
+      properties: {
+        "android.injected.signing.store.file" => ENV["SIGNING_KEYSTORE_PATH"],
+        "android.injected.signing.store.password" => ENV["SIGNING_KEYSTORE_PASSWORD"],
+        "android.injected.signing.key.alias" => ENV["SIGNING_KEY_ALIAS"],
+        "android.injected.signing.key.password" => ENV["SIGNING_KEY_PASSWORD"],
+      }
+    )
+
+    checkTrackingAddedInDependencyUsingIzzyScript(alpha:options[:alpha], beta:options[:beta], flavor: 'fdroid')
+    checkTrackingAddedInDependencyUsingExodus(alpha:options[:alpha], beta:options[:beta], flavor: 'fdroid')
+  end
 end
--- a/fastlane/README.md
+++ b/fastlane/README.md
@ -1,64 +1,96 @@
 fastlane documentation
-================
+----
+
 # Installation

 Make sure you have the latest version of the Xcode command line tools installed:

-```
+```sh
 xcode-select --install
 ```

-Install _fastlane_ using
-```
-[sudo] gem install fastlane -NV
-```
-or alternatively using `brew install fastlane`
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)

 # Available Actions
+
 ## Android
+
 ### android test
+
+```sh
+[bundle exec] fastlane android test
 ```
-fastlane android test
-```
+
 Run all the tests
+
 ### android deploy
+
+```sh
+[bundle exec] fastlane android deploy
 ```
-fastlane android deploy
-```
+
 Deploy new version to Google Play and APK Store options: beta:false (default)
+
 ### android deployToPlaystore
+
+```sh
+[bundle exec] fastlane android deployToPlaystore
 ```
-fastlane android deployToPlaystore
-```
+
 Deploy new version to Play Store
+
 ### android deployToServer
+
+```sh
+[bundle exec] fastlane android deployToServer
 ```
-fastlane android deployToServer
-```
+
 Deploy new version to server
+
 ### android deployToFDroid
+
+```sh
+[bundle exec] fastlane android deployToFDroid
 ```
-fastlane android deployToFDroid
-```
+
 Deploy new version to F-Droid
+
 ### android checkTrackingAddedInDependencyUsingIzzyScript
+
+```sh
+[bundle exec] fastlane android checkTrackingAddedInDependencyUsingIzzyScript
 ```
-fastlane android checkTrackingAddedInDependencyUsingIzzyScript
-```
+
 Check if tracking added in some dependency using Izzy's script
+
 ### android checkTrackingAddedInDependencyUsingExodus
+
+```sh
+[bundle exec] fastlane android checkTrackingAddedInDependencyUsingExodus
 ```
-fastlane android checkTrackingAddedInDependencyUsingExodus
-```
+
 Check if tracking added in some dependency using exodus
+
 ### android createGitHubDraftRelease
+
+```sh
+[bundle exec] fastlane android createGitHubDraftRelease
 ```
-fastlane android createGitHubDraftRelease
-```
+
 Create GitHub draft release

+### android dryRun
+
+```sh
+[bundle exec] fastlane android dryRun
+```
+
+Dry run - check trackin added for all flavors
+
 ----

 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
-More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
-The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
--- a/fastlane/izzyscript/result_apkstore.json
+++ b/fastlane/izzyscript/result_apkstore.json
--- a/fastlane/izzyscript/result_fdroid.json
+++ b/fastlane/izzyscript/result_fdroid.json
--- a/fastlane/izzyscript/result_playstore.json
+++ b/fastlane/izzyscript/result_playstore.json
--- a/fastlane/metadata/android/de-DE/changelogs/default.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/default.txt
@ -1 +1,3 @@
- Problem behoben, bei dem ein "Tresor nicht gefunden"-Dialog beim Entsperren mit OneDrive angezeigt wird, wenn er ein Leerzeichen im Namen enthält
+- Fehlermeldungen, wenn ein Tresor nicht unterstützt wird, verbessert
+- Anzeigefehler, der beim Verschieben von Ordnern mit lokalem Speicher und direktem Zugriff auf diesen auftritt, behoben
+- Fehler, dass beim automatischen Hochladen aufgrund der Batterieoptimierung nicht immer alle Bilder erfasst werden, behoben
--- a/fastlane/metadata/android/en-US/changelogs/default.txt
+++ b/fastlane/metadata/android/en-US/changelogs/default.txt
@ -1 +1,3 @@
- Fixed a problem where a "Vault not found" dialog is shown during unlock with OneDrive cloud if the vault contains a blank character
+- Improved error messages when a vault is not supported
+- Fixed moving folders with local storage shows an error when accessed directly
+- Fixed auto upload does not always upload all images automatically due to battery optimization
--- a/fastlane/release-notes.html
+++ b/fastlane/release-notes.html
@ -1,3 +1,5 @@
 <ul>
-  <li>Fixed a problem where a "Vault not found" dialog is shown during unlock with OneDrive cloud if the vault contains a blank character</li>
+  <li>Improved error messages when a vault is not supported</li>
+  <li>Fixed moving folders with local storage shows an error when accessed directly</li>
+  <li>Fixed auto upload does not always upload all images automatically due to battery optimization</li>
 </ul>
--- a/lib/google-http-client-1.41.5.jar
+++ b/lib/google-http-client-1.41.5.jar
--- a/lib/google-http-client-android-1.41.5.jar
+++ b/lib/google-http-client-android-1.41.5.jar
--- a/lib/pcloud-sdk-java
+++ b/lib/pcloud-sdk-java
@ -1 +1 @@
-Subproject commit dc4d0897f7917f026376d35f9a6eaf6edbc7115d
+Subproject commit 4834dde955127b1760be9bb527e9d45613b1f036
--- a/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt
@ -3,7 +3,6 @@ package org.cryptomator.presentation.exception
 import android.content.ActivityNotFoundException
 import android.content.Context
 import org.cryptomator.cryptolib.api.InvalidPassphraseException
-import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException
 import org.cryptomator.domain.di.PerView
 import org.cryptomator.domain.exception.CloudAlreadyExistsException
 import org.cryptomator.domain.exception.CloudNodeAlreadyExistsException
@ -13,11 +12,13 @@ import org.cryptomator.domain.exception.NoSuchCloudFileException
 import org.cryptomator.domain.exception.UnableToDecryptWebdavPasswordException
 import org.cryptomator.domain.exception.VaultAlreadyExistException
 import org.cryptomator.domain.exception.authentication.AuthenticationException
+import org.cryptomator.domain.exception.license.DesktopSupporterCertificateException
 import org.cryptomator.domain.exception.license.LicenseNotValidException
 import org.cryptomator.domain.exception.license.NoLicenseAvailableException
 import org.cryptomator.domain.exception.update.GeneralUpdateErrorException
 import org.cryptomator.domain.exception.update.HashMismatchUpdateCheckException
 import org.cryptomator.domain.exception.update.SSLHandshakePreAndroid5UpdateCheckException
+import org.cryptomator.domain.exception.vaultconfig.MissingVaultConfigFileException
 import org.cryptomator.domain.exception.vaultconfig.UnsupportedMasterkeyLocationException
 import org.cryptomator.domain.exception.vaultconfig.VaultConfigLoadException
 import org.cryptomator.domain.exception.vaultconfig.VaultKeyInvalidException
@ -25,7 +26,6 @@ import org.cryptomator.domain.exception.vaultconfig.VaultVersionMismatchExceptio
 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
 import timber.log.Timber
@ -41,18 +41,24 @@ class ExceptionHandlers @Inject constructor(private val context: Context, defaul
 		staticHandler(NetworkConnectionException::class.java, R.string.error_no_network_connection)
 		staticHandler(InvalidPassphraseException::class.java, R.string.error_invalid_passphrase)
 		staticHandler(CloudNodeAlreadyExistsException::class.java, R.string.error_file_or_folder_exists)
-		staticHandler(UnsupportedVaultFormatException::class.java, R.string.error_vault_version_not_supported)
 		staticHandler(VaultAlreadyExistException::class.java, R.string.error_vault_already_exists)
 		staticHandler(ActivityNotFoundException::class.java, R.string.error_activity_not_found)
 		staticHandler(CloudAlreadyExistsException::class.java, R.string.error_cloud_already_exists)
 		staticHandler(NoSuchCloudFileException::class.java, R.string.error_no_such_file)
 		staticHandler(IllegalFileNameException::class.java, R.string.error_export_illegal_file_name)
 		staticHandler(UnableToDecryptWebdavPasswordException::class.java, R.string.error_failed_to_decrypt_webdav_password)
+		staticHandler(DesktopSupporterCertificateException::class.java, R.string.dialog_enter_license_not_valid_content_desktop_supporter_certificate)
 		staticHandler(LicenseNotValidException::class.java, R.string.dialog_enter_license_not_valid_content)
 		staticHandler(NoLicenseAvailableException::class.java, R.string.dialog_enter_license_no_content)
 		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(
+			MissingVaultConfigFileException::class.java, String.format(
+				ResourceHelper.getString(R.string.error_vault_config_file_missing_due_to_format_999),
+				ResourceHelper.getString(R.string.vault_cryptomator)
+			)
+		)
 		staticHandler(
 			VaultVersionMismatchException::class.java, String.format(
 				ResourceHelper.getString(R.string.error_vault_version_mismatch),
@ -74,6 +80,7 @@ class ExceptionHandlers @Inject constructor(private val context: Context, defaul
 		exceptionHandlers.add(CancellationExceptionHandler())
 		exceptionHandlers.add(NoSuchVaultExceptionHandler())
 		exceptionHandlers.add(PermissionNotGrantedExceptionHandler())
+		exceptionHandlers.add(UnsupportedVaultFormatExceptionHandler())
 	}

 	fun handle(view: View, e: Throwable) {
--- a/presentation/src/main/java/org/cryptomator/presentation/exception/UnsupportedVaultFormatExceptionHandler.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/exception/UnsupportedVaultFormatExceptionHandler.kt
@ -0,0 +1,19 @@
+package org.cryptomator.presentation.exception
+
+import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException
+import org.cryptomator.presentation.R
+import org.cryptomator.presentation.ui.activity.view.View
+import org.cryptomator.presentation.util.ResourceHelper.Companion.getString
+import org.cryptomator.util.ExceptionUtil
+
+class UnsupportedVaultFormatExceptionHandler : ExceptionHandler() {
+
+	override fun supports(e: Throwable): Boolean {
+		return ExceptionUtil.contains(e, UnsupportedVaultFormatException::class.java)
+	}
+
+	override fun doHandle(view: View, e: Throwable) {
+		val detectedFormat = ExceptionUtil.extract(e, UnsupportedVaultFormatException::class.java).get().detectedVersion
+		view.showError(String.format(getString(R.string.error_vault_version_not_supported), detectedFormat))
+	}
+}
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/SettingsPresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/SettingsPresenter.kt
@ -5,6 +5,8 @@ import android.content.Context
 import android.content.Intent
 import android.os.AsyncTask
 import android.os.Build
+import android.os.PowerManager
+import android.provider.Settings
 import android.widget.Toast
 import com.google.common.base.Optional
 import org.cryptomator.data.util.NetworkConnectionCheck
@ -20,8 +22,9 @@ import org.cryptomator.presentation.exception.ExceptionHandlers
 import org.cryptomator.presentation.logging.Logfiles
 import org.cryptomator.presentation.logging.ReleaseLogger
 import org.cryptomator.presentation.model.ProgressModel
-import org.cryptomator.presentation.service.PhotoContentJob.Companion.scheduleJob
+import org.cryptomator.presentation.service.PhotoContentJob
 import org.cryptomator.presentation.ui.activity.view.SettingsView
+import org.cryptomator.presentation.ui.dialog.AskIgnoreBatteryOptimizationsDialog
 import org.cryptomator.presentation.ui.dialog.UpdateAppAvailableDialog
 import org.cryptomator.presentation.ui.dialog.UpdateAppDialog
 import org.cryptomator.presentation.util.EmailBuilder
@ -47,6 +50,12 @@ class SettingsPresenter @Inject internal constructor(
 	private val sharedPreferencesHandler: SharedPreferencesHandler
 ) : Presenter<SettingsView>(exceptionMappings) {

+	fun checkAutoUploadEnabledAndBatteryOptimizationDisabled() {
+		if (sharedPreferencesHandler.usePhotoUpload()) {
+			showAskIgnoreBatteryOptimizationsDialogWhenDisabled()
+		}
+	}
+
 	fun onSendErrorReportClicked() {
 		view?.showProgress(ProgressModel.GENERIC)
 		// no usecase here because the backend is not involved
@ -97,12 +106,32 @@ class SettingsPresenter @Inject internal constructor(
 	@Callback
 	fun onLocalStoragePermissionGranted(result: PermissionsResult) {
 		if (result.granted()) {
-			scheduleJob(context())
+			PhotoContentJob.scheduleJob(context())
+			showAskIgnoreBatteryOptimizationsDialogWhenDisabled()
 		} else {
 			view?.disableAutoUpload()
 		}
 	}

+	private fun showAskIgnoreBatteryOptimizationsDialogWhenDisabled() {
+		val powerManager = context().getSystemService(Context.POWER_SERVICE) as PowerManager
+		if (!powerManager.isIgnoringBatteryOptimizations(context().packageName) && !sharedPreferencesHandler.askBatteryOptimizationsDialogDisabled()) {
+			view?.showDialog(AskIgnoreBatteryOptimizationsDialog.newInstance())
+		}
+	}
+
+	fun askIgnoreBatteryOptimizationsAccepted() {
+		val intent = Intent()
+		intent.action = Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS
+		startIntent(intent)
+	}
+
+	fun onAskIgnoreBatteryOptimizationsRejected(askAgain: Boolean) {
+		if (!askAgain) {
+			sharedPreferencesHandler.setAskBatteryOptimizationsDialogDisabled(true)
+		}
+	}
+
 	fun onCheckUpdateClicked() {
 		if (networkConnectionCheck.isPresent) {
 			updateCheckUseCase //
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SettingsActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SettingsActivity.kt
@ -8,6 +8,7 @@ import org.cryptomator.presentation.R
 import org.cryptomator.presentation.model.ProgressModel
 import org.cryptomator.presentation.presenter.SettingsPresenter
 import org.cryptomator.presentation.ui.activity.view.SettingsView
+import org.cryptomator.presentation.ui.dialog.AskIgnoreBatteryOptimizationsDialog
 import org.cryptomator.presentation.ui.dialog.DebugModeDisclaimerDialog
 import org.cryptomator.presentation.ui.dialog.DisableAppWhenObscuredDisclaimerDialog
 import org.cryptomator.presentation.ui.dialog.DisableSecureScreenDisclaimerDialog
@ -20,10 +21,11 @@ import kotlinx.android.synthetic.main.toolbar_layout.toolbar
@Activity(layout = R.layout.activity_settings)
 class SettingsActivity : BaseActivity(),
 	SettingsView,
+	AskIgnoreBatteryOptimizationsDialog.Callback,
 	DebugModeDisclaimerDialog.Callback,
 	DisableAppWhenObscuredDisclaimerDialog.Callback,
 	DisableSecureScreenDisclaimerDialog.Callback,
-	UpdateAppAvailableDialog.Callback, //
+	UpdateAppAvailableDialog.Callback,
 	UpdateAppDialog.Callback {

 	@Inject
@ -31,6 +33,7 @@ class SettingsActivity : BaseActivity(),

 	override fun setupView() {
 		setupToolbar()
+		presenter.checkAutoUploadEnabledAndBatteryOptimizationDisabled()
 	}

 	private fun setupToolbar() {
@ -40,6 +43,14 @@ class SettingsActivity : BaseActivity(),

 	fun presenter(): SettingsPresenter = presenter

+	override fun onAskIgnoreBatteryOptimizationsAccepted() {
+		presenter.askIgnoreBatteryOptimizationsAccepted()
+	}
+
+	override fun onAskIgnoreBatteryOptimizationsRejected(askAgain: Boolean) {
+		presenter.onAskIgnoreBatteryOptimizationsRejected(askAgain);
+	}
+
 	override fun onDisclaimerAccepted() {
 		presenter.onDebugModeChanged(accepted())
 	}
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskIgnoreBatteryOptimizationsDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskIgnoreBatteryOptimizationsDialog.kt
@ -0,0 +1,41 @@
+package org.cryptomator.presentation.ui.dialog
+
+import android.content.DialogInterface
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import org.cryptomator.generator.Dialog
+import org.cryptomator.presentation.R
+import kotlinx.android.synthetic.main.dialog_ask_ignore_battery_optimizations.cb_ask_ignore_battery_optimizations
+import kotlinx.android.synthetic.main.dialog_ask_ignore_battery_optimizations.tv_ask_ignore_battery_optimizations
+
+@Dialog(R.layout.dialog_ask_ignore_battery_optimizations)
+class AskIgnoreBatteryOptimizationsDialog : BaseDialog<AskIgnoreBatteryOptimizationsDialog.Callback>() {
+
+	interface Callback {
+
+		fun onAskIgnoreBatteryOptimizationsAccepted()
+		fun onAskIgnoreBatteryOptimizationsRejected(askAgain: Boolean)
+	}
+
+	public override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
+		return builder //
+			.setTitle(R.string.dialog_ask_ignore_battery_optimizations_title) //
+			.setPositiveButton(getString(R.string.dialog_ask_ignore_battery_optimizations_neutral_button)) { _: DialogInterface, _: Int -> callback?.onAskIgnoreBatteryOptimizationsAccepted() } //
+			.setNegativeButton(getString(R.string.dialog_ask_ignore_battery_optimizations_negative_button)) { _: DialogInterface, _: Int -> callback?.onAskIgnoreBatteryOptimizationsRejected(!cb_ask_ignore_battery_optimizations.isChecked) } //
+			.create()
+	}
+
+	public override fun setupView() {
+		tv_ask_ignore_battery_optimizations.text = String.format(
+			getString(R.string.dialog_ask_ignore_battery_optimizations_hint),
+			getString(R.string.app_name),
+			getString(R.string.dialog_ask_ignore_battery_optimizations_neutral_button))
+	}
+
+	companion object {
+
+		fun newInstance(): DialogFragment {
+			return AskIgnoreBatteryOptimizationsDialog()
+		}
+	}
+}
--- a/presentation/src/main/java/org/cryptomator/presentation/util/FileIcon.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/util/FileIcon.java
@ -24,13 +24,13 @@ public enum FileIcon {
 	PDF(R.drawable.node_file_pdf, //
 			forExtensions("pdf", "ps")), //
 	SLIDES(R.drawable.node_file_presentation, //
-			forExtensions("key", "keynote", "odp", "pps", "ppt", "pptx")), //
+			forExtensions("key", "keynote", "odp", "ppt", "pot", "pps", "ppa", "pptx", "potx", "ppsx", "ppam", "pptm", "potm", "ppsm")), //
 	SOURCECODE(R.drawable.node_file_sourcecode, //
 			forExtensions("bat", "c", "cs", "cpp", "coffee", "d", "e", "for", "go", "h", "java", "js", "lua", "php", "pl", "ps1", "py", "r", "rb", "sh", "vb", "vbs")), //
 	SPREADSHEET(R.drawable.node_file_spreadsheet, //
-			forExtensions("csv", "numbers", "ods", "ots", "xls", "xlsm", "xlsx")), //
+			forExtensions("csv", "numbers", "ods", "ots", "xls", "xlt", "xla", "xlsx", "xltx", "xlsm", "xltm", "xlam", "xlsb")), //
 	TEXT(R.drawable.node_file_text, //
-			forMediaTypeOrExtensions("text", "md", "todo")), //
+			forMediaTypeOrExtensions("text", "md", "todo", "odts", "ods", "doc", "dot", "docx", "dotx", "docm", "dotm")), //
 	VAULT(R.drawable.node_vault, //
 			forExtensions("cryptomator")), //
 	UNKNOWN(R.drawable.node_file_unknown);
--- a/presentation/src/main/res/layout/dialog_ask_ignore_battery_optimizations.xml
+++ b/presentation/src/main/res/layout/dialog_ask_ignore_battery_optimizations.xml
@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:padding="@dimen/activity_vertical_margin">
+
+		<TextView
+			android:id="@+id/tv_ask_ignore_battery_optimizations"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/dialog_ask_ignore_battery_optimizations_hint" />
+
+		<CheckBox
+			android:id="@+id/cb_ask_ignore_battery_optimizations"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/tv_ask_ignore_battery_optimizations"
+			android:layout_marginTop="27dp"
+			android:checked="false"
+			android:paddingStart="16dp"
+			android:paddingEnd="16dp"
+			android:text="@string/dialog_ask_ignore_battery_optimizations_checkbox" />
+
+	</RelativeLayout>
+
+</androidx.core.widget.NestedScrollView>
--- a/presentation/src/main/res/menu/menu_text_editor.xml
+++ b/presentation/src/main/res/menu/menu_text_editor.xml
@ -26,7 +26,7 @@
 	<item
 		android:id="@+id/action_save_changes"
 		android:icon="@drawable/ic_save"
-		android:title="@string/screen_cloud_settings_title"
+		android:title="@string/snack_bar_action_title_save"
 		app:showAsAction="ifRoom" />

 </menu>
--- a/presentation/src/main/res/values-ar-rSA/strings.xml
+++ b/presentation/src/main/res/values-ar-rSA/strings.xml
@ -9,7 +9,6 @@
 	<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>
@ -112,7 +111,6 @@
 	<string name="screen_cloud_connections_title">اختر المسار</string>
 	<string name="screen_cloud_connections_no_connections">انقر هنا لإضافة مسار</string>
 	<string name="screen_cloud_error_webdav_not_supported">لا يبدو أن الخادم متوافق مع WebDAV</string>
-	<string name="screen_cloud_local_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>
--- a/presentation/src/main/res/values-bn-rBD/strings.xml
+++ b/presentation/src/main/res/values-bn-rBD/strings.xml
@ -9,7 +9,6 @@
 	<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">অসমর্থিত ভোল্ট। এই ভোল্টটি ক্রিপ্টোমেটরের অন্য একটি ভার্সন দিয়ে তৈরি হয়েছিল।</string>
 	<string name="error_vault_already_exists">ভোল্টটি ইতিমধ্যে রয়েছে।</string>
 	<string name="error_no_such_file">ফাইলটি নেই।</string>
 	<string name="error_vault_has_been_locked">ভোল্টটি লক করা হয়েছে।</string>
--- a/presentation/src/main/res/values-ca-rES/strings.xml
+++ b/presentation/src/main/res/values-ca-rES/strings.xml
@ -9,7 +9,6 @@
 	<string name="error_no_network_connection">No hi ha connexió de xarxa</string>
 	<string name="error_invalid_passphrase">Contrasenya incorrecta</string>
 	<string name="error_file_or_folder_exists">Ja existeix un fitxer o carpeta.</string>
-	<string name="error_vault_version_not_supported">Caixa forta no suportada. Caixa forta creada amb una altra versió de Cryptomator.</string>
 	<string name="error_vault_already_exists">La caixa forta ja existeix.</string>
 	<string name="error_no_such_file">El fitxer no existeix.</string>
 	<string name="error_vault_has_been_locked">S\'ha bloquejat la caixa forta.</string>
@ -116,7 +115,7 @@
 	<string name="screen_cloud_connections_title">Trieu una destinació</string>
 	<string name="screen_cloud_connections_no_connections">Feu clic aquí per afegir destinacions</string>
 	<string name="screen_cloud_error_webdav_not_supported">El servidor no sembla que sigui compatible amb WebDAV</string>
-	<string name="screen_cloud_local_error_no_content_provider">No hi ha ubicacions addicionals disponibles.</string>
+	<string name="screen_cloud_local_error_no_content_provider">No s\'ha trobat cap gestor de fitxers que suporte l\'obertura de directoris/carpetes</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Nom d\'usuari</string>
@ -199,6 +198,7 @@
 	<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_onedrive_connections">Connexions OneDrive</string>
 	<string name="screen_cloud_settings_webdav_connections">Connexions WebDAV</string>
 	<string name="screen_cloud_settings_pcloud_connections">connexions pCloud</string>
 	<string name="screen_cloud_settings_s3_connections">Connexions S3</string>
@ -292,6 +292,7 @@
 	<string name="dialog_vaults_removed_during_migration_title">Si us plau, torna a afegir les caixes fortes per el cloud %1s</string>
 	<string name="dialog_vaults_removed_during_migration_hint">Al migrar cap a aquesta versió de l\'app hem hagut d\'esborrar les següents caixes fortes de l\'aplicació:\n%2s \n\nAquestes caixes fortes no s\'han esborrat del cloud sinó que només de l\'aplicació. Sentim les molèsties ocasionades, si us plau torna a afegir les caixes fortes per a continuar treballant amb elles.</string>
 	<string name="dialog_vault_is_root_folder_of_cloud_title">La caixa forta és la carpeta principal de la connexió al núvol</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Crea una nova connexió al núvol on podeu seleccionar si més no la carpeta mare d\'aquesta caixa forta com a carpeta arrel per a afegir aquesta caixa forta.</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">Aquest paràmetre és una mesura de seguretat que preveu que altres aplicacions enganyin als usuaris per a que facin accions indesitjades.\n\nAl desactivar-la, confirmes que ets <a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">conscient dels riscs</a>.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Estàs segur que vols esborrar aquesta connexió al cloud?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Aquesta acció esborrarà la connexió al cloud i totes les seves caixes fortes.</string>
@ -304,6 +305,7 @@
 	<string name="dialog_enter_license_title">Proporcioneu una llicència vàlida</string>
 	<string name="dialog_enter_license_content">Hem detectat que has instal·lat Cryptomator sense fer servir la Google Play Store. Proveeix una llicència vàlida, que pot ser adquirida a <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">La llicència introduïda no és vàlida. Assegureu-vos que l\'heu escrita correctament.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">La clau proporcionada és un certificat per a escriptori. Si us plau, proporcioneu una llicència vàlida.</string>
 	<string name="dialog_enter_license_no_content">No heu introduït cap llicència. Si us plau, introduïu una llicència vàlida.</string>
 	<string name="dialog_enter_license_decline_button">Surt</string>
 	<string name="dialog_license_confirmation_title">Confirmació de la llicència</string>
@ -371,6 +373,7 @@
 	<string name="notification_open_writable_file_title">Obre fitxer editable</string>
 	<string name="notification_open_writable_file_message">La caixa forta seguirà desbloquejada fins que acabi l\'edició</string>
 	<string name="notification_update_check_finished_latest">La versió més recent s\'ha instal·lat</string>
+	<string name="notification_authenticating">Autenticació&#8230;</string>
 	<string name="screen_settings_lru_cache">Memòria cau</string>
 	<string name="screen_settings_lru_cache_toggle_summary">La cache dels fitxers accedits recentment s\'ha encriptat localment en el dispositiu per a reaprofitar-se quan es torni a desbloquejar</string>
 	<string name="screen_settings_lru_cache_size">Mida total de la memòria cau</string>
--- a/presentation/src/main/res/values-cs-rCZ/strings.xml
+++ b/presentation/src/main/res/values-cs-rCZ/strings.xml
@ -9,7 +9,8 @@
 	<string name="error_no_network_connection">Bez připojení k síti</string>
 	<string name="error_invalid_passphrase">Chybné heslo</string>
 	<string name="error_file_or_folder_exists">Soubor nebo složka již existuje.</string>
-	<string name="error_vault_version_not_supported">Nepodporovaný trezor. Tento trezor byl vytvořen s jinou verzí Cryptomator.</string>
+	<string name="error_vault_version_not_supported">Verze trezoru %1$s není podporována. Tento trezor byl vytvořen ve starší nebo novější verzí Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Soubor %1$s chybí ve složce trezoru. Ujistěte se, že tento soubor existuje ve složce trezoru v cloudu.</string>
 	<string name="error_vault_already_exists">Trezor již existuje.</string>
 	<string name="error_no_such_file">Soubor neexistuje.</string>
 	<string name="error_vault_has_been_locked">Trezor byl uzamčen.</string>
@ -118,7 +119,7 @@
 	<string name="screen_cloud_connections_title">Vyberte umístění</string>
 	<string name="screen_cloud_connections_no_connections">Klikněte zde pro přidání umístění</string>
 	<string name="screen_cloud_error_webdav_not_supported">Server není kompatibilní s WebDAV</string>
-	<string name="screen_cloud_local_error_no_content_provider">Nejsou k dispozici žádná další umístění.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Nebyl nalezen žádný správce souborů, který by podporoval otevírání adresářů</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Uživatel</string>
@ -275,6 +276,9 @@
 	<string name="dialog_accept_ssl_certificate_hint">SSL certifikát je neplatný. Chcete mu přesto důvěřovat?</string>
 	<string name="dialog_accept_ssl_certificate_details">Podrobnosti</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Toto by mohlo být bezpečnostní riziko. Vím, co dělám.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Zakázat optimalizace výdrže baterie</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Pro načítání nových obrázků a videí bez běhu na pozadí je třeba se vyvarovat optimalizace baterie. Ale nebojte se, %1$s nespotřebovává mnoho energie.\n\nChcete-li to nastavit, změňte \'Neoptimalizovat\' na \'Všechny aplikace\', vyberte %1$s a vyberte v tomto dialogu \'Neoptimalizovat\' po kliknutí \'%2$s\'.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Příště se neptat?</string>
 	<string name="dialog_http_security_hint">Použití HTTP je nezabezpečené. Doporučujeme použít HTTPS. Pokud znáte rizika, můžete pokračovat s HTTP.</string>
 	<string name="dialog_http_security_checkbox">Změnit na HTTPS</string>
 	<string name="dialog_http_security_title">Použít HTTPS?</string>
@ -308,6 +312,7 @@
 	<string name="dialog_enter_license_title">Zadejte platnou licenci</string>
 	<string name="dialog_enter_license_content">Zjistili jsme, že jste si nainstalovali Cryptomator bez použití Google Play Store. Zadejte platnou licenci, kterou lze zakoupit na <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">Zadaná licence není platná. Ujistěte se, že jste ji zadali správně.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Zadaný klíč je certifikátem podporovatele desktopové aplikace. Zadejte prosím platnou licenci.</string>
 	<string name="dialog_enter_license_no_content">Nebyla zadána žádná licence. Zadejte prosím platnou licenci.</string>
 	<string name="dialog_enter_license_decline_button">Zavřít</string>
 	<string name="dialog_license_confirmation_title">Potvrzení licence</string>
--- a/presentation/src/main/res/values-de-rDE/strings.xml
+++ b/presentation/src/main/res/values-de-rDE/strings.xml
@ -9,14 +9,15 @@
 	<string name="error_no_network_connection">Keine Internetverbindung</string>
 	<string name="error_invalid_passphrase">Falsches Passwort</string>
 	<string name="error_file_or_folder_exists">Die Datei oder der Ordner existiert bereits.</string>
-	<string name="error_vault_version_not_supported">Dieser Tresor wird nicht unterstützt, da dieser mit einer anderen Version von Cryptomator erstellt wurde.</string>
+	<string name="error_vault_version_not_supported">Tresorversion %1$s wird nicht unterstützt. Dieser Tresor wurde mit einer älteren oder neueren Version von Cryptomator erstellt.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">%1$s -Datei fehlt in Ihrem Tresorordner. Stellen Sie sicher, dass diese Datei in Ihrem Tresorordner in der Cloud existiert.</string>
 	<string name="error_vault_already_exists">Tresor existiert bereits.</string>
 	<string name="error_no_such_file">Datei wurde nicht gefunden.</string>
 	<string name="error_vault_has_been_locked">Tresor wurde gesperrt.</string>
 	<string name="error_cloud_already_exists">Cloud existiert bereits.</string>
 	<string name="error_activity_not_found">Installiere eine App, die diesen Dateityp unterstützt.</string>
 	<string name="error_server_not_found">Server nicht gefunden.</string>
-	<string name="error_device_policy_manager_not_found">Bitte öffne die Einstellungen Deines Geräts und stelle die Bildschirmsperre von Hand ein</string>
+	<string name="error_device_policy_manager_not_found">Bitte öffne die Einstellungen deines Geräts und stelle die Bildschirmsperre von Hand ein</string>
 	<string name="error_export_illegal_file_name">Export fehlgeschlagen. Versuche, Sonderzeichen aus den Dateinamen zu entfernen und erneut zu exportieren.</string>
 	<string name="error_name_contains_invalid_characters">Keine Sonderzeichen möglich.</string>
 	<string name="error_names_contains_invalid_characters">Dateinamen können keine Sonderzeichen enthalten.</string>
@ -57,7 +58,7 @@
 	<!-- # screen: vault list -->
 	<string name="screen_vault_list_actions_title">Zu Cryptomator hinzufügen</string>
 	<string name="screen_vault_list_action_create_new_vault">Neuen Tresor anlegen</string>
-	<string name="screen_vault_list_action_add_existing_vault">Vorhandenen Tresor hinzufügen</string>
+	<string name="screen_vault_list_action_add_existing_vault">Bestehenden Tresor hinzufügen</string>
 	<string name="screen_vault_list_vault_action_delete">Entfernen</string>
 	<string name="screen_vault_list_vault_creation_hint">Hier klicken um einen neuen Tresor zu erstellen</string>
 	<string name="screen_vault_list_change_password_successful">Passwort wurde erfolgreich geändert</string>
@ -116,7 +117,7 @@
 	<string name="screen_cloud_connections_title">Ort auswählen</string>
 	<string name="screen_cloud_connections_no_connections">Hier klicken um einen neuen Ort hinzufügen</string>
 	<string name="screen_cloud_error_webdav_not_supported">Server scheint nicht WebDAV-kompatibel zu sein</string>
-	<string name="screen_cloud_local_error_no_content_provider">Weitere Orte sind nicht verfügbar.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Kein Dateimanager gefunden, der das Öffnen von Verzeichnissen unterstützt</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Benutzername</string>
@ -130,7 +131,7 @@
 	<string name="screen_s3_settings_display_name_label">Anzeigename</string>
 	<string name="screen_s3_settings_access_key_label">Access Key</string>
 	<string name="screen_s3_settings_secret_key_label">Secret Key</string>
-	<string name="screen_s3_settings_bucket_label">Vorhandener Bucket</string>
+	<string name="screen_s3_settings_bucket_label">Bestehender Bucket</string>
 	<string name="screen_s3_settings_endpoint_label">Endpoint</string>
 	<string name="screen_s3_settings_region_label">Region</string>
 	<string name="screen_s3_settings_msg_display_name_not_empty">Der Anzeigename darf nicht leer sein</string>
@ -226,10 +227,10 @@
 	<string name="dialog_vault_not_found_positive_button_text">Entfernen</string>
 	<string name="dialog_existing_file_title">Datei existiert bereits</string>
 	<string name="dialog_existing_file_positive_button">Ersetzen</string>
-	<string name="dialog_existing_file_message">Eine Datei namens \'%1$s\' existiert bereits.</string>
-	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">Existierende überspringen</string>
+	<string name="dialog_existing_file_message">Eine Datei namens „%1$s“ existiert bereits.</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">Bestehende überspringen</string>
 	<string name="dialog_replace_positive_button_all_files_exist">Alle ersetzen</string>
-	<string name="dialog_replace_positive_button_some_files_exist">Existierende ersetzen</string>
+	<string name="dialog_replace_positive_button_some_files_exist">Bestehende ersetzen</string>
 	<string name="dialog_replace_positive_button_single_file_exists">Ersetzen</string>
 	<string name="dialog_replace_msg_single_file_exists">Eine Datei names \'%1$s\' existiert bereits. Soll diese ersetzt werden?</string>
 	<string name="dialog_replace_msg_all_files_exists">Alle Dateien existieren bereits. Sollen diese ersetzt werden?</string>
@ -273,6 +274,9 @@
 	<string name="dialog_accept_ssl_certificate_hint">Das SSL-Zertifikat ist ungültig. Möchtest du ihm trotzdem vertrauen?</string>
 	<string name="dialog_accept_ssl_certificate_details">Details</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Dies könnte ein Sicherheitsrisiko sein. Ich weiß was ich tue.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Akkuoptimierung deaktivieren</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Um neue Bilder und Videos abzurufen, ohne im Hintergrund zu laufen, müssen wir die Batterieoptimierung deaktivieren. Aber keine Sorge, %1$s verbraucht nicht viel Energie.\n\nUm diese Einstellung anzuwenden, ändere \'Nicht optimiert\' auf \'Alle Apps\', wähle %1$s und wähle \"Nicht optimieren\" nach Klick auf \'%2$s\' in diesem Dialog.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Nicht erneut fragen?</string>
 	<string name="dialog_http_security_hint">Die Verwendung von HTTP ist unsicher. Wir empfehlen stattdessen die Verwendung von HTTPS. Wenn du dir der Risiken bewusst bist, kannst du mit HTTP fortfahren.</string>
 	<string name="dialog_http_security_checkbox">Zu HTTPS ändern</string>
 	<string name="dialog_http_security_title">HTTPS nutzen?</string>
@ -306,6 +310,7 @@
 	<string name="dialog_enter_license_title">APK-Store Lizenz</string>
 	<string name="dialog_enter_license_content">Cryptomator wurde nicht über den Google Play Store installiert; gib daher eine gültige Lizenz ein. Diese kann auf <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a> erworben werden.</string>
 	<string name="dialog_enter_license_not_valid_content">Die eingegebene Lizenz ist ungültig. Stelle sicher, dass sie korrekt eingegeben wurde.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Der angegebene Schlüssel ist ein Desktop-Unterstützer-Zertifikat. Bitte gib eine gültige Lizenz an.</string>
 	<string name="dialog_enter_license_no_content">Keine Lizenz vorhanden. Gib eine gültige Lizenz ein.</string>
 	<string name="dialog_enter_license_decline_button">Beenden</string>
 	<string name="dialog_license_confirmation_title">Lizenzbestätigung</string>
--- a/presentation/src/main/res/values-el-rGR/strings.xml
+++ b/presentation/src/main/res/values-el-rGR/strings.xml
@ -9,7 +9,8 @@
 	<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_version_not_supported">Η έκδοση %1$s της κρύπτης δεν υποστηρίζεται. Αυτή η κρύπτη έχει δημιουργηθεί με παλαιότερη ή νεότερη έκδοση του Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Το αρχείο %1$s λείπει στο φάκελο της κρύπτης σας. Βεβαιωθείτε ότι αυτό το αρχείο υπάρχει στο φάκελο κρύπτης στο cloud.</string>
 	<string name="error_vault_already_exists">Η κρύπτη υπάρχει ήδη.</string>
 	<string name="error_no_such_file">Το αρχείο δεν υπάρχει.</string>
 	<string name="error_vault_has_been_locked">Η κρύπτη έχει κλειδωθεί.</string>
@ -116,7 +117,7 @@
 	<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_error_no_content_provider">Δεν υπάρχουν διαθέσιμες πρόσθετες τοποθεσίες.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Δε βρέθηκε διαχειριστής αρχείων που να υποστηρίζει το άνοιγμα καταλόγων</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Όνομα χρήστη</string>
@ -273,6 +274,9 @@
 	<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_ask_ignore_battery_optimizations_title">Απενεργοποιήστε τις βελτιστοποιήσεις μπαταρίας</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Για να ανακτήσετε νέες εικόνες και βίντεο χωρίς να τρέξετε στο παρασκήνιο, πρέπει να εξαιρέσουμε από τις βελτιστοποιήσεις της μπαταρίας. Αλλά μην ανησυχείτε, το %1$s δεν καταναλώνει πολλή ενέργεια.\n\nΓια να το εφαρμόσετε, αλλάξτε το \'Μη βελτιστοποιημένο\' σε \'Όλες οι εφαρμογές\', επιλέξτε %1$s και επιλέξτε \'Να μην βελτιστοποιείτε\' αφού κάνετε κλικ στο \'%2$s\' σε αυτό το διάλογο.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_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>
@ -306,6 +310,7 @@
 	<string name="dialog_enter_license_title">Δώστε μια έγκυρη άδεια</string>
 	<string name="dialog_enter_license_content">Εντοπίσαμε ότι εγκαταστήσατε Cryptomator χωρίς τη χρήση του Google Play Store. Παρέχετε έγκυρη άδεια, η οποία μπορεί να αγοραστεί στο <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_not_valid_content_desktop_supporter_certificate">Το κλειδί που παρέχεται είναι ένα πιστοποιητικό υποστήριξης επιφάνειας εργασίας. Παρακαλώ εισαγάγετε μια έγκυρη άδεια.</string>
 	<string name="dialog_enter_license_no_content">Δεν παρέχεται άδεια. Παρακαλώ εισάγετε μια έγκυρη άδεια.</string>
 	<string name="dialog_enter_license_decline_button">Έξοδος</string>
 	<string name="dialog_license_confirmation_title">Επιβεβαίωση άδειας</string>
--- a/presentation/src/main/res/values-es-rES/strings.xml
+++ b/presentation/src/main/res/values-es-rES/strings.xml
@ -9,7 +9,8 @@
 	<string name="error_no_network_connection">No hay conexión de red</string>
 	<string name="error_invalid_passphrase">Contraseña incorrecta</string>
 	<string name="error_file_or_folder_exists">Ya existe un archivo o carpeta.</string>
-	<string name="error_vault_version_not_supported">Bóveda no soportada. Se ha creado con otra versión de Cryptomator.</string>
+	<string name="error_vault_version_not_supported">La versión %1$s de la bóveda no es compatible. Esta bóveda ha sido creada con una versión anterior o nueva de Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Falta el archivo %1$s en la carpeta de su bóveda. Asegúrese de que este archivo existe en la carpeta de su bóveda en la nube.</string>
 	<string name="error_vault_already_exists">La bóveda ya existe.</string>
 	<string name="error_no_such_file">El archivo no existe.</string>
 	<string name="error_vault_has_been_locked">Se ha bloqueado la bóveda.</string>
@ -116,7 +117,7 @@
 	<string name="screen_cloud_connections_title">Elegir ubicación</string>
 	<string name="screen_cloud_connections_no_connections">Haga clic aquí para añadir ubicaciones</string>
 	<string name="screen_cloud_error_webdav_not_supported">El servidor no parece ser compatible con WebDAV</string>
-	<string name="screen_cloud_local_error_no_content_provider">No hay ubicaciones extra disponibles.</string>
+	<string name="screen_cloud_local_error_no_content_provider">No se encontró ningún administrador de archivos que admita la apertura de directorios</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Nombre de usuario</string>
@ -273,6 +274,9 @@
 	<string name="dialog_accept_ssl_certificate_hint">El certificado SSL es inválido. ¿Desea confiar en él de todas formas?</string>
 	<string name="dialog_accept_ssl_certificate_details">Detalles</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Esto podría ser un riesgo para la seguridad. Sé lo que estoy haciendo.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Desactivar optimizaciones de la batería</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Para recuperar imágenes y videos nuevos sin ejecutar en segundo plano, tenemos que dejar de usar las optimizaciones de la batería. Pero no se preocupe, %1$s no consume mucha energía.\n\nPara aplicarlo, cambie \'No optimizado\' a \'Todas las aplicaciones\', seleccione %1$s y elija \'No optimizar\' después de hacer clic en \'%2$s\' en esta ventana.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">¿No volver a preguntar?</string>
 	<string name="dialog_http_security_hint">El uso de HTTP no es seguro. Recomendamos usar HTTPS en su lugar. Si conoce los riesgos puede seguir usando HTTP.</string>
 	<string name="dialog_http_security_checkbox">Cambiar a HTTPS</string>
 	<string name="dialog_http_security_title">\"¿Usar HTPPS?</string>
@ -306,6 +310,7 @@
 	<string name="dialog_enter_license_title">Proporcione una licencia válida</string>
 	<string name="dialog_enter_license_content">Hemos detectado que ha instalado Cryptomator sin usar Google Play Store. Proporcione una licencia válida, que se puede adquirir en <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">La licencia proporcionada no es válida. Asegúrese de que la ha ingresado correctamente.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">La clave proporcionada es un certificado de soporte de escritorio. Ingrese una licencia válida.</string>
 	<string name="dialog_enter_license_no_content">Ninguna licencia proporcionada. Por favor, ingrese una licencia válida.</string>
 	<string name="dialog_enter_license_decline_button">Salir</string>
 	<string name="dialog_license_confirmation_title">Confirmación de licencia</string>
--- a/presentation/src/main/res/values-fil-rPH/strings.xml
+++ b/presentation/src/main/res/values-fil-rPH/strings.xml
@ -8,7 +8,6 @@
 	<string name="error_authentication_failed_re_authenticate">Bigo ang pagtutunay, maaaring maglogin gamit ang %1$s</string>
 	<string name="error_no_network_connection">Walang koneksyon sa network</string>
 	<string name="error_invalid_passphrase">Mali ang password</string>
-	<string name="error_vault_version_not_supported">Hindi suportado ang vault na ito. Ang vault na ito ay ginawa gamit ang ibang bersyon ng Cryptomator.</string>
 	<string name="error_vault_already_exists">Umiiral na ang vault na ito.</string>
 	<string name="error_no_such_file">Ang file na ito ay hindi pa umiiral.</string>
 	<string name="error_vault_has_been_locked">Naisara na ang vault.</string>
@ -95,7 +94,6 @@
 	<string name="screen_cloud_connections_title">Piliin ang location</string>
 	<string name="screen_cloud_connections_no_connections">Pindutin dito upang magdagdag ng lugar</string>
 	<string name="screen_cloud_error_webdav_not_supported">Ang server na ito ay mukhang hindi tugma sa WebDAV</string>
-	<string name="screen_cloud_local_error_no_content_provider">Walang ibang lokasyon na magagamit.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Username</string>
--- a/presentation/src/main/res/values-fr-rFR/strings.xml
+++ b/presentation/src/main/res/values-fr-rFR/strings.xml
@ -9,7 +9,8 @@
 	<string name="error_no_network_connection">Pas de connexion au réseau</string>
 	<string name="error_invalid_passphrase">Mot de passe erroné</string>
 	<string name="error_file_or_folder_exists">Un fichier ou un dossier existe déjà.</string>
-	<string name="error_vault_version_not_supported">Coffre-fort non prise en charge. Ce coffre a été créée avec une autre version de Cryptomator.</string>
+	<string name="error_vault_version_not_supported">La version du coffre %1$s n\'est pas prise en charge. Ce coffre a été créé avec une version plus ancienne ou plus récente de Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Le fichier %1$s est manquant dans le dossier contenant votre coffre. Assurez-vous que ce fichier existe dans le dossier contenant votre coffre dans le cloud.</string>
 	<string name="error_vault_already_exists">Le coffre-fort existe déjà.</string>
 	<string name="error_no_such_file">Le fichier n\'existe pas.</string>
 	<string name="error_vault_has_been_locked">Le coffre-fort a été verrouillé.</string>
@ -116,7 +117,7 @@
 	<string name="screen_cloud_connections_title">Choisissez l\'emplacement</string>
 	<string name="screen_cloud_connections_no_connections">Cliquez ici pour ajouter des emplacements</string>
 	<string name="screen_cloud_error_webdav_not_supported">Le serveur ne semble pas compatible avec WebDAV</string>
-	<string name="screen_cloud_local_error_no_content_provider">Aucun emplacement supplémentaire disponible.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Aucun gestionnaire de fichiers trouvé qui supporte l\'ouverture des répertoires</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Nom d\'utilisateur</string>
@ -273,6 +274,9 @@
 	<string name="dialog_accept_ssl_certificate_hint">Le certificat SSL n\'est pas valide. Vous voulez quand même lui faire confiance?</string>
 	<string name="dialog_accept_ssl_certificate_details">Détails</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Cela pourrait constituer un risque pour la sécurité. Je sais ce que je fais.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Désactiver les optimisations de la batterie</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Pour récupérer les nouvelles photos et vidéos sans que l\'application ne fonctionne en arrière-plan, nous devons nous exclure des optimisations de la batterie. Mais ne vous inquiétez pas, %1$s ne consomme pas beaucoup d\'énergie.\n\nPour ce faire, remplacez \"Non optimisé\" par \"Toutes les applications\", sélectionnez %1$s et choisissez \"Ne pas optimiser\" après avoir cliqué sur \"%2$s\" dans cette boîte de dialogue-ci.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Ne plus demander ?</string>
 	<string name="dialog_http_security_hint">L\'utilisation du HTTP n\'est pas sûre. Nous recommandons d\'utiliser plutôt le HTTPS. Si vous connaissez les risques, vous pouvez continuer à utiliser HTTP.</string>
 	<string name="dialog_http_security_checkbox">Passage au HTTPS</string>
 	<string name="dialog_http_security_title">Utiliser le HTTPS?</string>
@ -306,6 +310,7 @@
 	<string name="dialog_enter_license_title">Fournir une licence valide</string>
 	<string name="dialog_enter_license_content">Nous avons détecté que vous avez installé Cryptomator sans utiliser le Play Store de Google. Fournissez une licence valide, qui peut être achetée sur <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">La licence fournie n\'est pas valide. Vérifiez que vous l\'avez saisie correctement.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">La clé fournie est un certificat de participation pour la version ordinateur. Merci d\'entrer une licence valide.</string>
 	<string name="dialog_enter_license_no_content">Aucune licence n\'est fournie. Veuillez saisir une licence valide.</string>
 	<string name="dialog_enter_license_decline_button">Sortie</string>
 	<string name="dialog_license_confirmation_title">Confirmation de la licence</string>
--- a/presentation/src/main/res/values-gl-rES/strings.xml
+++ b/presentation/src/main/res/values-gl-rES/strings.xml
@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- # app -->
+	<string name="share_with_label">Cifrar</string>
+	<!-- # error messages -->
+	<string name="error_generic">Produciuse un erro</string>
+	<string name="error_authentication_failed">Fallo na autenticación</string>
+	<string name="error_authentication_failed_re_authenticate">Fallo na autenticación, por favor acceda usando %1$s</string>
+	<string name="error_no_network_connection">Non hai conexión de rede</string>
+	<string name="error_invalid_passphrase">Contrasinal incorrecto</string>
+	<string name="error_file_or_folder_exists">Ficheiro ou cartafol xa existente.</string>
+	<string name="error_vault_already_exists">Caixa forte xa existente.</string>
+	<string name="error_no_such_file">O ficheiro non existe.</string>
+	<string name="error_vault_has_been_locked">A caixa forte foi bloqueada.</string>
+	<string name="error_cloud_already_exists">Nube xa existente.</string>
+	<string name="error_activity_not_found">Por favor, descargue unha aplicación que poida abrir o ficheiro.</string>
+	<string name="error_server_not_found">Servidor non atopado.</string>
+	<string name="error_device_policy_manager_not_found">Por favor, abra a configuración do dispositivo e defina o bloqueo de pantalla manualmente</string>
+	<string name="error_export_illegal_file_name">Fallo na exportación. Tente borrar caracteres especiais do nome do ficheiro e exporte de novo.</string>
+	<string name="error_name_contains_invalid_characters">Non pode conter caracteres especiais.</string>
+	<string name="error_names_contains_invalid_characters">Os nomes de ficheiro non poden conter caracteres especiais.</string>
+	<string name="error_vault_name_contains_invalid_characters">O nome da caixa forte non pode conter caracteres especiais.</string>
+	<string name="error_general_update">Fallo na comprobación de actualización. Ocorreu un erro xeral.</string>
+	<string name="error_hash_mismatch_update">Fallo na comprobación de actualización. O hash calculado non coincide co do ficheiro subido</string>
+	<string name="error_update_no_internet">Fallo na comprobación de actualización. Non hai conexión a Internet.</string>
+	<string name="error_failed_to_decrypt_webdav_password">Fallo ao descifrar o contrasinal WebDAV, por favor engádao de novo en axustes</string>
+	<string name="error_play_services_not_available">Google Play Services non está instalado</string>
+	<string name="error_biometric_auth_aborted">Autenticación biométrica abortada</string>
+	<string name="error_vault_version_mismatch">A versión especificada en %1$s é diferente a %2$s</string>
+	<string name="error_vault_key_invalid">%1$s non coincide con esta %2$s</string>
+	<string name="error_vault_config_loading">Erro xeral cargando a configuración da caixa forte</string>
+	<string name="error_file_not_found_after_opening_using_3party">O ficheiro local xa non está presente ao volver a Cryptomator. Os posíbeis cambios non poden ser propagados de volta á nube.</string>
+	<string name="error_no_such_bucket">Non existe tal bucket</string>
+	<string name="error_masterkey_location_not_supported">A localización personalizada de chave mestra aínda non está soportada</string>
+	<!-- # clouds -->
+	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">Almacenamento local</string>
+	<!-- # permission -->
+	<!-- ## permission messages -->
+	<string name="permission_message_export_file">Cryptomator require acceso ao almacenamento para exportar ficheiros</string>
+	<string name="permission_message_upload_file">Cryptomator require acceso ao almacenamento para subir ficheiros</string>
+	<string name="permission_message_share_file">Cryptomator require acceso ao almacenamento para compartir ficheiros</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator perdeu o permiso para acceder a esta localización. Por favor, seleccione este cartafol de novo para restaurar o permiso.</string>
+	<string name="snack_bar_action_title_settings">Axustes</string>
+	<string name="snack_bar_action_title_search">Buscar</string>
+	<string name="snack_bar_action_title_search_previous">Anterior</string>
+	<string name="snack_bar_action_title_search_next">Seguinte</string>
+	<string name="snack_bar_action_title_sort">Ordenar</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">Mais recentes primeiro</string>
+	<string name="snack_bar_action_title_sort_oldest">Mais antigos primeiro</string>
+	<string name="snack_bar_action_title_sort_biggest">Mais grandes primeiro</string>
+	<string name="snack_bar_action_title_sort_smallest">Mais pequenos primeiro</string>
+	<!-- # screens -->
+	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">Engadir a Cryptomator</string>
+	<string name="screen_vault_list_action_create_new_vault">Crear unha nova caixa forte</string>
+	<string name="screen_vault_list_action_add_existing_vault">Engadir unha caixa forte xa existente</string>
+	<string name="screen_vault_list_vault_action_delete">Eliminar</string>
+	<string name="screen_vault_list_vault_creation_hint">Prema aquí para crear unha nova caixa forte</string>
+	<string name="screen_vault_list_change_password_successful">O contrasinal cambiouse correctamente</string>
+	<!-- # screen: file browser -->
+	<string name="screen_file_browser_default_title">Caixa forte</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">Seleccione o ficheiro da chave mestra</string>
+	<string name="screen_file_browser_create_new_vault_button_text">Colocar aquí</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">Nome da caixa forte: %1$s</string>
+	<plurals name="screen_file_browser_subtitle_move">
+		<item quantity="one">Mover %1$s a</item>
+		<item quantity="other">Mover %2$d elementos a</item>
+	</plurals>
+	<string name="screen_file_browser_move_button_text">Mover</string>
+	<string name="screen_file_browser_msg_empty_folder">Cartafol baleiro</string>
+	<string name="screen_file_browser_file_info_label_date">modificado fai %1$s</string>
+	<string name="screen_file_browser_share_intent_chooser_title">Compartir con</string>
+	<string name="screen_file_browser_share_destination_title">Seleccione un destino</string>
+	<string name="screen_file_browser_share_button_text">Seleccionar</string>
+	<string name="screen_file_browser_nothing_to_share">Non hai nada para compartir</string>
+	<string name="screen_file_browser_actions_title">Engadir a %1$s</string>
+	<string name="screen_file_browser_action_create_folder">Crear cartafol</string>
+	<string name="screen_file_browser_action_create_new_text_file">Crear un ficheiro de texto</string>
+	<string name="screen_file_browser_action_upload_files">Subir ficheiros</string>
+	<string name="screen_file_browser_upload_files_chooser_title">Ficheiros</string>
+	<string name="screen_file_browser_msg_file_exported">Ficheiro exportado</string>
+	<string name="screen_file_browser_msg_files_exported">Ficheiros exportados</string>
+	<string name="screen_file_browser_nothing_to_export">Non hai nada para exportar</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">Fallo ao crear o cartafol de descarga</string>
+	<string name="screen_file_browser_node_action_share">Compartir</string>
+	<string name="screen_file_browser_node_action_rename">Cambiar o nome</string>
+	<string name="screen_file_browser_node_action_edit_text">Editar</string>
+	<string name="screen_file_browser_node_action_export">Exportar</string>
+	<string name="screen_file_browser_node_action_delete">Eliminar</string>
+	<string name="screen_file_browser_node_action_open_with_text">Abrir con&#8230;</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">Seleccionar elementos</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d seleccionados</string>
+	<string name="screen_file_browser_select_items">Seleccionar</string>
+	<string name="screen_file_browser_select_all_items">Seleccionar todo</string>
+	<string name="screen_file_browser_refresh_items">Actualizar</string>
+	<string name="screen_file_browser_no_connection_message">Sen conexión</string>
+	<string name="screen_file_browser_no_connection_button_text">Tentar de novo</string>
+	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">Gardado correctamente</string>
+	<!-- ## screen: share files -->
+	<string name="screen_share_files_title">Gardar %1$s en&#8230;</string>
+	<string name="screen_share_files_content_text">texto</string>
+	<string name="screen_share_files_content_file">ficheiro</string>
+	<string name="screen_share_files_content_files">ficheiros</string>
+	<string name="screen_share_files_msg_filenames_must_be_unique">Os nomes de ficheiro han de ser únicos, por favor cambie o nome dos duplicados.</string>
+	<string name="screen_share_files_section_location">Gardar localización</string>
+	<string name="screen_share_files_save_button_text">Gardar</string>
+	<string name="screen_share_files_msg_success">Cifrado completado</string>
+	<!-- ## screen: choose cloud service -->
+	<string name="screen_choose_cloud_service_title">Servizo na nube</string>
+	<!-- ## screen: cloud connections -->
+	<string name="screen_cloud_connections_title">Elixir unha localización</string>
+	<string name="screen_cloud_connections_no_connections">Prema aquí para engadir localizacións</string>
+	<string name="screen_cloud_error_webdav_not_supported">O servidor non é compatíbel con WebDAV</string>
+	<string name="screen_cloud_local_error_no_content_provider">Non se atopa ningún xestor de ficheiros que soporte abrir cartafois</string>
+	<!-- ## screen: webdav settings -->
+	<string name="screen_webdav_settings_url_port_label">URL</string>
+	<string name="screen_webdav_settings_username_label">Nome de usuario</string>
+	<string name="screen_webdav_settings_password_label">Contrasinal</string>
+	<string name="screen_webdav_settings_done_button_text">Conectar</string>
+	<string name="screen_webdav_settings_msg_url_must_not_be_empty">A URL non pode ficar baleira.</string>
+	<string name="screen_webdav_settings_msg_url_is_invalid">A URL non é válida.</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">O nome de usuario non pode ficar baleiro.</string>
+	<string name="screen_webdav_settings_msg_password_must_not_be_empty">O contrasinal non pode ficar baleiro.</string>
+	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">Nome a mostrar</string>
+	<string name="screen_s3_settings_access_key_label">Chave de acceso</string>
+	<string name="screen_s3_settings_secret_key_label">Chave secreta</string>
+	<string name="screen_s3_settings_bucket_label">Bucket existente</string>
+	<string name="screen_s3_settings_endpoint_label">Endpoint</string>
+	<string name="screen_s3_settings_region_label">Rexión</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">O nome a mostrar non pode ficar baleiro</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">A chave de acceso non pode ficar baleira</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">A chave secreta non pode ficar baleira</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">O bucket non pode ficar baleiro</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">O endpoint ou rexión non poden ficar baleiros</string>
+	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_msg_name_empty">O nome da caixa forte non pode ficar baleiro.</string>
+	<string name="screen_enter_vault_name_vault_label">Nome da caixa forte</string>
+	<string name="screen_enter_vault_name_button_text">Crear</string>
+	<!-- ## screen: set password -->
+	<string name="screen_set_password_title">Establecer contrasinal</string>
+	<string name="screen_set_password_msg_password_mismatch">O contrasinal non coincide co contrasinal escrito.</string>
+	<string name="screen_set_password_button_text">Feito</string>
+	<string name="screen_set_password_hint">IMPORTANTE: Se esqueces o teu contrasinal, non será posíbel recuperar os teus datos.</string>
+	<string name="screen_set_password_retype_password_label">Reescriba o contrasinal</string>
+	<string name="screen_set_password_strength_indicator_0">Demasiado débil para crear unha caixa forte</string>
+	<string name="screen_set_password_strength_indicator_1">Débil</string>
+	<string name="screen_set_password_strength_indicator_2">Aceptable</string>
+	<string name="screen_set_password_strength_indicator_3">Forte</string>
+	<string name="screen_set_password_strength_indicator_4">Moi forte</string>
+	<!-- ## screen: settings -->
+	<string name="screen_settings_section_general">Xeral</string>
+	<string name="screen_settings_cloud_settings_label">Servizos na nube</string>
+	<string name="screen_settings_biometric_auth">Autenticación biométrica</string>
+	<string name="screen_settings_activate_biometric_auth">Activar autenticación biométrica</string>
+	<string name="screen_settings_confirm_face_unlock">Confirmar desbloqueo facial (se está dispoñíbel)</string>
+	<string name="screen_settings_section_search">Buscar</string>
+	<string name="screen_settings_error_report_failed">Erro ao enviar</string>
+	<string name="screen_settings_security_label">Consellos de seguridade</string>
+	<string name="screen_settings_section_version">Versión</string>
+	<string name="screen_settings_advanced_settings">Configuración avanzada</string>
+	<string name="screen_settings_background_unlock_preparation_label">Acelerar o desbloqueo</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">Descargue a configuración da caixa forte en segundo plano mentres introduce o contrasinal ou a autenticación biométrica</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files">Manter desbloqueado</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Manter as caixas fortes desbloqueadas durante a edición de ficheiros</string>
+	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_onedrive_connections">Conexións OneDrive</string>
+	<string name="screen_cloud_settings_webdav_connections">Conexións WebDAV</string>
+	<string name="screen_cloud_settings_pcloud_connections">Conexións pCloud</string>
+	<string name="screen_cloud_settings_s3_connections">Conexións S3</string>
+	<string name="screen_cloud_settings_local_storage_locations">Localizacións de almacenamento local</string>
+	<string name="screen_cloud_settings_log_in_to">Acceder a</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">Desconectarse de</string>
+	<!-- ## screen: licenses -->
+	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">%1$s non puido ser autenticado.</string>
+	<string name="screen_update_pcloud_connections_title">Actualizar as credenciais de pCloud</string>
+	<!-- ## screen: insecure android version info -->
+	<!-- # dialogs -->
+	<string name="dialog_button_cancel">Cancelar</string>
+	<string name="dialog_enter_password_positive_button">Desbloquear</string>
+	<string name="dialog_change_password_old_password_label">Antigo contrasinal</string>
+	<string name="dialog_change_password_new_password_label">Novo Contrasinal</string>
+	<string name="dialog_change_password">Cambiar o contrasinal</string>
+	<string name="dialog_change_password_msg_old_password_empty">O antigo contrasinal non pode ficar baleiro.</string>
+	<string name="dialog_change_password_msg_new_password_empty">O novo contrasinal non pode ficar baleiro.</string>
+	<string name="dialog_change_password_msg_password_mismatch">O novo contrasinal non coincide co contrasinal escrito.</string>
+	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">Non se encontra a caixa forte %1$s</string>
+	<string name="dialog_vault_not_found_message">A caixa forte foi cambiada de nome, movida ou eliminada. Elimine esta caixa forte da lista e engádaa de novo para continuar. Eliminar agora?</string>
+	<string name="dialog_vault_not_found_positive_button_text">Eliminar</string>
+	<string name="dialog_existing_file_title">O ficheiro xa existe</string>
+	<string name="dialog_existing_file_positive_button">Substituír</string>
+	<string name="dialog_existing_file_message">Xa existe un ficheiro co nome \'%1$s\'.</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">Ignorar xa existentes</string>
+	<string name="dialog_replace_positive_button_all_files_exist">Substituír todo</string>
+	<string name="dialog_replace_positive_button_some_files_exist">Substituír xa existentes</string>
+	<string name="dialog_replace_positive_button_single_file_exists">Substituír</string>
+	<string name="dialog_replace_msg_single_file_exists">Xa existe un ficheiro co nome \"%1$s\". Desexas substituílo?</string>
+	<string name="dialog_replace_msg_all_files_exists">Todos os ficheiros xa existen. Desexas substituílos?</string>
+	<string name="dialog_replace_msg_some_files_exists">%1$d ficheiros xa existen. Desexas substituílos?</string>
+	<string name="dialog_replace_title_single_file_exists">Substituír o ficheiro?</string>
+	<string name="dialog_replace_title_multiple_files_exist">Substituír os ficheiros?</string>
+	<!-- # error reports -->
+	<!-- # misc -->
+	<!-- ## file size helper -->
+	<!-- ## date helper -->
+	<!-- ## biometric authentication -->
+	<!-- notification -->
+	<!-- lock timeout names -->
+	<!-- cache size names -->
+	<!-- screen scheme mode names -->
+	<!-- update interval names -->
+</resources>
--- a/presentation/src/main/res/values-hu-rHU/strings.xml
+++ b/presentation/src/main/res/values-hu-rHU/strings.xml
@ -9,7 +9,6 @@
 	<string name="error_no_network_connection">Nincs hálózati kapcsolat</string>
 	<string name="error_invalid_passphrase">Helytelen jelszó</string>
 	<string name="error_file_or_folder_exists">Ez a fájl/mappa már létezik.</string>
-	<string name="error_vault_version_not_supported">Nem támogatott Széf. Ez a Széf a Cryptomator egy másik verziójával készült.</string>
 	<string name="error_vault_already_exists">A széf már létezik.</string>
 	<string name="error_no_such_file">Fájl nem létezik.</string>
 	<string name="error_vault_has_been_locked">A széf zárva van.</string>
@ -116,7 +115,6 @@
 	<string name="screen_cloud_connections_title">Válasszon helyt</string>
 	<string name="screen_cloud_connections_no_connections">Kattintson ide a hely hozzáadásához</string>
 	<string name="screen_cloud_error_webdav_not_supported">A kiszolgáló nem tűnik WebDAV kompatibilisnek</string>
-	<string name="screen_cloud_local_error_no_content_provider">További helyszínek nem állnak rendelkezésre.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">ULR</string>
 	<string name="screen_webdav_settings_username_label">Felhasználónév</string>
--- a/presentation/src/main/res/values-in-rID/strings.xml
+++ b/presentation/src/main/res/values-in-rID/strings.xml
@ -9,7 +9,6 @@
 	<string name="error_no_network_connection">Tidak ada koneksi jaringan</string>
 	<string name="error_invalid_passphrase">Kata sandi salah</string>
 	<string name="error_file_or_folder_exists">Berkas atau folder sudah ada.</string>
-	<string name="error_vault_version_not_supported">Vault tidak didukung. Vault ini telah dibuat dengan Cryptomator versi lain.</string>
 	<string name="error_vault_already_exists">Vault sudah ada.</string>
 	<string name="error_no_such_file">Berkas tidak ada.</string>
 	<string name="error_vault_has_been_locked">Vault telah dikunci.</string>
@ -115,7 +114,7 @@
 	<string name="screen_cloud_connections_title">Pilih lokasi</string>
 	<string name="screen_cloud_connections_no_connections">Ketuk disini untuk menambahkan lokasi</string>
 	<string name="screen_cloud_error_webdav_not_supported">Server tampaknya tidak kompatibel dengan WebDAV</string>
-	<string name="screen_cloud_local_error_no_content_provider">Tidak ada lokasi tambahan yang tersedia.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Tidak ditemukan file manager yang dapat membuka direktori ini</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Nama pengguna</string>
@ -305,6 +304,7 @@
 	<string name="dialog_enter_license_title">Berikan lisensi yang valid</string>
 	<string name="dialog_enter_license_content">Kami mendeteksi bahwa Anda menginstal Cryptomator tanpa menggunakan Google Play Store. Berikan lisensi yang valid, yang dapat dibeli di <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">Lisensi yang diberikan tidak valid. Pastikan Anda memasukkannya dengan benar.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Kunci yang Anda input adalah kunci supporter certificate untuk pengguna desktop. Harap masukkan lisensi yang valid.</string>
 	<string name="dialog_enter_license_no_content">Tidak ada lisensi yang diberikan. Harap masukkan lisensi yang valid.</string>
 	<string name="dialog_enter_license_decline_button">Keluar</string>
 	<string name="dialog_license_confirmation_title">Konfirmasi lisensi</string>
--- a/presentation/src/main/res/values-it-rIT/strings.xml
+++ b/presentation/src/main/res/values-it-rIT/strings.xml
@ -9,7 +9,8 @@
 	<string name="error_no_network_connection">Nessuna connessione di rete</string>
 	<string name="error_invalid_passphrase">Password errata</string>
 	<string name="error_file_or_folder_exists">Esiste già un file o una cartella.</string>
-	<string name="error_vault_version_not_supported">Cassaforte non supportata. Questa cassaforte è stata creata con un\'altra versione di Cryptomator.</string>
+	<string name="error_vault_version_not_supported">La versione %1$s della cassaforte non è supportata. Questa cassaforte è stata creata con una versione più vecchia o più recente di Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Il file %1$s manca nella cartella della cassaforte. Assicurati che questo file esista nella cartella della cassaforte nel cloud.</string>
 	<string name="error_vault_already_exists">La cassaforte esiste già.</string>
 	<string name="error_no_such_file">Il file non esiste.</string>
 	<string name="error_vault_has_been_locked">La cassaforte è stata bloccata.</string>
@ -116,7 +117,7 @@
 	<string name="screen_cloud_connections_title">Scegli una posizione</string>
 	<string name="screen_cloud_connections_no_connections">Clicca qui per aggiungere posizioni</string>
 	<string name="screen_cloud_error_webdav_not_supported">Il server non sembra essere compatibile con WebDAV</string>
-	<string name="screen_cloud_local_error_no_content_provider">Nessuna posizione aggiuntiva disponibile.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Nessun file manager trovato che supporta l\'apertura di cartelle</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Nome utente</string>
@ -199,6 +200,7 @@
 	<string name="screen_settings_keep_unlocked_while_editing_files">Mantieni sbloccato</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Mantieni le cassaforte sbloccate durante la modifica dei file</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_onedrive_connections">Connessioni OneDrive</string>
 	<string name="screen_cloud_settings_webdav_connections">Connessioni WebDAV</string>
 	<string name="screen_cloud_settings_pcloud_connections">connessioni pCloud</string>
 	<string name="screen_cloud_settings_s3_connections">Collegamenti S3</string>
@ -272,6 +274,9 @@
 	<string name="dialog_accept_ssl_certificate_hint">Il certificato SSL non è valido. Vuoi comunque fidarti?</string>
 	<string name="dialog_accept_ssl_certificate_details">Dettagli</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Questo potrebbe essere un rischio per la sicurezza. So cosa sto facendo.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Disattiva ottimizzazioni batteria</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Per recuperare nuove immagini e video senza esecuzione in background, dobbiamo opt-out dalle ottimizzazioni della batteria. Ma non preoccuparti, %1$s non consuma molta energia.\n\nPer abilitare, imposta \'Non ottimizzato\' in \'Tutte le app\', seleziona %1$s e scegli \'Non ottimizzare\' dopo aver cliccato \'%2$s\' in questa finestra di dialogo.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Non chiedere più</string>
 	<string name="dialog_http_security_hint">L\'utilizzo di HTTP non è sicuro. Si consiglia invece di utilizzare HTTPS. Se conosci i rischi, puoi continuare con HTTP.</string>
 	<string name="dialog_http_security_checkbox">Cambia in HTTPS</string>
 	<string name="dialog_http_security_title">Usare HTTPS?</string>
@ -305,6 +310,7 @@
 	<string name="dialog_enter_license_title">Fornire una licenza valida</string>
 	<string name="dialog_enter_license_content">Abbiamo rilevato che hai installato Cryptomator senza utilizzare Google Play Store. Fornisci una licenza valida, che può essere acquistata su <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">La licenza fornita non è valida. Assicurati di averla inserita correttamente.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">La chiave fornita è un certificato per la versione desktop rilasciata ai supporter. Inserisci una licenza valida.</string>
 	<string name="dialog_enter_license_no_content">Nessuna licenza fornita. Inserisci una licenza valida.</string>
 	<string name="dialog_enter_license_decline_button">Esci</string>
 	<string name="dialog_license_confirmation_title">Conferma licenza</string>
@ -372,6 +378,7 @@
 	<string name="notification_open_writable_file_title">Apri file scrivibile</string>
 	<string name="notification_open_writable_file_message">La cassaforte rimane sbloccata fino alla modifica completata</string>
 	<string name="notification_update_check_finished_latest">Ultima versione installata</string>
+	<string name="notification_authenticating">Autenticazione&#8230;</string>
 	<string name="screen_settings_lru_cache">Cache</string>
 	<string name="screen_settings_lru_cache_toggle_summary">La cache ha recentemente acceso ai file crittografati localmente sul dispositivo per un riutilizzo successivo quando riaperto</string>
 	<string name="screen_settings_lru_cache_size">Dimensione totale della cache</string>
--- a/presentation/src/main/res/values-iw-rIL/strings.xml
+++ b/presentation/src/main/res/values-iw-rIL/strings.xml
@ -9,7 +9,6 @@
 	<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>
--- a/presentation/src/main/res/values-ja-rJP/strings.xml
+++ b/presentation/src/main/res/values-ja-rJP/strings.xml
@ -9,7 +9,6 @@
 	<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>
@ -30,6 +29,7 @@
 	<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>
 	<string name="error_masterkey_location_not_supported">好きな場所に Masterkey を置くことはまだできません</string>
 	<!-- # clouds -->
@ -65,6 +65,9 @@
 	<string name="screen_file_browser_add_existing_vault_extra_text">Masterkey ファイルを選択</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>
+	<plurals name="screen_file_browser_subtitle_move">
+		<item quantity="other">%2$d アイテムを移動する</item>
+	</plurals>
 	<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>
@ -111,7 +114,7 @@
 	<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_error_no_content_provider">追加の利用できる保存先はありません。</string>
+	<string name="screen_cloud_local_error_no_content_provider">ディレクトリを開くことができるファイルマネージャが見つかりませんでした</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">ユーザー名</string>
@ -194,6 +197,7 @@
 	<string name="screen_settings_keep_unlocked_while_editing_files">解錠したままにする</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files_summary">ファイルの編集中は金庫を解錠しておく</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_onedrive_connections">OneDrive 接続</string>
 	<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>
@ -267,6 +271,8 @@
 	<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_ask_ignore_battery_optimizations_title">バッテリーの最適化を無効にする</string>
+	<string name="dialog_ask_ignore_battery_optimizations_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>
@ -285,7 +291,9 @@
 	<string name="dialog_app_is_obscured_info_hint">他のアプリケーションが Cryptomator の上に何かを表示しています（例: ブルーライト フィルターやナイト・モードアプリ）。このため、セキュリティの観点から Cryptomator が無効化されています。\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">Cryptomator を有効にするには</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">閉じる</string>
 	<string name="dialog_vaults_removed_during_migration_title">%1s クラウンドの金庫を再追加してください</string>
+	<string name="dialog_vaults_removed_during_migration_hint">このアプリのバージョンに移行に際して、アプリから次の保管庫を削除する必要があります:\n%2s \n\nこれらの保管庫はクラウドからではなく、このアプリからのみ削除されます。 ご不便をおかけして申し訳ありませんが、保管庫を再度追加してください。</string>
 	<string name="dialog_vault_is_root_folder_of_cloud_title">金庫がクラウト接続のルート フォルダーです</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">この保管庫を追加するルートディレクトリとして、少なくともこの保管庫フォルダの親フォルダを選択する新しいクラウド接続を作成する必要があります。</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">この設定は安全のための機能です。他のアプリがユーザーを騙してしまうことを防ぎます。\n\n無効にすることで、 <a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">リスクを認識していること</a> に留意する必要があります。</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">本当にこのクラウド接続を削除しますか？</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">この操作により、クラウド接続とクラウドのすべての金庫が削除されます。</string>
@ -298,6 +306,7 @@
 	<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_not_valid_content_desktop_supporter_certificate">入力されたキーはデスクトップサポーター証明書です。有効なライセンスを入力してください。</string>
 	<string name="dialog_enter_license_no_content">ライセンスがありません。有効なライセンスを入力してください。</string>
 	<string name="dialog_enter_license_decline_button">終了</string>
 	<string name="dialog_license_confirmation_title">ライセンスの確認を完了</string>
@ -313,6 +322,7 @@
 	<string name="dialog_sym_link_message">このシンボリックリンクに移動することはできません</string>
 	<string name="dialog_sym_link_back_button">戻る</string>
 	<string name="dialog_no_dir_file_title">ディレクトリのコンテンツを読み込むことができません</string>
+	<string name="dialog_no_dir_file_message">クラウドのフォルダ \'%1$s\' には有効なディレクトリファイルがありません。このフォルダは他のデバイスで作成され、まだクラウドに完全に同期されていない可能性があります。クラウドで以下のファイルが存在し、かつ空でないことを確認してください。: \n%2$s</string>
 	<string name="dialog_no_more_images_to_display">表示する画像がありません&#8230;</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.com</a>。現在のアカウントからログアウトし、このアプリの「+」を再度クリックして、新しいクラウド接続を作成してください。</string>
@ -364,7 +374,9 @@
 	<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="notification_authenticating">認証中&#8230;</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>
--- a/presentation/src/main/res/values-ko-rKR/strings.xml
+++ b/presentation/src/main/res/values-ko-rKR/strings.xml
@ -9,7 +9,6 @@
 	<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">지원되지 않는 Vault입니다. 이 Vault는 다른 버전의 Cryptomator로 생성되었습니다.</string>
 	<string name="error_vault_already_exists">Vault가 이미 존재합니다.</string>
 	<string name="error_no_such_file">파일이 존재하지 않습니다.</string>
 	<string name="error_vault_has_been_locked">Vault가 잠겼습니다.</string>
--- a/presentation/src/main/res/values-nb-rNO/strings.xml
+++ b/presentation/src/main/res/values-nb-rNO/strings.xml
@ -9,7 +9,6 @@
 	<string name="error_no_network_connection">Ingen nettverkstilkobling</string>
 	<string name="error_invalid_passphrase">Feil passord</string>
 	<string name="error_file_or_folder_exists">En fil eller mappe finnes allerede.</string>
-	<string name="error_vault_version_not_supported">Hvelvet støttes ikke. Dette hvelvet er laget med en annen versjon av Cryptomator.</string>
 	<string name="error_vault_already_exists">Hvelvet finnes allerede.</string>
 	<string name="error_no_such_file">Filen finnes ikke.</string>
 	<string name="error_vault_has_been_locked">Hvelvet har blitt låst.</string>
@ -77,6 +76,7 @@
 	<string name="screen_file_browser_node_action_open_with_text">Åpne med&#8230;</string>
 	<string name="screen_file_browser_selection_mode_title_zero_elements">Velg elementer</string>
 	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d valgt</string>
+	<string name="screen_file_browser_select_items">Velg</string>
 	<string name="screen_file_browser_select_all_items">Velg alle</string>
 	<string name="screen_file_browser_refresh_items">Oppdater</string>
 	<string name="screen_file_browser_no_connection_message">Ingen forbindelse</string>
@ -89,6 +89,7 @@
 	<string name="screen_share_files_content_file">fil</string>
 	<string name="screen_share_files_content_files">filer</string>
 	<string name="screen_share_files_msg_filenames_must_be_unique">Filnavnene må være unike, velg nye navn på duplikatene.</string>
+	<string name="screen_share_files_section_location">Lagringssted</string>
 	<string name="screen_share_files_save_button_text">Lagre</string>
 	<string name="screen_share_files_msg_success">Kryptering fullført</string>
 	<!-- ## screen: choose cloud service -->
@ -145,8 +146,10 @@
 	<string name="screen_cloud_settings_webdav_connections">WebDAV-tilkoblinger</string>
 	<string name="screen_cloud_settings_pcloud_connections">pCloud-tilkoblinger</string>
 	<string name="screen_cloud_settings_log_in_to">Logg inn i</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">Logg ut fra</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">%1$s kunne ikke autentiseres.</string>
 	<!-- ## screen: insecure android version info -->
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Avbryt</string>
@ -157,11 +160,35 @@
 	<string name="dialog_change_password_msg_old_password_empty">Feltet for gjeldende passord kan ikke være tomt.</string>
 	<string name="dialog_change_password_msg_new_password_empty">Feltet for nytt passordet kan ikke være tomt.</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">Hvelvet %1$s ble ikke funnet</string>
 	<string name="dialog_vault_not_found_positive_button_text">Fjern</string>
 	<string name="dialog_existing_file_title">Filen finnes allerede</string>
 	<string name="dialog_existing_file_positive_button">Erstatt</string>
 	<string name="dialog_replace_positive_button_all_files_exist">Erstatt alle</string>
 	<string name="dialog_replace_positive_button_single_file_exists">Erstatt</string>
+	<string name="dialog_replace_title_single_file_exists">Erstatt fil?</string>
+	<string name="dialog_replace_title_multiple_files_exist">Erstatt filene?</string>
+	<string name="dialog_unable_to_share_title">Kunne ikke dele filene</string>
+	<string name="dialog_unable_to_share_positive_button">Ok</string>
+	<string name="dialog_unable_to_share_negative_button">Opprett hvelv</string>
+	<string name="dialog_filetype_not_supported_title">Kan ikke åpne %1$s</string>
+	<string name="dialog_rename_vault_title">Endre navn på hvelvet</string>
+	<string name="dialog_rename_node_folder_title">Endre mappenavn</string>
+	<string name="dialog_rename_node_file_title">Endre filnavn</string>
+	<string name="dialog_unsaved_changes_title">Du har ulagrede endringer</string>
+	<string name="dialog_unsaved_changes_message">Vil du virkelig avslutte uten å lagre?</string>
+	<string name="dialog_unsaved_changes_discard">Forkast</string>
+	<string name="dialog_file_name_placeholder">tekst.txt</string>
+	<string name="dialog_delete_vault_message">Er du sikker på at du vil fjerne dette hvelvet?</string>
+	<string name="dialog_delete_vault_hint">Denne handlingen vil bare fjerne hvelvet fra denne listen og ikke slette det fysisk.</string>
+	<string name="dialog_upload_file_title">Laster opp&#8230;</string>
+	<string name="dialog_upload_file_remaining">Fil %1$d av %2$d</string>
+	<string name="dialog_export_file_title">Eksporterer (%1$d/%2$d)</string>
+	<string name="dialog_progress_please_wait">Vent litt&#8230;</string>
+	<string name="dialog_progress_creating_folder">Oppretter mappe&#8230;</string>
+	<string name="dialog_progress_creating_text_file">Oppretter tekstfil&#8230;</string>
+	<string name="action_progress_deleting">Sletter&#8230;</string>
+	<string name="dialog_progress_upload_file">Laster opp&#8230;</string>
 	<string name="dialog_lock_vault">Lås</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Lukk</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Er du sikker på at du vil fjerne denne skylagringstilkoblingen?</string>
--- a/presentation/src/main/res/values-nl-rNL/strings.xml
+++ b/presentation/src/main/res/values-nl-rNL/strings.xml
@ -9,7 +9,8 @@
 	<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 kluis. Deze kluis is gemaakt met een andere versie van Cryptomator.</string>
+	<string name="error_vault_version_not_supported">Kluisversie %1$s wordt niet ondersteund. Deze kluis is gemaakt met een oudere of nieuwere versie van Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">%1$s bestand ontbreekt in de kluis map. Zorg ervoor dat dit bestand bestaat in de kluismap in de cloud.</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>
@ -116,7 +117,7 @@
 	<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_error_no_content_provider">Geen extra locaties beschikbaar.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Geen bestandsbeheerder gevonden die het openen van mappen ondersteunt</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Gebruikersnaam</string>
@ -273,6 +274,9 @@
 	<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_ask_ignore_battery_optimizations_title">Batterij optimalisaties uitschakelen</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Om nieuwe foto\'s en video\'s op te halen zonder in de achtergrond te draaien, schakelt de batterij optimalisatie uit. Maak je geen zorgen, %1$s verbruikt niet veel energie.\n\nOm toe te passen, wijzig \'Niet geoptimaliseerd\' naar \'Alle apps\', selecteer %1$s en kies \'Niet optimaliseren\' na \'%2$s\' in dit dialoogvenster.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Niet opnieuw vragen?</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>
@ -306,6 +310,7 @@
 	<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_not_valid_content_desktop_supporter_certificate">De verstrekte sleutel is een desktop supportercertificaat. Voer een geldige licentie in.</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>
--- a/presentation/src/main/res/values-pl-rPL/strings.xml
+++ b/presentation/src/main/res/values-pl-rPL/strings.xml
@ -9,7 +9,8 @@
 	<string name="error_no_network_connection">Brak połączenia z Internetem</string>
 	<string name="error_invalid_passphrase">Błędne hasło</string>
 	<string name="error_file_or_folder_exists">Plik lub folder już istnieje.</string>
-	<string name="error_vault_version_not_supported">Nieobsługiwany sejf. Ten sejf został utworzony z inną wersją Cryptomator.</string>
+	<string name="error_vault_version_not_supported">Wersja sejfu %1$s jest nieobsługiwana. Ten sejf został utworzony ze starszą lub nowszą wersją Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Brak pliku %1$s w folderze sejfu. Upewnij się, że ten plik istnieje w folderze sejfu w chmurze.</string>
 	<string name="error_vault_already_exists">Sejf już istnieje.</string>
 	<string name="error_no_such_file">Plik nie istnieje.</string>
 	<string name="error_vault_has_been_locked">Sejf został zablokowany.</string>
@ -118,7 +119,7 @@
 	<string name="screen_cloud_connections_title">Wybierz lokalizację</string>
 	<string name="screen_cloud_connections_no_connections">Kliknij tutaj, aby dodać nową lokalizację</string>
 	<string name="screen_cloud_error_webdav_not_supported">Serwer wydaje się być niekompatybilny z WebDAV</string>
-	<string name="screen_cloud_local_error_no_content_provider">Brak dodatkowych lokalizacji.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Brak menedżera plików z obsługą otwierania katalogów</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Login</string>
@ -275,6 +276,9 @@
 	<string name="dialog_accept_ssl_certificate_hint">Certyfikat SSL jest nieprawidłowy. Czy mimo to chcesz mu zaufać?</string>
 	<string name="dialog_accept_ssl_certificate_details">Szczegóły</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Mogłoby to stanowić zagrożenie dla bezpieczeństwa. Wiem, co robię.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Wyłącz optymalizację baterii</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Aby pobrać nowe zdjęcia i filmy bez uruchamiania w tle, należy wyłączyć optymalizację baterii. Ale nie martw się, %1$s nie zużywa zbyt dużo energii.\n\nAby go zastosować, zmień \'Nie zoptymalizowane\' na \'Wszystkie aplikacje\', wybierz %1$s i wybierz \'Nie optymalizuj\' po kliknięciu \'%2$s\' w tym oknie.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Nie pytać ponownie?</string>
 	<string name="dialog_http_security_hint">Używanie HTTP jest niezabezpieczone. Zamiast tego zalecamy używanie HTTPS. Jeśli znasz ryzyko, możesz kontynuować używając HTTP.</string>
 	<string name="dialog_http_security_checkbox">Zmień na HTTPS</string>
 	<string name="dialog_http_security_title">Używać HTTPS?</string>
@ -308,6 +312,7 @@
 	<string name="dialog_enter_license_title">Podaj poprawną licencję</string>
 	<string name="dialog_enter_license_content">Wykryliśmy, że zainstalowałeś Cryptomator bez korzystania ze sklepu Google Play. Podaj poprawną licencję, którą można kupić na <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">Podana licencja jest nieprawidłowa. Upewnij się, że została wprowadzona poprawnie.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Podany klucz jest certyfikatem darczyńcy. Wprowadź prawidłową licencję.</string>
 	<string name="dialog_enter_license_no_content">Nie udzielono licencji. Wprowadź prawidłową licencję.</string>
 	<string name="dialog_enter_license_decline_button">Wyjdź</string>
 	<string name="dialog_license_confirmation_title">Informacje o licencji</string>
--- a/presentation/src/main/res/values-pt-rBR/strings.xml
+++ b/presentation/src/main/res/values-pt-rBR/strings.xml
@ -9,7 +9,6 @@
 	<string name="error_no_network_connection">Sem conexão com a internet</string>
 	<string name="error_invalid_passphrase">Senha incorreta</string>
 	<string name="error_file_or_folder_exists">Um arquivo ou pasta já existe.</string>
-	<string name="error_vault_version_not_supported">Cofre não suportado. Este cofre foi criado com outra versão do Cryptomator.</string>
 	<string name="error_vault_already_exists">O cofre já existe.</string>
 	<string name="error_no_such_file">O arquivo não existe.</string>
 	<string name="error_vault_has_been_locked">O cofre foi trancado.</string>
@ -116,7 +115,7 @@
 	<string name="screen_cloud_connections_title">Selecionar um local</string>
 	<string name="screen_cloud_connections_no_connections">Clique aqui para adicionar locais</string>
 	<string name="screen_cloud_error_webdav_not_supported">O servidor não parece ser compatível com WebDAV</string>
-	<string name="screen_cloud_local_error_no_content_provider">Não há localizações adicionais disponíveis.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Nenhum gerenciador de arquivos encontrado que suporte a abertura de pastas</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Usuário</string>
@ -306,6 +305,7 @@
 	<string name="dialog_enter_license_title">Fornecer uma licença válida</string>
 	<string name="dialog_enter_license_content">Nós detectamos que você instalou o Cryptomator sem usar a Google Play Store. Forneça uma licença válida, que pode ser comprada em <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">A licença fornecida não é válida. Verifique se você digitou corretamente.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">A chave fornecida é um certificado de suporte da área de trabalho. Por favor, insira uma licença válida.</string>
 	<string name="dialog_enter_license_no_content">Nenhuma licença fornecida. Por favor insira uma licença válida.</string>
 	<string name="dialog_enter_license_decline_button">Sair</string>
 	<string name="dialog_license_confirmation_title">Confirmação de licença</string>
--- a/presentation/src/main/res/values-pt-rPT/strings.xml
+++ b/presentation/src/main/res/values-pt-rPT/strings.xml
@ -9,7 +9,8 @@
 	<string name="error_no_network_connection">Sem ligação à rede</string>
 	<string name="error_invalid_passphrase">Palavra-chave errada</string>
 	<string name="error_file_or_folder_exists">Um ficheiro ou uma pasta já existe.</string>
-	<string name="error_vault_version_not_supported">Cofre não suportado. Este cofre foi criado com outra versão do Cryptomator.</string>
+	<string name="error_vault_version_not_supported">A versão do cofre %1$s não é compatível. Este cofre foi criado com uma versão mais antiga ou mais recente do Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">%1$s ficheiro está faltando na pasta do seu cofre. Certifique-se que esse ficheiro existe na pasta do cofre alojado na nuvem.</string>
 	<string name="error_vault_already_exists">O cofre já existe.</string>
 	<string name="error_no_such_file">O ficheiro não existe.</string>
 	<string name="error_vault_has_been_locked">O cofre foi bloqueado.</string>
@ -30,6 +31,7 @@
 	<!-- ## screen: share files -->
 	<!-- ## screen: choose cloud service -->
 	<!-- ## screen: cloud connections -->
+	<string name="screen_cloud_local_error_no_content_provider">Não foi encontrado nenhum gestor de arquivos compatível com a abertura de diretórios</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_password_label">Senha</string>
 	<!-- ## screen: s3 settings -->
@ -49,7 +51,11 @@
 	<string name="dialog_enter_password_positive_button">Destrancar</string>
 	<!-- Vault not found -->
 	<string name="dialog_lock_vault">Trancar</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Desativar otimizações de bateria</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Para recuperar novas fotos e vídeos sem executar em segundo plano, precisamos de desativar as otimizações de bateria. Mas não se preocupe, %1$s não consome muita energia. \n\n Para aplicá-lo, altere \'Não otimizado\' para \'Todos os aplicativos\', selecione %1$s e escolha \'Não otimizar\' depois de clicar em \'%2$s\' nesta caixa de diálogo.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Não perguntar novamente?</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Fechar</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">A chave fornecida é um certificado de apoiante para computador/portátil. Por favor, insira uma licença válida.</string>
 	<string name="dialog_sym_link_back_button">Anterior</string>
 	<!-- # error reports -->
 	<!-- # misc -->
--- a/presentation/src/main/res/values-ro-rRO/strings.xml
+++ b/presentation/src/main/res/values-ro-rRO/strings.xml
@ -9,7 +9,6 @@
 	<string name="error_no_network_connection">Nu există conexiune la rețea</string>
 	<string name="error_invalid_passphrase">Parolă greşită</string>
 	<string name="error_file_or_folder_exists">Un fișier sau dosar există deja.</string>
-	<string name="error_vault_version_not_supported">Seif nesuportat. Acest seif a fost creat cu o altă versiune de Cryptomator.</string>
 	<string name="error_vault_already_exists">Seiful există deja.</string>
 	<string name="error_no_such_file">Fișierul nu există.</string>
 	<string name="error_vault_has_been_locked">Seiful a fost blocat.</string>
@ -111,7 +110,6 @@
 	<string name="screen_cloud_connections_title">Alegeți o locație</string>
 	<string name="screen_cloud_connections_no_connections">Faceți clic aici pentru a adăuga locații</string>
 	<string name="screen_cloud_error_webdav_not_supported">Serverul nu pare să fie compatibil cu WebDAV</string>
-	<string name="screen_cloud_local_error_no_content_provider">Nu există locații suplimentare disponibile.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">Adresa URL</string>
 	<string name="screen_webdav_settings_username_label">Nume de utilizator</string>
--- a/presentation/src/main/res/values-ru-rRU/strings.xml
+++ b/presentation/src/main/res/values-ru-rRU/strings.xml
@ -9,7 +9,8 @@
 	<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_version_not_supported">Версия хранилища %1$s не поддерживается. Это хранилище было создано либо в устаревшей, либо в более новой версии Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Файл %1$s отсутствует в папке хранилища. Убедитесь, что этот файл существует в папке хранилища в облаке.</string>
 	<string name="error_vault_already_exists">Хранилище уже существует.</string>
 	<string name="error_no_such_file">Файл не существует.</string>
 	<string name="error_vault_has_been_locked">Хранилище заблокировано.</string>
@ -118,7 +119,7 @@
 	<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_error_no_content_provider">Нет дополнительных мест.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Не найден файловый менеджер, поддерживающий открытие папок</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Логин</string>
@ -275,6 +276,9 @@
 	<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_ask_ignore_battery_optimizations_title">Отключить оптимизацию батареи</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Чтобы получать новые изображения и видео без работы в фоновом режиме, необходимо отключить оптимизацию заряда аккумулятора. Но не волнуйтесь, %1$s не потребляет много энергии.\n\nЧтобы это сделать, измените \'Не оптимизировано\' на \'Все приложения\', выберите %1$s и в этом окне выберите \'Не оптимизировать\' после нажатия \'%2$s\'.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_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>
@ -308,6 +312,7 @@
 	<string name="dialog_enter_license_title">Предоставьте действительную лицензию</string>
 	<string name="dialog_enter_license_content">Мы обнаружили, что вы установили Cryptomator, не используя Google Play. Предоставьте действительную лицензию, которую можно приобрести на <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_not_valid_content_desktop_supporter_certificate">Предоставленный ключ - это сертификат спонсора. Введите действительную лицензию.</string>
 	<string name="dialog_enter_license_no_content">Нет лицензии. Введите действительную лицензию.</string>
 	<string name="dialog_enter_license_decline_button">Выход</string>
 	<string name="dialog_license_confirmation_title">Подтверждение лицензии</string>
--- a/presentation/src/main/res/values-sk-rSK/strings.xml
+++ b/presentation/src/main/res/values-sk-rSK/strings.xml
@ -9,7 +9,8 @@
 	<string name="error_no_network_connection">Chýba sieťové pripojenie</string>
 	<string name="error_invalid_passphrase">Nesprávne heslo</string>
 	<string name="error_file_or_folder_exists">Súbor alebo adresár už existuje.</string>
-	<string name="error_vault_version_not_supported">Nepodporovaný trezor. Tento trezor bol vytvorený s inou verziou Cryptomator-a.</string>
+	<string name="error_vault_version_not_supported">Verzia trezora %1$s je nepodporovaná. Tento trezor bol vytvorený staršou alebo novšou verziou Cryptomator-a.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">%1$s súbor chýba vo Vašom adresári trezora. Uistite sa že požadovaný súbor existuje vo Vašom adresári trezora v cloude.</string>
 	<string name="error_vault_already_exists">Trezor už existuje.</string>
 	<string name="error_no_such_file">Súbor neexistuje.</string>
 	<string name="error_vault_has_been_locked">Trezor bol zamknutý.</string>
@ -118,7 +119,7 @@
 	<string name="screen_cloud_connections_title">Vybrať umiestnenie</string>
 	<string name="screen_cloud_connections_no_connections">Kliknite sem pre pridanie umiestnení</string>
 	<string name="screen_cloud_error_webdav_not_supported">Server zdá sa byť WebDAV kompatibilný</string>
-	<string name="screen_cloud_local_error_no_content_provider">Ďalšie úložiská nie sú dostupné.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Nenašiel sa manažér súborov ktorý podporuje otváranie adresárov</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Uživateľské meno</string>
@ -275,6 +276,9 @@
 	<string name="dialog_accept_ssl_certificate_hint">SSL certifikát je neplatný. Napriek tomu mu chete veriť?</string>
 	<string name="dialog_accept_ssl_certificate_details">Podrobnosti</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Toto môže byť bezpečnostné riziko. Viem čo robím.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Vypnúť optimalizácie batérie</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Získať nové obrázky a videá bez behu na pozadí, potrebujeme rozhodnúť na základe optimalzácií batérie. Ale netrápte sa, %1$s nespotrebúva veľa energie. \n\nAplikovať to, zmente \'Neoptimalizované\' na \'Všetky aplikácie\', vyberte %1$s a zvoľte \'Neoptimalizovať\' po odkliknutí \'%2$s\' v tomto dialógu.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Nepýtať sa znovu?</string>
 	<string name="dialog_http_security_hint">Používanie HTTP nie je bezpečné. Odporúčame namiesto toho použiť HTTPS. Ak poznáte riziká, môžte pokračovať s HTTP.</string>
 	<string name="dialog_http_security_checkbox">Zmeniť na HTTPS</string>
 	<string name="dialog_http_security_title">Použiť HTTPS?</string>
@ -308,6 +312,7 @@
 	<string name="dialog_enter_license_title">Zadajte platný licenčný kľúč</string>
 	<string name="dialog_enter_license_content">Detekovali sme že máte nainštalovaný Cryptomator bez použitia Google Play Store. Poskytnite platnú licenciu, ktorá bola zakúpená v <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">Poskytnutá licencia nie je platná. Uistite sa či bola zadaná korektne.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Poskytnuty kľúč je pracovná plocha certifikátu podporovateľa. Prosím zadajte platnú licenciu.</string>
 	<string name="dialog_enter_license_no_content">Licencia neposkytnutá. Prosím zadajte platnú licenciu.</string>
 	<string name="dialog_enter_license_decline_button">Ukončiť</string>
 	<string name="dialog_license_confirmation_title">Potvrdenie licencie</string>
--- a/presentation/src/main/res/values-sv-rSE/strings.xml
+++ b/presentation/src/main/res/values-sv-rSE/strings.xml
@ -9,7 +9,8 @@
 	<string name="error_no_network_connection">Ingen nätverksanslutning</string>
 	<string name="error_invalid_passphrase">Felaktigt lösenord</string>
 	<string name="error_file_or_folder_exists">Filen eller katalogen finns redan.</string>
-	<string name="error_vault_version_not_supported">Valvet stöds ej. Detta valv har skapats med en annan version av Cryptomator.</string>
+	<string name="error_vault_version_not_supported">Valv-version %1$s stöds inte. Detta valv har skapats med en äldre eller nyare version av Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Filen %1$s saknas i din valvmapp. Se till att den här filen finns i din valvmapp i molnet.</string>
 	<string name="error_vault_already_exists">Valvet finns redan.</string>
 	<string name="error_no_such_file">Filen existerar inte.</string>
 	<string name="error_vault_has_been_locked">Valvet har låsts.</string>
@ -116,7 +117,7 @@
 	<string name="screen_cloud_connections_title">Välj en plats</string>
 	<string name="screen_cloud_connections_no_connections">Klicka här för att lägga till platser</string>
 	<string name="screen_cloud_error_webdav_not_supported">Servern verkar inte vara WebDAV-kompatibel</string>
-	<string name="screen_cloud_local_error_no_content_provider">Inga ytterligare platser tillgängliga.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Hittade ingen filhanterare som har stöd för att öppna kataloger</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Användarnamn</string>
@ -199,6 +200,7 @@
 	<string name="screen_settings_keep_unlocked_while_editing_files">Behåll olåst</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Håll valven upplåsta medan filer ändras</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_onedrive_connections">OneDrive-anslutningar</string>
 	<string name="screen_cloud_settings_webdav_connections">WebDAV-anslutningar</string>
 	<string name="screen_cloud_settings_pcloud_connections">pCloud-anslutningar</string>
 	<string name="screen_cloud_settings_s3_connections">S3 anslutningar</string>
@ -272,6 +274,9 @@
 	<string name="dialog_accept_ssl_certificate_hint">SSL-certifikatet är ogiltigt. Vill du lita på det ändå?</string>
 	<string name="dialog_accept_ssl_certificate_details">Detaljer</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Det kan vara en säkerhetsrisk. Jag vet vad jag gör.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Inaktivera batterioptimering</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">För att hämta nya bilder och videor utan att köra i bakgrunden måste vi välja bort batterioptimeringar. Men oroa dig inte, %1$s förbrukar inte mycket energi.\n\nFör att tillämpa detta, ändra \'Inte optimerad\' till \'Alla appar\', välj %1$s och välj \"Optimera inte\" efter att du klickat på \"%2$s\" i denna dialogruta.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Visa inte igen?</string>
 	<string name="dialog_http_security_hint">Användning av HTTP är osäkert. Vi rekommenderar att du använder HTTPS istället. Om du känner till riskerna kan du fortsätta med HTTP.</string>
 	<string name="dialog_http_security_checkbox">Ändra till HTTPS</string>
 	<string name="dialog_http_security_title">Använd HTTPS?</string>
@ -305,6 +310,7 @@
 	<string name="dialog_enter_license_title">Ange en giltig licens</string>
 	<string name="dialog_enter_license_content">Vi upptäckte att du installerade Cryptomator utan att använda Google Play Store. Ange en giltig licens, som kan köpas på <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">Den angivna licensen är inte giltig. Se till att du angav den korrekt.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Den angivna nyckeln är ett supportercertifikat för skrivbords-versionen. Ange en giltig licens.</string>
 	<string name="dialog_enter_license_no_content">Ingen licens angiven. Ange en giltig licens.</string>
 	<string name="dialog_enter_license_decline_button">Avsluta</string>
 	<string name="dialog_license_confirmation_title">Licensinformation</string>
@ -372,6 +378,7 @@
 	<string name="notification_open_writable_file_title">Öppna skrivbar fil</string>
 	<string name="notification_open_writable_file_message">Valvet är upplåst till färdig redigering</string>
 	<string name="notification_update_check_finished_latest">Senaste versionen installerad</string>
+	<string name="notification_authenticating">Autentiserar&#8230;</string>
 	<string name="screen_settings_lru_cache">Cache</string>
 	<string name="screen_settings_lru_cache_toggle_summary">Cachen har nyligen kommit åt filer krypterade lokalt på enheten för senare återanvändning när de öppnas igen</string>
 	<string name="screen_settings_lru_cache_size">Total cachestorlek</string>
--- a/presentation/src/main/res/values-te-rIN/strings.xml
+++ b/presentation/src/main/res/values-te-rIN/strings.xml
@ -74,7 +74,6 @@
 	<!-- ## screen: cloud connections -->
 	<string name="screen_cloud_connections_title">ఒక స్థానాన్ని ఎంచుకోండి</string>
 	<string name="screen_cloud_connections_no_connections">స్థానాలను జోడించడానికి ఇక్కడ క్లిక్ చేయండి</string>
-	<string name="screen_cloud_local_error_no_content_provider">అదనపు స్థానాలు అందుబాటులో లేవు.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">వినియోగదారు పేరు</string>
--- a/presentation/src/main/res/values-tr-rTR/strings.xml
+++ b/presentation/src/main/res/values-tr-rTR/strings.xml
@ -9,7 +9,8 @@
 	<string name="error_no_network_connection">Ağ bağlantısı yok</string>
 	<string name="error_invalid_passphrase">Şifre hatalı</string>
 	<string name="error_file_or_folder_exists">Dosya veya klasör zaten var.</string>
-	<string name="error_vault_version_not_supported">Kasa Desteklenmiyor. Bu kasa, Cryptomator\'un başka bir sürümüyle oluşturuldu.</string>
+	<string name="error_vault_version_not_supported">%1$s kasa sürümü desteklenmiyor. Bu kasa, Cryptomator\'ın daha eski veya daha yeni bir sürümüyle oluşturuldu.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Kasa klasörünüzde %1$s dosyası eksik. Bu dosyanın buluttaki kasa klasörünüzde bulunduğundan emin olun.</string>
 	<string name="error_vault_already_exists">Kasa zaten var.</string>
 	<string name="error_no_such_file">Dosya bulunmuyor.</string>
 	<string name="error_vault_has_been_locked">Kasa kilitlendi.</string>
@ -116,7 +117,7 @@
 	<string name="screen_cloud_connections_title">Bir yer seçin</string>
 	<string name="screen_cloud_connections_no_connections">Konum eklemek için buraya tıklayın</string>
 	<string name="screen_cloud_error_webdav_not_supported">Sunucu WebDAV uyumlu görünmüyor</string>
-	<string name="screen_cloud_local_error_no_content_provider">Kullanılabilir ek konum yok.</string>
+	<string name="screen_cloud_local_error_no_content_provider">Dizinlerin açılmasını destekleyen dosya yöneticisi bulunamadı</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Kullanıcı adı</string>
@ -273,6 +274,9 @@
 	<string name="dialog_accept_ssl_certificate_hint">SSL sertifikası geçersiz. Yine de güvenmek istiyor musun?</string>
 	<string name="dialog_accept_ssl_certificate_details">Detaylar</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Bu bir güvenlik riski olabilir! Ne yaptığımı biliyorum.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Pil optimizasyonlarını devre dışı bırak</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Arka planda çalışmadan yeni resimler ve videoları almak için pil optimizasyonlarını devre dışı bırakmanız gerekiyor. Ancak endişelenmeyin, %1$s fazla enerji tüketmez.\n\nUygulamak için \'Optimize edilmedi\'yi \'Tüm uygulamalar\' olarak değiştirin, %1$s\'yi seçin ve bu iletişim kutusunda \'%2$s\' tıkladıktan sonra \'Optimize etme\'yi seçin.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Bir daha sorma?</string>
 	<string name="dialog_http_security_hint">HTTP\'nin kullanımı güvensizdir. Bunun yerine HTTPS kullanmanızı öneririz. Riskleri biliyorsanız, HTTP ile devam edebilirsiniz.</string>
 	<string name="dialog_http_security_checkbox">HTTPS\'ye geç</string>
 	<string name="dialog_http_security_title">HTTPS kullanılsın mı?</string>
@ -306,6 +310,7 @@
 	<string name="dialog_enter_license_title">Geçerli bir lisans sağlayın</string>
 	<string name="dialog_enter_license_content">Cryptomator\'u Google Play Store kullanmadan yüklediğinizi tespit ettik. https://cryptomator.org/android/ adresinden satın alınabilecek geçerli bir lisans edinin lütfen.</string>
 	<string name="dialog_enter_license_not_valid_content">Sağlanan lisans geçerli değil. Doğru girdiğinizden emin olun.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Sağlanan anahtar, bir masaüstü destek sertifikasıdır. Lütfen geçerli bir lisans girin.</string>
 	<string name="dialog_enter_license_no_content">Lisans verilmemiştir. Lütfen geçerli bir lisans girin.</string>
 	<string name="dialog_enter_license_decline_button">Çıkış</string>
 	<string name="dialog_license_confirmation_title">Lisans onayı</string>
--- a/presentation/src/main/res/values-uk-rUA/strings.xml
+++ b/presentation/src/main/res/values-uk-rUA/strings.xml
@ -9,7 +9,6 @@
 	<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">Непідтримуване сховище. Це сховище було створено іншою версією криптоматора.</string>
 	<string name="error_vault_already_exists">Сховище вже існує.</string>
 	<string name="error_no_such_file">Файлу не існує.</string>
 	<string name="error_vault_has_been_locked">Сховище було заблоковано.</string>
@ -112,7 +111,6 @@
 	<string name="screen_cloud_connections_title">Обрати місцерозташування</string>
 	<string name="screen_cloud_connections_no_connections">Натисніть сюди щоб додати розташування</string>
 	<string name="screen_cloud_error_webdav_not_supported">Схоже, сервер не сумісний з WebDAV</string>
-	<string name="screen_cloud_local_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>
--- a/presentation/src/main/res/values-zh-rCN/strings.xml
+++ b/presentation/src/main/res/values-zh-rCN/strings.xml
@ -9,7 +9,8 @@
 	<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_version_not_supported">不支持的保险库版本 %1$s。这可能是使用太新或太旧的 Cryptomator 版本创建的保险库。</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">您的保险库文件夹中缺少 %1$s 文件。请确保您的云端的保险库文件夹中存在该文件。</string>
 	<string name="error_vault_already_exists">保险库已存在</string>
 	<string name="error_no_such_file">文件不存在</string>
 	<string name="error_vault_has_been_locked">保险库已锁定</string>
@ -115,7 +116,7 @@
 	<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_error_no_content_provider">无可用其他位置</string>
+	<string name="screen_cloud_local_error_no_content_provider">没有找到支持打开目录的文件管理器</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">用户名</string>
@ -272,6 +273,9 @@
 	<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_ask_ignore_battery_optimizations_title">禁用电池优化</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">要在不后台运行的情况下检索新的图片和视频，我们需要解除电池优化。但别担心，%1$s 不会消耗太多电量。\n\n如需应用，点击这个对话框中的“%2$s”后，将“未优化”改为“所有应用”，选择 %1$s 并选择“不要优化”。</string>
+	<string name="dialog_ask_ignore_battery_optimizations_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>
@ -305,6 +309,7 @@
 	<string name="dialog_enter_license_title">请提供有效许可证</string>
 	<string name="dialog_enter_license_content">我们检测到您在没有使用 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_not_valid_content_desktop_supporter_certificate">提供的密钥为桌面版赞助者证书。请输入有效的许可证。</string>
 	<string name="dialog_enter_license_no_content">未提供许可证，请输入有效许可证</string>
 	<string name="dialog_enter_license_decline_button">退出</string>
 	<string name="dialog_license_confirmation_title">授权通过</string>
--- a/presentation/src/main/res/values-zh-rTW/strings.xml
+++ b/presentation/src/main/res/values-zh-rTW/strings.xml
@ -9,7 +9,6 @@
 	<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>
@ -115,7 +114,6 @@
 	<string name="screen_cloud_connections_title">選擇位置</string>
 	<string name="screen_cloud_connections_no_connections">點擊此處新增位置</string>
 	<string name="screen_cloud_error_webdav_not_supported">服務器似乎與 WebDAV 不兼容</string>
-	<string name="screen_cloud_local_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>
@ -127,7 +125,9 @@
 	<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_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_bucket_not_empty">儲存貯體不可留空</string>
 	<!-- ## screen: enter vault name -->
 	<string name="screen_enter_vault_name_msg_name_empty">加密檔案庫名稱不可留空。</string>
@ -149,6 +149,7 @@
 	<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_section_search">搜尋</string>
 	<string name="screen_settings_live_search">即時搜尋</string>
 	<string name="screen_settings_section_auto_lock">自動鎖定</string>
@ -157,6 +158,7 @@
 	<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_instant_upload">即時上傳</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>
@ -176,13 +178,17 @@
 	<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_onedrive_connections">OneDrive 連結</string>
 	<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>
@ -195,6 +201,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_positive_button_text">移除</string>
 	<string name="dialog_existing_file_title">檔案已經存在</string>
 	<string name="dialog_existing_file_positive_button">取代</string>
@ -204,6 +211,8 @@
 	<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_msg_some_files_exists">%1$d 個檔案已經存在，您是否要取代？</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>
@ -231,9 +240,11 @@
 	<string name="dialog_progress_upload_file">正在上傳中……</string>
 	<string name="dialog_progress_download_file">正在下載&#8230;</string>
 	<string name="dialog_progress_encryption">正在加密中……</string>
+	<string name="dialog_progress_decryption">解密中&#8230;</string>
 	<string name="action_progress_moving">正在移動中……</string>
 	<string name="dialog_lock_vault">鎖定</string>
 	<string name="dialog_accept_ssl_certificate_title">無效的 TLS 憑證</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>
@ -246,10 +257,12 @@
 	<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_delete_cloud_connection_with_vaults_message">您確定要刪除此雲端連結嗎？</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_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>
@ -263,6 +276,11 @@
 	<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_no_dir_file_title">無法讀取資料夾內的檔案資訊</string>
+	<string name="dialog_no_more_images_to_display">已無更多圖片可供顯示 &#8230;</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.com</a> 後登出目前的帳號，並重新點擊本程式中的「+」來建立一個新的雲端連結。</string>
+	<string name="permission_snackbar_auth_auto_upload">Cryptomator 需要存儲權限以便開啟自動圖片上傳</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
@ -289,9 +307,11 @@
 	<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>
@ -300,8 +320,14 @@
 	<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_auto_upload_failed_due_to_vault_not_found">使用於自動上傳的加密檔案庫已不存在。</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="notification_authenticating">正在驗證 &#8230;</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>
@ -311,6 +337,7 @@
 	<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">1分鐘</string>
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@ -17,7 +17,8 @@
 	<string name="error_no_network_connection">No network connection</string>
 	<string name="error_invalid_passphrase">Wrong password</string>
 	<string name="error_file_or_folder_exists">A file or folder already exists.</string>
-	<string name="error_vault_version_not_supported">Unsupported vault. This vault has been created with another version of Cryptomator.</string>
+	<string name="error_vault_version_not_supported">Vault version %1$s is unsupported. This vault has been created with an older or newer version of Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">%1$s file is missing in your vault folder. Make sure that this file exists in your vault folder in the cloud.</string>
 	<string name="error_vault_already_exists">Vault already exists.</string>
 	<string name="error_no_such_file">File does not exist.</string>
 	<string name="error_vault_has_been_locked">Vault has been locked.</string>
@ -76,6 +77,8 @@
 	<string name="snack_bar_action_title_sort_biggest">Biggest first</string>
 	<string name="snack_bar_action_title_sort_smallest">Smallest first</string>

+	<string name="snack_bar_action_title_save" translatable="false">@string/screen_share_files_save_button_text</string>
+
 	<!-- # screens -->

 	<!-- # screen: vault list -->
@ -168,7 +171,7 @@
 	<string name="screen_cloud_settings_option_delete" translatable="false">@string/screen_vault_list_vault_action_delete</string>
 	<string name="screen_cloud_connections_no_connections">Click here to add locations</string>
 	<string name="screen_cloud_error_webdav_not_supported">Server doesn\'t seem to be WebDAV compatible</string>
-	<string name="screen_cloud_local_error_no_content_provider">No additional locations available.</string>
+	<string name="screen_cloud_local_error_no_content_provider">No file manager found that supports opening directories</string>

 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_title" translatable="false">@string/cloud_names_webdav</string>
@ -393,6 +396,12 @@
 	<string name="dialog_accept_ssl_certificate_details">Details</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">This could be a security risk. I know what I am doing.</string>

+	<string name="dialog_ask_ignore_battery_optimizations_title">Disable battery optimizations</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">To retrieve new pictures and videos without running in the background, we need to opt-out from battery optimizations. But don\'t worry, %1$s doesn\'t consume much energy.\n\nTo apply it, change \'Not optimized\' to \'All apps\', select %1$s and choose \'Don\'t optimize\' after clicking \'%2$s\' in this dialog.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_neutral_button" translatable="false">@string/dialog_unable_to_share_positive_button</string>
+	<string name="dialog_ask_ignore_battery_optimizations_negative_button" translatable="false">@string/dialog_button_cancel</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Don\'t ask again?</string>
+
 	<string name="dialog_http_security_hint">The usage of HTTP is insecure. We recommend to use HTTPS instead. If you know the risks, you can continue with HTTP.</string>
 	<string name="dialog_http_security_checkbox">Change to HTTPS</string>
 	<string name="dialog_http_security_title">Use HTTPS?</string>
@ -447,6 +456,7 @@
 	<string name="dialog_enter_license_title">Provide a valid license</string>
 	<string name="dialog_enter_license_content">We detected that you installed Cryptomator without using Google Play Store. Provide a valid license, which can be purchased on <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">The provided license isn\'t valid. Make sure you entered it correctly.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">The provided key is a desktop supporter certificate. Please enter a valid license.</string>
 	<string name="dialog_enter_license_no_content">No license provided. Please enter a valid license.</string>
 	<string name="dialog_enter_license_ok_button" translatable="false">@string/dialog_unable_to_share_positive_button</string>
 	<string name="dialog_enter_license_decline_button">Exit</string>
--- a/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt
+++ b/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt
@ -261,9 +261,18 @@ constructor(context: Context) : SharedPreferences.OnSharedPreferenceChangeListen
 		}
 	}

+	fun askBatteryOptimizationsDialogDisabled(): Boolean {
+		return defaultSharedPreferences.getBoolean(ASK_IGNORE_BATTERY_OPTIMIZATIONS_DIALOG_DISABLED, false)
+	}
+
+	fun setAskBatteryOptimizationsDialogDisabled(disable: Boolean) {
+		defaultSharedPreferences.setValue(ASK_IGNORE_BATTERY_OPTIMIZATIONS_DIALOG_DISABLED, disable)
+	}
+
 	companion object {

 		private const val SCREEN_LOCK_DIALOG_SHOWN = "askForScreenLockDialogShown"
+		private const val ASK_IGNORE_BATTERY_OPTIMIZATIONS_DIALOG_DISABLED = "askIgnoreBatteryOptimizationsDialogDisabled"
 		private const val SCREEN_BETA_DIALOG_SHOWN = "askForBetaConfirmationDialogShown"
 		private const val USE_BIOMETRIC_AUTHENTICATION = "useFingerprint"
 		private const val USE_CONFIRMATION_IN_FACE_UNLOCK_AUTHENTICATION = "useConfirmationInFaceUnlockBiometricAuthentication"