Skip to content

Commit

Permalink
Merge branch 'develop' into release/2.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
tobihagemann committed May 23, 2022
2 parents c0ca351 + d8cf6e7 commit a86f52b
Show file tree
Hide file tree
Showing 21 changed files with 503 additions and 13 deletions.
3 changes: 3 additions & 0 deletions Cryptomator.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@
74397A852832A09B00CB9410 /* sw-TZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sw-TZ"; path = "sw-TZ.lproj/Localizable.strings"; sourceTree = "<group>"; };
7460FFED26FB6C100018BCC4 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/Localizable.strings; sourceTree = "<group>"; };
7460FFEE26FCC6FC0018BCC4 /* OnboardingNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingNavigationController.swift; sourceTree = "<group>"; };
74626665283BD2D20070924B /* zh-HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-HK"; path = "zh-HK.lproj/Localizable.strings"; sourceTree = "<group>"; };
7469AD99266E26B0000DCD45 /* URL+Zip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+Zip.swift"; sourceTree = "<group>"; };
747C35162762A3F500E4CA28 /* AttributedTextHeaderFooterViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributedTextHeaderFooterViewModel.swift; sourceTree = "<group>"; };
74833F9D27E4CCD800C1C5F0 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2114,6 +2115,7 @@
tr,
"zh-Hans",
"zh-Hant",
"zh-HK",
);
mainGroup = 4A5E5B202453119100BD6298;
packageReferences = (
Expand Down Expand Up @@ -2795,6 +2797,7 @@
74267A1C26A5799F004C61BC /* tr */,
74267A1D26A579A4004C61BC /* zh-Hans */,
74397A842832A05E00CB9410 /* zh-Hant */,
74626665283BD2D20070924B /* zh-HK */,
);
name = Localizable.strings;
sourceTree = "<group>";
Expand Down
4 changes: 4 additions & 0 deletions SharedResources/de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"common.button.cancel" = "Abbrechen";
"common.button.change" = "Ändern";
"common.button.choose" = "Auswählen";
"common.button.clear" = "Löschen";
"common.button.close" = "Schließen";
"common.button.confirm" = "Bestätigen";
"common.button.create" = "Erstellen";
Expand Down Expand Up @@ -97,6 +98,8 @@
"fileProvider.error.defaultLock.title" = "Entsperren erforderlich";
"fileProvider.error.defaultLock.message" = "Um auf den Inhalt deines Tresors zuzugreifen und ihn anzuzeigen, muss dieser entsperrt werden.";
"fileProvider.error.unlockButton" = "Entsperren";
"fileProvider.clearFileFromCache.title" = "Datei aus Zwischenspeicher entfernen";
"fileProvider.clearFileFromCache.message" = "Dies entfernt nur die lokale Datei von Ihrem Gerät und löscht nicht die Datei in der Cloud.";
"fileProvider.uploadProgress.connecting" = "Verbindung wird hergestellt …";
"fileProvider.uploadProgress.missing" = "Der Fortschritt konnte nicht ermittelt werden. Möglicherweise läuft der Upload noch im Hintergrund.";
"fileProvider.uploadProgress.title" = "Wird hochgeladen …";
Expand Down Expand Up @@ -263,3 +266,4 @@
"webDAVAuthenticator.error.untrustedCertificate" = "Das Zertifikat dieses Servers ist nicht vertrauenswürdig. Eventuell musst du diese WebDAV-Verbindung erneut hinzufügen.";

