Skip to content

Commit e8de927

Browse files
committed
Merge branch 'release/2.2.3'
2 parents c0aa245 + e56460a commit e8de927

File tree

9 files changed

+64
-130
lines changed

9 files changed

+64
-130
lines changed

Cryptomator.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2852,7 +2852,7 @@
28522852
GCC_WARN_UNUSED_FUNCTION = YES;
28532853
GCC_WARN_UNUSED_VARIABLE = YES;
28542854
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
2855-
MARKETING_VERSION = 2.2.2;
2855+
MARKETING_VERSION = 2.2.3;
28562856
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
28572857
MTL_FAST_MATH = YES;
28582858
ONLY_ACTIVE_ARCH = YES;
@@ -2914,7 +2914,7 @@
29142914
GCC_WARN_UNUSED_FUNCTION = YES;
29152915
GCC_WARN_UNUSED_VARIABLE = YES;
29162916
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
2917-
MARKETING_VERSION = 2.2.2;
2917+
MARKETING_VERSION = 2.2.3;
29182918
MTL_ENABLE_DEBUG_INFO = NO;
29192919
MTL_FAST_MATH = YES;
29202920
OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";

Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"repositoryURL": "https://github.com/cryptomator/cloud-access-swift.git",
3434
"state": {
3535
"branch": null,
36-
"revision": "5e089b48d0dafe15f92c199dc82bbda0aa5cfc91",
37-
"version": "1.2.2"
36+
"revision": "0bdd40641ef409e46dab8e70be7ef3d9cc76309e",
37+
"version": "1.2.3"
3838
}
3939
},
4040
{

SharedResources/bn.lproj/Localizable.strings

+36-1
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,48 @@
4040
"addVault.createNewVault.setVaultName.error.emptyVaultName" = "ভোল্ট এর নাম খালি হতে পারবে না।";
4141
"addVault.createNewVault.chooseCloud.header" = "ভোল্ট এর এনক্রিপ্টেড ফাইলগুলো ক্রিপ্টোমেটর কোথায় সংরক্ষণ করবে?";
4242
"addVault.createNewVault.chooseFolder.error.vaultNameCollision" = "\"%@\" নামটি এখানে ইতিমধ্যে বিদ্যমান। অন্য একটি ভোল্ট নাম বা স্থান নির্বাচন করুন।";
43-
"addVault.createNewVault.password.confirmPassword.alert.message" = "সতর্কতা: আপনি যদি আপনার পাসওয়ার্ড ভুলে যান, তাহলে পাসওয়ার্ডটি পুনরুদ্ধার করার কোনো উপায় থাকবে না।";
43+
"addVault.createNewVault.detectedMasterkey.text" = "ক্রিপ্টোমেটর এখানে একটি বিদ্যমান ভোল্ট সনাক্ত করেছে. \nতাই নতুন ভোল্ট তৈরি করতে, পিছনে ফিরে যান এবং অন্য একটি ফোল্ডার পছন্দ করুন.";
44+
"addVault.createNewVault.password.enterPassword.header" = "একটি নতুন পাসওয়ার্ড লিখুন.";
45+
"addVault.createNewVault.password.confirmPassword.header" = "নতুন পাসওয়ার্ডটি নিশ্চিত করুন.";
46+
"addVault.createNewVault.password.confirmPassword.alert.title" = "পাসওয়ার্ডটি নিশ্চিত করবেন?";
47+
"addVault.createNewVault.password.confirmPassword.alert.message" = "সতর্কতা: আপনি যদি আপনার পাসওয়ার্ড ভুলে যান, তাহলে পাসওয়ার্ডটি পুনরুদ্ধার করার কোনো উপায় থাকবে না.";
48+
"addVault.createNewVault.password.error.emptyPassword" = "পাসওয়ার্ড খালি থাকতে পারবেনা.";
49+
"addVault.createNewVault.password.error.nonMatchingPasswords" = "পাসওয়ার্ড মিলছে না.";
50+
"addVault.createNewVault.password.error.tooShortPassword" = "পাসওয়ার্ডে কমপক্ষে ৮টি অক্ষর থাকতে হবে.";
51+
"addVault.createNewVault.progress" = "ভোল্ট তৈরি হচ্ছে…";
4452
"addVault.openExistingVault.title" = "বিদ্যমান কোনো ভোল্ট খুলুন";
53+
"addVault.openExistingVault.chooseCloud.header" = "ভোল্টটি কোথায় রয়েছে?";
54+
"addVault.openExistingVault.detectedMasterkey.text" = "ক্রিপ্টোমেটর \"%@\" ভোল্টটি সনাক্ত করেছে.\nআপনি কি ভোল্টটি যুক্ত করতে চান?";
55+
"addVault.openExistingVault.detectedMasterkey.add" = "এই ভোল্টটি যুক্ত করুন";
56+
"addVault.openExistingVault.password.footer" = "\"%@\" এর জন্য পাসওয়ার্ড প্রবেশ করান.";
57+
"addVault.openExistingVault.progress" = "ভোল্ট যুক্ত হচ্ছে…";
58+
"addVault.success.info" = "সফলভাবে \"%@\" ভোল্টটি যুক্ত হয়েছে.\nফাইলস আ্যপ এর মাধ্যমে ভোল্টটি ব্যবহার করুন.";
59+
"addVault.success.footer" = "ক্রিপ্টোমেটর ফাইলস আ্যপে স্বয়ংক্রিয় করুন, আপনি যদি সেটা না করে থাকেন.";
60+
61+
"biometryType.faceID" = "ফেইস আইডি";
62+
"biometryType.touchID" = "Touch ID";
63+
64+
"changePassword.error.invalidOldPassword" = "বর্তমান পাসওয়ার্ডটি ভুল. আবার চেষ্টা করুন.";
65+
"changePassword.header.currentPassword.title" = "বর্তমান পাসওয়ার্ডটি প্রবেশ করান.";
66+
"changePassword.header.newPassword.title" = "একটি নতুন পাসওয়ার্ড লিখুন.";
67+
"changePassword.header.newPasswordConfirmation.title" = "নতুন পাসওয়ার্ডটি নিশ্চিত করুন.";
68+
"changePassword.progress" = "পাসওয়ার্ড পরিবর্তিত হচ্ছে…";
69+
70+
"chooseFolder.emptyFolder.footer" = "ফোল্ডার খালি";
71+
"chooseFolder.createNewFolder.header.title" = "ফোল্ডারটির জন্য একটি নাম পছন্দ করুন.";
72+
"chooseFolder.createNewFolder.cells.name" = "ফোল্ডার এর নাম";
73+
"chooseFolder.createNewFolder.error.emptyFolderName" = "ফোল্ডার এর নাম খালি থাকতে পারবে না.";
74+
"chooseFolder.createNewFolder.progress" = "ফোল্ডার তৈরি হচ্ছে…";
75+
76+
"cloudProvider.error.itemNotFound" = "\"%@\" খুজে পাওয়া যায়নি.";
77+
"cloudProvider.error.itemAlreadyExists" = "\"%@\" ইতিমধ্যে বিদ্যমান.";
78+
"cloudProvider.error.itemTypeMismatch" = "\"%@\" এর একটি অপ্রত্যাশিত আইটেম রয়েছে.";
4579
"fileProvider.error.unlockButton" = "আনলক করুন";
4680
"purchase.retry.button" = "পুনরায় চেষ্টা করুন";
4781

4882
"settings.title" = "সেটিংস";
4983

5084
"unlockVault.button.unlock" = "আনলক করুন";
85+
"unlockVault.password.footer" = "\"%@\" এর জন্য পাসওয়ার্ড প্রবেশ করান.";
5186
"vaultDetail.button.moveVault" = "স্থানান্তর করুন";
5287
"vaultDetail.button.renameVault" = "নাম পরিবর্তন করুন";
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
"common.button.change" = "تغییر";
2+
"common.button.next" = "بعدی";
3+
"fileProvider.error.unlockButton" = "بازکردن قفل";
4+
5+
"unlockVault.button.unlock" = "بازکردن قفل";

SharedResources/he.lproj/Localizable.strings

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"common.button.enable" = "הפעל";
1919
"common.button.next" = "המשך";
2020
"common.button.ok" = "אישור";
21-
"common.button.remove" = "מחק";
21+
"common.button.remove" = "הסר";
2222
"common.cells.password" = "סיסמה";
2323
"common.cells.url" = "כתובת URL";
2424
"common.cells.username" = "שם משתמש";
+12-118
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,15 @@
1-
/*
2-
Localizable.strings
3-
Cryptomator
1+
"common.button.cancel" = "Odustani";
2+
"common.button.change" = "Promijeni";
3+
"common.button.done" = "Gotovo";
4+
"common.button.next" = "Sljedeći";
45

5-
Copyright © 2021 Skymatic GmbH. All rights reserved.
6-
*/
6+
"addVault.title" = "Dodaj trezor";
7+
"addVault.createNewVault.title" = "Napravi novi trezor";
8+
"addVault.createNewVault.setVaultName.cells.name" = "Ime trezora";
9+
"addVault.createNewVault.chooseCloud.header" = "Gdje bi Cryptomator trebao pohraniti šifrirane datoteke Vašeg trezora?";
10+
"addVault.openExistingVault.title" = "Otvori postojeći trezor";
11+
"fileProvider.error.unlockButton" = "Otključaj";
712

8-
"common.alert.error.title" = "Error";
9-
"common.button.cancel" = "Cancel";
10-
"common.button.choose" = "Choose";
11-
"common.button.confirm" = "Confirm";
12-
"common.button.create" = "Create";
13-
"common.button.createFolder" = "Create Folder";
14-
"common.button.done" = "Done";
15-
"common.button.edit" = "Edit";
16-
"common.button.next" = "Next";
17-
"common.button.ok" = "OK";
18-
"common.button.remove" = "Remove";
19-
"common.button.signOut" = "Sign Out";
20-
"common.cells.password" = "Password";
21-
"common.cells.url" = "URL";
22-
"common.cells.username" = "Username";
23-
"common.footer.learnMore" = "Learn more.";
13+
"unlockVault.button.unlock" = "Otključaj";
2414

25-
"accountList.header.title" = "Authentications";
26-
"accountList.emptyList.message" = "Tap here to add an account";
27-
"accountList.signOut.alert.title" = "Remove Associated Vaults?";
28-
"accountList.signOut.alert.message" = "By signing out, all associated vaults will be removed from the vault list. No encrypted data will be deleted. You can sign in again and re-add the vaults later.";
29-
30-
"addVault.title" = "Add Vault";
31-
"addVault.createNewVault.title" = "Create New Vault";
32-
"addVault.createNewVault.setVaultName.header.title" = "Choose a name for the vault.";
33-
"addVault.createNewVault.setVaultName.cells.name" = "Vault Name";
34-
"addVault.createNewVault.setVaultName.error.emptyVaultName" = "Vault name cannot be empty.";
35-
"addVault.createNewVault.setVaultName.error.invalidInput" = "Vault name should not contain \\ / : * ? \" < > | or end with a period.";
36-
"addVault.createNewVault.chooseCloud.header" = "Where should Cryptomator store the encrypted files of your vault?";
37-
"addVault.createNewVault.chooseFolder.error.vaultNameCollision" = "\"%@\" already exists at this location. Choose a different vault name or location.";
38-
"addVault.createNewVault.detectedMasterkey.text" = "Cryptomator detected an existing vault at this location.\nIn order to create a new vault, please go back and choose a different folder.";
39-
"addVault.createNewVault.password.enterPassword.header" = "Enter a new password.";
40-
"addVault.createNewVault.password.confirmPassword.header" = "Confirm the new password.";
41-
"addVault.createNewVault.password.confirmPassword.alert.title" = "Confirm Password?";
42-
"addVault.createNewVault.password.confirmPassword.alert.message" = "IMPORTANT: If you forget your password, there is no way to recover your data.";
43-
"addVault.createNewVault.password.error.emptyPassword" = "Password cannot be empty.";
44-
"addVault.createNewVault.password.error.nonMatchingPasswords" = "Passwords do not match.";
45-
"addVault.createNewVault.password.error.tooShortPassword" = "Password must contain at least 8 characters.";
46-
"addVault.openExistingVault.title" = "Open Existing Vault";
47-
"addVault.openExistingVault.chooseCloud.header" = "Where is the vault located?";
48-
"addVault.openExistingVault.detectedMasterkey.text" = "Cryptomator detected the vault \"%@\".\nWould you like to add this vault?";
49-
"addVault.openExistingVault.detectedMasterkey.add" = "Add This Vault";
50-
"addVault.openExistingVault.password.footer" = "Enter password for \"%@\"";
51-
"addVault.success.info" = "Successfully added vault \"%@\".\nAccess this vault via the Files app.";
52-
"addVault.success.openFilesApp" = "Open Files App";
53-
"addVault.success.footer" = "If you haven't already, enable Cryptomator in the Files app.";
54-
55-
"biometryType.faceID" = "Face ID";
56-
"biometryType.touchID" = "Touch ID";
57-
58-
"chooseFolder.emptyFolder.footer" = "Folder is Empty";
59-
"chooseFolder.createNewFolder.header.title" = "Choose a name for the folder.";
60-
"chooseFolder.createNewFolder.cells.name" = "Folder Name";
61-
"chooseFolder.createNewFolder.error.emptyFolderName" = "Folder name cannot be empty.";
62-
63-
"cloudProvider.error.itemNotFound" = "\"%@\" could not be found.";
64-
"cloudProvider.error.itemAlreadyExists" = "\"%@\" already exists.";
65-
"cloudProvider.error.itemTypeMismatch" = "\"%@\" has an unexpected item type.";
66-
"cloudProvider.error.parentFolderDoesNotExist" = "Parent folder \"%@\" does not exist.";
67-
"cloudProvider.error.pageTokenInvalid" = "Fetching contents of directory could not be continued.";
68-
"cloudProvider.error.quotaInsufficient" = "Your storage has insufficient space.";
69-
"cloudProvider.error.unauthorized" = "Unable to perform unauthorized operation.";
70-
"cloudProvider.error.noInternetConnection" = "Internet connection needed for this operation.";
71-
72-
"cloudProviderType.localFileSystem" = "Other File Provider";
73-
74-
"localFileSystemAuthentication.createNewVault.header" = "In the next screen, choose the storage location for your new vault.";
75-
"localFileSystemAuthentication.createNewVault.button" = "Select Storage Location";
76-
"localFileSystemAuthentication.createNewVault.error.detectedExistingVault" = "A vault already exists at this location. Please try again with a different storage location.";
77-
"localFileSystemAuthentication.openExistingVault.header" = "In the next screen, choose the folder of your existing vault.";
78-
"localFileSystemAuthentication.openExistingVault.button" = "Select Vault Folder";
79-
"localFileSystemAuthentication.openExistingVault.error.noVaultFound" = "The selected folder is not a vault. Please try again with a different folder.";
80-
81-
"onboarding.title" = "Welcome";
82-
"onboarding.info" = "Thanks for choosing Cryptomator to protect your files. To get started, go to the main app and add a vault.";
83-
"onboarding.openCryptomator.button" = "Open Cryptomator";
84-
85-
"settings.title" = "Settings";
86-
"settings.aboutCryptomator" = "About Cryptomator";
87-
"settings.aboutCryptomator.title" = "Version %@ (%@)";
88-
"settings.sendLogFile" = "Send Log File";
89-
90-
"unlockVault.button.unlock" = "Unlock";
91-
"unlockVault.button.unlockVia" = "Unlock via %@";
92-
"unlockVault.password.footer" = "Enter password for \"%@\"";
93-
"unlockVault.enableBiometricalUnlock.switch" = "Enable %@";
94-
"unlockVault.enableBiometricalUnlock.footer" = "Instead of unlocking your vault with your password, you can unlock it via %@.";
95-
"unlockVault.evaluatePolicy.reason" = "Unlock your vault";
96-
97-
"untrustedTLSCertificate.title" = "Invalid TLS Certificate";
98-
"untrustedTLSCertificate.message" = "The TLS Certificate of \"%@\" is invalid. Do you want to trust it anyway?\n\n SHA-256: %@";
99-
"untrustedTLSCertificate.add" = "Trust";
100-
"untrustedTLSCertificate.dismiss" = "Don't Trust";
101-
102-
"vaultDetail.button.lock" = "Lock Now";
103-
"vaultDetail.button.removeVault" = "Remove from Vault List";
104-
"vaultDetail.disabledBiometricalUnlock.footer" = "If you enable %@, your vault password will be stored in the iOS keychain.";
105-
"vaultDetail.enabledBiometricalUnlock.footer" = "Your vault password will only be required if %@ authentication fails.";
106-
"vaultDetail.info.footer.accessVault" = "Access the vault via the Files app.";
107-
"vaultDetail.info.footer.accountInfo" = "Logged in as %@ via %@.";
108-
"vaultDetail.locked.footer" = "Your vault is currently locked.";
109-
"vaultDetail.removeVault.footer" = "This will only remove the vault from the vault list and not delete any encrypted files.";
110-
"vaultDetail.unlocked.footer" = "Your vault is currently unlocked in the Files app.";
111-
"vaultDetail.unlockVault.footer" = "Enter password for \"%@\" to store it in the iOS keychain and to enable %@.";
112-
113-
"vaultList.header.title" = "Vaults";
114-
"vaultList.emptyList.message" = "Tap here to add a vault";
115-
"vaultList.remove.alert.title" = "Remove Vault?";
116-
"vaultList.remove.alert.message" = "This will only remove the vault from the vault list. No encrypted data will be deleted. You can re-add the vault later.";
117-
118-
"vaultProviderFactory.error.unsupportedVaultConfig" = "Vault configuration is unsupported. Please make sure that you are running the latest version of Cryptomator.";
119-
"vaultProviderFactory.error.unsupportedVaultVersion" = "Vault version is unsupported. This vault has been created with an older or newer version of Cryptomator.";
120-
121-
"webDAVAuthentication.title" = "WebDAV";
15+
"vaultDetail.button.changeVaultPassword" = "Promijeni lozinku";

fastlane/changelog.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
- Fixed missing vaults in Files app (#176)
2-
- Fixed missing shortcuts in Google Drive (#201)
1+
- Fixed empty folder inside a shortcut in Google Drive (#204)
2+
- Fixed conflict folder when creating multiple folders in Google Drive, OneDrive, and pCloud
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
- Fehlende Tresore in der App „Dateien“ behoben (#176)
2-
- Fehlende Shortcuts in Google Drive behoben (#201)
1+
- Leeren Ordner innerhalb eines Shortcuts in Google Drive behoben (#204)
2+
- Konfliktordner beim Erstellen mehrerer Ordner in Google Drive, OneDrive und pCloud behoben
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
- Fixed missing vaults in Files app (#176)
2-
- Fixed missing shortcuts in Google Drive (#201)
1+
- Fixed empty folder inside a shortcut in Google Drive (#204)
2+
- Fixed conflict folder when creating multiple folders in Google Drive, OneDrive, and pCloud

0 commit comments

Comments
 (0)