Merge branch 'release/2.1.2'

Author: tobihagemann

Cryptomator.xcodeproj/project.pbxproj

@@ -2805,7 +2805,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.1.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -2867,7 +2867,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.1.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";

CryptomatorCommon/Sources/CryptomatorCommonCore/CryptomatorDatabase.swift

@@ -134,9 +134,12 @@ public class CryptomatorDatabase {
 		var coordinatorError: NSError?
 		var dbPool: DatabasePool?
 		var dbError: Error?
+		var configuration = Configuration()
+		// Workaround for a SQLite regression (see https://github.com/groue/GRDB.swift/issues/1171 for more details)
+		configuration.acceptsDoubleQuotedStringLiterals = true
 		coordinator.coordinate(writingItemAt: databaseURL, options: .forMerging, error: &coordinatorError, byAccessor: { _ in
 			do {
-				dbPool = try DatabasePool(path: databaseURL.path)
+				dbPool = try DatabasePool(path: databaseURL.path, configuration: configuration)
 			} catch {
 				dbError = error
 			}

SharedResources/bn.lproj/Localizable.strings

@@ -41,8 +41,13 @@
 "addVault.createNewVault.setVaultName.error.emptyVaultName" = "ভোল্ট এর নাম খালি হতে পারবে না।";
 "addVault.createNewVault.chooseCloud.header" = "ভোল্ট এর এনক্রিপ্টেড ফাইলগুলো ক্রিপ্টোমেটর কোথায় সংরক্ষণ করবে?";
 "addVault.createNewVault.chooseFolder.error.vaultNameCollision" = "\"%@\" নামটি এখানে ইতিমধ্যে বিদ্যমান। অন্য একটি ভোল্ট নাম বা স্থান নির্বাচন করুন।";
+"addVault.createNewVault.password.confirmPassword.alert.message" = "সতর্কতা: আপনি যদি আপনার পাসওয়ার্ড ভুলে যান, তাহলে পাসওয়ার্ডটি পুনরুদ্ধার করার কোনো উপায় থাকবে না।";
+"addVault.openExistingVault.title" = "বিদ্যমান কোনো ভোল্ট খুলুন";
+"fileProvider.error.unlockButton" = "আনলক করুন";
 "purchase.retry.button" = "পুনরায় চেষ্টা করুন";
 
 "settings.title" = "সেটিংস";
+
+"unlockVault.button.unlock" = "আনলক করুন";
 "vaultDetail.button.moveVault" = "স্থানান্তর করুন";
 "vaultDetail.button.renameVault" = "নাম পরিবর্তন করুন";

SharedResources/he.lproj/Localizable.strings

@@ -1,25 +1,54 @@
+/* 
+  Localizable.strings
+  Cryptomator
+
+  Copyright © 2021 Skymatic GmbH. All rights reserved.
+*/
+
+"common.alert.error.title" = "שגיאה";
 "common.alert.attention.title" = "שים לב";
 "common.button.cancel" = "ביטול";
 "common.button.change" = "שנה";
 "common.button.choose" = "בחר";
 "common.button.create" = "צור";
+"common.button.createFolder" = "צור תיקייה";
 "common.button.done" = "סיום";
+"common.button.download" = "הורד";
 "common.button.edit" = "ערוך";
 "common.button.enable" = "הפעל";
 "common.button.next" = "המשך";
 "common.button.ok" = "אישור";
 "common.button.remove" = "מחק";
+"common.cells.password" = "סיסמה";
 "common.cells.url" = "כתובת URL";
 "common.cells.username" = "שם משתמש";
+"common.footer.learnMore" = "למידע נוסף.";
+
+"accountList.header.title" = "אימות";
 
 "addVault.title" = "יצירת כספת";
 "addVault.createNewVault.title" = "צור כספת חדשה";
 "addVault.createNewVault.setVaultName.cells.name" = "שם הכספת";
 "addVault.createNewVault.chooseCloud.header" = "היכן Cryptomator צריך לשמור את הקבצים המוצפנים של הכספת שלך?";
 "addVault.createNewVault.password.confirmPassword.alert.message" = "שים לב שאינך שוכח את סיסמתך! לא ניתן לשחזר את המידע שלך בחזרה מבלי הסיסמה.";
+"addVault.createNewVault.progress" = "יוצר כספת…";
 "addVault.openExistingVault.title" = "פתח כספת קיימת";
+"addVault.openExistingVault.progress" = "מוסיף כספת…";
+
+"biometryType.faceID" = "Face ID";
+"biometryType.touchID" = "Touch ID";
+
+"chooseFolder.emptyFolder.footer" = "התיקייה ריקה";
+"chooseFolder.createNewFolder.cells.name" = "שם תיקייה";
+"chooseFolder.createNewFolder.progress" = "יוצר תיקייה…";
+
+"fileProvider.onboarding.title" = "ברוך הבא";
 "fileProvider.error.unlockButton" = "בטל נעילה";
+
+"onboarding.title" = "ברוך הבא";
+"onboarding.button.continue" = "המשך";
 "purchase.retry.button" = "נסה שוב";
+"purchase.unlockedFullVersion.title" = "תודה";
 
 "settings.title" = "הגדרות";
 "settings.clearCache" = "נקה מטמון";

SharedResources/it.lproj/Localizable.strings

@@ -88,8 +88,21 @@
 "fileProvider.onboarding.title" = "Benvenuto";
 "fileProvider.onboarding.info" = "Grazie per aver scelto Cryptomator per proteggere i tuoi file. Per iniziare, vai all'app principale e aggiungi una cassaforte.";
 "fileProvider.onboarding.button.openCryptomator" = "Apri Cryptomator";
+"fileProvider.error.biometricalAuthCanceled.title" = "Sblocco annullato";
+"fileProvider.error.biometricalAuthCanceled.message" = "Lo sblocco con %@ non è riuscito. Riprovare.";
+"fileProvider.error.biometricalAuthWrongPassword.title" = "Password Errata";
+"fileProvider.error.defaultLock.title" = "Richiesto Sblocco";
+"fileProvider.error.defaultLock.message" = "La cassaforte deve essere sbloccata per accedere e vedere il contenuto.";
 "fileProvider.error.unlockButton" = "Sblocca";
 
+"keepUnlocked.alert.title" = "Blocco la cassaforte?";
+"keepUnlocked.alert.message" = "Questa modifica richiede che la cassaforte sia bloccata per avere effetto.";
+"keepUnlocked.alert.confirm" = "Conferma e Blocca Ora";
+"keepUnlocked.header" = "Specifica per quanto tempo la cassaforte deve rimanere sbloccata quando inattiva.";
+"keepUnlockedDuration.auto" = "Lascia decidere a iOS";
+"keepUnlockedDuration.auto.shortDisplayName" = "Auto";
+"keepUnlockedDuration.indefinite" = "Sempre";
+
 "localFileSystemAuthentication.createNewVault.header" = "Nella prossima schermata, scegli la posizione d'archiviazione per la tua nuova cassaforte.";
 "localFileSystemAuthentication.createNewVault.button" = "Seleziona Posizione d'Archiviazione";
 "localFileSystemAuthentication.createNewVault.error.detectedExistingVault" = "Una cassaforte esiste già in questa posizione. Riprova con un'altra posizione di archiviazione.";
@@ -199,6 +212,9 @@
 "vaultDetail.enabledBiometricalUnlock.footer" = "La password della cassaforte sarà richiesta solo se l'autenticazione %@ non è riuscita.";
 "vaultDetail.info.footer.accessVault" = "Accedi alla cassaforte tramite l'app File.";
 "vaultDetail.info.footer.accountInfo" = "Accesso effettuato come %@ tramite %@.";
+"vaultDetail.keepUnlocked.title" = "Durata Sblocco";
+"vaultDetail.keepUnlocked.footer.limitedDuration" = "Lo sblocco sarà richiesto dopo che la cassaforte sarà rimasta inattiva per %@.";
+"vaultDetail.keepUnlocked.footer.unlimitedDuration" = "Non sarà richiesto alcun sblocco se non bloccata manualmente.";
 "vaultDetail.locked.footer" = "La tua cassaforte è attualmente bloccata.";
 "vaultDetail.moveVault.detectedMasterkey.text" = "Cryptomator ha rilevato una cassaforte esistente in questa posizione.\nPer poter spostare la tua cassaforte, sei pregato di tornare indietro e scegliere una cartella differente.";
 "vaultDetail.moveVault.progress" = "Spostando…";

SharedResources/nb.lproj/Localizable.strings

@@ -5,7 +5,9 @@
 "common.button.done" = "Ferdig";
 "common.button.edit" = "Rediger";
 "common.button.next" = "Neste";
+"common.button.ok" = "Ok";
 "common.button.remove" = "Fjern";
+"common.button.signOut" = "Logg ut";
 "common.cells.password" = "Passord";
 "common.cells.url" = "URL";
 "common.cells.username" = "Brukernavn";

fastlane/Fastfile

@@ -44,7 +44,7 @@ platform :ios do
   lane :app_store do
     gym(scheme: "Cryptomator", clean: true)
     changelog = File.read("changelog.txt")
-    deliver(skip_screenshots: true, submit_for_review: true)
+    deliver(skip_screenshots: true, submit_for_review: true, submission_information: { add_id_info_uses_idfa: false })
     version = get_version_number(target: "Cryptomator")
     build = `git rev-list --count $(git rev-parse --abbrev-ref HEAD) | tr -d " \t\n\r"`
     slack(

fastlane/changelog.txt

@@ -1,6 +1 @@
-- Remote changes of `masterkey.cryptomator` and `vault.cryptomator` are now detected (#142, #161)
-- Auto-locked vaults are now correctly shown as locked (#163)
-- Improved WebDAV support, for FileRun in particular (#164)
-- Fixed crash when trying to decrypt invalid ciphertext files (#167)
-- Fixed change password when Touch ID / Face ID is enabled (#162)
-- Fixed inaccessible folder after creating a new folder with a reused name (#170)
+- Fixed regression that prevented the app from launching with the latest iOS version (#171, #174)

fastlane/metadata/de-DE/release_notes.txt

@@ -1,6 +1 @@
-- Änderungen von `masterkey.cryptomator` und `vault.cryptomator` werden nun erkannt (#142, #161)
-- Automatisch gesperrte Tresore werde nun korrekt als gesperrt angezeigt (#163)
-- WebDAV-Unterstützung verbessert, insbesondere für FileRun (#164)
-- Absturz beim Versuch, ungültige Ciphertext-Dateien zu entschlüsseln, behoben (#167)
-- Passwortänderung bei aktivierter Touch ID / Face ID behoben (#162)
-- Unzugänglicher Ordner nach Erstellung eines neuen Ordners mit einem wiederverwendeten Namen behoben (#170)
+- App lässt sich nun wieder mit der neuesten iOS-Version starten (#171, #174)

fastlane/metadata/en-US/release_notes.txt

@@ -1,6 +1 @@
-- Remote changes of `masterkey.cryptomator` and `vault.cryptomator` are now detected (#142, #161)
-- Auto-locked vaults are now correctly shown as locked (#163)
-- Improved WebDAV support, for FileRun in particular (#164)
-- Fixed crash when trying to decrypt invalid ciphertext files (#167)
-- Fixed change password when Touch ID / Face ID is enabled (#162)
-- Fixed inaccessible folder after creating a new folder with a reused name (#170)
+- Fixed regression that prevented the app from launching with the latest iOS version (#171, #174)