"Retry Upload" = "Upload erneut versuchen";
"Clear from Cache" = "Aus Zwischenspeicher entfernen";
4 changes: 4 additions & 0 deletions SharedResources/el.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"common.button.cancel" = "Ακύρωση";
"common.button.change" = "Αλλαγή";
"common.button.choose" = "Επιλογή";
"common.button.clear" = "Εκκαθάριση";
"common.button.close" = "Κλείσιμο";
"common.button.confirm" = "Επιβεβαίωση";
"common.button.create" = "Δημιουργία";
Expand Down Expand Up @@ -97,6 +98,8 @@
"fileProvider.error.defaultLock.title" = "Απαιτείται Ξεκλείδωμα";
"fileProvider.error.defaultLock.message" = "Για να αποκτήσετε πρόσβαση και να εμφανίσετε τα περιεχόμενα της κρύπτη σας, πρέπει να ξεκλειδωθεί.";
"fileProvider.error.unlockButton" = "Ξεκλείδωμα";
"fileProvider.clearFileFromCache.title" = "Εκκαθάριση αρχείου από την προσωρινή μνήμη";
"fileProvider.clearFileFromCache.message" = "Αυτό καταργεί μόνο το τοπικό αρχείο από τη συσκευή σας και δεν διαγράφει το αρχείο στο cloud.";
"fileProvider.uploadProgress.connecting" = "Σύνδεση…";
"fileProvider.uploadProgress.message" = "Τρέχουσα Πρόοδος: %@%\n\nΑν παρατηρήσετε ότι η πρόοδος μεταφόρτωσης έχει κολλήσει, μπορείτε να δοκιμάσετε ξανά τη μεταφόρτωση.";
"fileProvider.uploadProgress.missing" = "Η πρόοδος δεν μπορεί να καθοριστεί. Μπορεί να εκτελείται στο παρασκήνιο.";
Expand Down Expand Up @@ -264,3 +267,4 @@
"webDAVAuthenticator.error.untrustedCertificate" = "Το πιστοποιητικό αυτού του διακομιστή δεν είναι έμπιστο. Ίσως χρειαστεί να προσθέσετε ξανά αυτή τη σύνδεση WebDAV.";

"Retry Upload" = "Δοκιμάστε ξανά τη μεταφόρτωση";
"Clear from Cache" = "Εκκαθάριση από τη μνήμη Cache";
4 changes: 4 additions & 0 deletions SharedResources/es.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"common.button.cancel" = "Cancelar";
"common.button.change" = "Modificar";
"common.button.choose" = "Seleccionar";
"common.button.clear" = "Borrar";
"common.button.close" = "Cerrar";
"common.button.confirm" = "Confirmar";
"common.button.create" = "Crear";
Expand Down Expand Up @@ -97,6 +98,8 @@
"fileProvider.error.defaultLock.title" = "Desbloqueo requerido";
"fileProvider.error.defaultLock.message" = "Para acceder y mostrar el contenido de su bóveda hay que desbloquearla.";
"fileProvider.error.unlockButton" = "Desbloquear";
"fileProvider.clearFileFromCache.title" = "Borrar archivo de la caché";
"fileProvider.clearFileFromCache.message" = "Esto solo elimina el archivo local de su dispositivo y no lo elimina de la nube.";
"fileProvider.uploadProgress.connecting" = "Conectando…";
"fileProvider.uploadProgress.message" = "Progreso actual: %@\n\nSi nota que el progreso de la carga está atascado, puede volver a intentar la carga.";
"fileProvider.uploadProgress.missing" = "No se pudo determinar el progreso. Puede que todavía se ejecute en segundo plano.";
Expand Down Expand Up @@ -264,3 +267,4 @@
"webDAVAuthenticator.error.untrustedCertificate" = "El certificado de este servidor no es confiable. Es posible que tenga que volver a añadir esta conexión WebDAV.";

"Retry Upload" = "Reintentar carga";
"Clear from Cache" = "Borrar de la caché";
4 changes: 4 additions & 0 deletions SharedResources/fr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"common.button.cancel" = "Annuler";
"common.button.change" = "Modifier";
"common.button.choose" = "Choisir";
"common.button.clear" = "Effacer";
"common.button.close" = "Fermer";
"common.button.confirm" = "Confirmer";
"common.button.create" = "Créer";
Expand Down Expand Up @@ -97,6 +98,8 @@
"fileProvider.error.defaultLock.title" = "Déverrouillage requis";
"fileProvider.error.defaultLock.message" = "Pour accéder et afficher le contenu de votre coffre, il doit être déverrouillé.";
"fileProvider.error.unlockButton" = "Déverrouiller";
"fileProvider.clearFileFromCache.title" = "Effacer le fichier du cache";
"fileProvider.clearFileFromCache.message" = "Cela ne supprime le fichier local que de votre appareil et ne supprime pas le fichier dans le cloud.";
"fileProvider.uploadProgress.connecting" = "Connexion…";
"fileProvider.uploadProgress.message" = "Progression actuelle: %@\n\nSi vous remarquez que la progression de l'envoi est bloquée, vous pouvez recommencer l'envoi.";
"fileProvider.uploadProgress.missing" = "La progression n'a pas pu être déterminée. Il se peut que cela soit encore en cours en arrière-plan.";
Expand Down Expand Up @@ -264,3 +267,4 @@
"webDAVAuthenticator.error.untrustedCertificate" = "Le certificat de ce serveur n'est pas fiable. Vous devrez peut-être ré-ajouter cette connexion WebDAV.";

