Merge branch 'develop' into release/1.6.0

2021-09-14 17:40:24 +02:00 · 2021-09-14 17:40:24 +02:00 · 31308c6992
commit 31308c6992
parent 7ccdbb8539 2e695b38ec
18 changed files with 1162 additions and 149 deletions
--- a/build.gradle
+++ b/build.gradle
@ -8,7 +8,7 @@ buildscript {
 		google()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:4.2.2'
+		classpath 'com.android.tools.build:gradle:7.0.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.6.0-beta3'
+		androidVersionName = '1.6.0-SNAPSHOT'
 	}
 	repositories {
 		mavenCentral()
--- a/buildsystem/dependencies.gradle
+++ b/buildsystem/dependencies.gradle
@ -52,7 +52,7 @@ ext {
 	// cloud provider libs
 	cryptolibVersion = '2.0.2'

-	dropboxVersion = '4.0.0'
+	dropboxVersion = '4.0.1'

 	googleApiServicesVersion = 'v3-rev20210725-1.32.1'
 	googlePlayServicesVersion = '19.0.0'
@ -72,7 +72,7 @@ ext {
 	jUnitVersion = '5.7.1'
 	jUnit4Version = '4.13.1'
 	assertJVersion = '1.7.1'
-	mockitoVersion = '3.12.1'
+	mockitoVersion = '3.12.4'
 	mockitoKotlinVersion = '3.2.0'
 	hamcrestVersion = '1.3'
 	dexmakerVersion = '1.0'
--- a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.kt
+++ b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.kt
@ -1,8 +1,11 @@
 package org.cryptomator.data.cloud.googledrive

 import android.content.Context
+import com.google.api.client.http.HttpBackOffIOExceptionHandler
+import com.google.api.client.http.HttpBackOffUnsuccessfulResponseHandler
 import com.google.api.client.http.javanet.NetHttpTransport
 import com.google.api.client.json.gson.GsonFactory
+import com.google.api.client.util.ExponentialBackOff
 import com.google.api.services.drive.Drive
 import com.google.api.services.drive.DriveScopes
 import org.cryptomator.data.BuildConfig
@ -30,12 +33,7 @@ class GoogleDriveClientFactory internal constructor() {
 				Logger.getLogger("com.google.api.client").level = Level.CONFIG
 				Logger.getLogger("com.google.api.client").addHandler(object : Handler() {
 					override fun publish(record: LogRecord) {
-						if (record.message.startsWith("-------------- RESPONSE --------------") //
-							|| record.message.startsWith("-------------- REQUEST  --------------") //
-							|| record.message.startsWith("{\n \"files\": [\n")
-						) {
-							Timber.tag("GoogleDriveClient").d(record.message)
-						}
+						Timber.tag("GoogleDriveClient").d(record.message)
 					}

 					override fun flush() {}
@ -48,8 +46,20 @@ class GoogleDriveClientFactory internal constructor() {
 			val credential = FixedGoogleAccountCredential.usingOAuth2(context, setOf(DriveScopes.DRIVE)).also { it.setAccountName(accountName) }
 			return Drive.Builder(NetHttpTransport(), GsonFactory.getDefaultInstance(), credential) //
 				.setApplicationName("Cryptomator-Android/" + BuildConfig.VERSION_NAME) //
-				.build()
+				.setHttpRequestInitializer { request ->
+					credential.initialize(request)

+					val exponentialBackOff = ExponentialBackOff.Builder().setMaxElapsedTimeMillis(15 * 1000).build()
+					request.unsuccessfulResponseHandler = HttpBackOffUnsuccessfulResponseHandler(exponentialBackOff).setBackOffRequired { response ->
+						response.statusCode == 403 || response.statusCode / 100 == 5
+					}
+					request.ioExceptionHandler = HttpBackOffIOExceptionHandler(exponentialBackOff)
+
+					// trim down logging
+					request.isCurlLoggingEnabled = false
+					request.contentLoggingLimit = 0
+				}
+				.build()
 		}
 	}
 }
--- a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
+++ b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
@ -57,14 +57,8 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl

 	@Throws(IOException::class)
 	private fun findFile(parentDriveId: String?, name: String): File? {
-		val fileListQuery = client().files().list() //
-			.setFields("files(id,mimeType,name,size)") //
-			.setSupportsAllDrives(true)
-		fileListQuery.q = if (parentDriveId != null && parentDriveId == "root") {
-			"name contains '$name' and '$parentDriveId' in parents and trashed = false or sharedWithMe"
-		} else {
-			"name contains '$name' and '$parentDriveId' in parents and trashed = false"
-		}
+		val fileListQuery = client().files().list().setFields("files(id,mimeType,name,size)")
+		fileListQuery.q = "name contains '$name' and '$parentDriveId' in parents and trashed = false"
 		return fileListQuery.execute().files.firstOrNull { it.name == name }
 	}

@ -135,14 +129,8 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 				.list() //
 				.setFields("nextPageToken,files(id,mimeType,modifiedTime,name,size)") //
 				.setPageSize(1000) //
-				.setSupportsAllDrives(true) //
-				.setIncludeItemsFromAllDrives(true) //
 				.setPageToken(pageToken)
-			if (folder.driveId == "root") {
-				fileListQuery.q = "'" + folder.driveId + "' in parents and trashed = false or sharedWithMe"
-			} else {
-				fileListQuery.q = "'" + folder.driveId + "' in parents and trashed = false"
-			}
+			fileListQuery.q = "'" + folder.driveId + "' in parents and trashed = false"
 			val fileList = fileListQuery.execute()
 			for (file in fileList.files) {
 				result.add(idCache.cache(GoogleDriveCloudNodeFactory.from(folder, file)))
@ -171,7 +159,6 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 				.files() //
 				.create(metadata) //
 				.setFields("id,name") //
-				.setSupportsAllDrives(true) //
 				.execute()
 			return idCache.cache(GoogleDriveCloudNodeFactory.folder(parentFolder, createdFolder))
 		} ?: throw ParentFolderIsNullException(folder.name)
@ -193,7 +180,6 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 					.setFields("id,mimeType,modifiedTime,name,size") //
 					.setAddParents(targetsParent.driveId) //
 					.setRemoveParents(sourcesParent.driveId)  //
-					.setSupportsAllDrives(true) //
 					.execute()
 				idCache.remove(source)
 				return idCache.cache(GoogleDriveCloudNodeFactory.from(targetsParent, movedFile))
@ -237,7 +223,6 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 					.files() //
 					.update(file.driveId, metadata, it) //
 					.setFields("id,modifiedTime,name,size") //
-					.setSupportsAllDrives(true) //
 					.execute()
 			}
 		}
@ -260,7 +245,6 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 					.files() //
 					.create(metadata, it) //
 					.setFields("id,modifiedTime,name,size") //
-					.setSupportsAllDrives(true) //
 					.execute()
 			}
 		}
@ -331,7 +315,6 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 				client() //
 					.files()[file.driveId] //
 					.setAlt("media") //
