Merge branch 'develop' into feature/vault-format-8
This commit is contained in:
Julian Raufelder
commit
fc9110f520
36
Gemfile.lock
36
Gemfile.lock
@ -8,21 +8,21 @@ GEM
|
||||
rubyzip (~> 2.0)
|
||||
artifactory (3.0.15)
|
||||
atomos (0.1.3)
|
||||
aws-eventstream (1.1.0)
|
||||
aws-partitions (1.428.0)
|
||||
aws-sdk-core (3.112.0)
|
||||
aws-eventstream (1.1.1)
|
||||
aws-partitions (1.437.0)
|
||||
aws-sdk-core (3.113.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.239.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-kms (1.42.0)
|
||||
aws-sdk-kms (1.43.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.88.1)
|
||||
aws-sdk-s3 (1.93.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sigv4 (1.2.2)
|
||||
aws-sigv4 (1.2.3)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
babosa (1.0.4)
|
||||
bcrypt_pbkdf (1.0.1)
|
||||
@ -51,8 +51,8 @@ GEM
|
||||
faraday-net_http (1.0.1)
|
||||
faraday_middleware (1.0.0)
|
||||
faraday (~> 1.0)
|
||||
fastimage (2.2.2)
|
||||
fastlane (2.175.0)
|
||||
fastimage (2.2.3)
|
||||
fastlane (2.179.0)
|
||||
CFPropertyList (>= 2.3, < 4.0.0)
|
||||
addressable (>= 2.3, < 3.0.0)
|
||||
artifactory (~> 3.0)
|
||||
@ -104,7 +104,7 @@ GEM
|
||||
representable (~> 3.0)
|
||||
retriable (>= 2.0, < 4.0)
|
||||
signet (~> 0.12)
|
||||
google-apis-core (0.2.1)
|
||||
google-apis-core (0.3.0)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (~> 0.14)
|
||||
httpclient (>= 2.8.1, < 3.0)
|
||||
@ -114,17 +114,17 @@ GEM
|
||||
rexml
|
||||
signet (~> 0.14)
|
||||
webrick
|
||||
google-apis-iamcredentials_v1 (0.1.0)
|
||||
google-apis-iamcredentials_v1 (0.2.0)
|
||||
google-apis-core (~> 0.1)
|
||||
google-apis-storage_v1 (0.2.0)
|
||||
google-apis-storage_v1 (0.3.0)
|
||||
google-apis-core (~> 0.1)
|
||||
google-cloud-core (1.5.0)
|
||||
google-cloud-core (1.6.0)
|
||||
google-cloud-env (~> 1.0)
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-cloud-env (1.4.0)
|
||||
google-cloud-env (1.5.0)
|
||||
faraday (>= 0.17.3, < 2.0)
|
||||
google-cloud-errors (1.0.1)
|
||||
google-cloud-storage (1.30.0)
|
||||
google-cloud-errors (1.1.0)
|
||||
google-cloud-storage (1.31.0)
|
||||
addressable (~> 2.5)
|
||||
digest-crc (~> 0.4)
|
||||
google-apis-iamcredentials_v1 (~> 0.1)
|
||||
@ -132,7 +132,7 @@ GEM
|
||||
google-cloud-core (~> 1.2)
|
||||
googleauth (~> 0.9)
|
||||
mini_mime (~> 1.0)
|
||||
googleauth (0.15.1)
|
||||
googleauth (0.16.0)
|
||||
faraday (>= 0.17.3, < 2.0)
|
||||
jwt (>= 1.4, < 3.0)
|
||||
memoist (~> 0.16)
|
||||
@ -151,7 +151,7 @@ GEM
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2020.1104)
|
||||
mini_magick (4.11.0)
|
||||
mini_mime (1.0.2)
|
||||
mini_mime (1.0.3)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.0.0)
|
||||
nanaimo (0.3.0)
|
||||
@ -173,7 +173,7 @@ GEM
|
||||
ruby2_keywords (0.0.4)
|
||||
rubyzip (2.3.0)
|
||||
security (0.1.3)
|
||||
signet (0.14.1)
|
||||
signet (0.15.0)
|
||||
addressable (~> 2.3)
|
||||
faraday (>= 0.17.3, < 2.0)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
|
||||
@ -3,7 +3,7 @@ apply from: 'buildsystem/dependencies.gradle'
|
||||
apply plugin: "com.vanniktech.android.junit.jacoco"
|
||||
|
||||
buildscript {
|
||||
ext.kotlin_version = '1.4.31'
|
||||
ext.kotlin_version = '1.4.32'
|
||||
repositories {
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
|
||||
@ -16,7 +16,7 @@ ext {
|
||||
javaxAnnotationVersion = '1.0'
|
||||
|
||||
// support lib
|
||||
androidSupportAnnotationsVersion = '1.1.0'
|
||||
androidSupportAnnotationsVersion = '1.2.0'
|
||||
androidSupportAppcompatVersion = '1.2.0'
|
||||
androidSupportDesignVersion = '1.3.0'
|
||||
|
||||
@ -51,7 +51,7 @@ ext {
|
||||
// do not update to 1.4.0 until minsdk is 7.x (or desugaring works better) otherwise it will crash on 6.x
|
||||
cryptolibVersion = '2.0.0-beta6'
|
||||
|
||||
dropboxVersion = '3.2.0'
|
||||
dropboxVersion = '4.0.0'
|
||||
|
||||
googleApiServicesVersion = 'v3-rev197-1.25.0'
|
||||
googlePlayServicesVersion = '19.0.0'
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,5 @@
|
||||
#Thu Apr 18 12:59:33 CEST 2019
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
|
||||
|
||||
139
gradlew
vendored
139
gradlew
vendored
@ -1,4 +1,20 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
@ -6,42 +22,6 @@
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn ( ) {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die ( ) {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
esac
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
@ -60,8 +40,49 @@ cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$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"
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# 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
|
||||
;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
@ -85,7 +106,7 @@ location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||
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
|
||||
@ -105,10 +126,11 @@ if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin, switch paths to Windows format before running java
|
||||
if $cygwin ; then
|
||||
# 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
|
||||
@ -134,27 +156,30 @@ if $cygwin ; then
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=$((i+1))
|
||||
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" ;;
|
||||
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" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||
function splitJvmOpts() {
|
||||
JVM_OPTS=("$@")
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||
APP_ARGS=`save "$@"`
|
||||
|
||||
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||
# 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"
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
||||
179
gradlew.bat
vendored
179
gradlew.bat
vendored
@ -1,90 +1,89 @@
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS=
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windowz variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
if "%@eval[2+2]" == "4" goto 4NT_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
goto execute
|
||||
|
||||
:4NT_args
|
||||
@rem Get arguments from the 4NT Shell from JP Software
|
||||
set CMD_LINE_ARGS=%$
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
<!-- # error messages -->
|
||||
<string name="error_generic">Ein Fehler ist aufgetreten</string>
|
||||
<string name="error_authentication_failed">Authentifizierung fehlgeschlagen</string>
|
||||
<string name="error_authentication_failed_re_authenticate">Authentifizierungsfehler, bitte mit %1$s anmelden</string>
|
||||
<string name="error_no_network_connection">Keine Internetverbindung</string>
|
||||
<string name="error_invalid_passphrase">Falsches Passwort</string>
|
||||
<string name="error_file_or_folder_exists">Die Datei oder der Ordner existiert bereits.</string>
|
||||
@ -143,17 +144,23 @@
|
||||
<string name="screen_settings_activate_biometric_auth">Biometrischer Login aktivieren</string>
|
||||
<string name="screen_settings_confirm_face_unlock">Nach Entsperrung mittels dem Gesichts, bestätigen (falls verfügbar)</string>
|
||||
<string name="screen_settings_block_app_when_obscured">App blockieren, wenn verdeckt</string>
|
||||
<string name="screen_settings_secure_screen">Bildschirm-Sicherheit</string>
|
||||
<string name="screen_settings_block_app_when_obscured_summary">Blockiere das Abfangen der Eingabe und das Anzeigen einer falschen Benutzeroberfläche</string>
|
||||
<string name="screen_settings_secure_screen">Blockiere Screenshots</string>
|
||||
<string name="screen_settings_secure_screen_summary">Blockiere Screenshots im Anwendungsverlauf und innerhalb der App</string>
|
||||
<string name="screen_settings_section_search">Suche</string>
|
||||
<string name="screen_settings_live_search">Live-Suche</string>
|
||||
<string name="screen_settings_live_search_summary">Suchergebnisse während der Eingabe der Abfrage aktualisieren</string>
|
||||
<string name="screen_settings_glob_search">Suche mit Glob-Muster</string>
|
||||
<string name="screen_settings_glob_search_summary">Verwende Glob-Muster wie z.B. alice.*.jpg</string>
|
||||
<string name="screen_settings_section_auto_lock">Automatisch sperren</string>
|
||||
<string name="screen_settings_auto_lock_timeout">Sperren nach</string>
|
||||
<string name="screen_settings_auto_lock_on_screen_lock">Bei deaktiviertem Bildschirm</string>
|
||||
<string name="screen_settings_section_auto_photo_upload">Automatisches Photo-Hochladen</string>
|
||||
<string name="screen_settings_section_auto_photo_upload_vault">Tresor auswählen für das Hochladen</string>
|
||||
<string name="screen_settings_section_auto_photo_upload_toggle">Aktivieren</string>
|
||||
<string name="screen_settings_section_auto_photo_upload_toggle_summary">Bilder im Hintergrund aufnehmen und sobald der ausgewählte Tresor entsperrt ist, Upload automatisch starten</string>
|
||||
<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Nur mit WLAN hochladen</string>
|
||||
<string name="screen_settings_section_auto_photo_upload_including_videos">Videos hochladen</string>
|
||||
<string name="screen_settings_auto_photo_upload_title">Bilder abspeichern in…</string>
|
||||
<string name="screen_settings_section_social">Uns folgen</string>
|
||||
<string name="screen_settings_website_label">Cryptomator-Website</string>
|
||||
@ -167,9 +174,11 @@
|
||||
<string name="screen_settings_error_report_label">Log-Datei senden</string>
|
||||
<string name="screen_settings_error_report_failed">Senden fehlgeschlagen</string>
|
||||
<string name="screen_settings_security_label">Sicherheitshinweise</string>
|
||||
<string name="screen_settings_keep_unlocked_while_editing_files">Halte Tresore geöffnet während dem Editieren einer Datei</string>
|
||||
<string name="screen_settings_advanced_settings">Erweiterte Eigenschaften</string>
|
||||
<string name="screen_settings_background_unlock_preparation_label">Vorbereitungen zum Entsperren im Hintergrund</string>
|
||||
<string name="screen_settings_background_unlock_preparation_label">Entsperren beschleunigen</string>
|
||||
<string name="screen_settings_background_unlock_preparation_label_summary">Während der Passwort-Eingabe oder biometrische Authentifizierung, Tresor-Konfiguration im Hintergrund herunterladen</string>
|
||||
<string name="screen_settings_keep_unlocked_while_editing_files">Entsperrt bleiben</string>
|
||||
<string name="screen_settings_keep_unlocked_while_editing_files_summary">Halte Tresore geöffnet während dem Editieren einer Datei</string>
|
||||
<!-- ## screen: cloud settings -->
|
||||
<string name="screen_cloud_settings_webdav_connections">WebDAV-Verbindungen</string>
|
||||
<string name="screen_cloud_settings_pcloud_connections">pCloud-Verbindungen</string>
|
||||
@ -212,6 +221,7 @@
|
||||
<string name="dialog_replace_title_multiple_files_exist">Dateien ersetzen?</string>
|
||||
<string name="dialog_unable_to_share_title">Teilen nicht möglich</string>
|
||||
<string name="dialog_unable_to_share_message">Sie haben keinen Tresor eingerichtet. Bitte legen Sie zuerst einen Tresor mit der Cryptomator-App an.</string>
|
||||
<string name="dialog_unable_to_share_positive_button">OK</string>
|
||||
<string name="dialog_unable_to_share_negative_button">Tresor erstellen</string>
|
||||
<string name="dialog_filetype_not_supported_title">%1$s kann nicht geöffnet werden</string>
|
||||
<string name="dialog_filetype_not_supported_message">Bitte installieren Sie eine App, die diese Datei öffnen kann. Möchten Sie die Datei stattdessen auf dem Gerät speichern?</string>
|
||||
@ -245,6 +255,7 @@
|
||||
<string name="dialog_lock_vault">Sperren</string>
|
||||
<string name="dialog_accept_ssl_certificate_title">Ungültiges SSL-Zertifikat</string>
|
||||
<string name="dialog_accept_ssl_certificate_hint">Das SSL-Zertifikat ist ungültig. Wollen Sie diesem trotzdem vertrauen?</string>
|
||||
<string name="dialog_accept_ssl_certificate_details">Details</string>
|
||||
<string name="dialog_accept_ssl_certificate_security_checkbox">Dies könnte ein Sicherheitsrisiko sein. Ich weiß was ich tue.</string>
|
||||
<string name="dialog_http_security_hint">Die Verwendung von HTTP ist unsicher. Wir empfehlen stattdessen die Nutzung von HTTPS. Wenn Sie sich der Risiken bewusst sind, können Sie mit HTTP fortfahren.</string>
|
||||
<string name="dialog_http_security_checkbox">Zu HTTPS ändern</string>
|
||||
@ -293,6 +304,7 @@
|
||||
<string name="dialog_no_dir_file_message">Der Ordner \'%1$s\' in der Cloud hat keine Verzeichniss-Datei. Es könnte sein, dass der Ordner auf einem anderen Gerät erstellt wurde und noch nicht vollständig mit der Cloud synchronisiert ist. Bitte überprüfen, ob die folgende Datei in der Cloud existiert:\n%2$s</string>
|
||||
<string name="dialog_beta_confirmation_title">Beta-Version</string>
|
||||
<string name="dialog_beta_confirmation">Das ist eine Beta-Version, die das Tresor-Format 7 unterstützt. Bitte nicht mit einem produktiv eingesetzten Tresor verwenden oder dafür sorgen, dass gute Sicherungen vorhanden sind.</string>
|
||||
<string name="dialog_no_more_images_to_display">Keine weiteren Bilder anzuzeigen…</string>
|
||||
<string name="permission_snackbar_auth_local_vault">Cryptomator benötigt Zugriff auf den Speicher um lokale Tresore zu nutzen</string>
|
||||
<string name="permission_snackbar_auth_auto_upload">Cryptomator benötigt Zugriff auf den Speicher um den automatischen Foto-Upload zu nutzen</string>
|
||||
<!-- # error reports -->
|
||||
@ -337,6 +349,7 @@
|
||||
<string name="notification_open_writable_file_message">Tresor bleibt entsperrt bis die Datei nicht mehr editiert wird</string>
|
||||
<string name="notification_update_check_finished_latest">Neueste Version installiert</string>
|
||||
<string name="screen_settings_lru_cache">Zwischenspeicher</string>
|
||||
<string name="screen_settings_lru_cache_toggle_summary">Cache kürzlich geöffnete Dateien lokal und verschlüsseltauf dem Gerät für eine spätere Wiederverwendung beim erneuten öffnen</string>
|
||||
<string name="screen_settings_lru_cache_size">Zwischenspeichergröße insgesamt</string>
|
||||
<string name="screen_settings_clear_lru_cache_size">Zwischenspeicher leeren</string>
|
||||
<string name="screen_settings_lru_cache_changed__restart_toast">Änderungen werden nach einem Neustart der App aktiv</string>
|
||||
@ -351,6 +364,7 @@
|
||||
<string name="lock_timeout_2m">2 Minuten</string>
|
||||
<string name="lock_timeout_5m">5 Minuten</string>
|
||||
<string name="lock_timeout_10m">10 Minuten</string>
|
||||
<string name="lock_timeout_never">Nie</string>
|
||||
<!-- cache size names -->
|
||||
<!-- screen scheme mode names -->
|
||||
<string name="screen_settings_style_mode">Design</string>
|
||||
|
||||
@ -142,19 +142,24 @@
|
||||
<string name="screen_settings_activate_biometric_auth">Activer l\'authentification biométrique</string>
|
||||
<string name="screen_settings_confirm_face_unlock">Confirmer le déverrouillage par reconnaissance faciale (si disponible)</string>
|
||||
<string name="screen_settings_block_app_when_obscured">Bloquer l\'application lorsqu\'elle est masquée</string>
|
||||
<string name="screen_settings_secure_screen">Sécurité de l\'écran</string>
|
||||
<string name="screen_settings_block_app_when_obscured_summary">Bloquer l\'interception de l\'entrée et l\'affichage d\'une fausse interface utilisateur</string>
|
||||
<string name="screen_settings_secure_screen">Bloquer les captures d\'écran</string>
|
||||
<string name="screen_settings_secure_screen_summary">Empêcher la prise de capture d\'écran dans la liste des éléments récents et dans l\'application</string>
|
||||
<string name="screen_settings_section_search">Recherche</string>
|
||||
<string name="screen_settings_live_search">Recherche en direct</string>
|
||||
<string name="screen_settings_live_search_summary">Mettre à jour les résultats de la recherche pendant la saisie de la requête</string>
|
||||
<string name="screen_settings_glob_search">Recherche avec le modèle glob</string>
|
||||
<string name="screen_settings_glob_search_summary">Utilisez le modèle de correspondance glob comme alice.*.jpg</string>
|
||||
<string name="screen_settings_section_auto_lock">Verrouillage automatique</string>
|
||||
<string name="screen_settings_auto_lock_timeout">Verrouillage après</string>
|
||||
<string name="screen_settings_auto_lock_on_screen_lock">Lorsque l\'écran est éteint</string>
|
||||
<string name="screen_settings_section_auto_photo_upload">Téléversement automatique de photo</string>
|
||||
<string name="screen_settings_section_auto_photo_upload_vault">Choisir un coffre-fort pour le téléversement</string>
|
||||
<string name="screen_settings_section_auto_photo_upload_toggle">Activer</string>
|
||||
<string name="screen_settings_section_auto_photo_upload_toggle_summary">Capturez les images en arrière-plan et une fois que le coffre-fort sélectionné est déverrouillé, lancez le téléversement</string>
|
||||
<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Téléverser sur réseau WIFI uniquement</string>
|
||||
<string name="screen_settings_section_auto_photo_upload_including_videos">Téléversement des vidéos</string>
|
||||
<string name="screen_settings_auto_photo_upload_title">Enregistrer les fichiers du téléversement automatique dans…</string>
|
||||
<string name="screen_settings_auto_photo_upload_title">Enregistrer les fichiers téléverser automatiquement dans…</string>
|
||||
<string name="screen_settings_website_label">Site web de Cryptomator</string>
|
||||
<string name="screen_settings_twitter_label">Suivez-nous sur Twitter</string>
|
||||
<string name="screen_settings_facebook_label">Aimez notre page Facebook</string>
|
||||
@ -168,9 +173,10 @@
|
||||
<string name="screen_settings_error_report_failed">L\'envoi a échoué</string>
|
||||
<string name="screen_settings_security_label">Conseils de sécurité</string>
|
||||
<string name="screen_settings_section_version">Version</string>
|
||||
<string name="screen_settings_keep_unlocked_while_editing_files">Gardez les coffres déverrouillés lors de la modification des fichiers</string>
|
||||
<string name="screen_settings_advanced_settings">Paramètres Avancés</string>
|
||||
<string name="screen_settings_background_unlock_preparation_label">Préparations du déverrouillage en arrière-plan</string>
|
||||
<string name="screen_settings_background_unlock_preparation_label">Accélérer le déverrouillage</string>
|
||||
<string name="screen_settings_keep_unlocked_while_editing_files">Maintenir deverouillé</string>
|
||||
<string name="screen_settings_keep_unlocked_while_editing_files_summary">Gardez les coffres forts déverrouillées pendant l\'édition des fichiers</string>
|
||||
<!-- ## screen: cloud settings -->
|
||||
<string name="screen_cloud_settings_webdav_connections">Connexions WebDAV</string>
|
||||
<string name="screen_cloud_settings_pcloud_connections">Connexions pCloud</string>
|
||||
@ -295,6 +301,7 @@
|
||||
<string name="dialog_no_dir_file_message">Le dossier cloud \'%1$s\' n\'a pas de fichier de répertoire. Il se peut que le dossier ait été créé sur un autre appareil et qu\'il n\'ait pas encore été entièrement synchronisé avec le cloud. Veuillez vérifier dans votre cloud si le fichier suivant existe: \n%2$s</string>
|
||||
<string name="dialog_beta_confirmation_title">Version bêta</string>
|
||||
<string name="dialog_beta_confirmation">Il s\'agit d\'une version bêta qui introduit la prise en charge du format de coffre-fort vault 7. Veuillez vous assurer que vous n\'utilisez pas votre coffre-fort principal pour les tests ou que vous disposez d\'une bonne stratégie de sauvegarde.</string>
|
||||
<string name="dialog_no_more_images_to_display">Plus d\'images à afficher…</string>
|
||||
<string name="permission_snackbar_auth_local_vault">Cryptomator a besoin de l\'accès au stockage pour utiliser les coffres locaux</string>
|
||||
<string name="permission_snackbar_auth_auto_upload">Cryptomator a besoin de l\'accès au stockage pour effectuer le téléversement automatique de photos</string>
|
||||
<!-- # error reports -->
|
||||
@ -343,6 +350,7 @@
|
||||
<string name="notification_open_writable_file_message">Le coffre-fort reste déverrouillé jusqu\'à la fin des modifications</string>
|
||||
<string name="notification_update_check_finished_latest">Dernière version installée</string>
|
||||
<string name="screen_settings_lru_cache">Cache</string>
|
||||
<string name="screen_settings_lru_cache_toggle_summary">Mettre en cache les fichiers récemment consultés chiffrés localement sur l\'appareil pour une réutilisation lors d\'une réouverture ultérieure</string>
|
||||
<string name="screen_settings_lru_cache_size">Taille totale du cache</string>
|
||||
<string name="screen_settings_clear_lru_cache_size">Vider le cache</string>
|
||||
<string name="screen_settings_lru_cache_changed__restart_toast">Les changements seront appliqués lors du prochain démarrage de l\'application</string>
|
||||
|
||||
@ -138,7 +138,6 @@
|
||||
<string name="screen_settings_activate_biometric_auth">Biyometrik kimlik doğrulamayı etkinleştir</string>
|
||||
<string name="screen_settings_confirm_face_unlock">Yüz tanıma kilidini (varsa) onaylayın</string>
|
||||
<string name="screen_settings_block_app_when_obscured">Gizlendiğinde uygulamayı engelle</string>
|
||||
<string name="screen_settings_secure_screen">Ekran güvenliği</string>
|
||||
<string name="screen_settings_section_search">Arama</string>
|
||||
<string name="screen_settings_live_search">Canlı arama</string>
|
||||
<string name="screen_settings_glob_search">Glob kalıbı kullanarak ara</string>
|
||||
@ -163,9 +162,7 @@
|
||||
<string name="screen_settings_error_report_failed">Gönderim başarısız oldu</string>
|
||||
<string name="screen_settings_security_label">Güvenlik ipuçları</string>
|
||||
<string name="screen_settings_section_version">Sürüm</string>
|
||||
<string name="screen_settings_keep_unlocked_while_editing_files">Düzenlerken kasa kilidi açık</string>
|
||||
<string name="screen_settings_advanced_settings">Gelişmiş Ayarlar</string>
|
||||
<string name="screen_settings_background_unlock_preparation_label">Arka planda kilit açma</string>
|
||||
<!-- ## screen: cloud settings -->
|
||||
<string name="screen_cloud_settings_webdav_connections">WebDAV bağlantıları</string>
|
||||
<string name="screen_cloud_settings_pcloud_connections">pCloud bağlantıları</string>
|
||||
|
||||
@ -250,7 +250,7 @@
|
||||
|
||||
<string name="screen_settings_advanced_settings">Advanced Settings</string>
|
||||
<string name="screen_settings_background_unlock_preparation_label">Accelerate unlock</string>
|
||||
<string name="screen_settings_background_unlock_preparation_label_summary">Download key material in the background while prompted to enter the password or biometric auth</string>
|
||||
<string name="screen_settings_background_unlock_preparation_label_summary">Download vault config in the background while prompted to enter the password or biometric auth</string>
|
||||
<string name="screen_settings_keep_unlocked_while_editing_files">Keep unlocked</string>
|
||||
<string name="screen_settings_keep_unlocked_while_editing_files_summary">Keep vaults unlocked while editing files</string>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user