"Retry Upload" = "Réessayer l'envoi";
"Clear from Cache" = "Effacer du cache";
4 changes: 4 additions & 0 deletions SharedResources/hi.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"common.button.cancel" = "रद्द करें";
"common.button.change" = "बदलें";
"common.button.choose" = "चुनें";
"common.button.clear" = "साफ़ करें";
"common.button.close" = "बंद करें";
"common.button.confirm" = "पुष्टि करें";
"common.button.create" = "बनाएं";
Expand Down Expand Up @@ -83,6 +84,8 @@
"fileProvider.onboarding.info" = "आपके दस्तावेज़ों की सुरक्षा के हेतु क्रिप्टोमेटर का चयन करने के लिए आपका धन्यवाद। शुरू करने के लिए मुख्य ऐप में जाएँ और एक कक्ष तो जोड़ें।";
"fileProvider.onboarding.button.openCryptomator" = "क्रिप्टोमेटर खोलें";
"fileProvider.error.unlockButton" = "अनलॉक करें";
"fileProvider.clearFileFromCache.title" = "कैशे से फ़ाइल साफ़ करें";
"fileProvider.clearFileFromCache.message" = "यह केवल आपके डिवाइस से स्थानीय फ़ाइल को हटाता है और क्लाउड में फ़ाइल को नहीं हटाता";

"localFileSystemAuthentication.createNewVault.header" = "अगले स्क्रीन पर अपने कक्ष के लिए भंडार स्थान का चयन करें।";
"localFileSystemAuthentication.createNewVault.button" = "संग्रहण का स्थान चयन करें";
Expand Down Expand Up @@ -136,3 +139,4 @@
"vaultList.header.title" = "कक्षों का नाम";
"vaultList.emptyList.message" = "कक्ष जोड़ने के लिए यहाँ दबाएँ";
"vaultList.remove.alert.title" = "कक्ष हटाना चाहेंगे?";
"Clear from Cache" = "कैशे से फ़ाइल साफ़ करें";
4 changes: 4 additions & 0 deletions SharedResources/hr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"common.button.cancel" = "Odustani";
"common.button.change" = "Promijeni";
"common.button.choose" = "Odaberi";
"common.button.clear" = "Očisti";
"common.button.close" = "Zatvori";
"common.button.confirm" = "Potvrdi";
"common.button.create" = "Izradi";
Expand Down Expand Up @@ -97,6 +98,8 @@
"fileProvider.error.defaultLock.title" = "Potrebno je otključanje";
"fileProvider.error.defaultLock.message" = "Za pristup i prikaz sadržaja Vašeg trezora, on mora biti otključan.";
"fileProvider.error.unlockButton" = "Otključaj";
"fileProvider.clearFileFromCache.title" = "Očisti datoteku iz predmemorije";
"fileProvider.clearFileFromCache.message" = "Ovo samo uklanja lokalnu datoteku s vašeg uređaja, a ne briše datoteku u oblaku.";
"fileProvider.uploadProgress.connecting" = "Spajanje…";
"fileProvider.uploadProgress.message" = "Trenutni napredak: %@\n\nAko primijetite da je napredak učitavanja zapeo, možete ponovno pokušati s prijenosom.";
"fileProvider.uploadProgress.missing" = "Napredak se ne može utvrditi. Možda još uvijek radi u pozadini.";
Expand Down Expand Up @@ -264,3 +267,4 @@
"webDAVAuthenticator.error.untrustedCertificate" = "Certifikat ovog poslužitelja nije pouzdan. Možda ćete morati ponovno dodati ovu WebDAV vezu.";

"Retry Upload" = "Ponovno pokušaj prijenos";
"Clear from Cache" = "Očisti iz predmemorije";
15 changes: 14 additions & 1 deletion SharedResources/id.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"common.button.cancel" = "Batalkan";
"common.button.change" = "Ganti";
"common.button.choose" = "Pilih";
"common.button.clear" = "Hapus";
"common.button.close" = "Tutup";
"common.button.confirm" = "Konfirmasi";
"common.button.create" = "Buat";
Expand Down Expand Up @@ -97,6 +98,13 @@
"fileProvider.error.defaultLock.title" = "Kunci Perlu Dibuka";
"fileProvider.error.defaultLock.message" = "Kunci perlu dibuka untuk mengakses dan menunjukkan isi vault Anda.";
"fileProvider.error.unlockButton" = "Buka Kunci";
"fileProvider.clearFileFromCache.title" = "Hapus File dari Cache";
"fileProvider.clearFileFromCache.message" = "Ini hanya akan menghapus file lokal di perangkat Anda dan tidak akan menghapus file yang ada di cloud.";
"fileProvider.uploadProgress.connecting" = "Menyambungkan…";
"fileProvider.uploadProgress.message" = "Kemajuan Proses Saat Ini: %@\n\nJika proses Upload tidak mengalami peningkatan, Anda bisa mencoba unggah kembali.";
"fileProvider.uploadProgress.missing" = "Kemajuan proses tidak dapat ditentukan. Kemungkinan masih berjalan di latar belakang.";
"fileProvider.uploadProgress.title" = "Mengunggah…";
"fileProvider.uploadProgress.missingDomainError" = "Tidak dapat menemukan domain.";