-					.setSupportsAllDrives(true) //
 					.executeMediaAndDownloadTo(it)
 			}
 		} catch (e: HttpResponseException) {
@ -389,7 +372,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl

 	@Throws(IOException::class)
 	fun delete(node: GoogleDriveNode) {
-		client().files().delete(node.driveId).setSupportsAllDrives(true).execute()
+		client().files().delete(node.driveId).execute()
 		idCache.remove(node)
 	}

--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,5 @@
-#Wed May 12 18:12:25 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--- a/269
+++ b/269
@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh

 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@ -17,67 +17,101 @@
 #

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################

 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum

 warn () {
    echo "$*"
-}
+} >&2

 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@ -106,80 +140,95 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'

 exec "$JAVACMD" "$@"
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 7c0dc9baf7ef0e6f5a701fa8817b2e34be67f21b
+Subproject commit 3b48a4973fddaec258edfb702fc242261d81cd1c
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@ -49,7 +49,6 @@ android {
 			crunchPngs false
 			minifyEnabled false
 			shrinkResources false
-			useProguard false

 			buildConfigField "String", "DROPBOX_API_KEY", "\"" + getApiKey('DROPBOX_API_KEY') + "\""
 			manifestPlaceholders = [DROPBOX_API_KEY: getApiKey('DROPBOX_API_KEY')]
--- a/presentation/src/main/res/values-ca-rES/strings.xml
+++ b/presentation/src/main/res/values-ca-rES/strings.xml
@ -156,9 +156,15 @@
 	<string name="screen_settings_biometric_auth">Autenticació biomètrica</string>
 	<string name="screen_settings_activate_biometric_auth">Activar l\'autenticació biomètrica</string>
 	<string name="screen_settings_confirm_face_unlock">Confirmar el desbloqueig de cara (si està disponible)</string>
+	<string name="screen_settings_block_app_when_obscured">Bloquejar l\'app quan passi a segon pla</string>
+	<string name="screen_settings_block_app_when_obscured_summary">Bloquejar la intercepció de l\'entrada i mostrar una interfície d\'usuari falsa</string>
 	<string name="screen_settings_secure_screen">Bloca les captures de pantalla</string>
 	<string name="screen_settings_secure_screen_summary">Bloca les captures de pantalla a les llistes de recents i dins de l\'aplicació</string>
 	<string name="screen_settings_section_search">Cercar</string>
+	<string name="screen_settings_live_search">Cerca en temps real</string>
+	<string name="screen_settings_live_search_summary">Actualitzar els resultats de cerca mentre s\'escriu la consulta</string>
+	<string name="screen_settings_glob_search">Cercar amb patró glob</string>
+	<string name="screen_settings_glob_search_summary">Usar la coincidència del patró glob com alice.*.jpg</string>
 	<string name="screen_settings_section_auto_lock">Bloca automàticament</string>
 	<string name="screen_settings_auto_lock_timeout">Bloca després de</string>
 	<string name="screen_settings_auto_lock_on_screen_lock">Quan la pantalla està desactivada</string>
--- a/presentation/src/main/res/values-ja-rJP/strings.xml
+++ b/presentation/src/main/res/values-ja-rJP/strings.xml
@ -157,8 +157,12 @@
 	<string name="screen_settings_confirm_face_unlock">顔認証のロック解除 (利用できる場合)</string>
 	<string name="screen_settings_block_app_when_obscured">他のアプリが重なるときにアプリを停止</string>
 	<string name="screen_settings_secure_screen">スクリーンショットをブロック</string>
+	<string name="screen_settings_secure_screen_summary">アプリ内や「最近使ったアプリ」でスクリーンショットを表示しない</string>
 	<string name="screen_settings_section_search">検索</string>
 	<string name="screen_settings_live_search">ライブ検索</string>
+	<string name="screen_settings_live_search_summary">クエリを入力中に検索結果を更新する</string>
+	<string name="screen_settings_glob_search">glob パターンを使用して検索</string>
+	<string name="screen_settings_glob_search_summary">alice.*.jpg のような glob パターン一致を使用する</string>
 	<string name="screen_settings_section_auto_lock">自動的な施錠</string>
 	<string name="screen_settings_auto_lock_timeout">次の場合にロックする</string>
 	<string name="screen_settings_auto_lock_on_screen_lock">画面がロックされたとき</string>
@ -288,14 +292,25 @@
 	<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 Store を使用せずに Cryptomator をインストールしたことを検出しました。有効なライセンスを購入してください:  <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
+	<string name="dialog_enter_license_not_valid_content">入力されたライセンスが無効です。正しく入力されていることを確認してください。</string>
+	<string name="dialog_enter_license_no_content">ライセンスがありません。有効なライセンスを入力してください。</string>
 	<string name="dialog_enter_license_decline_button">終了</string>
+	<string name="dialog_license_confirmation_title">ライセンスの確認</string>
+	<string name="dialog_license_confirmation_message">%1$s-san 有効なライセンスを入力していただきありがとうございます。 </string>
 	<string name="dialog_update_available_title">利用可能なアップデートがあります</string>
+	<string name="dialog_update_available_message">Cryptomator を最新のバージョンに更新します。OK を押すとバックグラウンドでアプリがダウンロードされ、インストール可能になると通知されます。</string>
 	<string name="dialog_update_available_update">すぐに更新</string>
 	<string name="dialog_update_available_download_site">ダウンロード サイトに行く</string>
 	<string name="dialog_update_available_cancel">あとで</string>
 	<string name="dialog_download_update_title">ダウンロード中</string>
 	<string name="dialog_download_update_message">Cryptomator の最新バージョンをダウンロード中</string>
+	<string name="dialog_sym_link_title">フォルダがシンボリック リンクです</string>
+	<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_more_images_to_display">表示する画像がありません&#8230;</string>
+	<string name="dialog_pcloud_credentials_updated_title">\'%1$s\' の資格情報が更新されました</string>
 	<string name="permission_snackbar_auth_local_vault">ローカルの金庫を使用するには、Cryptomator がストレージにアクセスする許可が必要です</string>
 	<string name="permission_snackbar_auth_auto_upload">自動的に画像をアップロードするには、Cryptomator がストレージにアクセスする許可が必要です</string>
 	<!-- # error reports -->
@ -337,7 +352,9 @@
 	<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_due_to_vault_locked">アップロード中は金庫が施錠されます。続けるには金庫を再度開いてください。</string>
 	<string name="notification_open_writable_file_title">書き込み可能なファイルを開く</string>
+	<string name="notification_open_writable_file_message">編集が完了するまで金庫は施錠されます</string>
 	<string name="notification_update_check_finished_latest">最新バージョンがインストールされました</string>
 	<string name="screen_settings_lru_cache">キャッシュ</string>
 	<string name="screen_settings_lru_cache_size">キャッシュの合計サイズ</string>
@ -347,7 +364,10 @@
 	<string name="screen_settings_license_mail">%1$s</string>
 	<string name="dialog_settings_update_check_interval_title">更新確認の間隔</string>
 	<string name="screen_settings_check_updates">更新の確認</string>
+	<string name="screen_settings_last_check_updates">最終実行 %1$s</string>
+	<string name="dialog_cache_size_title">クラウドごとのキャッシュ サイズ</string>
 	<!-- lock timeout names -->
+	<string name="lock_timeout_instant">インスタント</string>
 	<string name="lock_timeout_1m">1分</string>
 	<string name="lock_timeout_2m">2分</string>
 	<string name="lock_timeout_5m">5分</string>
--- a/presentation/src/main/res/values-ko-rKR/strings.xml
+++ b/presentation/src/main/res/values-ko-rKR/strings.xml
@ -1,29 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- # app -->
+	<string name="share_with_label">암호화</string>
 	<!-- # error messages -->
+	<string name="error_generic">오류가 발생했습니다</string>
+	<string name="error_authentication_failed">인증에 실패했습니다.</string>
+	<string name="error_authentication_failed_re_authenticate">인증에 실패했습니다, %1$s를 사용하여 로그인 하십시요.</string>
+	<string name="error_no_network_connection">네트워크가 연결되어 있지 않습니다.</string>
+	<string name="error_invalid_passphrase">잘못된 비밀번호입니다.</string>
+	<string name="error_file_or_folder_exists">파일 또는 폴더가 이미 존재합니다.</string>
+	<string name="error_vault_version_not_supported">지원되지 않는 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>
+	<string name="error_server_not_found">서버를 찾을 수 없습니다</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<!-- # permission -->
 	<!-- ## permission messages -->
 	<string name="snack_bar_action_title_settings">설정</string>
 	<string name="snack_bar_action_title_search_next">다음</string>
+	<string name="snack_bar_action_title_sort_az">A - Z</string>
+	<string name="snack_bar_action_title_sort_za">Z - A</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
 	<string name="screen_vault_list_vault_action_delete">제거</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Vault</string>
+	<string name="screen_file_browser_move_button_text">이동</string>
+	<string name="screen_file_browser_msg_empty_folder">빈 폴더</string>
+	<string name="screen_file_browser_file_info_label_date">%1$s 전 변경됨</string>
 	<string name="screen_file_browser_share_button_text">선택</string>
+	<string name="screen_file_browser_actions_title">%1$s에 추가</string>
+	<string name="screen_file_browser_action_create_folder">폴더 생성</string>
+	<string name="screen_file_browser_action_create_new_text_file">텍스트 파일 생성</string>
+	<string name="screen_file_browser_action_upload_files">파일 업로드</string>
+	<string name="screen_file_browser_upload_files_chooser_title">파일</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">다운로드 디렉터리 생성에 실패하였습니다</string>
+	<string name="screen_file_browser_node_action_share">공유하기</string>
+	<string name="screen_file_browser_node_action_rename">이름 변경</string>
 	<string name="screen_file_browser_node_action_edit_text">수정</string>
+	<string name="screen_file_browser_node_action_export">내보내기</string>
+	<string name="screen_file_browser_node_action_delete">삭제</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">아이템 선택</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d 항목 선택됨</string>
+	<string name="screen_file_browser_select_items">&#8230; 선택</string>
+	<string name="screen_file_browser_select_all_items">전체 선택</string>
+	<string name="screen_file_browser_refresh_items">새로고침</string>
+	<string name="screen_file_browser_no_connection_message">연결 없음</string>
+	<string name="screen_file_browser_no_connection_button_text">재시도</string>
 	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">성공적으로 저장되었습니다</string>
 	<!-- ## screen: share files -->
+	<string name="screen_share_files_content_text">텍스트</string>
+	<string name="screen_share_files_content_file">파일</string>
+	<string name="screen_share_files_content_files">파일</string>
+	<string name="screen_share_files_section_location">저장 위치</string>
+	<string name="screen_share_files_save_button_text">저장</string>
+	<string name="screen_share_files_msg_success">암호화 완료</string>
 	<!-- ## screen: choose cloud service -->
 	<!-- ## screen: cloud connections -->
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">사용자명</string>
 	<string name="screen_webdav_settings_password_label">비밀번호</string>
+	<string name="screen_webdav_settings_done_button_text">연결</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_access_key_label">액세스 키</string>
 	<!-- ## screen: enter vault name -->
 	<string name="screen_enter_vault_name_button_text">생성</string>
 	<!-- ## screen: set password -->
@ -34,6 +77,21 @@
 	<string name="screen_set_password_strength_indicator_3">강함</string>
 	<!-- ## screen: settings -->
 	<string name="screen_settings_section_general">일반</string>
+	<string name="screen_settings_section_auto_lock">자동 잠금</string>
+	<string name="screen_settings_auto_lock_timeout">다음 시간 이후 잠금</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">화면이 꺼졌을 때</string>
+	<string name="screen_settings_section_auto_photo_upload">사진 자동 업로드</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">업로드 할 Vault 선택</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">활성화</string>
+	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Wi-Fi 상태에서만 업로드</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">동영상 업로드</string>
+	<string name="screen_settings_section_legal">법적 사항</string>
+	<string name="screen_settings_licenses_label">라이센스</string>
+	<string name="screen_settings_license_terms_label">라이센스 약관</string>
+	<string name="screen_settings_section_support">지원</string>
+	<string name="screen_settings_debug_mode_label">디버그 모드</string>
+	<string name="screen_settings_error_report_label">로그파일 전송</string>
+	<string name="screen_settings_section_version">버전</string>
 	<!-- ## screen: cloud settings -->
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
@ -42,9 +100,19 @@
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">취소</string>
 	<string name="dialog_enter_password_positive_button">잠금해제</string>
+	<string name="dialog_change_password_old_password_label">이전 비밀번호</string>
+	<string name="dialog_change_password_new_password_label">신규 비밀번호</string>
+	<string name="dialog_change_password">비밀번호 변경</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_positive_button_text">제거</string>
+	<string name="dialog_existing_file_positive_button">교체</string>
+	<string name="dialog_replace_positive_button_single_file_exists">교체</string>
 	<string name="dialog_unable_to_share_positive_button">OK</string>
+	<string name="dialog_unsaved_changes_discard">취소</string>
+	<string name="dialog_file_name_placeholder">text.txt</string>
+	<string name="dialog_delete_vault_message">이 Vault를 정말로 제거하시겠습니까?</string>
+	<string name="dialog_upload_file_title">&#8230; 업로드 중</string>
+	<string name="dialog_progress_upload_file">&#8230; 업로드 중</string>
 	<string name="dialog_lock_vault">잠금</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">닫기</string>
 	<string name="dialog_sym_link_back_button">뒤로</string>
--- a/presentation/src/main/res/values-nb-rNO/strings.xml
+++ b/presentation/src/main/res/values-nb-rNO/strings.xml
@ -1,33 +1,119 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- # app -->
+	<string name="share_with_label">Krypter</string>
 	<!-- # error messages -->
+	<string name="error_generic">En feil oppstod</string>
+	<string name="error_authentication_failed">Autentisering feilet</string>
+	<string name="error_authentication_failed_re_authenticate">Autentisering feilet. Logg inn med %1$s</string>
+	<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_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>
+	<string name="error_cloud_already_exists">Skylagringen finnes allerede.</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">Lokal lagring</string>
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<string name="snack_bar_action_title_settings">Innstillinger</string>
+	<string name="snack_bar_action_title_search">Søk</string>
+	<string name="snack_bar_action_title_search_previous">Forrige</string>
 	<string name="snack_bar_action_title_search_next">Neste</string>
+	<string name="snack_bar_action_title_sort">Sorter</string>
+	<string name="snack_bar_action_title_sort_az">A - Å</string>
+	<string name="snack_bar_action_title_sort_za">Å - A</string>
+	<string name="snack_bar_action_title_sort_newest">Nyeste først</string>
+	<string name="snack_bar_action_title_sort_oldest">Eldste først</string>
+	<string name="snack_bar_action_title_sort_biggest">Største først</string>
+	<string name="snack_bar_action_title_sort_smallest">Minste først</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">Legg til i Cryptomator</string>
+	<string name="screen_vault_list_action_create_new_vault">Lag et nytt hvelv</string>
+	<string name="screen_vault_list_action_add_existing_vault">Legg til et eksisterende hvelv</string>
+	<string name="screen_vault_list_vault_action_delete">Fjern</string>
+	<string name="screen_vault_list_vault_creation_hint">Klikk her for å lage et nytt hvelv</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Hvelv</string>
+	<string name="screen_file_browser_create_new_vault_button_text">Plasser her</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">Hvelvnavn: %1$s</string>
+	<string name="screen_file_browser_move_button_text">Flytt</string>
+	<string name="screen_file_browser_msg_empty_folder">Tom mappe</string>
+	<string name="screen_file_browser_file_info_label_date">endret for %1$s siden</string>
+	<string name="screen_file_browser_share_intent_chooser_title">Del med</string>
 	<string name="screen_file_browser_share_button_text">Velg</string>
+	<string name="screen_file_browser_action_create_folder">Opprett mappe</string>
+	<string name="screen_file_browser_action_create_new_text_file">Lag en tekstfil</string>
+	<string name="screen_file_browser_action_upload_files">Last opp filer</string>
+	<string name="screen_file_browser_upload_files_chooser_title">Filer</string>
+	<string name="screen_file_browser_msg_file_exported">Fil eksportert</string>
+	<string name="screen_file_browser_msg_files_exported">Filer eksportert</string>
+	<string name="screen_file_browser_nothing_to_export">Ingenting å eksportere</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">Opprettelse av nedlastingsmappe feilet</string>
+	<string name="screen_file_browser_node_action_share">Del</string>
+	<string name="screen_file_browser_node_action_rename">Endre navn</string>
+	<string name="screen_file_browser_node_action_edit_text">Rediger</string>
+	<string name="screen_file_browser_node_action_export">Eksporter</string>
+	<string name="screen_file_browser_node_action_delete">Slett</string>
+	<string name="screen_file_browser_node_action_open_with_text">Åpne med&#8230;</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d valgt</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>
+	<string name="screen_file_browser_no_connection_button_text">Prøv igjen</string>
 	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">Vellykket lagring</string>
 	<!-- ## screen: share files -->
+	<string name="screen_share_files_title">Lagre %1$s til&#8230;</string>
+	<string name="screen_share_files_content_text">tekst</string>
+	<string name="screen_share_files_content_file">fil</string>
+	<string name="screen_share_files_content_files">filer</string>
+	<string name="screen_share_files_save_button_text">Lagre</string>
 	<!-- ## screen: choose cloud service -->
+	<string name="screen_choose_cloud_service_title">Skylagringstjeneste</string>
 	<!-- ## screen: cloud connections -->
 	<!-- ## screen: webdav settings -->
+	<string name="screen_webdav_settings_url_port_label">URL</string>
+	<string name="screen_webdav_settings_username_label">Brukernavn</string>
 	<string name="screen_webdav_settings_password_label">Passord</string>
 	<!-- ## screen: s3 settings -->
 	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_vault_label">Hvelvnavn</string>
+	<string name="screen_enter_vault_name_button_text">Opprett</string>
 	<!-- ## screen: set password -->
+	<string name="screen_set_password_title">Angi passord</string>
 	<string name="screen_set_password_button_text">Ferdig</string>
+	<string name="screen_set_password_retype_password_label">Gjenta passordet</string>
 	<string name="screen_set_password_strength_indicator_1">Svakt</string>
 	<string name="screen_set_password_strength_indicator_2">Ok</string>
 	<string name="screen_set_password_strength_indicator_3">Sterkt</string>
+	<string name="screen_set_password_strength_indicator_4">Veldig sterkt</string>
 	<!-- ## screen: settings -->
 	<string name="screen_settings_section_general">Generelt</string>
+	<string name="screen_settings_cloud_settings_label">Skylagringstjenester</string>
+	<string name="screen_settings_section_search">Søk</string>
+	<string name="screen_settings_auto_lock_timeout">Lås etter</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">Aktiver</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">Last opp videoer</string>
+	<string name="screen_settings_website_label">Cryptomators nettside</string>
+	<string name="screen_settings_twitter_label">Følg oss på Twitter</string>
+	<string name="screen_settings_facebook_label">Lik oss på Facebook</string>
+	<string name="screen_settings_section_legal">Juridisk</string>
+	<string name="screen_settings_licenses_label">Lisenser</string>
+	<string name="screen_settings_section_support">Brukerstøtte</string>
+	<string name="screen_settings_contact_label">Be om hjelp</string>
+	<string name="screen_settings_debug_mode_label">Feilsøkingsmodus</string>
+	<string name="screen_settings_error_report_label">Send loggfil</string>
+	<string name="screen_settings_error_report_failed">Sending feilet</string>
+	<string name="screen_settings_section_version">Versjon</string>
+	<string name="screen_settings_advanced_settings">Avanserte innstillinger</string>
 	<!-- ## screen: cloud settings -->
+	<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>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
 	<!-- ## screen: empty dir file info -->
@ -35,9 +121,21 @@
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Avbryt</string>
 	<string name="dialog_enter_password_positive_button">Lås opp</string>
+	<string name="dialog_change_password_old_password_label">Gjeldende passord</string>
+	<string name="dialog_change_password_new_password_label">Nytt passord</string>
+	<string name="dialog_change_password">Bytt passord</string>
+	<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_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_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>
+	<string name="dialog_delete_cloud_connection_with_vaults_hint">Denne handlingen vil fjerne skylagringsforbindelsen og alle hvelv i denne skyen.</string>
 	<string name="dialog_sym_link_back_button">Tilbake</string>
 	<!-- # error reports -->
 	<!-- # misc -->
@ -46,8 +144,20 @@
 	<string name="time_unit_minutes_pl">minutter</string>
 	<!-- ## biometric authentication -->
 	<!-- notification -->
+	<string name="screen_settings_lru_cache">Hurtigminne</string>
+	<string name="screen_settings_lru_cache_toggle_summary">Hurtigminnet åpnet nylig filer som er kryptert lokalt på enheten, for senere gjenbruk når de åpnes igjen</string>
+	<string name="screen_settings_lru_cache_size">Total hurtigminnestørrelse</string>
+	<string name="screen_settings_clear_lru_cache_size">Tøm hurtigminnet</string>
+	<string name="screen_settings_lru_cache_changed__restart_toast">Endringer vil bli tatt i bruk ved neste omstart av appen</string>
+	<string name="dialog_cache_size_title">Hurtigminnestørrelse per sky</string>
 	<!-- lock timeout names -->
 	<!-- cache size names -->
+	<string name="cache_size_50m">50 MB</string>
+	<string name="cache_size_100m">100 MB</string>
+	<string name="cache_size_250m">250 MB</string>
+	<string name="cache_size_500m">500 MB</string>
+	<string name="cache_size_1000m">1 GB</string>
+	<string name="cache_size_5000m">5 GB</string>
 	<!-- screen scheme mode names -->
 	<string name="light">Lys</string>
 	<string name="dark">Mørk</string>
--- a/presentation/src/main/res/values-nl-rNL/strings.xml
+++ b/presentation/src/main/res/values-nl-rNL/strings.xml
@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- # app -->
+	<string name="share_with_label">Versleutelen</string>
 	<!-- # error messages -->
+	<string name="error_generic">Er is een fout opgetreden</string>
+	<string name="error_authentication_failed">Authenticatie mislukt</string>
+	<string name="error_no_network_connection">Geen netwerkverbinding</string>
+	<string name="error_invalid_passphrase">Fout wachtwoord</string>
+	<string name="error_file_or_folder_exists">Een bestand of map bestaat reeds.</string>
+	<string name="error_vault_version_not_supported">Niet-ondersteunde Vault. Deze Vault is gemaakt met een andere versie van Cryptomator.</string>
+	<string name="error_vault_already_exists">Vault bestaat reeds.</string>
+	<string name="error_no_such_file">Bestand bestaat niet.</string>
+	<string name="error_vault_has_been_locked">Vault is vergrendeld.</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<!-- # permission -->
--- a/presentation/src/main/res/values-ro-rRO/strings.xml
+++ b/presentation/src/main/res/values-ro-rRO/strings.xml
@ -1,38 +1,409 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- # app -->
+	<string name="share_with_label">Criptează</string>
 	<!-- # error messages -->
+	<string name="error_generic">A apărut o eroare</string>
+	<string name="error_authentication_failed">Autentificare eșuată</string>
+	<string name="error_authentication_failed_re_authenticate">Autentificare eșuată, vă rugăm să vă conectați din nou prin %1$s</string>
+	<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>
+	<string name="error_cloud_already_exists">Acest cloud există deja.</string>
+	<string name="error_activity_not_found">Vă rugăm să descărcați o aplicație care poate deschide acest fișier.</string>
+	<string name="error_server_not_found">Serverul nu a fost găsit.</string>
+	<string name="error_device_policy_manager_not_found">Deschideți setările dispozitivelor dvs. și setați blocarea ecranului manual</string>
+	<string name="error_export_illegal_file_name">Exportul a eșuat. Încercați să eliminați caracterele speciale din numele fișierelor și să exportați din nou.</string>
+	<string name="error_name_contains_invalid_characters">Nu poate să conțină caractere speciale.</string>
+	<string name="error_names_contains_invalid_characters">Numele fișierelor nu pot conține caractere speciale.</string>
+	<string name="error_vault_name_contains_invalid_characters">Numele seifului nu poate conține caractere speciale.</string>
+	<string name="error_general_update">Verificarea actualizării a eșuat. A apărut o eroare generală.</string>
+	<string name="error_hash_mismatch_update">Verificarea actualizării a eșuat. Hash-ul calculat nu se potrivește cu fișierul încărcat</string>
+	<string name="error_update_no_internet">Verificarea actualizării a eșuat. Nu există conexiune la internet.</string>
+	<string name="error_failed_to_decrypt_webdav_password">Nu s-a reușit decriptarea parolei WebDAV, vă rugăm să o introduceți din nou în setări</string>
+	<string name="error_play_services_not_available">Serviciile Play nu sunt instalate</string>
+	<string name="error_biometric_auth_aborted">Autentificare biometrică anulată</string>
+	<string name="error_vault_version_mismatch">Versiunea specificată în vault.cryptomator este diferită de masterkey.cryptomator</string>
+	<string name="error_vault_key_invalid">vault.cryptomator nu se potrivește cu acest masterkey.cryptomator</string>
+	<string name="error_vault_config_loading">Eroare generală în timpul încărcării configurației seifului</string>
+	<string name="error_file_not_found_after_opening_using_3party">Fișierul local nu mai este prezent după ce s-a trecut înapoi la Cryptomator. Modificările posibile nu pot fi propagate înapoi în cloud.</string>
+	<string name="error_no_such_bucket">Nu există așa găleată</string>
+	<string name="error_masterkey_location_not_supported">Nu este suportată încă utilizarea locației personalizate pentru masterkey</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">Stocare locală</string>
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<string name="permission_message_export_file">Cryptomator are nevoie de acces la stocare pentru a exporta fișiere</string>
+	<string name="permission_message_upload_file">Cryptomator are nevoie de acces la stocare pentru a încărca fișiere</string>
+	<string name="permission_message_share_file">Cryptomator are nevoie de acces la stocare pentru a exporta fișiere</string>
+	<string name="snack_bar_action_title_settings">Setări</string>
+	<string name="snack_bar_action_title_search">Căutare</string>
+	<string name="snack_bar_action_title_search_previous">Precedentul</string>
+	<string name="snack_bar_action_title_search_next">Următorul</string>
+	<string name="snack_bar_action_title_sort">Sortare</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">Cele mai noi mai întâi</string>
+	<string name="snack_bar_action_title_sort_oldest">Cel mai vechi mai întâi</string>
+	<string name="snack_bar_action_title_sort_biggest">Cele mai mari mai întâi</string>
+	<string name="snack_bar_action_title_sort_smallest">Cele mai mici mai întâi</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">Adaugă la Criptomator</string>
+	<string name="screen_vault_list_action_create_new_vault">Creează seif nou</string>
+	<string name="screen_vault_list_action_add_existing_vault">Adaugă seif existent</string>
+	<string name="screen_vault_list_vault_action_delete">Șterge</string>
+	<string name="screen_vault_list_vault_creation_hint">Faceți clic aici pentru a crea un seif nou</string>
+	<string name="screen_vault_list_change_password_successful">Parola a fost modificată cu succes</string>
 	<!-- # screen: file browser -->
+	<string name="screen_file_browser_default_title">Seif</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">Selectaţi fişierul Masterkey</string>
+	<string name="screen_file_browser_create_new_vault_button_text">Plasează aici</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">Numele seifului: %1$s</string>
+	<plurals name="screen_file_browser_subtitle_move">
+		<item quantity="one">Mută %1$s în</item>
+		<item quantity="few">Mută %2$d elemente la</item>
+		<item quantity="other">Mută %2$d elemente la</item>
+	</plurals>
+	<string name="screen_file_browser_move_button_text">Mută</string>
+	<string name="screen_file_browser_msg_empty_folder">Dosar gol</string>
+	<string name="screen_file_browser_file_info_label_date">modificat %1$s în urmă</string>
+	<string name="screen_file_browser_share_intent_chooser_title">Distribuie cu</string>
+	<string name="screen_file_browser_share_destination_title">Alegeți o destinație</string>
+	<string name="screen_file_browser_share_button_text">Alegeți</string>
+	<string name="screen_file_browser_nothing_to_share">Nimic de distribuit</string>
+	<string name="screen_file_browser_actions_title">Adaugă la %1$s</string>
+	<string name="screen_file_browser_action_create_folder">Creați un dosar</string>
+	<string name="screen_file_browser_action_create_new_text_file">Creați fișier text</string>
+	<string name="screen_file_browser_action_upload_files">Încarcă fişiere</string>
+	<string name="screen_file_browser_upload_files_chooser_title">Fișiere</string>
+	<string name="screen_file_browser_msg_file_exported">Fișier exportat</string>
+	<string name="screen_file_browser_msg_files_exported">Fișiere exportate</string>
+	<string name="screen_file_browser_nothing_to_export">Nimic de exportat</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">Acțiunea de creare a dosarului de descărcări a eșuat</string>
+	<string name="screen_file_browser_node_action_share">Distribuie</string>
+	<string name="screen_file_browser_node_action_rename">Redenumește</string>
+	<string name="screen_file_browser_node_action_edit_text">Editează</string>
+	<string name="screen_file_browser_node_action_export">Exportă</string>
+	<string name="screen_file_browser_node_action_delete">Șterge</string>
+	<string name="screen_file_browser_node_action_open_with_text">Deschideți cu&#8230;</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">Selectați elemente</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d selectate</string>
+	<string name="screen_file_browser_select_items">Selectează&#8230;</string>
+	<string name="screen_file_browser_select_all_items">Selectează tot</string>
+	<string name="screen_file_browser_refresh_items">Împrospătează</string>
+	<string name="screen_file_browser_no_connection_message">Nu există conexiune</string>
+	<string name="screen_file_browser_no_connection_button_text">Încercați din nou</string>
 	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">Salvat cu succes</string>
 	<!-- ## screen: share files -->
+	<string name="screen_share_files_title">Salvează %1$s în&#8230;</string>
+	<string name="screen_share_files_content_text">text</string>
+	<string name="screen_share_files_content_file">fişier</string>
+	<string name="screen_share_files_content_files">fișiere</string>
+	<string name="screen_share_files_msg_filenames_must_be_unique">Numele fișierelor trebuie să fie unic, vă rugăm să redenumiți duplicatele.</string>
+	<string name="screen_share_files_section_location">Salvați locația</string>
+	<string name="screen_share_files_save_button_text">Salvează</string>
+	<string name="screen_share_files_msg_success">Criptare finalizată</string>
 	<!-- ## screen: choose cloud service -->
+	<string name="screen_choose_cloud_service_title">Serviciu Cloud</string>
 	<!-- ## screen: cloud connections -->
+	<string name="screen_cloud_connections_title">Alegeți o locație</string>
+	<string name="screen_cloud_connections_no_connections">Faceți clic aici pentru a adăuga locații</string>
+	<string name="screen_cloud_error_webdav_not_supported">Serverul nu pare să fie compatibil cu WebDAV</string>
+	<string name="screen_cloud_local_custom_storage_title">Locații personalizate</string>
+	<string name="screen_cloud_local_default_storage_title">Spațiu de stocare prestabilit</string>
+	<string name="screen_cloud_local_error_no_content_provider">Nu există locații suplimentare disponibile.</string>
 	<!-- ## screen: webdav settings -->
+	<string name="screen_webdav_settings_url_port_label">Adresa URL</string>
+	<string name="screen_webdav_settings_username_label">Nume de utilizator</string>
+	<string name="screen_webdav_settings_password_label">Parolă</string>
+	<string name="screen_webdav_settings_done_button_text">Conectare</string>
+	<string name="screen_webdav_settings_msg_url_must_not_be_empty">URL-ul nu poate fi gol.</string>
+	<string name="screen_webdav_settings_msg_url_is_invalid">URL-ul nu este valid.</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">Numele de utilizator nu poate fi gol.</string>
+	<string name="screen_webdav_settings_msg_password_must_not_be_empty">Parola nu poate fi goală.</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">Nume afișat</string>
+	<string name="screen_s3_settings_access_key_label">Cheia de acces</string>
+	<string name="screen_s3_settings_secret_key_label">Cheia secretă</string>
+	<string name="screen_s3_settings_bucket_label">Găleată existentă</string>
+	<string name="screen_s3_settings_endpoint_label">Endpoint</string>
+	<string name="screen_s3_settings_region_label">Regiune</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">Numele afișat nu poate fi gol</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">Cheia de acces nu poate fi goală</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">Cheia secretă nu poate fi goală</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Găleata nu poate fi goală</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Endpoint sau regiunea nu poate fi goală</string>
 	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_msg_name_empty">Numele seifului nu poate fi gol.</string>
+	<string name="screen_enter_vault_name_vault_label">Nume seif</string>
+	<string name="screen_enter_vault_name_button_text">Creează</string>
 	<!-- ## screen: set password -->
+	<string name="screen_set_password_title">Setează parola</string>
+	<string name="screen_set_password_msg_password_mismatch">Parola nu corespunde parolei reintroduse.</string>
+	<string name="screen_set_password_button_text">Terminat</string>
+	<string name="screen_set_password_hint">IMPORTANT: Dacă vă uitați parola, nu există nicio modalitate de a vă recupera datele.</string>
+	<string name="screen_set_password_retype_password_label">Reintroduceţi parola</string>
+	<string name="screen_set_password_strength_indicator_0">Prea slabă pentru a crea un seif</string>
+	<string name="screen_set_password_strength_indicator_1">Slabă</string>
+	<string name="screen_set_password_strength_indicator_2">Acceptabilă</string>
+	<string name="screen_set_password_strength_indicator_3">Puternică</string>
+	<string name="screen_set_password_strength_indicator_4">Foarte puternică</string>
 	<!-- ## screen: settings -->
+	<string name="screen_settings_section_general">Setări Generale</string>
+	<string name="screen_settings_cloud_settings_label">Servicii cloud</string>
+	<string name="screen_settings_biometric_auth">Autentificarea biometrică</string>
+	<string name="screen_settings_activate_biometric_auth">Activează autentificarea biometrică</string>
+	<string name="screen_settings_confirm_face_unlock">Confirmă deblocarea facială (dacă este disponibilă)</string>
+	<string name="screen_settings_block_app_when_obscured">Blochează aplicația când este ascunsă</string>
+	<string name="screen_settings_block_app_when_obscured_summary">Blochează interceptarea intrării și afișarea unei interfețe false a utilizatorului</string>
+	<string name="screen_settings_secure_screen">Blocare capturi ecran</string>
+	<string name="screen_settings_secure_screen_summary">Blochează capturile de ecran în lista de aplicații recente și în interiorul aplicației</string>
+	<string name="screen_settings_section_search">Căutare</string>
+	<string name="screen_settings_live_search">Căutare live</string>
+	<string name="screen_settings_live_search_summary">Actualizează rezultatele căutării în timpul introducerii interogării</string>
+	<string name="screen_settings_glob_search">Caută folosind modelul glob</string>
+	<string name="screen_settings_glob_search_summary">Utilizați modelul glob care se potrivește ca alice.*.jpg</string>
+	<string name="screen_settings_section_auto_lock">Blocare automată</string>
+	<string name="screen_settings_auto_lock_timeout">Blocare automată după</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">Când ecranul este dezactivat</string>
+	<string name="screen_settings_section_auto_photo_upload">Încărcare automată a fotografiilor</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">Alege seiful pentru încărcare</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">Activează</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Capturează imagini în fundal și odată ce seiful selectat este deblocat, începe încărcarea</string>
+	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Încărcaţi numai folosind WIFI</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">Încarcă fişiere video</string>
+	<string name="screen_settings_auto_photo_upload_title">Salvați fișierele încărcate automat în&#8230;</string>
+	<string name="screen_settings_website_label">Pagina web a aplicației Cryptomator</string>
+	<string name="screen_settings_twitter_label">Urmăriți-ne pe Twitter</string>
+	<string name="screen_settings_facebook_label">Dă-ne un Like pe Facebook</string>
+	<string name="screen_settings_section_legal">Aspecte legale</string>
+	<string name="screen_settings_licenses_label">Licențe</string>
+	<string name="screen_settings_license_terms_label">Termenii şi condiţii</string>
+	<string name="screen_settings_section_support">Suport</string>
+	<string name="screen_settings_contact_label">Solicită ajutor</string>
+	<string name="screen_settings_debug_mode_label">Mod de depanare</string>
+	<string name="screen_settings_error_report_label">Trimiteți fişierul jurnal</string>
+	<string name="screen_settings_error_report_failed">Trimitere eșuată</string>
+	<string name="screen_settings_security_label">Indicații de securitate</string>
+	<string name="screen_settings_section_version">Versiune</string>
+	<string name="screen_settings_advanced_settings">Setări avansate</string>
+	<string name="screen_settings_background_unlock_preparation_label">Accelerează deblocarea</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">Descărcați configurarea seifului în fundal în timp ce vi se solicită introducerea parolei sau a autentificării biometrice</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files">Păstrați deblocat</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Păstrați seifele deblocate în timpul editării fișierelor</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_webdav_connections">Conexiuni WebDAV</string>
+	<string name="screen_cloud_settings_pcloud_connections">conexiuni pCloud</string>
+	<string name="screen_cloud_settings_s3_connections">Conexiuni S3</string>
+	<string name="screen_cloud_settings_local_storage_locations">Locații de stocare locală</string>
+	<string name="screen_cloud_settings_log_in_to">Conectați-vă la</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">Deconectare de la</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">%1$s nu a putut fi autentificat.</string>
+	<string name="screen_update_pcloud_connections_title">Actualizare acreditări pCloud</string>
 	<!-- ## screen: empty dir file info -->
+	<string name="screen_empty_dir_file_info_title">\'%1$s\' inaccesibil</string>
+	<string name="screen_empty_dir_file_info_headline">Cryptomator a detectat că acest dosar este inaccesibil.</string>
+	<string name="screen_empty_dir_file_info_text">Este posibil să fi fost şters de o altă aplicaţie sau o sincronizare în nor defectuoasă ar fi putut cauza acest lucru.\n\nÎncercaţi să restauraţi fişierul director, prin intermediul furnizorului dvs. cloud, la o versiune anterioară care nu este goală. Fișierul în cauză este:\n%1$s\n\nDacă nu funcționează, puteţi utiliza Sanitizer pentru a verifica seiful dumneavoastră pentru probleme şi, posibil, pentru a restabili datele.</string>
+	<string name="screen_empty_dir_file_info_button_label">Mai multe detalii despre Sanitizer</string>
 	<!-- ## screen: insecure android version info -->
 	<!-- # dialogs -->
+	<string name="dialog_button_cancel">Anulează</string>
+	<string name="dialog_enter_password_positive_button">Deblocați</string>
+	<string name="dialog_change_password_old_password_label">Parola veche</string>
+	<string name="dialog_change_password_new_password_label">Parola nouă</string>
+	<string name="dialog_change_password">Schimbați parola</string>
+	<string name="dialog_change_password_msg_old_password_empty">Parola veche nu poate fi goală.</string>
+	<string name="dialog_change_password_msg_new_password_empty">Parola nouă nu poate fi goală.</string>
+	<string name="dialog_change_password_msg_password_mismatch">Parola nouă nu se potrivește cu parola reintrodusă.</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">Seiful %1$s nu a fost găsit</string>
+	<string name="dialog_vault_not_found_message">Seiful a fost redenumit, mutat sau şters. Ştergeţi acest seif format din listă şi adăugaţi-l din nou pentru a continua. Ștergeți acum?</string>
+	<string name="dialog_vault_not_found_positive_button_text">Șterge</string>
+	<string name="dialog_existing_file_title">Fişierul există deja</string>
+	<string name="dialog_existing_file_positive_button">Înlocuiește</string>
+	<string name="dialog_existing_file_message">Un fişier numit \'%1$s\' există deja.</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">Sari peste existente</string>
+	<string name="dialog_replace_positive_button_all_files_exist">Înlocuiește tot</string>
+	<string name="dialog_replace_positive_button_some_files_exist">Înlocuiește existente</string>
+	<string name="dialog_replace_positive_button_single_file_exists">Înlocuiește</string>
+	<string name="dialog_replace_msg_single_file_exists">Un fișier numit \'%1$sexistă deja. Doriți să îl înlocuiți?</string>
+	<string name="dialog_replace_msg_all_files_exists">Toate fișierele există deja. Doriți să le înlocuiți?</string>
+	<string name="dialog_replace_msg_some_files_exists">%1$d fișiere deja există. Doriți să le înlocuiți?</string>
+	<string name="dialog_replace_title_single_file_exists">Înlocuiţi fişierul?</string>
+	<string name="dialog_replace_title_multiple_files_exist">Înlocuiţi fişierele?</string>
+	<string name="dialog_unable_to_share_title">Imposibil de partajat fișierele</string>
+	<string name="dialog_unable_to_share_message">Nu ați setat nici un seif. Vă rugăm să creați mai întâi un seif nou cu aplicația Cryptomator.</string>
+	<string name="dialog_unable_to_share_positive_button">OK</string>
+	<string name="dialog_unable_to_share_negative_button">Crează seif</string>
+	<string name="dialog_filetype_not_supported_title">Nu se poate deschide %1$s</string>
+	<string name="dialog_filetype_not_supported_message">Vă rugăm să descărcați o aplicație care poate deschide acest fișier sau doriți să salvați pe dispozitiv?</string>
+	<string name="dialog_rename_vault_title">Redenumire seif</string>
+	<string name="dialog_rename_node_folder_title">Redenumiți dosarul</string>
+	<string name="dialog_rename_node_file_title">Redenumiţi fişierul</string>
+	<string name="dialog_unsaved_changes_title">Aveți câteva modificări nesalvate</string>
+	<string name="dialog_unsaved_changes_message">Sigur doriți să ieșiți fără a salva?</string>
+	<string name="dialog_unsaved_changes_discard">Renunţaţi</string>
+	<string name="dialog_file_name_placeholder">text.txt</string>
+	<string name="dialog_delete_vault_message">Sunteţi sigur că doriţi să ştergeţi acest seif?</string>
+	<string name="dialog_delete_vault_hint">Această acţiune va elimina seiful doar din această listă şi nu îl va şterge fizic.</string>
+	<string name="dialog_upload_file_title">Se încarcă&#8230;</string>
+	<string name="dialog_upload_file_remaining">Fișier %1$d din %2$d</string>
+	<string name="dialog_export_file_title">Exportare (%1$d/%2$d)</string>
+	<string name="dialog_progress_please_wait">Vă rugăm să aşteptaţi &#8230;</string>
+	<string name="dialog_progress_creating_folder">Se creează dosarul&#8230;</string>
+	<string name="dialog_progress_creating_text_file">Se creează fișierele text&#8230;</string>
+	<string name="action_progress_authentication">Autentificare&#8230;</string>
+	<string name="action_progress_renaming">Redenumire&#8230;</string>
+	<string name="action_progress_deleting">Ștergere&#8230;</string>
+	<string name="dialog_progress_unlocking_vault">Deblocare seif&#8230;</string>
+	<string name="dialog_progress_change_password">Se schimbă parola&#8230;</string>
+	<string name="dialog_progress_creating_vault">Se creează seif&#8230;</string>
+	<string name="dialog_progress_upload_file">Se încarcă&#8230;</string>
+	<string name="dialog_progress_download_file">Se descarcă&#8230;</string>
+	<string name="dialog_progress_encryption">Criptare&#8230;</string>
+	<string name="dialog_progress_decryption">Decriptare&#8230;</string>
+	<string name="action_progress_moving">Se mută&#8230;</string>
+	<string name="dialog_lock_vault">Blocaţi</string>
+	<string name="dialog_accept_ssl_certificate_title">Certificat SSL invalid</string>
+	<string name="dialog_accept_ssl_certificate_hint">Certificatul SSL este invalid. Doriți să aveți încredere în el oricum?</string>
+	<string name="dialog_accept_ssl_certificate_details">Detalii</string>
+	<string name="dialog_accept_ssl_certificate_security_checkbox">Acesta ar putea fi un risc pentru securitate. Ştiu ce fac.</string>
+	<string name="dialog_http_security_hint">Utilizarea HTTP este nesigură. Vă recomandăm să utilizați HTTPS în schimb. Dacă cunoașteți riscurile, puteți continua cu HTTP.</string>
+	<string name="dialog_http_security_checkbox">Schimbare la HTTPS</string>
+	<string name="dialog_http_security_title">Folosiți HTTPS?</string>
+	<string name="dialog_no_screen_lock_hint">Nu este setată nicio blocare a ecranului. Pentru a stoca acreditările într-un mod sigur, setați cu OK un model sau o parolă.</string>
+	<string name="dialog_no_screen_lock_title">Setați blocarea ecranului?</string>
+	<string name="dialog_no_screen_lock_checkbox">Setați blocarea ecranului</string>
+	<string name="dialog_no_biometric_auth_set_up_title">Nicio autentificare de bază configurată în sistem</string>
+	<string name="dialog_no_biometric_auth_set_up_message">E nevoie de cel puțin un deget sau o față pentru a utiliza acest serviciu.</string>
+	<string name="dialog_debug_mode_disclaimer_hint">În acest mod, datele sensibile pot fi scrise într-un fișier jurnal de pe dispozitivul dumneavoastră (de exemplu, nume de fișiere și căi de fișiere). Parolele, cookie-urile etc. sunt excluse în mod explicit.\n\nNu uitați să dezactivați modul de depanare cât mai curând posibil.</string>
+	<string name="dialog_debug_mode_disclaimer_title">Atenție</string>
+	<string name="dialog_debug_mode_positive_button">Activează</string>
+	<string name="dialog_disable_app_obscured_disclaimer_hint">Această setare este o caracteristică de securitate și previne alte aplicații să păcălească utilizatorii să facă lucruri pe care nu ar trebui să le facă.\n\nPrin dezactivare, confirmați că sunteți <a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">conștient de riscurile</a>.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_title">Atenție</string>
+	<string name="dialog_disable_app_obscured_positive_button">Dezactivează</string>
+	<string name="dialog_app_is_obscured_info_title">Aplicația este ascunsă</string>
+	<string name="dialog_app_is_obscured_info_hint">O altă aplicație afișează ceva deasupra Cryptomator (de exemplu, un filtru de lumină albastră sau o aplicație pentru modul de noapte). Din motive de securitate, Cryptomator este dezactivat.\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">Cum să activezi Cryptomator</a></string>
+	<string name="dialog_app_is_obscured_info_neutral_button">Închide</string>
+	<string name="dialog_disable_secure_screen_disclaimer_hint">Această setare este o caracteristică de securitate și previne alte aplicații să păcălească utilizatorii să facă lucruri pe care nu ar trebui să le facă.\n\nPrin dezactivare, confirmați că sunteți <a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">conștient de riscurile</a>.</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_message">Sunteţi sigur că doriţi să eliminaţi această conexiune cloud?</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_hint">Această acțiune va elimina conexiunea în cloud și toate seifurile acestui cloud.</string>
+	<string name="dialog_confirm_delete_multiple_title">Ștergeți %1$d elemente?</string>
+	<string name="dialog_confirm_delete_multiple_message">Sunteţi sigur că doriţi să ştergeţi aceste elemente?</string>
+	<string name="dialog_confirm_delete_file_message">Sunteţi sigur că doriţi să ştergeţi acest fişier?</string>
+	<string name="dialog_confirm_delete_folder_message">Aceasta va şterge tot conţinutul dosarului. Sunteţi sigur că doriţi să ştergeţi acest dosar?</string>
+	<string name="dialog_biometric_auth_key_invalidated_title">Funcția de autentificare biometrică dezactivată</string>
+	<string name="dialog_biometric_auth_key_invalidated_message">Deoarece cheia a fost invalidată, elementul de autentificare biometrică a fost dezactivat. Pentru a putea fi reutilizat, deschideți setările Cryptomator.</string>
+	<string name="dialog_enter_license_title">Furnizați o licență validă</string>
+	<string name="dialog_enter_license_content">Am detectat că ați instalat Cryptomator fără să utilizați Google Play Store. Furnizați o licență validă, care poate fi cumpărată pe <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
+	<string name="dialog_enter_license_not_valid_content">Licența furnizată nu este validă. Asigurați-vă că ați introdus-o corect.</string>
+	<string name="dialog_enter_license_no_content">Nici o licență furnizată. Introduceți o licență validă.</string>
+	<string name="dialog_enter_license_decline_button">Ieșire</string>
+	<string name="dialog_license_confirmation_title">Confirmare licență</string>
+	<string name="dialog_license_confirmation_message">Vă mulțumim %1$s pentru furnizarea licenței dvs. valide.</string>
+	<string name="dialog_update_available_title">Actualizare disponibilă</string>
+	<string name="dialog_update_available_message">Actualizare Cryptomator la ultima versiune. Apăsând OK vom descărca aplicația în fundal și vă vom cere să o instalați.</string>
+	<string name="dialog_update_available_update">Actualizează acum</string>
+	<string name="dialog_update_available_download_site">Mergeți la site-ul pentru descărcări</string>
+	<string name="dialog_update_available_cancel">Mai târziu</string>
+	<string name="dialog_download_update_title">Rulează descărcarea</string>
+	<string name="dialog_download_update_message">Se descarcă ultima versiune de Cryptomator</string>
+	<string name="dialog_sym_link_title">Dosarul este un link simbolic</string>
+	<string name="dialog_sym_link_message">Nu puteți naviga în acest link simbolic</string>
+	<string name="dialog_sym_link_back_button">Înapoi</string>
+	<string name="dialog_no_dir_file_title">Nu s-a putut încărca conținutul dosarului</string>
+	<string name="dialog_no_dir_file_message">Dosarul Cloud \'%1$s\' nu are un fișier dosar. Poate fi că dosarul a fost creat pe un alt dispozitiv și nu a fost încă complet sincronizat cu cloudul. Vă rugăm să verificaţi în cloud dacă următorul fişier există:\n%2$s</string>
+	<string name="dialog_no_more_images_to_display">Nu mai sunt imagini de afișat&#8230;</string>
+	<string name="dialog_pcloud_credentials_updated_title">Acreditări ale \'%1$s\' au fost actualizate</string>
+	<string name="dialog_pcloud_credentials_updated">Dacă doriți să adăugaţi un cont nou de tip pCloud, faceţi clic pe acest link <a href="https://www.pcloud.com">www.pcloud. om</a>, deconectați-vă de la contul curent, și faceți clic din nou pe \'+\' din această aplicație pentru a crea o nouă conexiune cloud.</string>
+	<string name="permission_snackbar_auth_local_vault">Cryptomator are nevoie de acces la stocare pentru a utiliza seifuri locale</string>
+	<string name="permission_snackbar_auth_auto_upload">Cryptomator are nevoie de acces la stocare pentru a folosi încărcarea automată a fotografiilor</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
+	<string name="file_size_zero">Zero kB</string>
+	<string name="file_size_unit_bytes">octeți</string>
+	<string name="file_size_unit_kilo_bytes">kB</string>
+	<string name="file_size_unit_mega_bytes">MB</string>
+	<string name="file_size_unit_giga_bytes">GB</string>
+	<string name="file_size_unit_tera_bytes">TB</string>
 	<!-- ## date helper -->
+	<string name="time_unit_seconds_sg">secundă</string>
+	<string name="time_unit_seconds_pl">secunde</string>
+	<string name="time_unit_minutes_sg">minut</string>
+	<string name="time_unit_minutes_pl">minute</string>
+	<string name="time_unit_hours_sg">oră</string>
+	<string name="time_unit_hours_pl">ore</string>
+	<string name="time_unit_days_sg">zi</string>
+	<string name="time_unit_days_pl">zile</string>
+	<string name="time_unit_weeks_sg">săptămână</string>
+	<string name="time_unit_weeks_pl">săptămâni</string>
+	<string name="time_unit_months_sg">lună</string>
+	<string name="time_unit_months_pl">luni</string>
+	<string name="time_unit_years_sg">an</string>
+	<string name="time_unit_years_pl">ani</string>
 	<!-- ## biometric authentication -->
+	<string name="dialog_biometric_auth_title">Autentificare biometrică</string>
+	<string name="dialog_biometric_auth_message">Autentifică-te folosind acreditările biometrice</string>
+	<string name="dialog_biometric_auth_use_password">Utilizați parola seif</string>
+	<string name="dialog_unable_to_auto_upload_files_title">Imposibil de încărcat automat fișierele</string>
 	<!-- notification -->
+	<string name="notification_unlocked">Seifuri deblocate: %1$d</string>
+	<string name="notification_timeout">Autoblocare în %1$s</string>
+	<string name="notification_lock_all">Blochează toate</string>
+	<string name="notification_cancel_auto_upload">Anulare încărcare</string>
+	<string name="notification_auto_upload_title">Rulează autoîncărcarea de fotografii</string>
+	<string name="notification_auto_upload_message">Se încarcă %1d/%2d</string>
+	<string name="notification_auto_upload_finished_title">Încărcarea automată a pozei a fost finalizată</string>
+	<string name="notification_auto_upload_finished_message">%1$d imagini încărcate în seif</string>
+	<string name="notification_auto_upload_failed_title">Încărcarea automată a fotografiei a eșuat</string>
+	<string name="notification_auto_upload_failed_general_error">Eroare generală în timpul încărcării.</string>
+	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Dosarul selectat pentru încărcare nu mai este disponibil. Mergeți la setări și alegeți unul nou</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">Seif blocat în timpul încărcării, vă rugăm să redeschideți seiful pentru a continua</string>
+	<string name="notification_open_writable_file_title">Deschide fișier inscriptibil</string>
+	<string name="notification_open_writable_file_message">Seiful rămâne deblocat până la editarea finalizată</string>
+	<string name="notification_update_check_finished_latest">Ultima versiune instalată</string>
+	<string name="screen_settings_lru_cache">Memorie cache</string>
+	<string name="screen_settings_lru_cache_toggle_summary">Recent memoria cache a accesat fișiere criptate local pe acest dispozitiv pentru a fi reutilizare ulterior la redeschidere</string>
+	<string name="screen_settings_lru_cache_size">Total memorie cache</string>
+	<string name="screen_settings_clear_lru_cache_size">Golește memoria cache</string>
+	<string name="screen_settings_lru_cache_changed__restart_toast">Modificările vor fi aplicate la următoarea repornire a aplicației</string>
+	<string name="screen_settings_license">Înregistrat pentru</string>
+	<string name="screen_settings_license_mail">%1$s</string>
+	<string name="dialog_settings_update_check_interval_title">Interval de verificare a actualizărilor</string>
+	<string name="screen_settings_check_updates">Verifică actualizări</string>
+	<string name="screen_settings_last_check_updates">Ultima execuție %1$s</string>
+	<string name="dialog_cache_size_title">Dimensiune cache pentru fiecare Cloud</string>
 	<!-- lock timeout names -->
+	<string name="lock_timeout_instant">Instant</string>
+	<string name="lock_timeout_1m">Un minut</string>
+	<string name="lock_timeout_2m">2 minute</string>
+	<string name="lock_timeout_5m">5 minute</string>
+	<string name="lock_timeout_10m">10 minute</string>
+	<string name="lock_timeout_never">Niciodată</string>
 	<!-- cache size names -->
+	<string name="cache_size_50m">50 MB</string>
+	<string name="cache_size_100m">100 MB</string>
+	<string name="cache_size_250m">250 MB</string>
+	<string name="cache_size_500m">500 MB</string>
+	<string name="cache_size_1000m">1 GB</string>
+	<string name="cache_size_5000m">5 GB</string>
 	<!-- screen scheme mode names -->
+	<string name="screen_settings_style_mode">Aspect</string>
+	<string name="follow_system">Automat (conform tematicii de sistem)</string>
+	<string name="light">Luminos</string>
+	<string name="dark">Întunecat</string>
 	<!-- update interval names -->
+	<string name="update_interval_1d">O dată pe zi</string>
+	<string name="update_interval_1w">O dată pe săptămână</string>
+	<string name="update_interval_1m">O dată pe lună</string>
 </resources>
--- a/presentation/src/main/res/values-sv-rSE/strings.xml
+++ b/presentation/src/main/res/values-sv-rSE/strings.xml
@ -58,55 +58,351 @@
 	<string name="screen_vault_list_action_create_new_vault">Skapa nytt valv</string>
 	<string name="screen_vault_list_action_add_existing_vault">Lägg till befintligt valv</string>
 	<string name="screen_vault_list_vault_action_delete">Ta bort</string>
+	<string name="screen_vault_list_vault_creation_hint">Klicka här för att skapa ett nytt valv</string>
+	<string name="screen_vault_list_change_password_successful">Lösenordet har ändrats</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Valv</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">Välj Masterkey-fil</string>
+	<string name="screen_file_browser_create_new_vault_button_text">Placera här</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">Valvets namn: %1$s</string>
+	<plurals name="screen_file_browser_subtitle_move">
+		<item quantity="one">Flytta %1$s till</item>
+		<item quantity="other">Flytta %2$d objekt till</item>
+	</plurals>
+	<string name="screen_file_browser_move_button_text">Flytta</string>
+	<string name="screen_file_browser_msg_empty_folder">Tom mapp</string>
+	<string name="screen_file_browser_file_info_label_date">ändrad för %1$s sedan</string>
+	<string name="screen_file_browser_share_intent_chooser_title">Dela med</string>
+	<string name="screen_file_browser_share_destination_title">Välj destination</string>
 	<string name="screen_file_browser_share_button_text">Välj</string>
-	<string name="screen_file_browser_node_action_edit_text">Ändra</string>
+	<string name="screen_file_browser_nothing_to_share">Inget att dela</string>
+	<string name="screen_file_browser_actions_title">Lägg till i %1$s</string>
+	<string name="screen_file_browser_action_create_folder">Skapa mapp</string>
+	<string name="screen_file_browser_action_create_new_text_file">Skapa en textfil</string>
+	<string name="screen_file_browser_action_upload_files">Ladde upp filer</string>
+	<string name="screen_file_browser_upload_files_chooser_title">Filer</string>
+	<string name="screen_file_browser_msg_file_exported">Fil exporterad</string>
+	<string name="screen_file_browser_msg_files_exported">Filer exporterade</string>
+	<string name="screen_file_browser_nothing_to_export">Inget att exportera</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">Det gick inte att skapa nedladdningskatalog</string>
+	<string name="screen_file_browser_node_action_share">Dela</string>
+	<string name="screen_file_browser_node_action_rename">Byt namn</string>
+	<string name="screen_file_browser_node_action_edit_text">Redigera</string>
+	<string name="screen_file_browser_node_action_export">Exportera</string>
+	<string name="screen_file_browser_node_action_delete">Ta bort</string>
+	<string name="screen_file_browser_node_action_open_with_text">Öppna med&#8230;</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">Välj objekt</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d har markerats</string>
+	<string name="screen_file_browser_select_items">Välj &#8230;</string>
+	<string name="screen_file_browser_select_all_items">Välj alla</string>
+	<string name="screen_file_browser_refresh_items">Uppdatera</string>
+	<string name="screen_file_browser_no_connection_message">Ingen anslutning</string>
+	<string name="screen_file_browser_no_connection_button_text">Försök igen</string>
 	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">Sparad</string>
 	<!-- ## screen: share files -->
+	<string name="screen_share_files_title">Spara %1$s till&#8230;</string>
+	<string name="screen_share_files_content_text">text</string>
+	<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">Filnamn måste vara unika, vänligen byt namn på dubbletter.</string>
+	<string name="screen_share_files_section_location">Spara plats</string>
+	<string name="screen_share_files_save_button_text">Spara</string>
+	<string name="screen_share_files_msg_success">Kryptering slutförd</string>
 	<!-- ## screen: choose cloud service -->
+	<string name="screen_choose_cloud_service_title">Molntjänst</string>
 	<!-- ## screen: cloud connections -->
+	<string name="screen_cloud_connections_title">Välj en plats</string>
+	<string name="screen_cloud_connections_no_connections">Klicka här för att lägga till platser</string>
+	<string name="screen_cloud_error_webdav_not_supported">Servern verkar inte vara WebDAV-kompatibel</string>
+	<string name="screen_cloud_local_custom_storage_title">Anpassad plats</string>
+	<string name="screen_cloud_local_default_storage_title">Förvald lagring</string>
+	<string name="screen_cloud_local_error_no_content_provider">Inga ytterligare platser tillgängliga.</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Användarnamn</string>
 	<string name="screen_webdav_settings_password_label">Lösenord</string>
+	<string name="screen_webdav_settings_done_button_text">Anslut</string>
+	<string name="screen_webdav_settings_msg_url_must_not_be_empty">URL kan ej vara tom.</string>
+	<string name="screen_webdav_settings_msg_url_is_invalid">URL: en är ogiltig.</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">Användarnamn får inte vara tomt.</string>
+	<string name="screen_webdav_settings_msg_password_must_not_be_empty">Lösenord får inte vara tomt.</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">Visningsnamn</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">Befintlig 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">Visningsnamn får inte vara tomt</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">Access key får inte vara tom</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">Secret key får inte vara tom</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Bucket får inte vara tomt</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Endpoint eller region får inte vara tom</string>
 	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_msg_name_empty">Valvnamn får inte vara tomt.</string>
+	<string name="screen_enter_vault_name_vault_label">Valvnamn</string>
 	<string name="screen_enter_vault_name_button_text">Skapa</string>
 	<!-- ## screen: set password -->
+	<string name="screen_set_password_title">Ange lösenord</string>
+	<string name="screen_set_password_msg_password_mismatch">Lösenordet matchar inte det andra lösenordet.</string>
 	<string name="screen_set_password_button_text">Klar</string>
 	<string name="screen_set_password_hint">VIKTIGT: Om du glömmer ditt lösenord finns det inget sätt att återställa dina data.</string>
+	<string name="screen_set_password_retype_password_label">Skriv lösenordet igen</string>
+	<string name="screen_set_password_strength_indicator_0">För svag för att skapa ett valv</string>
 	<string name="screen_set_password_strength_indicator_1">Svagt</string>
 	<string name="screen_set_password_strength_indicator_2">Skapligt</string>
 	<string name="screen_set_password_strength_indicator_3">Starkt</string>
+	<string name="screen_set_password_strength_indicator_4">Mycket starkt</string>
 	<!-- ## screen: settings -->
 	<string name="screen_settings_section_general">Allmänt</string>
+	<string name="screen_settings_cloud_settings_label">Molntjänster</string>
+	<string name="screen_settings_biometric_auth">Biometrisk autentisering</string>
+	<string name="screen_settings_activate_biometric_auth">Aktivera biometrisk autentisering</string>
+	<string name="screen_settings_confirm_face_unlock">Bekräfta ansiktsupplåsning (om tillgängligt)</string>
+	<string name="screen_settings_block_app_when_obscured">Blockera appen när den är täckt</string>
+	<string name="screen_settings_block_app_when_obscured_summary">Blockera indata och visning av falska användargränssnitt</string>
+	<string name="screen_settings_secure_screen">Blockera skärmdumpar</string>
+	<string name="screen_settings_secure_screen_summary">Blockera skärmdumpar i Senaste-listan samt inuti appen</string>
 	<string name="screen_settings_section_search">Sök</string>
+	<string name="screen_settings_live_search">Live-sökning</string>
+	<string name="screen_settings_live_search_summary">Uppdatera sökresultaten medans du skriver</string>
+	<string name="screen_settings_glob_search">Sök med hjälp av globala mönster</string>
+	<string name="screen_settings_glob_search_summary">Använd globala mönster som matchar t.ex. alice.*.jpg</string>
+	<string name="screen_settings_section_auto_lock">Automatiskt lås</string>
+	<string name="screen_settings_auto_lock_timeout">Lås efter</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">När skärmen är inaktiverad</string>
+	<string name="screen_settings_section_auto_photo_upload">Automatisk fotouppladdning</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">Välj valv för uppladdning</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">Aktivera</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Registrerar bilder i bakgrunden och när det valda valvet är upplåst, startas uppladdning</string>
+	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Ladda endast upp med WIFI</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">Ladda upp video</string>
+	<string name="screen_settings_auto_photo_upload_title">Spara automatiskt uppladdade filer till&#8230;</string>
+	<string name="screen_settings_website_label">Cryptomator webbplats</string>
+	<string name="screen_settings_twitter_label">Följ oss på Twitter</string>
+	<string name="screen_settings_facebook_label">Gilla oss på Facebook</string>
+	<string name="screen_settings_section_legal">Juridiskt</string>
+	<string name="screen_settings_licenses_label">Licenser</string>
+	<string name="screen_settings_license_terms_label">Licensvillkor</string>
+	<string name="screen_settings_section_support">Support</string>
+	<string name="screen_settings_contact_label">Be om hjälp</string>
+	<string name="screen_settings_debug_mode_label">Felsökningsläge</string>
+	<string name="screen_settings_error_report_label">Skicka loggfil</string>
+	<string name="screen_settings_error_report_failed">Sändningen misslyckades</string>
+	<string name="screen_settings_security_label">Säkerhetstips</string>
+	<string name="screen_settings_section_version">Version</string>
+	<string name="screen_settings_advanced_settings">Avancerade inställningar</string>
+	<string name="screen_settings_background_unlock_preparation_label">Accelerera upplåsning</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">Ladda ner valvkonfiguration i bakgrunden medan du uppmanas att låsa upp</string>
+	<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_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>
+	<string name="screen_cloud_settings_local_storage_locations">Lokala lagringsplatser</string>
+	<string name="screen_cloud_settings_log_in_to">Logga in på %1</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">Logga ut från {0}</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">%1$s kunde inte autentiseras.</string>
+	<string name="screen_update_pcloud_connections_title">Uppdatera pCloud-uppgifter</string>
 	<!-- ## screen: empty dir file info -->
+	<string name="screen_empty_dir_file_info_title">\'%1$s\' onåbar</string>
+	<string name="screen_empty_dir_file_info_headline">Cryptomator upptäckte att den här mappen inte kan nås.</string>
+	<string name="screen_empty_dir_file_info_text">Det kan ha tagits bort av ett annat program eller en felaktig molnsynkronisering.\n\nFörsök att återställa katalogfilen via din molnleverantör till en tidigare version som inte är tom. Filen i fråga är:\n%1$s\n\nOm det inte fungerar kan använda Sanitizer för att kontrollera problem i ditt valv och eventuellt återställa dina data.</string>
+	<string name="screen_empty_dir_file_info_button_label">Mer information om Sanitizer</string>
 	<!-- ## screen: insecure android version info -->
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Avbryt</string>
 	<string name="dialog_enter_password_positive_button">Lås upp</string>
+	<string name="dialog_change_password_old_password_label">Gammalt lösenord</string>
+	<string name="dialog_change_password_new_password_label">Nytt lösenord</string>
+	<string name="dialog_change_password">Byt lösenord</string>
+	<string name="dialog_change_password_msg_old_password_empty">Gammalt lösenord får inte vara tomt.</string>
+	<string name="dialog_change_password_msg_new_password_empty">Nytt lösenord får inte vara tomt.</string>
+	<string name="dialog_change_password_msg_password_mismatch">De både lösenorden matchar inte.</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">Valvet %1$s hittades inte</string>
+	<string name="dialog_vault_not_found_message">Valvet har döpts om, flyttats eller tagits bort. Ta bort detta valv från listan och lägg till det igen för att fortsätta. Ta bort nu?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Ta bort</string>
+	<string name="dialog_existing_file_title">Filen finns redan</string>
+	<string name="dialog_existing_file_positive_button">Ersätt</string>
+	<string name="dialog_existing_file_message">En fil som heter \'%1$s\' finns redan.</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">Hoppa över befintliga</string>
+	<string name="dialog_replace_positive_button_all_files_exist">Ersätt alla</string>
+	<string name="dialog_replace_positive_button_some_files_exist">Ersätt befintliga</string>
+	<string name="dialog_replace_positive_button_single_file_exists">Ersätt</string>
+	<string name="dialog_replace_msg_single_file_exists">Filen %1$s finns redan. Vill du ersätta den?</string>
+	<string name="dialog_replace_msg_all_files_exists">Alla filer finns redan. Vill du ersätta dem?</string>
+	<string name="dialog_replace_msg_some_files_exists">%1$d filer finns redan. Vill du ersätta dem?</string>
+	<string name="dialog_replace_title_single_file_exists">Ersätt fil?</string>
+	<string name="dialog_replace_title_multiple_files_exist">Ersätt filer?</string>
+	<string name="dialog_unable_to_share_title">Kunde inte dela filer</string>
+	<string name="dialog_unable_to_share_message">Du har inte konfigurerat några valv. Skapa ett nytt valv med Cryptomator-appen först.</string>
 	<string name="dialog_unable_to_share_positive_button">OK</string>
+	<string name="dialog_unable_to_share_negative_button">Skapa Valv</string>
+	<string name="dialog_filetype_not_supported_title">Kan inte öppna %1$s</string>
+	<string name="dialog_filetype_not_supported_message">Ladda ner en app som kan öppna den här filtypen eller spara till din enhet?</string>
+	<string name="dialog_rename_vault_title">Döp om valv</string>
+	<string name="dialog_rename_node_folder_title">Döp om mapp</string>
+	<string name="dialog_rename_node_file_title">Döp om fil</string>
+	<string name="dialog_unsaved_changes_title">Du har osparade ändringar</string>
+	<string name="dialog_unsaved_changes_message">Vill du avsluta utan att spara?</string>
+	<string name="dialog_unsaved_changes_discard">Kasta</string>
+	<string name="dialog_file_name_placeholder">text.txt</string>
+	<string name="dialog_delete_vault_message">Är du säker på att du vill ta bort detta valv?</string>
+	<string name="dialog_delete_vault_hint">Denna åtgärd kommer bara att ta bort valvet från denna lista och inte ta bort det fysiskt.</string>
+	<string name="dialog_upload_file_title">Laddar upp&#8230;</string>
+	<string name="dialog_upload_file_remaining">Fil %1$d av %2$d</string>
+	<string name="dialog_export_file_title">Exporterar (%1$d/%2$d)</string>
+	<string name="dialog_progress_please_wait">Vänligen vänta&#8230;</string>
+	<string name="dialog_progress_creating_folder">Skapar mapp&#8230;</string>
+	<string name="dialog_progress_creating_text_file">Skapar textfil&#8230;</string>
+	<string name="action_progress_authentication">Autentiserar&#8230;</string>
+	<string name="action_progress_renaming">Byter namn&#8230;</string>
+	<string name="action_progress_deleting">Tar bort&#8230;</string>
+	<string name="dialog_progress_unlocking_vault">Låser upp valvet&#8230;</string>
+	<string name="dialog_progress_change_password">Ändrar lösenord&#8230;</string>
+	<string name="dialog_progress_creating_vault">Skapar valv&#8230;</string>
+	<string name="dialog_progress_upload_file">Laddar upp&#8230;</string>
+	<string name="dialog_progress_download_file">Laddar ner&#8230;</string>
+	<string name="dialog_progress_encryption">Krypterar&#8230;</string>
+	<string name="dialog_progress_decryption">Dekrypterar&#8230;</string>
+	<string name="action_progress_moving">Flyttar&#8230;</string>
 	<string name="dialog_lock_vault">Lås</string>
+	<string name="dialog_accept_ssl_certificate_title">Ogiltigt SSL-certifikat</string>
+	<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_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>
+	<string name="dialog_no_screen_lock_hint">Inget skärmlås är inställt. För att lagra dina uppgifter på ett säkert sätt, välj OK för att ange ett mönster eller lösenord.</string>
+	<string name="dialog_no_screen_lock_title">Ange skärmlås?</string>
+	<string name="dialog_no_screen_lock_checkbox">Ställ in skärmlås</string>
+	<string name="dialog_no_biometric_auth_set_up_title">Ingen grundläggande autentisering konfigurerad i systemet</string>
+	<string name="dialog_no_biometric_auth_set_up_message">Registrera minst ett finger/ansikte för att använda denna tjänst.</string>
+	<string name="dialog_debug_mode_disclaimer_hint">I detta läge kan känsliga data skrivas till en loggfil på din enhet (t.ex. filnamn och sökvägar). Lösenord, cookies etc. är uttryckligen uteslutna.\n\nKom ihåg att inaktivera felsökningsläge så snart som möjligt.</string>
+	<string name="dialog_debug_mode_disclaimer_title">Observera</string>
+	<string name="dialog_debug_mode_positive_button">Aktivera</string>
+	<string name="dialog_disable_app_obscured_disclaimer_hint">Den här inställningen är en säkerhetsfunktion och hindrar andra appar från att lura användare att göra saker de inte vill göra.\n\nGenom att inaktivera bekräftar du att du är <a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">medveten om riskerna</a>.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_title">Observera</string>
+	<string name="dialog_disable_app_obscured_positive_button">Inaktivera</string>
+	<string name="dialog_app_is_obscured_info_title">Appen är täckt</string>
+	<string name="dialog_app_is_obscured_info_hint">En annan app visar något ovanpå Cryptomator (t.ex., ett blått ljusfilter eller nattläge app). Av säkerhetsskäl är Cryptomator inaktiverad.\n\n<a href="https://docs.cryptomator.org/en/1.5/android/settings/#block-app-when-obscured">Så här aktiverar du Cryptomator</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Stäng</string>
+	<string name="dialog_disable_secure_screen_disclaimer_hint">Den här inställningen är en säkerhetsfunktion och hindrar andra appar från att lura användare att göra saker de inte vill göra.\n\nGenom att inaktivera bekräftar du att du är <a href="https://docs.cryptomator.org/en/1.5/android/settings/#screen-security">medveten om riskerna</a>.</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_message">Är du säker på att du vill ta bort den här molnanslutningen?</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_hint">Denna åtgärd kommer att ta bort molnanslutningen och alla valv i detta moln.</string>
+	<string name="dialog_confirm_delete_multiple_title">Ta bort %1$d objekt?</string>
+	<string name="dialog_confirm_delete_multiple_message">Är du säker på att du vill ta bort dessa objekt?</string>
+	<string name="dialog_confirm_delete_file_message">Är du säker på att du vill ta bort denna fil?</string>
+	<string name="dialog_confirm_delete_folder_message">Detta kommer att ta bort allt innehåll i mappen. Är du säker på att du vill ta bort denna mapp?</string>
+	<string name="dialog_biometric_auth_key_invalidated_title">Biometrisk autentiseringsfunktion inaktiverad</string>
+	<string name="dialog_biometric_auth_key_invalidated_message">Eftersom nyckeln har ogiltigförklarats har den biometriska autentiseringsfunktionen avaktiverats. För att återaktivera, öppna Cryptomatorns inställningar.</string>
+	<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_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>
+	<string name="dialog_license_confirmation_message">Tack %1$s för att du angivit din giltiga licens.</string>
+	<string name="dialog_update_available_title">Uppdatering tillgänglig</string>
+	<string name="dialog_update_available_message">Uppdatera Cryptomator till den senaste versionen. Genom att trycka på OK kommer vi att ladda ner appen i bakgrunden och be dig att installera den.</string>
+	<string name="dialog_update_available_update">Uppdatera nu</string>
+	<string name="dialog_update_available_download_site">Gå till nedladdningssida</string>
+	<string name="dialog_update_available_cancel">Senare</string>
+	<string name="dialog_download_update_title">Nedladdningen körs</string>
+	<string name="dialog_download_update_message">Laddar ner senaste versionen av Cryptomator</string>
+	<string name="dialog_sym_link_title">Mappen är en symbolisk länk</string>
+	<string name="dialog_sym_link_message">Du kan inte gå till denna symboliska länk</string>
 	<string name="dialog_sym_link_back_button">Bakåt</string>
+	<string name="dialog_no_dir_file_title">Det går inte att ladda innehållet i katalogen</string>
+	<string name="dialog_no_dir_file_message">Moln-mappen \'%1$s\' har inte en katalogfil. Det kan bero på att mappen skapades på en annan enhet och ännu inte har synkroniserats fullt ut med molnet. Kontrollera i ditt moln om följande fil finns:\n%2$s</string>
+	<string name="dialog_no_more_images_to_display">Inga fler bilder att visa&#8230;</string>
+	<string name="dialog_pcloud_credentials_updated_title">Användaruppgifter för \'%1$s\' uppdaterad</string>
+	<string name="dialog_pcloud_credentials_updated">Om du tänkte lägga till ett nytt pCloud-konto, klicka på denna url <a href="https://www.pcloud.com">www.pcloud. Om</a>, logga ut från det aktuella kontot och klicka igen på \'+\' i den här appen för att skapa en ny molnanslutning.</string>
+	<string name="permission_snackbar_auth_local_vault">Cryptomator behöver åtkomst till lagringsutrymmet för att använda lokala valv</string>
+	<string name="permission_snackbar_auth_auto_upload">Cryptomator behöver åtkomst till lagringsutrymmet för att kunna använda automatisk uppladdning av foton</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
+	<string name="file_size_zero">Noll kB</string>
+	<string name="file_size_unit_bytes">bytes</string>
+	<string name="file_size_unit_kilo_bytes">kB</string>
+	<string name="file_size_unit_mega_bytes">MB</string>
+	<string name="file_size_unit_giga_bytes">GB</string>
+	<string name="file_size_unit_tera_bytes">TB</string>
 	<!-- ## date helper -->
+	<string name="time_unit_seconds_sg">sekund</string>
+	<string name="time_unit_seconds_pl">sekunder</string>
+	<string name="time_unit_minutes_sg">minut</string>
 	<string name="time_unit_minutes_pl">minuter</string>
+	<string name="time_unit_hours_sg">timme</string>
+	<string name="time_unit_hours_pl">timmar</string>
+	<string name="time_unit_days_sg">dag</string>
+	<string name="time_unit_days_pl">dagar</string>
+	<string name="time_unit_weeks_sg">vecka</string>
+	<string name="time_unit_weeks_pl">veckor</string>
+	<string name="time_unit_months_sg">månad</string>
+	<string name="time_unit_months_pl">månader</string>
+	<string name="time_unit_years_sg">år</string>
+	<string name="time_unit_years_pl">år</string>
 	<!-- ## biometric authentication -->
+	<string name="dialog_biometric_auth_title">Biometrisk inloggning</string>
+	<string name="dialog_biometric_auth_message">Logga in med din biometriska referens</string>
+	<string name="dialog_biometric_auth_use_password">Använd valvlösenord</string>
+	<string name="dialog_unable_to_auto_upload_files_title">Det går inte att ladda upp filer automatiskt</string>
 	<!-- notification -->
+	<string name="notification_unlocked">Valv upplåst: %1$d</string>
+	<string name="notification_timeout">Automatiskt lås om %1$s</string>
+	<string name="notification_lock_all">Lås alla</string>
+	<string name="notification_cancel_auto_upload">Avbryt uppladdning</string>
+	<string name="notification_auto_upload_title">Automatisk fotouppladdning körs</string>
+	<string name="notification_auto_upload_message">Laddar upp %1d/%2d</string>
+	<string name="notification_auto_upload_finished_title">Automatisk fotouppladdning slutförd</string>
+	<string name="notification_auto_upload_finished_message">%1$d bilder uppladdade till valvet</string>
+	<string name="notification_auto_upload_failed_title">Automatisk fotouppladdning misslyckades</string>
+	<string name="notification_auto_upload_failed_general_error">Allmänt fel uppstod under uppladdning.</string>
+	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Vald mapp för uppladdning finns inte längre. Gå till inställningar och välj en ny</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">Valv låstes under uppladdningen, vänligen öppna valvet för att fortsätta</string>
+	<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="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>
+	<string name="screen_settings_clear_lru_cache_size">Rensa cachen</string>
+	<string name="screen_settings_lru_cache_changed__restart_toast">Ändringar kommer att tillämpas vid omstart av appen</string>
+	<string name="screen_settings_license">Registrerad till</string>
+	<string name="screen_settings_license_mail">%1$s</string>
+	<string name="dialog_settings_update_check_interval_title">Uppdateringsintervall</string>
+	<string name="screen_settings_check_updates">Sök efter uppdateringar</string>
+	<string name="screen_settings_last_check_updates">Senaste körning %1$s</string>
+	<string name="dialog_cache_size_title">Cache-storlek per moln</string>
 	<!-- lock timeout names -->
+	<string name="lock_timeout_instant">Omedelbart</string>
+	<string name="lock_timeout_1m">1 minut</string>
+	<string name="lock_timeout_2m">2 minuter</string>
+	<string name="lock_timeout_5m">5 minuter</string>
+	<string name="lock_timeout_10m">10 minuter</string>
+	<string name="lock_timeout_never">Aldrig</string>
 	<!-- cache size names -->
+	<string name="cache_size_50m">50 MB</string>
+	<string name="cache_size_100m">100 MB</string>
+	<string name="cache_size_250m">250 MB</string>
+	<string name="cache_size_500m">500 MB</string>
+	<string name="cache_size_1000m">1 GB</string>
+	<string name="cache_size_5000m">5 GB</string>
 	<!-- screen scheme mode names -->
+	<string name="screen_settings_style_mode">Stil</string>
+	<string name="follow_system">Automatisk (följ systemet)</string>
 	<string name="light">Ljust</string>
 	<string name="dark">Mörkt</string>
 	<!-- update interval names -->
+	<string name="update_interval_1d">Varje dag</string>
+	<string name="update_interval_1w">Varje vecka</string>
+	<string name="update_interval_1m">Varje månad</string>
 </resources>
--- a/presentation/src/main/res/values-zh-rTW/strings.xml
+++ b/presentation/src/main/res/values-zh-rTW/strings.xml
@ -4,23 +4,94 @@
 	<string name="share_with_label">加密</string>
 	<!-- # error messages -->
 	<string name="error_generic">發生了一個錯誤</string>
+	<string name="error_authentication_failed">認證失敗</string>
+	<string name="error_authentication_failed_re_authenticate">認證失敗，請重新使用 %1$s 登綠。</string>
+	<string name="error_no_network_connection">沒有網路連線</string>
+	<string name="error_invalid_passphrase">密碼錯誤</string>
+	<string name="error_file_or_folder_exists">該檔案或資料夾已存在。</string>
+	<string name="error_vault_version_not_supported">不支援的加密檔案庫。這個加密檔案庫是用其它版本的 Cryptomator 所建立的。</string>
+	<string name="error_vault_already_exists">保險箱已經存在。</string>
+	<string name="error_no_such_file">檔案不存在。</string>
+	<string name="error_vault_has_been_locked">加密檔案庫已鎖定。</string>
+	<string name="error_cloud_already_exists">雲端硬碟已經存在。</string>
+	<string name="error_activity_not_found">請下載行動裝置應用程式來打開這個檔案。</string>
+	<string name="error_server_not_found">找不到伺服器。</string>
+	<string name="error_device_policy_manager_not_found">請打開你的裝置設定，再手動設定螢幕鎖定。</string>
+	<string name="error_export_illegal_file_name">資料匯出失敗。請把檔案名稱中的特殊字元刪除後，再重新匯出資料。</string>
+	<string name="error_name_contains_invalid_characters">不能含有特殊字元。</string>
+	<string name="error_names_contains_invalid_characters">檔案名稱不能含有特殊字元。</string>
+	<string name="error_vault_name_contains_invalid_characters">加密檔案庫的名稱不能含有特殊字元。</string>
+	<string name="error_general_update">檢查更新失敗。發生一般錯誤。</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">本機儲存空間</string>
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<string name="snack_bar_action_title_settings">設定</string>
+	<string name="snack_bar_action_title_search">搜尋</string>
+	<string name="snack_bar_action_title_search_previous">上一頁</string>
 	<string name="snack_bar_action_title_search_next">繼續</string>
+	<string name="snack_bar_action_title_sort">排序</string>
+	<string name="snack_bar_action_title_sort_az">以英文字母A至Z排序</string>
+	<string name="snack_bar_action_title_sort_za">以英文字母Z至A排序</string>
+	<string name="snack_bar_action_title_sort_newest">最新的優先</string>
+	<string name="snack_bar_action_title_sort_oldest">最舊的優先</string>
+	<string name="snack_bar_action_title_sort_biggest">最大的優先</string>
+	<string name="snack_bar_action_title_sort_smallest">最小的優先</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">加到 Cryptomator</string>
+	<string name="screen_vault_list_action_create_new_vault">新建加密檔案庫</string>
+	<string name="screen_vault_list_action_add_existing_vault">新增至現有的加密檔案庫</string>
 	<string name="screen_vault_list_vault_action_delete">移除</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">加密檔案庫</string>
+	<string name="screen_file_browser_move_button_text">移動</string>
+	<string name="screen_file_browser_msg_empty_folder">清空資料夾</string>
+	<string name="screen_file_browser_share_intent_chooser_title">分享對象</string>
+	<string name="screen_file_browser_share_destination_title">選擇目的地</string>
+	<string name="screen_file_browser_share_button_text">選擇</string>
+	<string name="screen_file_browser_nothing_to_share">沒有東西可分享</string>
+	<string name="screen_file_browser_action_create_folder">建立新資料夾</string>
+	<string name="screen_file_browser_action_create_new_text_file">建立新文字檔案</string>
+	<string name="screen_file_browser_action_upload_files">上傳檔案</string>
+	<string name="screen_file_browser_upload_files_chooser_title">檔案</string>
+	<string name="screen_file_browser_msg_file_exported">檔案已匯出</string>
+	<string name="screen_file_browser_msg_files_exported">所有的檔案皆已匯出</string>
+	<string name="screen_file_browser_nothing_to_export">沒有任何東西可匯出。</string>
+	<string name="screen_file_browser_node_action_share">分享</string>
+	<string name="screen_file_browser_node_action_rename">重新命名</string>
+	<string name="screen_file_browser_node_action_edit_text">編輯</string>
+	<string name="screen_file_browser_node_action_export">匯出</string>
+	<string name="screen_file_browser_select_all_items">選擇全部</string>
+	<string name="screen_file_browser_refresh_items">重新整理</string>
+	<string name="screen_file_browser_no_connection_button_text">重試</string>
 	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">儲存成功。</string>
 	<!-- ## screen: share files -->
+	<string name="screen_share_files_content_text">文字</string>
+	<string name="screen_share_files_content_file">檔案</string>
+	<string name="screen_share_files_content_files">檔案</string>
+	<string name="screen_share_files_section_location">儲存位置</string>
+	<string name="screen_share_files_save_button_text">儲存</string>
+	<string name="screen_share_files_msg_success">加密已完成</string>
 	<!-- ## screen: choose cloud service -->
+	<string name="screen_choose_cloud_service_title">雲端服務</string>
 	<!-- ## screen: cloud connections -->
+	<string name="screen_cloud_connections_title">選擇位置</string>
+	<string name="screen_cloud_connections_no_connections">點擊此處新增位置</string>
+	<string name="screen_cloud_local_custom_storage_title">自訂位置</string>
 	<!-- ## screen: webdav settings -->
+	<string name="screen_webdav_settings_url_port_label">網址</string>
 	<string name="screen_webdav_settings_password_label">密碼</string>
+	<string name="screen_webdav_settings_done_button_text">連線</string>
+	<string name="screen_webdav_settings_msg_url_must_not_be_empty">網址不能為空白</string>
+	<string name="screen_webdav_settings_msg_url_is_invalid">網址是無效的</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">使用者名稱不可留空。</string>
+	<string name="screen_webdav_settings_msg_password_must_not_be_empty">密碼不可留空。</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">顯示名稱</string>
+	<string name="screen_s3_settings_region_label">區域</string>
 	<!-- ## screen: enter vault name -->
 	<!-- ## screen: set password -->
 	<string name="screen_set_password_button_text">完成</string>
@ -29,7 +100,22 @@
 	<string name="screen_set_password_strength_indicator_3">強</string>
 	<!-- ## screen: settings -->
 	<string name="screen_settings_section_general">一般</string>
+	<string name="screen_settings_cloud_settings_label">雲端服務</string>
+	<string name="screen_settings_section_search">搜尋</string>
+	<string name="screen_settings_live_search">即時搜尋</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">啟動</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">上傳影片</string>
+	<string name="screen_settings_twitter_label">在 Twitter 上追蹤我們</string>
+	<string name="screen_settings_facebook_label">在臉書上給我們點讚</string>
+	<string name="screen_settings_section_legal">法律</string>
+	<string name="screen_settings_licenses_label">軟體授權</string>
+	<string name="screen_settings_section_support">技術支援</string>
+	<string name="screen_settings_contact_label">請求協助</string>
+	<string name="screen_settings_debug_mode_label">除錯模式</string>
+	<string name="screen_settings_section_version">版本</string>
+	<string name="screen_settings_advanced_settings">進階設定</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_log_in_to">登錄到</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
 	<!-- ## screen: empty dir file info -->
@ -37,8 +123,14 @@
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">取消</string>
 	<string name="dialog_enter_password_positive_button">解鎖</string>
+	<string name="dialog_change_password_old_password_label">舊密碼</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_positive_button_text">移除</string>
+	<string name="dialog_existing_file_title">檔案已經存在</string>
+	<string name="dialog_existing_file_positive_button">取代</string>
+	<string name="dialog_replace_positive_button_all_files_exist">全部取代</string>
+	<string name="dialog_replace_positive_button_single_file_exists">取代</string>
+	<string name="dialog_unable_to_share_positive_button">確認</string>
 	<string name="dialog_lock_vault">鎖定</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">關閉</string>
 	<string name="dialog_sym_link_back_button">上一頁</string>
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit acf192842fefda106395b88b8c898873cd95c550
+Subproject commit c3d912cd86e5a7d7b4b627c83ba84276712a215a