diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml index e8cc24058..3141d0ecd 100644 --- a/main/buildkit/pom.xml +++ b/main/buildkit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.2 + 1.5.3 buildkit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index e8e0d078b..2c2316047 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.2 + 1.5.3 commons Cryptomator Commons diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/UiTheme.java b/main/commons/src/main/java/org/cryptomator/common/settings/UiTheme.java index 70511554f..a8b66c65c 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/UiTheme.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/UiTheme.java @@ -1,8 +1,8 @@ package org.cryptomator.common.settings; public enum UiTheme { - LIGHT("Light"), - DARK("Dark"); + LIGHT("preferences.general.theme.light"), + DARK("preferences.general.theme.dark"); // CUSTOM("Custom (%s)"); private String displayName; diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 242c41b84..ac0c6428c 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.2 + 1.5.3 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index 642dcfe98..a408883c0 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.2 + 1.5.3 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index fc9e8e3f5..a3f7a47b6 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.5.2 + 1.5.3 pom Cryptomator @@ -24,7 +24,7 @@ UTF-8 - 1.9.9 + 1.9.10 2.2.2 1.2.3 1.1.14 @@ -79,6 +79,11 @@ + + org.cryptomator + siv-mode + 1.4.0 + org.cryptomator cryptofs diff --git a/main/ui/pom.xml b/main/ui/pom.xml index d305cbee9..c1637aab9 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.2 + 1.5.3 ui Cryptomator GUI diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java index 85c8630b0..1d4ec34ac 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java @@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; import javax.inject.Named; import java.util.Optional; +import java.util.ResourceBundle; import java.util.concurrent.ExecutorService; @PreferencesScoped @@ -35,6 +36,7 @@ public class GeneralPreferencesController implements FxController { private final ObjectProperty selectedTabProperty; private final LicenseHolder licenseHolder; private final ExecutorService executor; + private final ResourceBundle resourceBundle; public ChoiceBox themeChoiceBox; public CheckBox startHiddenCheckbox; public CheckBox debugModeCheckbox; @@ -44,20 +46,21 @@ public class GeneralPreferencesController implements FxController { public RadioButton nodeOrientationRtl; @Inject - GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional autoStartStrategy, ObjectProperty selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor) { + GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional autoStartStrategy, ObjectProperty selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle) { this.settings = settings; this.trayMenuSupported = trayMenuSupported; this.autoStartStrategy = autoStartStrategy; this.selectedTabProperty = selectedTabProperty; this.licenseHolder = licenseHolder; this.executor = executor; + this.resourceBundle = resourceBundle; } @FXML public void initialize() { themeChoiceBox.getItems().addAll(UiTheme.values()); themeChoiceBox.valueProperty().bindBidirectional(settings.theme()); - themeChoiceBox.setConverter(new UiThemeConverter()); + themeChoiceBox.setConverter(new UiThemeConverter(resourceBundle)); startHiddenCheckbox.selectedProperty().bindBidirectional(settings.startHidden()); @@ -116,9 +119,15 @@ public class GeneralPreferencesController implements FxController { private static class UiThemeConverter extends StringConverter { + private final ResourceBundle resourceBundle; + + UiThemeConverter(ResourceBundle resourceBundle) { + this.resourceBundle = resourceBundle; + } + @Override public String toString(UiTheme impl) { - return impl.getDisplayName(); + return resourceBundle.getString(impl.getDisplayName()); } @Override diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java index 9ed5ba2ea..1556d0f74 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java @@ -82,7 +82,7 @@ public class MountOptionsController implements FxController { // mount point options: mountPoint.selectedToggleProperty().addListener(this::toggleMountPoint); driveLetterSelection.getItems().addAll(windowsDriveLetters.getAllDriveLetters()); - driveLetterSelection.setConverter(new WinDriveLetterLabelConverter(windowsDriveLetters)); + driveLetterSelection.setConverter(new WinDriveLetterLabelConverter(windowsDriveLetters, resourceBundle)); driveLetterSelection.setValue(vault.getVaultSettings().winDriveLetter().get()); if (vault.getVaultSettings().usesIndividualMountPath().get()) { @@ -144,15 +144,17 @@ public class MountOptionsController implements FxController { private static class WinDriveLetterLabelConverter extends StringConverter { private final Set occupiedDriveLetters; + private final ResourceBundle resourceBundle; - WinDriveLetterLabelConverter(WindowsDriveLetters windowsDriveLetters) { + WinDriveLetterLabelConverter(WindowsDriveLetters windowsDriveLetters, ResourceBundle resourceBundle) { this.occupiedDriveLetters = windowsDriveLetters.getOccupiedDriveLetters(); + this.resourceBundle = resourceBundle; } @Override public String toString(String driveLetter) { if (occupiedDriveLetters.contains(driveLetter)) { - return driveLetter + ": (occupied)"; // TODO localize? + return driveLetter + ": (" + resourceBundle.getString("vaultOptions.mount.winDriveLetterOccupied") + ")"; } else { return driveLetter + ":"; } diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css index f9b113c77..6f8022beb 100644 --- a/main/ui/src/main/resources/css/dark_theme.css +++ b/main/ui/src/main/resources/css/dark_theme.css @@ -631,6 +631,10 @@ -fx-background-color: TEXT_FILL; } +.check-box:selected:disabled > .box > .mark { + -fx-background-color: TEXT_FILL_MUTED; +} + /******************************************************************************* * * * RadioButton * diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css index 0170b32d7..42f93bfbf 100644 --- a/main/ui/src/main/resources/css/light_theme.css +++ b/main/ui/src/main/resources/css/light_theme.css @@ -630,6 +630,10 @@ -fx-background-color: TEXT_FILL; } +.check-box:selected:disabled > .box > .mark { + -fx-background-color: TEXT_FILL_MUTED; +} + /******************************************************************************* * * * RadioButton * diff --git a/main/ui/src/main/resources/fxml/vault_list.fxml b/main/ui/src/main/resources/fxml/vault_list.fxml index 82bb8d9e7..51430ca2f 100644 --- a/main/ui/src/main/resources/fxml/vault_list.fxml +++ b/main/ui/src/main/resources/fxml/vault_list.fxml @@ -26,7 +26,7 @@ - diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties index 96ff90da6..10599e2a2 100644 --- a/main/ui/src/main/resources/i18n/strings.properties +++ b/main/ui/src/main/resources/i18n/strings.properties @@ -129,6 +129,8 @@ preferences.title=Preferences ## General preferences.general=General preferences.general.theme=Look & Feel +preferences.general.theme.light=Light +preferences.general.theme.dark=Dark preferences.general.unlockThemes=Unlock dark mode preferences.general.startHidden=Hide window when starting Cryptomator preferences.general.debugLogging=Enable debug logging diff --git a/main/ui/src/main/resources/i18n/strings_ar.properties b/main/ui/src/main/resources/i18n/strings_ar.properties index 60cb6712b..fabea25bb 100644 --- a/main/ui/src/main/resources/i18n/strings_ar.properties +++ b/main/ui/src/main/resources/i18n/strings_ar.properties @@ -107,6 +107,7 @@ migration.start.confirm=نعم, محفظتي متزامنة بالكامل ## Run migration.run.enterPassword=أدخل كلمة المرور لـ "%s" migration.run.startMigrationBtn=ترقية الحافظة +migration.run.progressHint=قد يستغرق هذا بعض الوقت… ## Sucess migration.success.nextStepsInstructions=تم ترحيل "%s" بنجاح.\nيمكنك الآن فتح مخزنك. migration.success.unlockNow=افتح الان @@ -115,6 +116,12 @@ migration.error.missingFileSystemCapabilities.title=نظام الملفات غي migration.error.missingFileSystemCapabilities.description=لم تبدأ عملية الترحيل بعد، لأن المخزن الخاص بك موجود على نظام ملفات غير مناسب. migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=نظام الملفات لا يدعم أسماء الملفات الطويلة. migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=نظام الملفات لا يدعم المسارات الطويلة. +migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=نظام الملفات لا يُسمح بقراءته. +migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=نظام الملفات لا يُسمح بأن تتم الكتابة إليه. +## Impossible +migration.impossible.heading=غير قادر على ترحيل المخزن +migration.impossible.reason=لا يمكن ترحيل المخزن تلقائياً لأن موقع التخزين أو نقطة الوصول غير متوافقة. +migration.impossible.moreInfo=لا يزال ممكناً فتح المخزن باستخدام إصدار قديم. للحصول على تعليمات حول كيفية ترحيل المخزن يدوياً، قم بزيارة # Preferences preferences.title=تفضيلات diff --git a/main/ui/src/main/resources/i18n/strings_ca.properties b/main/ui/src/main/resources/i18n/strings_ca.properties index 5780ae266..593083676 100644 --- a/main/ui/src/main/resources/i18n/strings_ca.properties +++ b/main/ui/src/main/resources/i18n/strings_ca.properties @@ -107,6 +107,7 @@ migration.start.confirm=Sí, la meua caixa forta està completament sicronitzada ## Run migration.run.enterPassword=Introduïu la contrasenya per a "%s" migration.run.startMigrationBtn=Migrar la caixa forta +migration.run.progressHint=Això pot trigar una mica... ## Sucess migration.success.nextStepsInstructions="%s" s'ha migrat correctament.\nJa podeu desbloquejar la vostra caixa forta. migration.success.unlockNow=Desbloqueja ara @@ -117,12 +118,18 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=El sistema d migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=El sistema de fitxers no suporta camins llargs. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=El sistema de fitxers no permet la lectura. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=El sistema de fitxers no permet l'escriptura. +## Impossible +migration.impossible.heading=No s'ha pogut migrar la caixa forta +migration.impossible.reason=La caixa forta no es pot migrar automàticament perquè la ubicació d'enmagatzematge o el punt d'accès no són compatibles. +migration.impossible.moreInfo=La caixa forta es pot obrir amb una versió anterior. Per saber com poder fer la migració de manera manual, visiteu # Preferences preferences.title=Preferències ## General preferences.general=General preferences.general.theme=Apariència +preferences.general.theme.light=Clar +preferences.general.theme.dark=Fosc preferences.general.unlockThemes=Desbloqueja el tema fosc preferences.general.startHidden=Amaga la finestra al iniciar Cryptomator preferences.general.debugLogging=Habilita el registre de depuració diff --git a/main/ui/src/main/resources/i18n/strings_cs.properties b/main/ui/src/main/resources/i18n/strings_cs.properties index 7c69d7b62..79b53efcb 100644 --- a/main/ui/src/main/resources/i18n/strings_cs.properties +++ b/main/ui/src/main/resources/i18n/strings_cs.properties @@ -117,6 +117,7 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Souborový s migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Souborový systém nepodporuje dlouhé cesty. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Souborový systém neumožňuje čtení. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Souborový systém neumožňuje zápis. +## Impossible # Preferences preferences.title=Nastavení diff --git a/main/ui/src/main/resources/i18n/strings_de.properties b/main/ui/src/main/resources/i18n/strings_de.properties index 5efd3d683..f57e30b13 100644 --- a/main/ui/src/main/resources/i18n/strings_de.properties +++ b/main/ui/src/main/resources/i18n/strings_de.properties @@ -107,6 +107,7 @@ migration.start.confirm=Ja, mein Tresor ist vollständig synchronisiert ## Run migration.run.enterPassword=Gib das Passwort für „%s“ ein migration.run.startMigrationBtn=Tresor migrieren +migration.run.progressHint=Dies kann einige Zeit dauern … ## Sucess migration.success.nextStepsInstructions=„%s“ erfolgreich migriert.\nDu kannst deinen Tresor jetzt entsperren. migration.success.unlockNow=Jetzt entsperren @@ -117,12 +118,18 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Das Dateisys migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Das Dateisystem unterstützt keine langen Pfadnamen. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Das Dateisystem lässt keine Lesevorgänge zu. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Das Dateisystem lässt keine Schreibvorgänge zu. +## Impossible +migration.impossible.heading=Tresor kann nicht migriert werden +migration.impossible.reason=Der Tresor kann nicht automatisch migriert werden, da sein Speicherort oder Zugangspunkt nicht kompatibel ist. +migration.impossible.moreInfo=Der Tresor kann immer noch mit einer älteren Version geöffnet werden. Eine Anleitung zum manuellen Migrieren eines Tresors findest du unter # Preferences preferences.title=Einstellungen ## General preferences.general=Allgemein preferences.general.theme=Erscheinungsbild +preferences.general.theme.light=Hell +preferences.general.theme.dark=Dunkel preferences.general.unlockThemes=Dunklen Modus freischalten preferences.general.startHidden=Cryptomator im Hintergrund starten preferences.general.debugLogging=Diagnoseprotokoll aktivieren diff --git a/main/ui/src/main/resources/i18n/strings_el.properties b/main/ui/src/main/resources/i18n/strings_el.properties index 2615f059e..74d4117b5 100644 --- a/main/ui/src/main/resources/i18n/strings_el.properties +++ b/main/ui/src/main/resources/i18n/strings_el.properties @@ -31,6 +31,7 @@ ## Run ## Sucess ## Missing file system capabilities +## Impossible # Preferences ## General diff --git a/main/ui/src/main/resources/i18n/strings_es.properties b/main/ui/src/main/resources/i18n/strings_es.properties index 59180ba63..9fb1c6f88 100644 --- a/main/ui/src/main/resources/i18n/strings_es.properties +++ b/main/ui/src/main/resources/i18n/strings_es.properties @@ -107,6 +107,7 @@ migration.start.confirm=Sí, mi bóveda está sincronizada ## Run migration.run.enterPassword=Ingresar la contraseña para "%s" migration.run.startMigrationBtn=Migrar bóveda +migration.run.progressHint=Esto puede tardar un poco… ## Sucess migration.success.nextStepsInstructions="%s" se migró con éxito.\nYa se puede desbloquear la bóveda. migration.success.unlockNow=Desbloquear ahora @@ -117,6 +118,10 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=El sistema d migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=El sistema de archivos no soporta rutas largas. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=El sistema de archivos no permite la lectura. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=El sistema de archivos no permite la escritura. +## Impossible +migration.impossible.heading=No se pudo migrar la bóveda +migration.impossible.reason=La bóveda no puede migrarse automáticamente porque su ubicación de almacenamiento o punto de acceso es incompatible. +migration.impossible.moreInfo=La bóveda aún se puede abrir con una versión anterior. Para obtener instrucciones en cómo migrar manualmente una bóveda, visite # Preferences preferences.title=Preferencias diff --git a/main/ui/src/main/resources/i18n/strings_fr.properties b/main/ui/src/main/resources/i18n/strings_fr.properties index 6602031d3..3afd63adf 100644 --- a/main/ui/src/main/resources/i18n/strings_fr.properties +++ b/main/ui/src/main/resources/i18n/strings_fr.properties @@ -107,6 +107,7 @@ migration.start.confirm=Ce coffre est bien synchronisé ## Run migration.run.enterPassword=Entrez le mot de passe pour %s migration.run.startMigrationBtn=Migrer le coffre +migration.run.progressHint=Veuillez patienter, cela peut prendre du temps… ## Sucess migration.success.nextStepsInstructions=“%s” migré.\nVous pouvez à présent déverrouiller ce coffre. migration.success.unlockNow=Déverouiller @@ -117,12 +118,18 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Ce système migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Ce système de fichiers ne prend pas en charge les chemins d'accès longs. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Le système de fichiers ne permet pas d'être lu. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Le système de fichiers ne permet pas l'écriture. +## Impossible +migration.impossible.heading=Impossible de migrer le coffre +migration.impossible.reason=Le coffre ne peut pas être migré automatiquement car son emplacement de stockage ou son point d'accès n'est pas compatible. +migration.impossible.moreInfo=Le coffre peut toujours être ouvert avec une version plus ancienne. Pour obtenir des instructions sur la façon de migrer manuellement un coffre, visitez # Preferences preferences.title=Préférences ## General preferences.general=Général preferences.general.theme=Apparence +preferences.general.theme.light=Clair +preferences.general.theme.dark=Sombre preferences.general.unlockThemes=Débloquer le mode nuit preferences.general.startHidden=Démarrer Cryptomator en mode caché preferences.general.debugLogging=Activer les logs debug diff --git a/main/ui/src/main/resources/i18n/strings_hi.properties b/main/ui/src/main/resources/i18n/strings_hi.properties index 1bfbcf08e..69d23278b 100644 --- a/main/ui/src/main/resources/i18n/strings_hi.properties +++ b/main/ui/src/main/resources/i18n/strings_hi.properties @@ -63,6 +63,7 @@ migration.title=वाउल्ट को अपग्रेड करें ## Run ## Sucess ## Missing file system capabilities +## Impossible # Preferences ## General diff --git a/main/ui/src/main/resources/i18n/strings_hr.properties b/main/ui/src/main/resources/i18n/strings_hr.properties index 2615f059e..74d4117b5 100644 --- a/main/ui/src/main/resources/i18n/strings_hr.properties +++ b/main/ui/src/main/resources/i18n/strings_hr.properties @@ -31,6 +31,7 @@ ## Run ## Sucess ## Missing file system capabilities +## Impossible # Preferences ## General diff --git a/main/ui/src/main/resources/i18n/strings_it.properties b/main/ui/src/main/resources/i18n/strings_it.properties index 561e22b1a..434b1b1e3 100644 --- a/main/ui/src/main/resources/i18n/strings_it.properties +++ b/main/ui/src/main/resources/i18n/strings_it.properties @@ -107,6 +107,7 @@ migration.start.confirm=Sì, la mia cassaforte è completamente sincronizzata ## Run migration.run.enterPassword=Immettere la password per "%s" migration.run.startMigrationBtn=Migra Cassaforte +migration.run.progressHint=Potrebbe richiedere un po' di tempo… ## Sucess migration.success.nextStepsInstructions=Migrato "%s" con successo.\nOra puoi sbloccare la tua cassaforte. migration.success.unlockNow=Sblocca adesso @@ -117,6 +118,10 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Il file syst migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Il file system non supporta percorsi lunghi. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Il file system non consente di essere letto. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Il file system non consente di essere scritto. +## Impossible +migration.impossible.heading=Impossibile migrare la cassaforte +migration.impossible.reason=La cassaforte non può essere migrata automaticamente perché la sua posizione di archiviazione di accesso non è compatibile. +migration.impossible.moreInfo=La cassaforte può ancora essere aperta con una versione precedente. Per istruzioni su come migrare manualmente una cassaforte, visita # Preferences preferences.title=Impostazioni diff --git a/main/ui/src/main/resources/i18n/strings_ja.properties b/main/ui/src/main/resources/i18n/strings_ja.properties index 2c91b02f4..b84eb6daf 100644 --- a/main/ui/src/main/resources/i18n/strings_ja.properties +++ b/main/ui/src/main/resources/i18n/strings_ja.properties @@ -117,12 +117,15 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=ファイル migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=ファイルシステムが長いパスをサポートしていません。 migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=ファイルシステムによって読み込みが許可されていません。 migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=ファイルシステムによって書き込みが許可されていません。 +## Impossible # Preferences preferences.title=設定 ## General preferences.general=基本設定 preferences.general.theme=外見 & 操作性 +preferences.general.theme.light=明るい +preferences.general.theme.dark=暗い preferences.general.unlockThemes=ダークモードの解錠 preferences.general.startHidden=Cryptomator を開始したときウィンドウを隠す preferences.general.debugLogging=ログを有効にする diff --git a/main/ui/src/main/resources/i18n/strings_ko.properties b/main/ui/src/main/resources/i18n/strings_ko.properties index e1288a00c..6ec9c90f7 100644 --- a/main/ui/src/main/resources/i18n/strings_ko.properties +++ b/main/ui/src/main/resources/i18n/strings_ko.properties @@ -107,6 +107,7 @@ migration.start.confirm=네, 이 Vault는 동기화가 완전히 된 상태입 ## Run migration.run.enterPassword="%s"의 비밀번호를 입력하십시요. migration.run.startMigrationBtn=Vault 마이그레이션 +migration.run.progressHint=이 작업은 시간이 조금 소요됩니다. ## Sucess migration.success.nextStepsInstructions="%s" 의 마이그레이션이 성공적으로 완료되었습니다. 이제 Vault를 잠금해제할 수 있습니다. migration.success.unlockNow=지금 잠금해제 @@ -115,12 +116,20 @@ migration.error.missingFileSystemCapabilities.title=지원하지 않는 파일 migration.error.missingFileSystemCapabilities.description=Vault가 부적절한 파일시스템에 있기 때문에 마이그레이션이 시작되지 않았습니다. migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=너무 긴 파일 이름을 파일시스템에서 지원하지 않습니다. migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=너무 긴 경로를 파일시스템에서 지원하지 않습니다. +migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=파일 시스템이 읽기를 허용하지 않습니다. +migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=파일 시스템이 쓰기를 허용하지 않습니다. +## Impossible +migration.impossible.heading=Vault를 마이그레이션 할 수 없습니다. +migration.impossible.reason=저장소 위치 또는 접근 지점이 호환되지 않아 Vault를 자동으로 마이그레이션 할 수 없습니다. +migration.impossible.moreInfo=Vault를 이전 버전으로 계속 열수 있습니다. Vault를 직접 마이그레이션 하는 설명을 보시려면, 다음을 방문하십시요. # Preferences preferences.title=환경설정 ## General preferences.general=일반 preferences.general.theme=테마설정 +preferences.general.theme.light=밝게 +preferences.general.theme.dark=어둡게 preferences.general.unlockThemes=다크모드 해제 preferences.general.startHidden=Cryptomator를 시작할 때 창 숨김 preferences.general.debugLogging=디버그 로그기록을 사용하도록 설정 diff --git a/main/ui/src/main/resources/i18n/strings_lv.properties b/main/ui/src/main/resources/i18n/strings_lv.properties index 118634834..e6a457342 100644 --- a/main/ui/src/main/resources/i18n/strings_lv.properties +++ b/main/ui/src/main/resources/i18n/strings_lv.properties @@ -117,6 +117,7 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Datņu sist migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Datņu sistēma neatbalsta garus ceļu nosaukumus. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Nav atļaujas lasīt no datņu sistēmas. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Nav atļaujas rakstīt datņu sistēmā. +## Impossible # Preferences preferences.title=Iestatījumi diff --git a/main/ui/src/main/resources/i18n/strings_nb.properties b/main/ui/src/main/resources/i18n/strings_nb.properties index c13402387..59af0cb16 100644 --- a/main/ui/src/main/resources/i18n/strings_nb.properties +++ b/main/ui/src/main/resources/i18n/strings_nb.properties @@ -117,6 +117,7 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Filsystemet migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Filsystemet støtter ikke lange søkestier. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Filsystemet tillater ikke lesing. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Filsystemet tillater ikke å bli skrevet på. +## Impossible # Preferences preferences.title=Innstillinger diff --git a/main/ui/src/main/resources/i18n/strings_nl.properties b/main/ui/src/main/resources/i18n/strings_nl.properties index 49e69dcb1..3d944895c 100644 --- a/main/ui/src/main/resources/i18n/strings_nl.properties +++ b/main/ui/src/main/resources/i18n/strings_nl.properties @@ -115,6 +115,7 @@ migration.error.missingFileSystemCapabilities.title=Niet ondersteund bestandssys migration.error.missingFileSystemCapabilities.description=Migratie is niet gestart, omdat uw kluis zich op een niet-adequaat bestandssysteem bevindt. migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Het bestandssysteem ondersteunt geen lange bestandsnamen. migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Het bestandssysteem ondersteunt geen lange paden. +## Impossible # Preferences preferences.title=Voorkeuren diff --git a/main/ui/src/main/resources/i18n/strings_nn.properties b/main/ui/src/main/resources/i18n/strings_nn.properties index 358fa7cd0..6d93ff1e5 100644 --- a/main/ui/src/main/resources/i18n/strings_nn.properties +++ b/main/ui/src/main/resources/i18n/strings_nn.properties @@ -117,6 +117,7 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Filsystemet migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Filsystemet støttar ikkje lange søkastiar. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Filsystemet tillèt ikkje å bli lese. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Filsystemet tillèt ikkje å bli skrive på. +## Impossible # Preferences preferences.title=Innstillingar diff --git a/main/ui/src/main/resources/i18n/strings_pt.properties b/main/ui/src/main/resources/i18n/strings_pt.properties index 2615f059e..74d4117b5 100644 --- a/main/ui/src/main/resources/i18n/strings_pt.properties +++ b/main/ui/src/main/resources/i18n/strings_pt.properties @@ -31,6 +31,7 @@ ## Run ## Sucess ## Missing file system capabilities +## Impossible # Preferences ## General diff --git a/main/ui/src/main/resources/i18n/strings_pt_BR.properties b/main/ui/src/main/resources/i18n/strings_pt_BR.properties index 4c876285d..a89797a3e 100644 --- a/main/ui/src/main/resources/i18n/strings_pt_BR.properties +++ b/main/ui/src/main/resources/i18n/strings_pt_BR.properties @@ -107,6 +107,7 @@ migration.start.confirm=Sim, meu cofre está completamente sincronizado ## Run migration.run.enterPassword=Digite a senha para "%s" migration.run.startMigrationBtn=Migrar Cofre +migration.run.progressHint=Isso pode levar algum tempo… ## Sucess migration.success.nextStepsInstructions="%s" migrado com sucesso.\nVocê agora pode desbloquear este cofre. migration.success.unlockNow=Desbloquear Agora @@ -117,12 +118,18 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=O sistema de migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=O sistema de arquivos não suporta caminhos longos. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=O sistema de arquivos não permite leitura. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=O sistema de arquivos não permite ser gravado. +## Impossible +migration.impossible.heading=Não é possível migrar o cofre +migration.impossible.reason=O cofre não pode ser migrado automaticamente porque sua localização de armazenamento ou o ponto de acesso não é compatível. +migration.impossible.moreInfo=O cofre ainda pode ser aberto com uma versão mais antiga. Para instruções sobre como migrar um cofre manualmente, visite # Preferences preferences.title=Preferências ## General preferences.general=Geral preferences.general.theme=Aparência +preferences.general.theme.light=Claro +preferences.general.theme.dark=Escuro preferences.general.unlockThemes=Desbloquear o modo escuro preferences.general.startHidden=Ocultar janela ao iniciar o Cryptomator preferences.general.debugLogging=Ativar log de debug diff --git a/main/ui/src/main/resources/i18n/strings_ro.properties b/main/ui/src/main/resources/i18n/strings_ro.properties index 2615f059e..74d4117b5 100644 --- a/main/ui/src/main/resources/i18n/strings_ro.properties +++ b/main/ui/src/main/resources/i18n/strings_ro.properties @@ -31,6 +31,7 @@ ## Run ## Sucess ## Missing file system capabilities +## Impossible # Preferences ## General diff --git a/main/ui/src/main/resources/i18n/strings_ru.properties b/main/ui/src/main/resources/i18n/strings_ru.properties index 4a3b16687..0d9557152 100644 --- a/main/ui/src/main/resources/i18n/strings_ru.properties +++ b/main/ui/src/main/resources/i18n/strings_ru.properties @@ -107,6 +107,7 @@ migration.start.confirm=Да, моё хранилище полностью си ## Run migration.run.enterPassword=Введите пароль для "%s" migration.run.startMigrationBtn=Перенести хранилище +migration.run.progressHint=Это может занять некоторое время… ## Sucess migration.success.nextStepsInstructions=Перенос "%s" успешно выполнен.\nТеперь можно разблокировать хранилище. migration.success.unlockNow=Разблокировать @@ -117,12 +118,18 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Файлов migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Файловая система не поддерживает длинные пути. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Файловая система не разрешает чтение. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Файловая система не разрешает запись. +## Impossible +migration.impossible.heading=Невозможно перенести хранилище +migration.impossible.reason=Хранилище не может быть перенесено автоматически из-за несовместимости его расположения или точки доступа. +migration.impossible.moreInfo=Хранилище по-прежнему можно открыть в более старой версии. Чтобы узнать, как вручную перенести хранилище, посетите # Preferences preferences.title=Настройки ## General preferences.general=Общие preferences.general.theme=Оформление +preferences.general.theme.light=Светлая +preferences.general.theme.dark=Темная preferences.general.unlockThemes=Разблокировать тёмный режим preferences.general.startHidden=Скрывать окно при запуске Cryptomator preferences.general.debugLogging=Вести журнал отладки diff --git a/main/ui/src/main/resources/i18n/strings_sk.properties b/main/ui/src/main/resources/i18n/strings_sk.properties index 06376116b..251e7d721 100644 --- a/main/ui/src/main/resources/i18n/strings_sk.properties +++ b/main/ui/src/main/resources/i18n/strings_sk.properties @@ -77,12 +77,23 @@ removeVault.information=To spôsobí, že Cryptomator iba zabudne na tento trezo removeVault.confirmBtn=Odstrániť trezor # Change Password +changepassword.title=Zmeniť heslo +changepassword.enterOldPassword=Zadaj aktuálne heslo pre "%s" +changepassword.finalConfirmation=Chápem, že ak zabudnem svoje heslo, nebudem mať prístup k svojim údajom # Forget Password +forgetPassword.title=Zabudnuté heslo +forgetPassword.information=Týmto vymažete uložené heslo tohto trezoru z vášho systému kľúčov. +forgetPassword.confirmBtn=Zabudnuté heslo # Unlock +unlock.title=Odomknúť trezor +unlock.passwordPrompt=Zadajte heslo pre "%s": +unlock.savePassword=Uložiť heslo unlock.unlockBtn=Odomknúť ## Success +unlock.success.message=Úspešne sa odomkol "%s"! Váš trezor je teraz prístupný. +unlock.success.revealBtn=Odhaliť trezor ## Invalid Mount Point # Migration @@ -91,6 +102,7 @@ unlock.unlockBtn=Odomknúť ## Sucess migration.success.unlockNow=Odomknúť teraz ## Missing file system capabilities +## Impossible # Preferences preferences.title=Predvoľby @@ -101,6 +113,7 @@ preferences.title=Predvoľby ## About # Main Window +main.closeBtn.tooltip=Zavrieť main.preferencesBtn.tooltip=Predvoľby ## Drag 'n' Drop ## Vault List @@ -122,6 +135,7 @@ main.vaultDetail.lockBtn=Uzamknúť ## Mount vaultOptions.mount.mountPoint.directoryPickerButton=Vybrať… ## Master Key +vaultOptions.masterkey.changePasswordBtn=Zmeniť heslo # Recovery Key diff --git a/main/ui/src/main/resources/i18n/strings_sv.properties b/main/ui/src/main/resources/i18n/strings_sv.properties index 9a08304c6..633b40135 100644 --- a/main/ui/src/main/resources/i18n/strings_sv.properties +++ b/main/ui/src/main/resources/i18n/strings_sv.properties @@ -107,6 +107,7 @@ migration.start.confirm=Ja, mitt valv är synkroniserat ## Run migration.run.enterPassword=Ange lösenordet för "%s" migration.run.startMigrationBtn=Migrera valv +migration.run.progressHint=Detta kan ta lite tid… ## Sucess migration.success.nextStepsInstructions="%s" migrerades fullständigt.\nDu kan nu låsa upp ditt valv. migration.success.unlockNow=Lås upp nu @@ -117,6 +118,10 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Filsystemet migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Filsystemet har inte stöd för långa filnamn. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Filsystemet tillåter inte att läsas. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Filsystemet tillåter inte att skrivas till. +## Impossible +migration.impossible.heading=Kan inte migrera valv +migration.impossible.reason=Valvet kan inte migreras automatiskt eftersom dess lagringsplats eller åtkomstpunkt inte är kompatibel. +migration.impossible.moreInfo=Valvet kan fortfarande öppnas med en äldre version. För instruktioner om hur du manuellt migrerar ett valv, besök # Preferences preferences.title=Inställningar diff --git a/main/ui/src/main/resources/i18n/strings_tr.properties b/main/ui/src/main/resources/i18n/strings_tr.properties index c4e855780..76d0c85cb 100644 --- a/main/ui/src/main/resources/i18n/strings_tr.properties +++ b/main/ui/src/main/resources/i18n/strings_tr.properties @@ -107,6 +107,7 @@ migration.start.confirm=Evet, kasam tamamen senkronize edildi ## Run migration.run.enterPassword="%s" için şifre girin migration.run.startMigrationBtn=Kasayı Taşı +migration.run.progressHint=Bu biraz zaman alabilir… ## Sucess migration.success.nextStepsInstructions="%s" başarıyla taşındı.\nKasanızın kilidini şimdi kaldırabilirsiniz. migration.success.unlockNow=Kilidi Şimdi Aç @@ -117,12 +118,18 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Dosya sistem migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Dosya sistemi, uzun yolları desteklemiyor. migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Dosya sistemi okunmaya izin vermiyor. migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Dosya sistemi yazılmaya izin vermiyor. +## Impossible +migration.impossible.heading=Kasa taşınamadı +migration.impossible.reason=Depolama konumu veya erişim noktası uyumlu olmadığı için kasa otomatik olarak taşınamıyor. +migration.impossible.moreInfo=Kasa eski bir sürüm ile halen açılabilir. Kasanın nasıl elle taşınabileceğine dair yönlendirme için ziyaret edin # Preferences preferences.title=Seçenekler ## General preferences.general=Genel preferences.general.theme=Görünüş ve Davranış +preferences.general.theme.light=Açık +preferences.general.theme.dark=Koyu preferences.general.unlockThemes=Koyu modun kilidini aç preferences.general.startHidden=Cryptomator'ı başlatırken pencereyi gizle preferences.general.debugLogging=Hata ayıklama günlüğünü etkinleştir diff --git a/main/ui/src/main/resources/i18n/strings_zh.properties b/main/ui/src/main/resources/i18n/strings_zh.properties index a661c1030..f589d894a 100644 --- a/main/ui/src/main/resources/i18n/strings_zh.properties +++ b/main/ui/src/main/resources/i18n/strings_zh.properties @@ -117,6 +117,7 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=此文件系 migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=此文件系统不支持长路径 migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=文件系统不允许读取访问 migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=文件系统不允许写入 +## Impossible # Preferences preferences.title=首选项 diff --git a/main/ui/src/main/resources/i18n/strings_zh_TW.properties b/main/ui/src/main/resources/i18n/strings_zh_TW.properties index 5adec32ad..85b6f0196 100644 --- a/main/ui/src/main/resources/i18n/strings_zh_TW.properties +++ b/main/ui/src/main/resources/i18n/strings_zh_TW.properties @@ -107,6 +107,7 @@ migration.start.confirm=是的,我的加密檔案庫已同步完成 ## Run migration.run.enterPassword=輸入 "%s" 的密碼 migration.run.startMigrationBtn=升級加密檔案庫 +migration.run.progressHint=這可能需要一點時間… ## Sucess migration.success.nextStepsInstructions=已成功升級 "%s"。\n您現在可以解鎖您的加密檔案庫了。 migration.success.unlockNow=立即解鎖 @@ -117,6 +118,10 @@ migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=檔案系統 migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=檔案系統不支援長路徑名 migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=此檔案系統不允許讀取。 migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=此檔案系統不允許寫入。 +## Impossible +migration.impossible.heading=無法升級加密檔案庫 +migration.impossible.reason=此加密檔案庫無法自動升級,因為它的儲存位置並不相容。 +migration.impossible.moreInfo=此加密檔案庫仍可被舊版本開啟。如需手動升級加密檔案庫的操作指引,請參照 # Preferences preferences.title=偏好 @@ -192,7 +197,7 @@ wrongFileAlert.instruction.0=請依下列步驟加密檔案: wrongFileAlert.instruction.1=1. 解鎖您的加密檔案庫。 wrongFileAlert.instruction.2=2. 點擊「顯示」可在檔案總管中檢視磁區。 wrongFileAlert.instruction.3=3. 把您的檔案加入磁區。 -wrongFileAlert.link=如需進一步協助協助,請前往 +wrongFileAlert.link=如需進一步協助協助,請參照 # Vault Options ## General