"keepUnlocked.alert.title" = "Kunci Vault?";
"keepUnlocked.alert.message" = "Perubahan berikut memerlukan vault Anda dalam kondisi terbuka agar bisa diterapkan.";
Expand Down Expand Up @@ -151,6 +159,8 @@
"purchase.restorePurchase.fullVersionFound.alert.title" = "Pemulihan Berhasil";
"purchase.restorePurchase.fullVersionNotFound.alert.title" = "Versi Lengkap Tidak Tersedia";
"purchase.restorePurchase.fullVersionNotFound.alert.message" = "Kami tidak dapat menemukan versi lengkap yang sudah dibeli untuk dipulihkan. Silahkan coba opsi lain.";
"purchase.restorePurchase.eligibleForUpgrade.alert.title" = "Berhak untuk Peningkatan";
"purchase.restorePurchase.eligibleForUpgrade.alert.message" = "Sepertinya Anda mencoba melakukan peningkatan dari versi Cryptomator yang lebih lama. Jika demikian, silakan pilih opsi \"Penawaran Peningkatan\".";
"purchase.retry.button" = "Coba lagi";
"purchase.retry.footer" = "Tidak dapat memuat produk yang tersedia.";
"purchase.title" = "Buka Versi Lengkap";
Expand Down Expand Up @@ -201,7 +211,7 @@
"untrustedTLSCertificate.add" = "Percayai";
"untrustedTLSCertificate.dismiss" = "Jangan Percaya";

"upgrade.title" = "Penawaran Upgrade";
"upgrade.title" = "Penawaran Peningkatan";
"upgrade.notEligible.alert.title" = "Upgrade gagal";
"upgrade.notEligible.alert.message" = "Cryptomator tidak bisa menemukan versi yang lebih lama terpasang di perangkat Anda saat ini. Jika Anda sudah membelinya, silahkan download kembali melalui App Store dan coba kembali.";
"upgrade.info" = "Terima kasih telah mempercayai Cryptomator sejak versi pertama. Sebagai pengguna setia, Anda berhak mendapatkan upgrade gratis.";
Expand Down Expand Up @@ -255,3 +265,6 @@

"webDAVAuthenticator.error.unsupportedProtocol" = "Server tampaknya tidak kompatibel dengan WebDAV. Harap periksa apakah Anda telah menggunakan URL yang benar.";
"webDAVAuthenticator.error.untrustedCertificate" = "Sertifikat server ini tidak tepercaya. Anda mungkin harus menambahkan kembali koneksi WebDAV ini.";

"Retry Upload" = "Unggah Kembali";
"Clear from Cache" = "Hapus dari Cache";
4 changes: 4 additions & 0 deletions SharedResources/it.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"common.button.cancel" = "Annulla";
"common.button.change" = "Aggiorna";
"common.button.choose" = "Scegli";
"common.button.clear" = "Cancella";
"common.button.close" = "Chiudi";
"common.button.confirm" = "Conferma";
"common.button.create" = "Crea";
Expand Down Expand Up @@ -97,6 +98,8 @@
"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";
"fileProvider.clearFileFromCache.title" = "Cancella file dalla cache";
"fileProvider.clearFileFromCache.message" = "Questo rimuove solo il file locale dal dispositivo e non elimina il file nel cloud.";
"fileProvider.uploadProgress.connecting" = "Connessione…";
"fileProvider.uploadProgress.missing" = "Non è stato possibile determinare i progressi, che potrebbero essere ancora in esecuzione in background.";
"fileProvider.uploadProgress.title" = "Caricamento…";
Expand Down Expand Up @@ -263,3 +266,4 @@
"webDAVAuthenticator.error.untrustedCertificate" = "Il certificato di questo server non è attendibile. Potrebbe essere necessario aggiungere nuovamente questa connessione WebDAV.";

"Retry Upload" = "Riprova A Caricare";
"Clear from Cache" = "Elimina dalla cache";
11 changes: 11 additions & 0 deletions SharedResources/ja.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"common.button.cancel" = "キャンセル";
"common.button.change" = "変更";
"common.button.choose" = "選択";
"common.button.clear" = "明らか";
"common.button.close" = "閉じる";
"common.button.confirm" = "確認";
"common.button.create" = "作成";
Expand Down Expand Up @@ -97,6 +98,13 @@
"fileProvider.error.defaultLock.title" = "ロック解除が必要です";
"fileProvider.error.defaultLock.message" = "保管庫の内容にアクセスして表示するには、ロックを解除する必要があります。";
"fileProvider.error.unlockButton" = "解錠";
"fileProvider.clearFileFromCache.title" = "キャッシュからファイルをクリア";
"fileProvider.clearFileFromCache.message" = "これにより、デバイスからローカルファイルが削除されるだけで、クラウド内のファイルは削除されません。";
"fileProvider.uploadProgress.connecting" = "接続する...";
"fileProvider.uploadProgress.message" = "現在の進行:%@\n\nアップロードの進行状況が止まっていることに気付いた場合は、アップロードを再試行できます。";
"fileProvider.uploadProgress.missing" = "進捗状況を確認できませんでした。 まだバックグラウンドで実行されている可能性があります。";
"fileProvider.uploadProgress.title" = "アップロード中";
"fileProvider.uploadProgress.missingDomainError" = "ドメインが見つかりませんでした。";

"keepUnlocked.alert.title" = "金庫を施錠しますか?";
"keepUnlocked.alert.message" = "この変更を適用するには金庫を施錠する必要があります。";
Expand Down Expand Up @@ -257,3 +265,6 @@

"webDAVAuthenticator.error.unsupportedProtocol" = "サーバーに WebDAV との互換性がありません。正しい URL を使用しているか確認してください";
"webDAVAuthenticator.error.untrustedCertificate" = "このサーバーの証明書は信頼されていません。WebDAV 接続を再追加する必要があります。";

"Retry Upload" = "アップロードを再試行";
"Clear from Cache" = "キャッシュからクリア";
11 changes: 11 additions & 0 deletions SharedResources/nl.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"common.button.cancel" = "Annuleren";
"common.button.change" = "Wijzig";
"common.button.choose" = "Kies";
"common.button.clear" = "Wissen";
"common.button.close" = "Sluiten";
"common.button.confirm" = "Bevestig";
"common.button.create" = "Maak";
Expand Down Expand Up @@ -97,6 +98,13 @@
"fileProvider.error.defaultLock.title" = "Ontgrendeling vereist";
"fileProvider.error.defaultLock.message" = "Om toegang te krijgen tot de inhoud van je kluis, moet deze worden ontgrendeld.";
"fileProvider.error.unlockButton" = "Ontgrendel";
"fileProvider.clearFileFromCache.title" = "Wissen uit cache";
"fileProvider.clearFileFromCache.message" = "Dit verwijdert alleen het lokale bestand van uw apparaat en verwijdert het bestand in de cloud niet.";
"fileProvider.uploadProgress.connecting" = "Verbinden…";
"fileProvider.uploadProgress.message" = "Huidige vooruitgang: %@\n\n Als je merkt dat de upload vastzit, dan kan je deze opnieuw proberen.";
"fileProvider.uploadProgress.missing" = "De vooruitgang kon niet worden bepaald. Misschien wordt deze nog steeds op de achtergrond uitgevoerd.";
"fileProvider.uploadProgress.title" = "Uploaden…";
"fileProvider.uploadProgress.missingDomainError" = "Kan domein niet vinden.";

"keepUnlocked.alert.title" = "Kluis vergrendelen?";
"keepUnlocked.alert.message" = "Deze wijziging vereist dat je kluis vergrendeld is om van kracht te worden.";
Expand Down Expand Up @@ -257,3 +265,6 @@

"webDAVAuthenticator.error.unsupportedProtocol" = "Server lijkt niet compatibel te zijn met WebDAV. Controleer of je de juiste URL hebt gebruikt.";
"webDAVAuthenticator.error.untrustedCertificate" = "Certificaat van deze server is niet vertrouwd. Je moet mogelijk deze WebDAV verbinding opnieuw toevoegen.";

"Retry Upload" = "Upload nogmaals proberen";
"Clear from Cache" = "Wissen uit cache";
Loading

0 comments on commit a86f52b

Please sign in to comment.