From cb2bc17283c2d301641e48fafa9b95aae9d872e8 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 21 Jan 2021 11:06:22 +0100 Subject: [PATCH 01/95] New translations strings.properties (Hungarian) [ci skip] --- .../src/main/resources/i18n/strings_hu.properties | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/main/ui/src/main/resources/i18n/strings_hu.properties b/main/ui/src/main/resources/i18n/strings_hu.properties index 02db56bf8..c9e96a621 100644 --- a/main/ui/src/main/resources/i18n/strings_hu.properties +++ b/main/ui/src/main/resources/i18n/strings_hu.properties @@ -1,5 +1,4 @@ # Locale Specific CSS files such as CJK, RTL,... -additionalStyleSheets= # Generics ## Button @@ -41,7 +40,6 @@ addvaultwizard.new.namePrompt=A széf neve ### Location addvaultwizard.new.locationInstruction=Hova mentse a Cryptomator a széf titkosított fájljait? addvaultwizard.new.locationLabel=Tárolási hely -addvaultwizard.new.locationPrompt=… addvaultwizard.new.directoryPickerLabel=Egyedi hely addvaultwizard.new.directoryPickerButton=Választás… addvaultwizard.new.directoryPickerTitle=Könyvtár kiválasztása @@ -108,6 +106,10 @@ unlock.error.heading=Nem lehet feloldani a széfet unlock.error.invalidMountPoint.notExisting=A csatolási pont "%s" nem egy könyvtár, nem üres vagy nem létezik. unlock.error.invalidMountPoint.existing=A csatolási pont "%s" már létezik vagy a already exists or szülőmappa hiányzik. +# Lock +## Force +## Failure + # Migration migration.title=Széf frissítése ## Start @@ -146,18 +148,12 @@ preferences.general.debugLogging=Hibakeresési naplózás engedélyezése preferences.general.debugDirectory=Naplófájlok megjelenítése preferences.general.autoStart=Cryptomator indítása a rendszerrel együtt preferences.general.keychainBackend=Itt tárolja a jelszavakat -preferences.general.keychainBackend.org.cryptomator.linux.keychain.SecretServiceKeychainAccess=Gnome Keyring -preferences.general.keychainBackend.org.cryptomator.linux.keychain.KDEWalletKeychainAccess=KDE Wallet -preferences.general.keychainBackend.org.cryptomator.macos.keychain.MacSystemKeychainAccess=macOS Keychain Access -preferences.general.keychainBackend.org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess=Windows Data Protection preferences.general.interfaceOrientation=Felhasználói felület orientációja preferences.general.interfaceOrientation.ltr=Balról jobbra preferences.general.interfaceOrientation.rtl=Jobbról balra ## Volume preferences.volume=Virtuális meghajtó preferences.volume.type=Kötet tipusa -preferences.volume.webdav.port=WebDAV Port -preferences.volume.webdav.scheme=WebDAV Scheme ## Updates preferences.updates=Frissítések preferences.updates.currentVersion=Jelenlegi verzió: %s @@ -232,8 +228,6 @@ main.vaultDetail.lockBtn=Zárolás main.vaultDetail.bytesPerSecondRead=Olvasás: main.vaultDetail.bytesPerSecondWritten=Írás: main.vaultDetail.throughput.idle=tétlen -main.vaultDetail.throughput.kbps=%.1f kiB/s -main.vaultDetail.throughput.mbps=%.1f MiB/s main.vaultDetail.stats=Széf statisztika ### Missing main.vaultDetail.missing.info=A Cryptomator nem talált széfet ezen az útvonalon. From 2634433b2c174ecf7458f4a76654072415240e92 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 22 Jan 2021 13:19:41 +0100 Subject: [PATCH 02/95] New translations strings.properties (Hungarian) [ci skip] --- main/ui/src/main/resources/i18n/strings_hu.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/ui/src/main/resources/i18n/strings_hu.properties b/main/ui/src/main/resources/i18n/strings_hu.properties index c9e96a621..fd7fb5b98 100644 --- a/main/ui/src/main/resources/i18n/strings_hu.properties +++ b/main/ui/src/main/resources/i18n/strings_hu.properties @@ -47,7 +47,7 @@ addvaultwizard.new.fileAlreadyExists=Nem lehet a széfet létrehozni ezen a hely addvaultwizard.new.locationDoesNotExist=Nem lehet a széfet létrehozni ezen a helyen, mert az útvonal legalább egy darabja nem létezik. addvaultwizard.new.invalidName=Érvénytelen széf elnevezés. Kérjük vegye figyelembe a szabályos könyvtárelnevezésre vonatkozó szabályokat. ### Password -addvaultwizard.new.createVaultBtn=Széf létrehozása +addvaultwizard.new.createVaultBtn=Új széf létrehozása addvaultwizard.new.generateRecoveryKeyChoice=Nem fog tudni hozzáférni az adataihoz a jelszó nélkül. Akar egy visszaállítási kulcsot arra az esetre, ha elveszíti a jelszavát? addvaultwizard.new.generateRecoveryKeyChoice.yes=Igen kérem, jobb félni, mint megijedni. addvaultwizard.new.generateRecoveryKeyChoice.no=Nem köszönöm, nem fogom elveszíteni a jelszavam. @@ -117,7 +117,7 @@ migration.start.prompt=A "%s" széf formátuma frissítésre szorul. A folytatá migration.start.confirm=Igen, a széfem teljes mértékben szinkronizálva van ## Run migration.run.enterPassword=Írja be a jelszót a következőhöz Enter the password for "%s" -migration.run.startMigrationBtn=Széf migrációja +migration.run.startMigrationBtn=Széf frissítése migration.run.progressHint=Ez eltarthat egy darabig… ## Sucess migration.success.nextStepsInstructions=A "%s" sikeresen migrálva. \nMost már feloldhatja a széfet. From 01929c22880b24accd991c2d667a7047fc60dab1 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 22 Jan 2021 13:48:57 +0100 Subject: [PATCH 03/95] New translations strings.properties (Hungarian) [ci skip] --- .../main/resources/i18n/strings_hu.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/main/ui/src/main/resources/i18n/strings_hu.properties b/main/ui/src/main/resources/i18n/strings_hu.properties index fd7fb5b98..6604ac7cb 100644 --- a/main/ui/src/main/resources/i18n/strings_hu.properties +++ b/main/ui/src/main/resources/i18n/strings_hu.properties @@ -256,22 +256,22 @@ vaultOptions.general.unlockAfterStartup=A széf feloldása a Cryptomator indít vaultOptions.general.actionAfterUnlock=Sikeres feloldás után vaultOptions.general.actionAfterUnlock.ignore=Ne tegyen semmit vaultOptions.general.actionAfterUnlock.reveal=Jelenítse meg a kötetet -vaultOptions.general.actionAfterUnlock.ask=Kérdezzen +vaultOptions.general.actionAfterUnlock.ask=Kérdez ## Mount -vaultOptions.mount=Csatolás -vaultOptions.mount.readonly=Csak olvasható +vaultOptions.mount=Felcsatolás +vaultOptions.mount.readonly=Csak-olvasható vaultOptions.mount.customMountFlags=Egyedi csatolási paraméterek vaultOptions.mount.winDriveLetterOccupied=foglalt vaultOptions.mount.mountPoint=Csatolási pont -vaultOptions.mount.mountPoint.auto=Válasszon egy megfelelő helyet autómatikusan +vaultOptions.mount.mountPoint.auto=Válasszon egy megfelelő helyet automatikusan vaultOptions.mount.mountPoint.driveLetter=Használja a kiválasztott meghajtó betűjelét vaultOptions.mount.mountPoint.custom=Egyedi útvonal -vaultOptions.mount.mountPoint.directoryPickerButton=Kiválasztás… +vaultOptions.mount.mountPoint.directoryPickerButton=Kiválaszt… vaultOptions.mount.mountPoint.directoryPickerTitle=Válasszon egy üres könyvtárat ## Master Key vaultOptions.masterkey=Jelszó vaultOptions.masterkey.changePasswordBtn=Jelszó megváltoztatása -vaultOptions.masterkey.forgetSavedPasswordBtn=Elmentett jelszó elfelejtése +vaultOptions.masterkey.forgetSavedPasswordBtn=Mentett jelszó törlése vaultOptions.masterkey.recoveryKeyExpanation=A helyreállítási kulcs az egyetlen módja annak, hogy visszaállítsa a széfhez való hozzáférést, ha elveíti a jelszavát. vaultOptions.masterkey.showRecoveryKeyBtn=Visszaállítási kulcs megjelenítése vaultOptions.masterkey.recoverPasswordBtn=Jelszó visszaállítása @@ -286,8 +286,8 @@ recoveryKey.recover.validKey=Ez egy érvényes visszaállítási kulcs recoveryKey.printout.heading=Cryptomator visszaállítási kulcs\n"%s"\n # New Password -newPassword.promptText=Írja be az új jelszavát -newPassword.reenterPassword=Erősítse meg az új jelszavát +newPassword.promptText=Adjon meg egy új jelszót +newPassword.reenterPassword=Az új jelszó megerősítése newPassword.passwordsMatch=A jelszavak megegyeznek! newPassword.passwordsDoNotMatch=A jelszavak nem egyeznek meg passwordStrength.messageLabel.tooShort=Használjon legalább %d karaktert From e4709ed6fe0cf035efa24c073d68b4cc4d117d4e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 1 Feb 2021 12:06:38 +0100 Subject: [PATCH 04/95] Refactored FxmlFile and FxmlLoaderFactory --- .../ui/addvaultwizard/AddVaultModule.java | 34 +++++++++---------- .../changepassword/ChangePasswordModule.java | 10 +++--- .../cryptomator/ui/common/ErrorModule.java | 8 ++--- .../org/cryptomator/ui/common/FxmlFile.java | 2 +- ...derFactory.java => FxmlLoaderFactory.java} | 10 ++++-- .../forgetPassword/ForgetPasswordModule.java | 10 +++--- .../org/cryptomator/ui/lock/LockModule.java | 14 ++++---- .../ui/mainwindow/MainWindowModule.java | 10 +++--- .../ui/mainwindow/VaultListCellFactory.java | 6 ++-- .../ui/migration/MigrationModule.java | 26 +++++++------- .../ui/preferences/PreferencesModule.java | 10 +++--- .../org/cryptomator/ui/quit/QuitModule.java | 10 +++--- .../ui/recoverykey/RecoveryKeyModule.java | 22 ++++++------ .../ui/removevault/RemoveVaultModule.java | 10 +++--- .../ui/stats/VaultStatisticsModule.java | 10 +++--- .../cryptomator/ui/unlock/UnlockModule.java | 18 +++++----- .../ui/vaultoptions/VaultOptionsModule.java | 10 +++--- .../wrongfilealert/WrongFileAlertModule.java | 10 +++--- 18 files changed, 117 insertions(+), 113 deletions(-) rename main/ui/src/main/java/org/cryptomator/ui/common/{FXMLLoaderFactory.java => FxmlLoaderFactory.java} (91%) diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java index 3c9c53e5b..42d243e80 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java @@ -6,7 +6,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -43,8 +43,8 @@ public abstract class AddVaultModule { @Provides @AddVaultWizardWindow @AddVaultWizardScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -91,50 +91,50 @@ public abstract class AddVaultModule { @Provides @FxmlScene(FxmlFile.ADDVAULT_WELCOME) @AddVaultWizardScoped - static Scene provideWelcomeScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_WELCOME.getRessourcePathString()); + static Scene provideWelcomeScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_WELCOME); } @Provides @FxmlScene(FxmlFile.ADDVAULT_EXISTING) @AddVaultWizardScoped - static Scene provideChooseExistingVaultScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_EXISTING.getRessourcePathString()); + static Scene provideChooseExistingVaultScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_EXISTING); } @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_NAME) @AddVaultWizardScoped - static Scene provideCreateNewVaultNameScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_NAME.getRessourcePathString()); + static Scene provideCreateNewVaultNameScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_NAME); } @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) @AddVaultWizardScoped - static Scene provideCreateNewVaultLocationScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_LOCATION.getRessourcePathString()); + static Scene provideCreateNewVaultLocationScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_LOCATION); } @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_PASSWORD) @AddVaultWizardScoped - static Scene provideCreateNewVaultPasswordScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_PASSWORD.getRessourcePathString()); + static Scene provideCreateNewVaultPasswordScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_PASSWORD); } @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY) @AddVaultWizardScoped - static Scene provideCreateNewVaultRecoveryKeyScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY.getRessourcePathString()); + static Scene provideCreateNewVaultRecoveryKeyScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY); } @Provides @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) @AddVaultWizardScoped - static Scene provideCreateNewVaultSuccessScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_SUCCESS.getRessourcePathString()); + static Scene provideCreateNewVaultSuccessScene(@AddVaultWizardWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ADDVAULT_SUCCESS); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java index aff1b1e0d..e80871208 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -37,8 +37,8 @@ abstract class ChangePasswordModule { @Provides @ChangePasswordWindow @ChangePasswordScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -56,8 +56,8 @@ abstract class ChangePasswordModule { @Provides @FxmlScene(FxmlFile.CHANGEPASSWORD) @ChangePasswordScoped - static Scene provideUnlockScene(@ChangePasswordWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/changepassword.fxml"); + static Scene provideUnlockScene(@ChangePasswordWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.CHANGEPASSWORD); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java index 3dd0a6a14..d2515e661 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java @@ -18,8 +18,8 @@ import java.util.ResourceBundle; abstract class ErrorModule { @Provides - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -38,8 +38,8 @@ abstract class ErrorModule { @Provides @FxmlScene(FxmlFile.ERROR) - static Scene provideErrorScene(FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ERROR.getRessourcePathString()); + static Scene provideErrorScene(FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ERROR); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java index 310e11747..4d429ab7d 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java @@ -39,7 +39,7 @@ public enum FxmlFile { this.ressourcePathString = ressourcePathString; } - public String getRessourcePathString() { + String getRessourcePathString() { return ressourcePathString; } } diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java similarity index 91% rename from main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java rename to main/ui/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java index c1f7f8350..cf8940cc2 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java @@ -11,13 +11,13 @@ import java.util.Map; import java.util.ResourceBundle; import java.util.function.Function; -public class FXMLLoaderFactory { +public class FxmlLoaderFactory { private final Map, Provider> controllerFactories; private final Function sceneFactory; private final ResourceBundle resourceBundle; - public FXMLLoaderFactory(Map, Provider> controllerFactories, Function sceneFactory, ResourceBundle resourceBundle) { + public FxmlLoaderFactory(Map, Provider> controllerFactories, Function sceneFactory, ResourceBundle resourceBundle) { this.controllerFactories = controllerFactories; this.sceneFactory = sceneFactory; this.resourceBundle = resourceBundle; @@ -48,13 +48,17 @@ public class FXMLLoaderFactory { return loader; } + public Scene createScene(FxmlFile fxmlFile) { + return createScene(fxmlFile.getRessourcePathString()); + } + /** * {@link #load(String) Loads} the FXML file and creates a new Scene containing the loaded ui. * * @param fxmlResourceName Name of the resource (as in {@link Class#getResource(String)}). * @throws UncheckedIOException wrapping any IOException thrown by {@link #load(String)). */ - public Scene createScene(String fxmlResourceName) { + private Scene createScene(String fxmlResourceName) { final FXMLLoader loader; try { loader = load(fxmlResourceName); diff --git a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java index 5164eea30..b0c34e9f5 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -29,8 +29,8 @@ abstract class ForgetPasswordModule { @Provides @ForgetPasswordWindow @ForgetPasswordScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -62,8 +62,8 @@ abstract class ForgetPasswordModule { @Provides @FxmlScene(FxmlFile.FORGET_PASSWORD) @ForgetPasswordScoped - static Scene provideForgetPasswordScene(@ForgetPasswordWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/forget_password.fxml"); + static Scene provideForgetPasswordScene(@ForgetPasswordWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.FORGET_PASSWORD); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/lock/LockModule.java b/main/ui/src/main/java/org/cryptomator/ui/lock/LockModule.java index bbc8c2209..160dcf6fb 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/lock/LockModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/lock/LockModule.java @@ -6,7 +6,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -40,8 +40,8 @@ abstract class LockModule { @Provides @LockWindow @LockScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -63,15 +63,15 @@ abstract class LockModule { @Provides @FxmlScene(FxmlFile.LOCK_FORCED) @LockScoped - static Scene provideForceLockScene(@LockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/lock_forced.fxml"); + static Scene provideForceLockScene(@LockWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.LOCK_FORCED); } @Provides @FxmlScene(FxmlFile.LOCK_FAILED) @LockScoped - static Scene provideLockFailedScene(@LockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/lock_failed.fxml"); + static Scene provideLockFailedScene(@LockWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.LOCK_FAILED); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java index e39a9d991..f8316d289 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java @@ -6,7 +6,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -39,8 +39,8 @@ abstract class MainWindowModule { @Provides @MainWindow @MainWindowScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, MainWindowSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, MainWindowSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -60,8 +60,8 @@ abstract class MainWindowModule { @Provides @FxmlScene(FxmlFile.MAIN_WINDOW) @MainWindowScoped - static Scene provideMainScene(@MainWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/main_window.fxml"); + static Scene provideMainScene(@MainWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MAIN_WINDOW); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java index 80cf2f82b..d73109d0e 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java @@ -1,7 +1,7 @@ package org.cryptomator.ui.mainwindow; import org.cryptomator.common.vaults.Vault; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.controls.DraggableListCell; import javax.inject.Inject; @@ -17,10 +17,10 @@ import java.io.UncheckedIOException; @MainWindowScoped public class VaultListCellFactory implements Callback, ListCell> { - private final FXMLLoaderFactory fxmlLoaders; + private final FxmlLoaderFactory fxmlLoaders; @Inject - VaultListCellFactory(@MainWindow FXMLLoaderFactory fxmlLoaders) { + VaultListCellFactory(@MainWindow FxmlLoaderFactory fxmlLoaders) { this.fxmlLoaders = fxmlLoaders; } diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java index 9f41b497e..44f6960b1 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java @@ -6,7 +6,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.cryptofs.common.FileSystemCapabilityChecker; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -30,8 +30,8 @@ abstract class MigrationModule { @Provides @MigrationWindow @MigrationScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -56,36 +56,36 @@ abstract class MigrationModule { @Provides @FxmlScene(FxmlFile.MIGRATION_START) @MigrationScoped - static Scene provideMigrationStartScene(@MigrationWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/migration_start.fxml"); + static Scene provideMigrationStartScene(@MigrationWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MIGRATION_START); } @Provides @FxmlScene(FxmlFile.MIGRATION_RUN) @MigrationScoped - static Scene provideMigrationRunScene(@MigrationWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/migration_run.fxml"); + static Scene provideMigrationRunScene(@MigrationWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MIGRATION_RUN); } @Provides @FxmlScene(FxmlFile.MIGRATION_SUCCESS) @MigrationScoped - static Scene provideMigrationSuccessScene(@MigrationWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/migration_success.fxml"); + static Scene provideMigrationSuccessScene(@MigrationWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MIGRATION_SUCCESS); } @Provides @FxmlScene(FxmlFile.MIGRATION_CAPABILITY_ERROR) @MigrationScoped - static Scene provideMigrationCapabilityErrorScene(@MigrationWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/migration_capability_error.fxml"); + static Scene provideMigrationCapabilityErrorScene(@MigrationWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MIGRATION_CAPABILITY_ERROR); } @Provides @FxmlScene(FxmlFile.MIGRATION_IMPOSSIBLE) @MigrationScoped - static Scene provideMigrationImpossibleScene(@MigrationWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/migration_impossible.fxml"); + static Scene provideMigrationImpossibleScene(@MigrationWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.MIGRATION_IMPOSSIBLE); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java index 3cc012b03..51fa6b581 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -32,8 +32,8 @@ abstract class PreferencesModule { @Provides @PreferencesWindow @PreferencesScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -49,8 +49,8 @@ abstract class PreferencesModule { @Provides @FxmlScene(FxmlFile.PREFERENCES) @PreferencesScoped - static Scene providePreferencesScene(@PreferencesWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/preferences.fxml"); + static Scene providePreferencesScene(@PreferencesWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.PREFERENCES); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java index 9c779f434..ee90d747b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -25,8 +25,8 @@ abstract class QuitModule { @Provides @QuitWindow @QuitScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -43,8 +43,8 @@ abstract class QuitModule { @Provides @FxmlScene(FxmlFile.QUIT) @QuitScoped - static Scene provideQuitScene(@QuitWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/quit.fxml"); + static Scene provideQuitScene(@QuitWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.QUIT); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java index c6f502886..58d9fbde9 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java @@ -6,7 +6,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -33,8 +33,8 @@ abstract class RecoveryKeyModule { @Provides @RecoveryKeyWindow @RecoveryKeyScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -69,29 +69,29 @@ abstract class RecoveryKeyModule { @Provides @FxmlScene(FxmlFile.RECOVERYKEY_CREATE) @RecoveryKeyScoped - static Scene provideRecoveryKeyCreationScene(@RecoveryKeyWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/recoverykey_create.fxml"); + static Scene provideRecoveryKeyCreationScene(@RecoveryKeyWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_CREATE); } @Provides @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) @RecoveryKeyScoped - static Scene provideRecoveryKeySuccessScene(@RecoveryKeyWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/recoverykey_success.fxml"); + static Scene provideRecoveryKeySuccessScene(@RecoveryKeyWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_SUCCESS); } @Provides @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) @RecoveryKeyScoped - static Scene provideRecoveryKeyRecoverScene(@RecoveryKeyWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/recoverykey_recover.fxml"); + static Scene provideRecoveryKeyRecoverScene(@RecoveryKeyWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_RECOVER); } @Provides @FxmlScene(FxmlFile.RECOVERYKEY_RESET_PASSWORD) @RecoveryKeyScoped - static Scene provideRecoveryKeyResetPasswordScene(@RecoveryKeyWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/recoverykey_reset_password.fxml"); + static Scene provideRecoveryKeyResetPasswordScene(@RecoveryKeyWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_RESET_PASSWORD); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java index 5e717c431..5915766ed 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -26,8 +26,8 @@ abstract class RemoveVaultModule { @Provides @RemoveVaultWindow @RemoveVaultScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -45,8 +45,8 @@ abstract class RemoveVaultModule { @Provides @FxmlScene(FxmlFile.REMOVE_VAULT) @RemoveVaultScoped - static Scene provideRemoveVaultScene(@RemoveVaultWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/remove_vault.fxml"); + static Scene provideRemoveVaultScene(@RemoveVaultWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.REMOVE_VAULT); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java index 14395af24..803de314c 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java @@ -11,7 +11,7 @@ import javafx.stage.Stage; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultState; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -29,8 +29,8 @@ abstract class VaultStatisticsModule { @Provides @VaultStatisticsWindow @VaultStatisticsScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -60,8 +60,8 @@ abstract class VaultStatisticsModule { @Provides @FxmlScene(FxmlFile.VAULT_STATISTICS) @VaultStatisticsScoped - static Scene provideVaultStatisticsScene(@VaultStatisticsWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/stats.fxml"); + static Scene provideVaultStatisticsScene(@VaultStatisticsWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.VAULT_STATISTICS); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java index da5e2884d..2ed17fdff 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java @@ -8,7 +8,7 @@ import org.cryptomator.common.keychain.KeychainManager; import org.cryptomator.common.vaults.Vault; import org.cryptomator.integrations.keychain.KeychainAccessException; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -78,8 +78,8 @@ abstract class UnlockModule { @Provides @UnlockWindow @UnlockScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -101,22 +101,22 @@ abstract class UnlockModule { @Provides @FxmlScene(FxmlFile.UNLOCK) @UnlockScoped - static Scene provideUnlockScene(@UnlockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/unlock.fxml"); + static Scene provideUnlockScene(@UnlockWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.UNLOCK); } @Provides @FxmlScene(FxmlFile.UNLOCK_SUCCESS) @UnlockScoped - static Scene provideUnlockSuccessScene(@UnlockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/unlock_success.fxml"); + static Scene provideUnlockSuccessScene(@UnlockWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.UNLOCK_SUCCESS); } @Provides @FxmlScene(FxmlFile.UNLOCK_INVALID_MOUNT_POINT) @UnlockScoped - static Scene provideInvalidMountPointScene(@UnlockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/unlock_invalid_mount_point.fxml"); + static Scene provideInvalidMountPointScene(@UnlockWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.UNLOCK_INVALID_MOUNT_POINT); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java index 0e65ed0d2..bf47c294c 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java @@ -7,7 +7,7 @@ import dagger.multibindings.IntoMap; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.changepassword.ChangePasswordComponent; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -29,8 +29,8 @@ abstract class VaultOptionsModule { @Provides @VaultOptionsWindow @VaultOptionsScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -50,8 +50,8 @@ abstract class VaultOptionsModule { @Provides @FxmlScene(FxmlFile.VAULT_OPTIONS) @VaultOptionsScoped - static Scene provideVaultOptionsScene(@VaultOptionsWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/vault_options.fxml"); + static Scene provideVaultOptionsScene(@VaultOptionsWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.VAULT_OPTIONS); } // ------------------ diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java index 4d26a371c..7600146e5 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import org.cryptomator.ui.common.DefaultSceneFactory; -import org.cryptomator.ui.common.FXMLLoaderFactory; +import org.cryptomator.ui.common.FxmlLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; @@ -26,8 +26,8 @@ abstract class WrongFileAlertModule { @Provides @WrongFileAlertWindow @WrongFileAlertScoped - static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { - return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + static FxmlLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle); } @Provides @@ -45,8 +45,8 @@ abstract class WrongFileAlertModule { @Provides @FxmlScene(FxmlFile.WRONGFILEALERT) @WrongFileAlertScoped - static Scene provideWrongFileAlertScene(@WrongFileAlertWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/wrongfilealert.fxml"); + static Scene provideWrongFileAlertScene(@WrongFileAlertWindow FxmlLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.WRONGFILEALERT); } // ------------------ From da0933fa9239a4da87278d04567534d6a4ab266e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 8 Feb 2021 04:36:28 +0100 Subject: [PATCH 05/95] New translations strings.properties (Punjabi) [ci skip] --- main/ui/src/main/resources/i18n/strings_pa.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main/ui/src/main/resources/i18n/strings_pa.properties b/main/ui/src/main/resources/i18n/strings_pa.properties index 528f5568f..acb07e6e5 100644 --- a/main/ui/src/main/resources/i18n/strings_pa.properties +++ b/main/ui/src/main/resources/i18n/strings_pa.properties @@ -149,6 +149,8 @@ preferences.general.theme.automatic=ਆਟੋਮੈਟਿਕ preferences.general.theme.light=ਹਲਕਾ preferences.general.theme.dark=ਗੂੜ੍ਹਾ preferences.general.unlockThemes=ਗੂੜ੍ਹਾ ਢੰਗ ਅਣ-ਲਾਕ ਕਰੋ +preferences.general.showMinimizeButton=ਘੱਟੋ-ਘੱਟ ਬਟਨ ਦਿਖਾਓ +preferences.general.showTrayIcon=ਟਰੇ ਆਈਕਾਨ ਵੇਖਾਓ (ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੈ) preferences.general.startHidden=ਜਦੋਂ Cryptomator ਸ਼ੁਰੂ ਹੋਵੇ ਤਾਂ ਵਿੰਡੋ ਲੁਕਾਓ preferences.general.debugLogging=ਡੀਬੱਗ ਲਾਗ ਸਮਰੱਥ ਕਰੋ preferences.general.debugDirectory=ਲਾਗ ਫਾਇਲਾਂ ਦਿਖਾਓ From 80cbc6699a0dc6a357dcf7b964766e2b5b7f4863 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 13:53:05 +0100 Subject: [PATCH 06/95] fixed label [ci skip] --- main/ui/src/main/resources/i18n/strings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties index 11a3ed3bd..8ab40defa 100644 --- a/main/ui/src/main/resources/i18n/strings.properties +++ b/main/ui/src/main/resources/i18n/strings.properties @@ -203,7 +203,7 @@ stats.read.accessCount=Total reads: %d stats.write.throughput.idle=Write: idle stats.write.throughput.kibs=Write: %.2f kiB/s stats.write.throughput.mibs=Write: %.2f MiB/s -stats.write.total.data.none=Data read: - +stats.write.total.data.none=Data written: - stats.write.total.data.kib=Data written: %.1f kiB stats.write.total.data.mib=Data written: %.1f MiB stats.write.total.data.gib=Data written: %.1f GiB From 947d25b33508b83eb245ac15e22537f890ab3ba3 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:08:56 +0100 Subject: [PATCH 07/95] New translations strings.properties (Punjabi) [ci skip] --- main/ui/src/main/resources/i18n/strings_pa.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_pa.properties b/main/ui/src/main/resources/i18n/strings_pa.properties index acb07e6e5..f83756811 100644 --- a/main/ui/src/main/resources/i18n/strings_pa.properties +++ b/main/ui/src/main/resources/i18n/strings_pa.properties @@ -202,7 +202,6 @@ stats.read.accessCount=ਕੁੱਲ ਪੜ੍ਹੇ: %d stats.write.throughput.idle=ਲਿਖੇ: ਵੇਹਲ stats.write.throughput.kibs=ਲਿਖੇ: %.2f kiB/s stats.write.throughput.mibs=ਲਿਖੇ: %.2f MiB/s -stats.write.total.data.none=ਡਾਟਾ ਪੜ੍ਹਿਆ: - stats.write.total.data.kib=ਡਾਟਾ ਲਿਖਿਆ: %.1f kiB stats.write.total.data.mib=ਡਾਟਾ ਲਿਖਿਆ: %.1f MiB stats.write.total.data.gib=ਡਾਟਾ ਲਿਖਿਆ: %.1f GiB From 09e953066009f12c52b689cbe592d13e5f829cf5 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:08:57 +0100 Subject: [PATCH 08/95] New translations strings.properties (Russian) [ci skip] --- main/ui/src/main/resources/i18n/strings_ru.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_ru.properties b/main/ui/src/main/resources/i18n/strings_ru.properties index 5ab401c49..0c9010f50 100644 --- a/main/ui/src/main/resources/i18n/strings_ru.properties +++ b/main/ui/src/main/resources/i18n/strings_ru.properties @@ -202,7 +202,6 @@ stats.read.accessCount=Всего операций чтения: %d stats.write.throughput.idle=Запись: бездействие stats.write.throughput.kibs=Запись: %.2f КиБ/с stats.write.throughput.mibs=Запись: %.2f МиБ/с -stats.write.total.data.none=Прочитано: - stats.write.total.data.kib=Записано: %.1f КиБ stats.write.total.data.mib=Записано: %.1f МиБ stats.write.total.data.gib=Записано: %.1f ГиБ From 7c5f40d7d1dd5c2432d721cbe051d15db2de028a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:04 +0100 Subject: [PATCH 09/95] New translations strings.properties (Portuguese, Brazilian) [ci skip] --- main/ui/src/main/resources/i18n/strings_pt_BR.properties | 1 - 1 file changed, 1 deletion(-) 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 46e12a324..b3b2f1091 100644 --- a/main/ui/src/main/resources/i18n/strings_pt_BR.properties +++ b/main/ui/src/main/resources/i18n/strings_pt_BR.properties @@ -202,7 +202,6 @@ stats.read.accessCount=Total de leituras: %d stats.write.throughput.idle=Escrita: ociosa stats.write.throughput.kibs=Escrita: %.2f kiB/s stats.write.throughput.mibs=Escrita: %.2f MiB/s -stats.write.total.data.none=Dados lidos: - stats.write.total.data.kib=Dados gravados: %.1f kiB stats.write.total.data.mib=Dados gravados: %.1f MiB stats.write.total.data.gib=Dados gravados: %.1f GiB From 0382069995b2f6dddac7e65aa68c0679853c680d Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:05 +0100 Subject: [PATCH 10/95] New translations strings.properties (Chinese Traditional) [ci skip] --- main/ui/src/main/resources/i18n/strings_zh_TW.properties | 1 - 1 file changed, 1 deletion(-) 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 57e5e212b..463d50613 100644 --- a/main/ui/src/main/resources/i18n/strings_zh_TW.properties +++ b/main/ui/src/main/resources/i18n/strings_zh_TW.properties @@ -202,7 +202,6 @@ stats.read.accessCount=總讀取：%d stats.write.throughput.idle=寫入：閒置 stats.write.throughput.kibs=寫入：%.2f kiB/s stats.write.throughput.mibs=寫入：%.2f MiB/s -stats.write.total.data.none=資料讀取：無 stats.write.total.data.kib=資料寫入：%.1f kiB stats.write.total.data.mib=資料寫入：%.1f MiB stats.write.total.data.gib=資料寫入：%.1f GiB From 6a7a309a2b8f65daa3c3e46cd7607c5df6272b8d Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:07 +0100 Subject: [PATCH 11/95] New translations strings.properties (Chinese Simplified) [ci skip] --- main/ui/src/main/resources/i18n/strings_zh.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_zh.properties b/main/ui/src/main/resources/i18n/strings_zh.properties index 39815a92f..37df94359 100644 --- a/main/ui/src/main/resources/i18n/strings_zh.properties +++ b/main/ui/src/main/resources/i18n/strings_zh.properties @@ -202,7 +202,6 @@ stats.read.accessCount=读取总数：%d stats.write.throughput.idle=写入：空闲 stats.write.throughput.kibs=写入：%.2f kiB/s stats.write.throughput.mibs=写入：%.2f MiB/s -stats.write.total.data.none=已读取数据：- stats.write.total.data.kib=已写入数据：%.1f kiB stats.write.total.data.mib=已写入数据：%.1f MiB stats.write.total.data.gib=已写入数据：%.1f GiB From 2b7ed5f4dddd4d9734f4343f2f772a7a56c031aa Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:08 +0100 Subject: [PATCH 12/95] New translations strings.properties (Turkish) [ci skip] --- main/ui/src/main/resources/i18n/strings_tr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_tr.properties b/main/ui/src/main/resources/i18n/strings_tr.properties index 3e06731af..629d53302 100644 --- a/main/ui/src/main/resources/i18n/strings_tr.properties +++ b/main/ui/src/main/resources/i18n/strings_tr.properties @@ -202,7 +202,7 @@ stats.read.accessCount=Toplam okuma: %d stats.write.throughput.idle=Yazma: boşta stats.write.throughput.kibs=Yazma: %.2f kB/s stats.write.throughput.mibs=Yazma: %.2f MB/s -stats.write.total.data.none=Yazılan veri: - +stats.write.total.data.none=Yazılmış veri: - stats.write.total.data.kib=Yazılan veri: %.1f kB stats.write.total.data.mib=Yazılan veri: %.1f MB stats.write.total.data.gib=Yazılan veri: %.1f GB From eed9c906cca39fdc39aecf7a366c21481ab82d65 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:09 +0100 Subject: [PATCH 13/95] New translations strings.properties (Swedish) [ci skip] --- main/ui/src/main/resources/i18n/strings_sv.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_sv.properties b/main/ui/src/main/resources/i18n/strings_sv.properties index 98a487633..de62f9109 100644 --- a/main/ui/src/main/resources/i18n/strings_sv.properties +++ b/main/ui/src/main/resources/i18n/strings_sv.properties @@ -195,7 +195,6 @@ stats.read.accessCount=Totalt läst: %d stats.write.throughput.idle=Skriv: inaktiv stats.write.throughput.kibs=Skriv: %.2f kiB/s stats.write.throughput.mibs=Skriv: %.2f MiB/s -stats.write.total.data.none=Data läst: - stats.write.total.data.kib=Data skrivet: %.1f kiB stats.write.total.data.mib=Data skrivet: %.1f MiB stats.write.total.data.gib=Data skrivet: %.1f GiB From d37fa33278585dba5740ce55fb725e072f6f5d74 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:11 +0100 Subject: [PATCH 14/95] New translations strings.properties (Slovak) [ci skip] --- main/ui/src/main/resources/i18n/strings_sk.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_sk.properties b/main/ui/src/main/resources/i18n/strings_sk.properties index 710173c14..14d554e0f 100644 --- a/main/ui/src/main/resources/i18n/strings_sk.properties +++ b/main/ui/src/main/resources/i18n/strings_sk.properties @@ -154,7 +154,6 @@ stats.read.accessCount=Spolu načítané: %d stats.write.throughput.idle=Zápis: nečinnosť stats.write.throughput.kibs=Zápis: %.2f KiB/s stats.write.throughput.mibs=Zápis: %.2f MiB/s -stats.write.total.data.none=Čítanie dát: - stats.write.total.data.kib=Zapísaných dát: %.1f kiB stats.write.total.data.mib=Zapísaných dát: %.1f MiB stats.write.total.data.gib=Zapísaných dát: %.1f GiB From 90cb7beb1f2439c728be99b92e05db6488b5f064 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:14 +0100 Subject: [PATCH 15/95] New translations strings.properties (Polish) [ci skip] --- main/ui/src/main/resources/i18n/strings_pl.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_pl.properties b/main/ui/src/main/resources/i18n/strings_pl.properties index 6de44a403..4d3f105e1 100644 --- a/main/ui/src/main/resources/i18n/strings_pl.properties +++ b/main/ui/src/main/resources/i18n/strings_pl.properties @@ -202,7 +202,6 @@ stats.read.accessCount=Całkowite odczyty: %d stats.write.throughput.idle=Zapis: bezczynny stats.write.throughput.kibs=Zapis: %.2f kiB/s stats.write.throughput.mibs=Zapis: %.2f kiB/s -stats.write.total.data.none=Dane odczytywane: - stats.write.total.data.kib=Zapisane dane: %.1f kiB stats.write.total.data.mib=Zapisane dane: %.1f MiB stats.write.total.data.gib=Zapisane dane: %.1f kiB From 630bfa4cee1301b0d02365332e16943a47a790b6 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:15 +0100 Subject: [PATCH 16/95] New translations strings.properties (Dutch) [ci skip] --- main/ui/src/main/resources/i18n/strings_nl.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_nl.properties b/main/ui/src/main/resources/i18n/strings_nl.properties index 1b5f489c6..21b3d3206 100644 --- a/main/ui/src/main/resources/i18n/strings_nl.properties +++ b/main/ui/src/main/resources/i18n/strings_nl.properties @@ -202,7 +202,6 @@ stats.read.accessCount=Totaal gelezen: %d stats.write.throughput.idle=Schrijven: inactief stats.write.throughput.kibs=Schrijven: %.2f kiB/s stats.write.throughput.mibs=Schrijven: %.2f MiB/s -stats.write.total.data.none=Gegevens gelezen: - stats.write.total.data.kib=Gegevens geschreven: %.1f kiB stats.write.total.data.mib=Gegevens geschreven: %.1f MiB stats.write.total.data.gib=Gegevens geschreven: %.1f GiB From cdfcca06d1acac01d66955c15a4501cf8331ec48 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:16 +0100 Subject: [PATCH 17/95] New translations strings.properties (Korean) [ci skip] --- main/ui/src/main/resources/i18n/strings_ko.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_ko.properties b/main/ui/src/main/resources/i18n/strings_ko.properties index 8aeea1acf..43e5f21a3 100644 --- a/main/ui/src/main/resources/i18n/strings_ko.properties +++ b/main/ui/src/main/resources/i18n/strings_ko.properties @@ -200,7 +200,6 @@ stats.read.accessCount=총 읽기 횟수: %d stats.write.throughput.idle=쓰기: 대기중 stats.write.throughput.kibs=쓰기: %.2f kiB/s stats.write.throughput.mibs=쓰기: %.2f MiB/s -stats.write.total.data.none=데이터 읽기: - stats.write.total.data.kib=데이터 쓰기: %.1f kiB stats.write.total.data.mib=데이터 쓰기: %.1f MiB stats.write.total.data.gib=데이터 쓰기: %.1f GiB From 84a3082589c8a045a67583fbb66102f9c1c1b1fd Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:17 +0100 Subject: [PATCH 18/95] New translations strings.properties (Japanese) [ci skip] --- main/ui/src/main/resources/i18n/strings_ja.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_ja.properties b/main/ui/src/main/resources/i18n/strings_ja.properties index 867112a56..7e92e7774 100644 --- a/main/ui/src/main/resources/i18n/strings_ja.properties +++ b/main/ui/src/main/resources/i18n/strings_ja.properties @@ -202,7 +202,6 @@ stats.read.accessCount=合計読み取り: %d stats.write.throughput.idle=書き込み: アイドル状態 stats.write.throughput.kibs=書き込み: %.2f kiB/s stats.write.throughput.mibs=書き込み: %.2f MiB/s -stats.write.total.data.none=データ読み込み: - stats.write.total.data.kib=書き込み済みデータ: %.1f kiB stats.write.total.data.mib=書き込み済みデータ: %.1f MiB stats.write.total.data.gib=書き込み済みデータ: %.1f GiB From 0cbace67a55a6fa25da078d5ea9f2d25b7689b4e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:19 +0100 Subject: [PATCH 19/95] New translations strings.properties (Italian) [ci skip] --- main/ui/src/main/resources/i18n/strings_it.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_it.properties b/main/ui/src/main/resources/i18n/strings_it.properties index 1770788c0..f4b4c9a3a 100644 --- a/main/ui/src/main/resources/i18n/strings_it.properties +++ b/main/ui/src/main/resources/i18n/strings_it.properties @@ -200,7 +200,6 @@ stats.read.accessCount=Totale lettura: %d stats.write.throughput.idle=Scrivi: inattivo stats.write.throughput.kibs=Scrittura: %.2f kiB/s stats.write.throughput.mibs=Scrittura: %.2f MiB/s -stats.write.total.data.none=Dati letti: - stats.write.total.data.kib=Dati scritti: %.1f kiB stats.write.total.data.mib=Dati scritti: %.1f MiB stats.write.total.data.gib=Dati scritti: %.1f GiB From e76440d9282f4bfa1b1de19c32fec8dd7324fcac Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:20 +0100 Subject: [PATCH 20/95] New translations strings.properties (Hungarian) [ci skip] --- main/ui/src/main/resources/i18n/strings_hu.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_hu.properties b/main/ui/src/main/resources/i18n/strings_hu.properties index 6604ac7cb..c0e5cc28f 100644 --- a/main/ui/src/main/resources/i18n/strings_hu.properties +++ b/main/ui/src/main/resources/i18n/strings_hu.properties @@ -188,7 +188,6 @@ stats.read.accessCount=Összes olvasás: %d stats.write.throughput.idle=Írás: tétlen stats.write.throughput.kibs=Írás: %.2f kiB/s stats.write.throughput.mibs=Írás: %.2f MiB/s -stats.write.total.data.none=Írott adat: - stats.write.total.data.kib=Írott adat: %.1f kiB stats.write.total.data.mib=Írott adat: %.1f MiB stats.write.total.data.gib=Írott adat: %.1f GiB From 0e0e75b89c40020808949446d3ab7a7f1606895e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:22 +0100 Subject: [PATCH 21/95] New translations strings.properties (Greek) [ci skip] --- main/ui/src/main/resources/i18n/strings_el.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_el.properties b/main/ui/src/main/resources/i18n/strings_el.properties index df49fdb2b..7a4085f0d 100644 --- a/main/ui/src/main/resources/i18n/strings_el.properties +++ b/main/ui/src/main/resources/i18n/strings_el.properties @@ -200,7 +200,6 @@ stats.read.accessCount=Συνολικές αναγνώσεις: %d stats.write.throughput.idle=Εγγραφή: ηρεμία stats.write.throughput.kibs=Εγγραφή: %.2f kiB/s stats.write.throughput.mibs=Εγγραφή: %.2f MiB/s -stats.write.total.data.none=Ανάγνωση δεδομένων: - stats.write.total.data.kib=Δεδομένα που γράφτηκαν: %.1f kiB stats.write.total.data.mib=Δεδομένα που γράφτηκαν: %.1f MiB stats.write.total.data.gib=Δεδομένα που γράφτηκαν: %.1f GiB From 350a4ab762d28f4dc5e3390ece1d6437d50bd77a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:23 +0100 Subject: [PATCH 22/95] New translations strings.properties (German) [ci skip] --- .../main/resources/i18n/strings_de.properties | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/main/ui/src/main/resources/i18n/strings_de.properties b/main/ui/src/main/resources/i18n/strings_de.properties index 9e78da0f0..5877134df 100644 --- a/main/ui/src/main/resources/i18n/strings_de.properties +++ b/main/ui/src/main/resources/i18n/strings_de.properties @@ -189,28 +189,27 @@ stats.cacheHitRate=Cache-Trefferrate stats.read.throughput.idle=Lesen: Leerlauf stats.read.throughput.kibs=Lesen: %.2f kiB/s stats.read.throughput.mibs=Lesen: %.2f MiB/s -stats.read.total.data.none=Daten gelesen: - -stats.read.total.data.kib=Daten gelesen: %.1f kiB -stats.read.total.data.mib=Daten gelesen: %.1f MiB -stats.read.total.data.gib=Daten gelesen: %.1f GiB -stats.decr.total.data.none=Daten entschlüsselt: - -stats.decr.total.data.kib=Daten entschlüsselt: %.1f kiB -stats.decr.total.data.mib=Daten entschlüsselt: %.1f MiB -stats.decr.total.data.gib=Daten entschlüsselt: %.1f GiB -stats.read.accessCount=Gesamt gelesen: %d +stats.read.total.data.none=Gelesen: - +stats.read.total.data.kib=Gelesen: %.1f kiB +stats.read.total.data.mib=Gelesen: %.1f MiB +stats.read.total.data.gib=Gelesen: %.1f GiB +stats.decr.total.data.none=Entschlüsselt: - +stats.decr.total.data.kib=Entschlüsselt: %.1f kiB +stats.decr.total.data.mib=Entschlüsselt: %.1f MiB +stats.decr.total.data.gib=Entschlüsselt: %.1f GiB +stats.read.accessCount=Lesezugriffe: %d ## Write stats.write.throughput.idle=Schreiben: Leerlauf stats.write.throughput.kibs=Schreiben: %.2f kiB/s stats.write.throughput.mibs=Schreiben: %.2f MiB/s -stats.write.total.data.none=Daten gelesen: - -stats.write.total.data.kib=Daten geschrieben: %.1f kiB -stats.write.total.data.mib=Daten geschrieben: %.1f MiB -stats.write.total.data.gib=Daten geschrieben: %.1f GiB -stats.encr.total.data.none=Daten verschlüsselt: - -stats.encr.total.data.kib=Daten verschlüsselt: %.1f kiB -stats.encr.total.data.mib=Datenverschlüsselt: %.1f MiB -stats.encr.total.data.gib=Daten verschlüsselt: %.1f GiB -stats.write.accessCount=Gesamt geschrieben: %d +stats.write.total.data.kib=Geschrieben: %.1f kiB +stats.write.total.data.mib=Geschrieben: %.1f MiB +stats.write.total.data.gib=Geschrieben: %.1f GiB +stats.encr.total.data.none=Verschlüsselt: - +stats.encr.total.data.kib=Verschlüsselt: %.1f kiB +stats.encr.total.data.mib=Verschlüsselt: %.1f MiB +stats.encr.total.data.gib=Verschlüsselt: %.1f GiB +stats.write.accessCount=Schreibzugriffe: %d # Main Window main.closeBtn.tooltip=Schließen From 74d7f63f646e9dd7873f66b139cd55c56ccd286f Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:24 +0100 Subject: [PATCH 23/95] New translations strings.properties (Czech) [ci skip] --- main/ui/src/main/resources/i18n/strings_cs.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_cs.properties b/main/ui/src/main/resources/i18n/strings_cs.properties index c6a4c4d79..8af675d7e 100644 --- a/main/ui/src/main/resources/i18n/strings_cs.properties +++ b/main/ui/src/main/resources/i18n/strings_cs.properties @@ -197,7 +197,6 @@ stats.read.accessCount=Celkem přečteno: %d stats.write.throughput.idle=Zápis: nečinný stats.write.throughput.kibs=Zápis: %.2f kiB/s stats.write.throughput.mibs=Zápis: %.2f MiB/s -stats.write.total.data.none=Přečteno: - stats.write.total.data.kib=Zapsáno: %.1f kiB stats.write.total.data.mib=Zapsáno: %.1f MiB stats.write.total.data.gib=Zapsáno: %.1f GiB From f30451f7e1187c379bf87533d61aeb8e100fd4ea Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:25 +0100 Subject: [PATCH 24/95] New translations strings.properties (Catalan) [ci skip] --- main/ui/src/main/resources/i18n/strings_ca.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_ca.properties b/main/ui/src/main/resources/i18n/strings_ca.properties index 35254759f..a636b1e1b 100644 --- a/main/ui/src/main/resources/i18n/strings_ca.properties +++ b/main/ui/src/main/resources/i18n/strings_ca.properties @@ -202,7 +202,6 @@ stats.read.accessCount=Lectures en total: %d stats.write.throughput.idle=Escriu: inactiu stats.write.throughput.kibs=Escriu: %.2f kiB/s stats.write.throughput.mibs=Escriu: %.2f MiB/s -stats.write.total.data.none=Dades llegides: - stats.write.total.data.kib=Dades escrites: %.1f kiB stats.write.total.data.mib=Dades escrites: %.1f MiB stats.write.total.data.gib=Dades escrites: %.1f GiB From 36121527ca046e8c88c27e3a0581c0a2bfe7ae28 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:27 +0100 Subject: [PATCH 25/95] New translations strings.properties (Spanish) [ci skip] --- main/ui/src/main/resources/i18n/strings_es.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_es.properties b/main/ui/src/main/resources/i18n/strings_es.properties index 365186f44..1d788bcb1 100644 --- a/main/ui/src/main/resources/i18n/strings_es.properties +++ b/main/ui/src/main/resources/i18n/strings_es.properties @@ -202,7 +202,6 @@ stats.read.accessCount=Total leídos: %d stats.write.throughput.idle=Escritura: inactivo stats.write.throughput.kibs=Escritura: %.2f kiB/s stats.write.throughput.mibs=Escritura: %.2f MiB/s -stats.write.total.data.none=Datos leídos: - stats.write.total.data.kib=Datos escritos: %.1f kiB stats.write.total.data.mib=Datos escritos: %.1f MiB stats.write.total.data.gib=Datos escritos: %.1f GiB From 450dec2baffca5ac9e9d00da31f266aa81e6eb03 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:29 +0100 Subject: [PATCH 26/95] New translations strings.properties (French) [ci skip] --- main/ui/src/main/resources/i18n/strings_fr.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_fr.properties b/main/ui/src/main/resources/i18n/strings_fr.properties index dd3b29882..14724de98 100644 --- a/main/ui/src/main/resources/i18n/strings_fr.properties +++ b/main/ui/src/main/resources/i18n/strings_fr.properties @@ -202,7 +202,6 @@ stats.read.accessCount=Total des lectures: %d stats.write.throughput.idle=Écriture : inactif stats.write.throughput.kibs=Écriture : %.2f kiO/s stats.write.throughput.mibs=Écriture : %.2f Mo/s -stats.write.total.data.none=Lecture des données : - stats.write.total.data.kib=Données écrites : %.1f kiO stats.write.total.data.mib=Données écrites : %.1f MiO stats.write.total.data.gib=Données écrites : %.1f GiO From 3ccae93757ce265080bd8060809f13da1fc07d0b Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:09:30 +0100 Subject: [PATCH 27/95] New translations strings.properties (Norwegian Bokmal) [ci skip] --- main/ui/src/main/resources/i18n/strings_nb.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/main/ui/src/main/resources/i18n/strings_nb.properties b/main/ui/src/main/resources/i18n/strings_nb.properties index ad6e8f8cf..7d49be4c4 100644 --- a/main/ui/src/main/resources/i18n/strings_nb.properties +++ b/main/ui/src/main/resources/i18n/strings_nb.properties @@ -202,7 +202,6 @@ stats.read.accessCount=Lesninger totalt: %d stats.write.throughput.idle=Skrive: inaktiv stats.write.throughput.kibs=Skriver: %.2f kiB/s stats.write.throughput.mibs=Skriver: %.2f MiB/s -stats.write.total.data.none=Data lest: - stats.write.total.data.kib=Data skrevet: %.1f kiB stats.write.total.data.mib=Data skrevet: %.1f MiB stats.write.total.data.gib=Data skrevet: %.1f GiB From 93c78b63ca2b677948ab0661d80832ea45f4ea7c Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:41:50 +0100 Subject: [PATCH 28/95] New translations strings.properties (Russian) [ci skip] --- main/ui/src/main/resources/i18n/strings_ru.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/main/ui/src/main/resources/i18n/strings_ru.properties b/main/ui/src/main/resources/i18n/strings_ru.properties index 0c9010f50..88f441b4f 100644 --- a/main/ui/src/main/resources/i18n/strings_ru.properties +++ b/main/ui/src/main/resources/i18n/strings_ru.properties @@ -202,6 +202,7 @@ stats.read.accessCount=Всего операций чтения: %d stats.write.throughput.idle=Запись: бездействие stats.write.throughput.kibs=Запись: %.2f КиБ/с stats.write.throughput.mibs=Запись: %.2f МиБ/с +stats.write.total.data.none=Записано данных: - stats.write.total.data.kib=Записано: %.1f КиБ stats.write.total.data.mib=Записано: %.1f МиБ stats.write.total.data.gib=Записано: %.1f ГиБ From c1edb30472e6426e0197c4941d4ccfc5562cf1b0 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 14:41:51 +0100 Subject: [PATCH 29/95] New translations strings.properties (Bosnian) [ci skip] --- .../main/resources/i18n/strings_bs.properties | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/main/ui/src/main/resources/i18n/strings_bs.properties b/main/ui/src/main/resources/i18n/strings_bs.properties index d5781878b..cd8432b4f 100644 --- a/main/ui/src/main/resources/i18n/strings_bs.properties +++ b/main/ui/src/main/resources/i18n/strings_bs.properties @@ -105,30 +105,81 @@ unlock.success.revealBtn=Otkrij sef unlock.error.heading=Sef nije moguće otključati ### Invalid Mount Point unlock.error.invalidMountPoint.notExisting=Tačka postavljanja "%s" nije direktorij, nije prazna ili ne postoji. +unlock.error.invalidMountPoint.existing=Tačka povezivanja "%s" već postoji ili nadređeni folder nedostaje. # Lock ## Force +lock.forced.heading=Zaključavanje nije uspjelo +lock.forced.message=Zaključavanje "%s" blokirano je operacijama na čekanju ili otvorenim datotekama. Možete prisilno zaključati ovaj sef, međutim prekid U / I-a može rezultirati gubitkom nespremljenih podataka. +lock.forced.confirmBtn=Prisilno zaključaj ## Failure +lock.fail.heading=Zaključavanje sefa nije uspjelo. +lock.fail.message=Sef "%s" nije moguće zaključati. Osigurajte da je nespremljeni rad sačuvan negdje drugdje i da su važne operacije čitanja / pisanja završene. Da biste zatvorili sef, zaustavite Cryptomator proces. # Migration +migration.title=Nadogradi sef ## Start +migration.start.prompt=Sef "%s" treba ažurirati na noviji format. Prije nastavka, provjerite da nije na čekanju sinkronizacija koja utječe na ovaj sef. +migration.start.confirm=Da, moj sef je u potpunosti sinhroniziran ## Run +migration.run.enterPassword=Unesite lozinku za "%s" +migration.run.startMigrationBtn=Nadogradi sef +migration.run.progressHint=Ovo bi moglo potrajati… ## Sucess +migration.success.nextStepsInstructions="%s" je uspješno nadograđen.\nSada možete otključati svoj sef. migration.success.unlockNow=Otključaj sada ## Missing file system capabilities +migration.error.missingFileSystemCapabilities.title=Nepodržan tip datoteke +migration.error.missingFileSystemCapabilities.description=Migracija nije započeta, jer se vaš sef nalazi u neadekvatnom sistemu datoteka. +migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=Sistem datoteka ne podržava duga imena datoteka. +migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=Sistem datoteka ne podržava duga imena datoteka. +migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=Sistem datoteka ne dozvoljava čitanje. +migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=Sistem datoteka ne dozvoljava pisanje. ## Impossible +migration.impossible.heading=Sef se ne može nadograditi +migration.impossible.reason=Sef se ne može automatski migrirati jer njegovo mjesto za pohranu ili pristupna točka nisu kompatibilni. +migration.impossible.moreInfo=Sef se i dalje može otvoriti sa starijom verzijom. Za upute o ručnom migriranju sefa posjetite # Preferences preferences.title=Postavke ## General +preferences.general=Generalno +preferences.general.theme=Izgled +preferences.general.theme.automatic=Automatski +preferences.general.theme.light=Svijetlo +preferences.general.theme.dark=Tamno +preferences.general.unlockThemes=Otključaj tamni mod +preferences.general.showMinimizeButton=Pokaži dugme za minimiziranje +preferences.general.showTrayIcon=Prikaži tray ikonu (potrebnan restart) +preferences.general.startHidden=Sakrij prozor prilikom pokretanja Cryptomatora +preferences.general.debugLogging=Omogući evidenciju otklanjanja pogrešaka +preferences.general.debugDirectory=Pokaži dnevnik podataka +preferences.general.autoStart=Pokreni Cryptomator pri pokretanju sistema +preferences.general.keychainBackend=Pohrani lozinku sa +preferences.general.keychainBackend.org.cryptomator.linux.keychain.SecretServiceKeychainAccess=Gnome Keyring +preferences.general.keychainBackend.org.cryptomator.linux.keychain.KDEWalletKeychainAccess=KDE Wallet +preferences.general.keychainBackend.org.cryptomator.macos.keychain.MacSystemKeychainAccess=macOS Keychain Access +preferences.general.keychainBackend.org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess=Windows Data Protection +preferences.general.interfaceOrientation=Orijentacija Interfejsa +preferences.general.interfaceOrientation.ltr=S lijeva ka desno +preferences.general.interfaceOrientation.rtl=Sa desna ka lijevo ## Volume +preferences.volume=Virtuelni pogon +preferences.volume.type=Tip volumena +preferences.volume.webdav.port=WebDAV Port +preferences.volume.webdav.scheme=WebDAV Scheme ## Updates +preferences.updates=Ažuriranja +preferences.updates.currentVersion=Trenutna verzija: %s +preferences.updates.autoUpdateCheck=Automatski provjeri ima li ažuriranja +preferences.updates.checkNowBtn=Provjeri sada ## Donation Key ## About # Vault Statistics ## Read ## Write +stats.write.total.data.none=Podaci su upisani:- # Main Window main.closeBtn.tooltip=Zatvori @@ -146,12 +197,25 @@ main.vaultDetail.bytesPerSecondRead=Čitaj: main.vaultDetail.bytesPerSecondWritten=Piši: main.vaultDetail.stats=Statistika sefa ### Missing +main.vaultDetail.missing.recheck=Provjeri ponovo +main.vaultDetail.missing.remove=Ukloni sa liste sefova… +main.vaultDetail.missing.changeLocation=Promijeni lokaciju sefa… ### Needs Migration +main.vaultDetail.migrateButton=Nadogradi sef +main.vaultDetail.migratePrompt=Da biste mogli pristupiti svom sefu, morate ga nadograditi na novi format # Wrong File Alert +wrongFileAlert.title=Kako enkriptovati podatke +wrongFileAlert.header.title=Da li ste pokušali enkriptovati ove datoteke? +wrongFileAlert.header.lead=U tu svrhu Cryptomator kreira volumen u vašem upravljačkom sistemu. +wrongFileAlert.instruction.0=Da biste enkriptovali datoteke, slijedite ove korake: +wrongFileAlert.instruction.1=1. Otključajte sef. +wrongFileAlert.instruction.2=2. Kliknite "Otkrivanje" da biste otvorili volumen u vašem upravitelju datotekama. +wrongFileAlert.instruction.3=3. Dodajte datoteke u ovaj disk. # Vault Options ## General +vaultOptions.general=Generalno vaultOptions.general.vaultName=Ime sefa ## Mount vaultOptions.mount.mountPoint.directoryPickerButton=Odaberi… From 0a8516ae9ac718fc8b41726d84466d82d0cdcc5b Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 15:09:55 +0100 Subject: [PATCH 30/95] New translations strings.properties (French) [ci skip] --- main/ui/src/main/resources/i18n/strings_fr.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/main/ui/src/main/resources/i18n/strings_fr.properties b/main/ui/src/main/resources/i18n/strings_fr.properties index 14724de98..3df70d548 100644 --- a/main/ui/src/main/resources/i18n/strings_fr.properties +++ b/main/ui/src/main/resources/i18n/strings_fr.properties @@ -202,6 +202,7 @@ stats.read.accessCount=Total des lectures: %d stats.write.throughput.idle=Écriture : inactif stats.write.throughput.kibs=Écriture : %.2f kiO/s stats.write.throughput.mibs=Écriture : %.2f Mo/s +stats.write.total.data.none=Données écrites : - stats.write.total.data.kib=Données écrites : %.1f kiO stats.write.total.data.mib=Données écrites : %.1f MiO stats.write.total.data.gib=Données écrites : %.1f GiO From 635f64c84717f806f116d7eda5d64900fcf7fd6e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 15:09:56 +0100 Subject: [PATCH 31/95] New translations strings.properties (German) [ci skip] --- main/ui/src/main/resources/i18n/strings_de.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/main/ui/src/main/resources/i18n/strings_de.properties b/main/ui/src/main/resources/i18n/strings_de.properties index 5877134df..80f5a41d6 100644 --- a/main/ui/src/main/resources/i18n/strings_de.properties +++ b/main/ui/src/main/resources/i18n/strings_de.properties @@ -202,6 +202,7 @@ stats.read.accessCount=Lesezugriffe: %d stats.write.throughput.idle=Schreiben: Leerlauf stats.write.throughput.kibs=Schreiben: %.2f kiB/s stats.write.throughput.mibs=Schreiben: %.2f MiB/s +stats.write.total.data.none=Daten geschrieben: - stats.write.total.data.kib=Geschrieben: %.1f kiB stats.write.total.data.mib=Geschrieben: %.1f MiB stats.write.total.data.gib=Geschrieben: %.1f GiB From 02aa46ece8395cf562f3e8fd9650c435af76bf3e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 15:09:58 +0100 Subject: [PATCH 32/95] New translations strings.properties (Bosnian) [ci skip] --- .../main/resources/i18n/strings_bs.properties | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/main/ui/src/main/resources/i18n/strings_bs.properties b/main/ui/src/main/resources/i18n/strings_bs.properties index cd8432b4f..8e45c0cc3 100644 --- a/main/ui/src/main/resources/i18n/strings_bs.properties +++ b/main/ui/src/main/resources/i18n/strings_bs.properties @@ -212,18 +212,57 @@ wrongFileAlert.instruction.0=Da biste enkriptovali datoteke, slijedite ove korak wrongFileAlert.instruction.1=1. Otključajte sef. wrongFileAlert.instruction.2=2. Kliknite "Otkrivanje" da biste otvorili volumen u vašem upravitelju datotekama. wrongFileAlert.instruction.3=3. Dodajte datoteke u ovaj disk. +wrongFileAlert.link=Za dalju podršku, posjetite # Vault Options ## General vaultOptions.general=Generalno vaultOptions.general.vaultName=Ime sefa +vaultOptions.general.unlockAfterStartup=Otključaj sef pri pokretanju Cryptomatora +vaultOptions.general.actionAfterUnlock=Nakon uspješnog otključavanja +vaultOptions.general.actionAfterUnlock.ignore=Ne radi ništa +vaultOptions.general.actionAfterUnlock.reveal=Otkrij pogon +vaultOptions.general.actionAfterUnlock.ask=Pitaj ## Mount +vaultOptions.mount=Povezivanje +vaultOptions.mount.readonly=Samo čitanje +vaultOptions.mount.customMountFlags=Prilagođena obilježja povezivanja +vaultOptions.mount.winDriveLetterOccupied=zauzeto +vaultOptions.mount.mountPoint=Tačka povezivanja +vaultOptions.mount.mountPoint.auto=Automatski odaberi pogodnu lokaciju +vaultOptions.mount.mountPoint.driveLetter=Koristi dodjeljeno slovo (oznaku) diska +vaultOptions.mount.mountPoint.custom=Prilagođena adresa vaultOptions.mount.mountPoint.directoryPickerButton=Odaberi… +vaultOptions.mount.mountPoint.directoryPickerTitle=Izaberi praznu mapu ## Master Key +vaultOptions.masterkey=Šifra vaultOptions.masterkey.changePasswordBtn=Promjeni lozinku +vaultOptions.masterkey.forgetSavedPasswordBtn=Zaborav spremljenu šifru +vaultOptions.masterkey.recoveryKeyExpanation=Ključ za oporavak je vaše jedino sredstvo za vraćanje pristupa sefu ako izgubite lozinku. +vaultOptions.masterkey.showRecoveryKeyBtn=Pokaži ključ za oporavak +vaultOptions.masterkey.recoverPasswordBtn=Povrati šifru # Recovery Key +recoveryKey.title=Ključ za oporavak +recoveryKey.enterPassword.prompt=Unesite šifru da biste prikazali ključ za oporavak za "%s": +recoveryKey.display.message=Sljedeći ključ za oporavak može se koristiti za vraćanje pristupa "%s": +recoveryKey.display.StorageHints=Pohranite ga negdje vrlo sigurno, npr.:\n • Spremite ga pomoću menadžera lozinki\n • Spremite ga na USB disk\n • Odštampajte ga na papiru +recoveryKey.recover.prompt=Unesite ključ za oporavak za "%s": +recoveryKey.recover.validKey=Ključ za oporavak je ispravan +recoveryKey.printout.heading=Cryptomator Ključ za oporavak za \n"%s"\n # New Password +newPassword.promptText=Unesi novu šifru +newPassword.reenterPassword=Potvrdi novu šifru +newPassword.passwordsMatch=Šifra odgovara! +newPassword.passwordsDoNotMatch=Šifre se ne poklapaju +passwordStrength.messageLabel.tooShort=Upotrijebite najmanje %d znakova +passwordStrength.messageLabel.0=Veoma slabo +passwordStrength.messageLabel.1=Slabo +passwordStrength.messageLabel.2=Dovoljno +passwordStrength.messageLabel.3=Sigurno +passwordStrength.messageLabel.4=Veoma sigurno # Quit +quit.prompt=Zatvoriti prijavu? Postoje otključani sefovi. +quit.lockAndQuit=Zaključaj i zatvori From 4f44e71e13880d015b39761b8b20ba8070f02c37 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 15:40:40 +0100 Subject: [PATCH 33/95] New translations strings.properties (Czech) [ci skip] --- main/ui/src/main/resources/i18n/strings_cs.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/main/ui/src/main/resources/i18n/strings_cs.properties b/main/ui/src/main/resources/i18n/strings_cs.properties index 8af675d7e..50d5d4398 100644 --- a/main/ui/src/main/resources/i18n/strings_cs.properties +++ b/main/ui/src/main/resources/i18n/strings_cs.properties @@ -197,6 +197,7 @@ stats.read.accessCount=Celkem přečteno: %d stats.write.throughput.idle=Zápis: nečinný stats.write.throughput.kibs=Zápis: %.2f kiB/s stats.write.throughput.mibs=Zápis: %.2f MiB/s +stats.write.total.data.none=Zapsaná data: - stats.write.total.data.kib=Zapsáno: %.1f kiB stats.write.total.data.mib=Zapsáno: %.1f MiB stats.write.total.data.gib=Zapsáno: %.1f GiB From c7332476118bbe9c7b65ed339ecde60e62de182c Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 15:40:42 +0100 Subject: [PATCH 34/95] New translations strings.properties (Japanese) [ci skip] --- main/ui/src/main/resources/i18n/strings_ja.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/main/ui/src/main/resources/i18n/strings_ja.properties b/main/ui/src/main/resources/i18n/strings_ja.properties index 7e92e7774..57f9bff51 100644 --- a/main/ui/src/main/resources/i18n/strings_ja.properties +++ b/main/ui/src/main/resources/i18n/strings_ja.properties @@ -202,6 +202,7 @@ stats.read.accessCount=合計読み取り: %d stats.write.throughput.idle=書き込み: アイドル状態 stats.write.throughput.kibs=書き込み: %.2f kiB/s stats.write.throughput.mibs=書き込み: %.2f MiB/s +stats.write.total.data.none=書き込み済みデータ: - stats.write.total.data.kib=書き込み済みデータ: %.1f kiB stats.write.total.data.mib=書き込み済みデータ: %.1f MiB stats.write.total.data.gib=書き込み済みデータ: %.1f GiB From 2518086e46afb88f591c110cdeb7e64be71f55a7 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 15:40:44 +0100 Subject: [PATCH 35/95] New translations strings.properties (Polish) [ci skip] --- main/ui/src/main/resources/i18n/strings_pl.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/main/ui/src/main/resources/i18n/strings_pl.properties b/main/ui/src/main/resources/i18n/strings_pl.properties index 4d3f105e1..f3c18adfe 100644 --- a/main/ui/src/main/resources/i18n/strings_pl.properties +++ b/main/ui/src/main/resources/i18n/strings_pl.properties @@ -202,6 +202,7 @@ stats.read.accessCount=Całkowite odczyty: %d stats.write.throughput.idle=Zapis: bezczynny stats.write.throughput.kibs=Zapis: %.2f kiB/s stats.write.throughput.mibs=Zapis: %.2f kiB/s +stats.write.total.data.none=Zapisane dane: - stats.write.total.data.kib=Zapisane dane: %.1f kiB stats.write.total.data.mib=Zapisane dane: %.1f MiB stats.write.total.data.gib=Zapisane dane: %.1f kiB From efacbbe2b6ec48c62db6a3b9575b78c236abf11a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 15:40:45 +0100 Subject: [PATCH 36/95] New translations strings.properties (Bosnian) [ci skip] --- .../main/resources/i18n/strings_bs.properties | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/main/ui/src/main/resources/i18n/strings_bs.properties b/main/ui/src/main/resources/i18n/strings_bs.properties index 8e45c0cc3..e09428c26 100644 --- a/main/ui/src/main/resources/i18n/strings_bs.properties +++ b/main/ui/src/main/resources/i18n/strings_bs.properties @@ -173,30 +173,80 @@ preferences.updates=Ažuriranja preferences.updates.currentVersion=Trenutna verzija: %s preferences.updates.autoUpdateCheck=Automatski provjeri ima li ažuriranja preferences.updates.checkNowBtn=Provjeri sada +preferences.updates.updateAvailable=Dostupno ažuriranje na verziju %s. ## Donation Key +preferences.donationKey=Donacija +preferences.donationKey.registeredFor=Registrovan za %s +preferences.donationKey.noDonationKey=Nije pronađen važeći ključ za donaciju. To je poput licence, ali za sjajne ljude koji koriste besplatni softver. ;-) +preferences.donationKey.getDonationKey=Nabavite ključ za donaciju ## About +preferences.about=O programu # Vault Statistics +stats.title=Statistika za %s +stats.cacheHitRate=Brzina učitavanja u predmemoriju ## Read +stats.read.throughput.idle=Čitaj: U pripravnosti +stats.read.throughput.kibs=Čitanje: %.2f kiB/s +stats.read.throughput.mibs=Čitanje: %.2f MiB/s +stats.read.total.data.none=Pročitano podataka: - +stats.read.total.data.kib=Pročitano podataka: %.1f kiB +stats.read.total.data.mib=Pročitano podataka: %.1f MiB +stats.read.total.data.gib=Pročitano podataka: %.1f GiB +stats.decr.total.data.none=Otključani podaci: - +stats.decr.total.data.kib=Otključano podataka: %.1f kiB +stats.decr.total.data.mib=Otključano podataka: %.1f MiB +stats.decr.total.data.gib=Otključano podataka: %.1f GiB +stats.read.accessCount=Ukupno pročitano: %d ## Write +stats.write.throughput.idle=Pisanje: U pripravnosti +stats.write.throughput.kibs=Upisano: %.2f kiB/s +stats.write.throughput.mibs=Upisano: %.2f MiB/s stats.write.total.data.none=Podaci su upisani:- +stats.write.total.data.kib=Upisano podataka: %.1f kiB +stats.write.total.data.mib=Upisano podataka: %.1f MiB +stats.write.total.data.gib=Upisano podataka: %.1f GiB +stats.encr.total.data.none=Otključano podataka: - +stats.encr.total.data.kib=Otključano podataka: %.1f kiB +stats.encr.total.data.mib=Otključano podataka: %.1f MiB +stats.encr.total.data.gib=Otključano podataka: %.1f GiB +stats.write.accessCount=Ukupno upisano: %d # Main Window main.closeBtn.tooltip=Zatvori +main.minimizeBtn.tooltip=Minimiziraj main.preferencesBtn.tooltip=Postavke +main.debugModeEnabled.tooltip=Omogućen je mod otklanjanja pogrešaka +main.donationKeyMissing.tooltip=Molimo razmislite o doniranju ## Drag 'n' Drop +main.dropZone.dropVault=Dodajte ovaj sef +main.dropZone.unknownDragboardContent=Ako želite dodati sef, povucite ga u ovaj prozor ## Vault List +main.vaultlist.emptyList.onboardingInstruction=Kliknite ovdje da dodate sef +main.vaultlist.contextMenu.remove=Ukloni Sef… main.vaultlist.addVaultBtn=Dodaj sef ## Vault Detail ### Welcome +main.vaultDetail.welcomeOnboarding=Hvala što ste izabrali Cryptomator za zaštitu podataka. Ako vam je potrebna pomoć, pogledajte naše vodiče za početak: ### Locked +main.vaultDetail.lockedStatus=ZAKLJUČANO +main.vaultDetail.unlockBtn=Otključaj… main.vaultDetail.unlockNowBtn=Otključaj sada +main.vaultDetail.optionsBtn=Opcije sefa +main.vaultDetail.passwordSavedInKeychain=Šifra sačuvana ### Unlocked +main.vaultDetail.unlockedStatus=OTKLJUČANO +main.vaultDetail.accessLocation=Sadržaj Vašeg sefa je dostupan ovdje: +main.vaultDetail.revealBtn=Otkrij pogon main.vaultDetail.lockBtn=Zaključaj main.vaultDetail.bytesPerSecondRead=Čitaj: main.vaultDetail.bytesPerSecondWritten=Piši: +main.vaultDetail.throughput.idle=u stanju mirovanja +main.vaultDetail.throughput.kbps=%.1f kiB/s +main.vaultDetail.throughput.mbps=%.1f MiB/s main.vaultDetail.stats=Statistika sefa ### Missing +main.vaultDetail.missing.info=Cryptomator nije mogao pronaći disk na ovoj lokaciji. main.vaultDetail.missing.recheck=Provjeri ponovo main.vaultDetail.missing.remove=Ukloni sa liste sefova… main.vaultDetail.missing.changeLocation=Promijeni lokaciju sefa… From 2395dbcae902936c6dc44fd67611ef178b496453 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 16:09:11 +0100 Subject: [PATCH 37/95] New translations strings.properties (Italian) [ci skip] --- main/ui/src/main/resources/i18n/strings_it.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/main/ui/src/main/resources/i18n/strings_it.properties b/main/ui/src/main/resources/i18n/strings_it.properties index f4b4c9a3a..c39233db4 100644 --- a/main/ui/src/main/resources/i18n/strings_it.properties +++ b/main/ui/src/main/resources/i18n/strings_it.properties @@ -200,6 +200,7 @@ stats.read.accessCount=Totale lettura: %d stats.write.throughput.idle=Scrivi: inattivo stats.write.throughput.kibs=Scrittura: %.2f kiB/s stats.write.throughput.mibs=Scrittura: %.2f MiB/s +stats.write.total.data.none=Dati scritti: - stats.write.total.data.kib=Dati scritti: %.1f kiB stats.write.total.data.mib=Dati scritti: %.1f MiB stats.write.total.data.gib=Dati scritti: %.1f GiB From 797e15c775e7977d3862ae0d908fc8746d922bb8 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 17:08:04 +0100 Subject: [PATCH 38/95] New translations strings.properties (Chinese Traditional) [ci skip] --- main/ui/src/main/resources/i18n/strings_zh_TW.properties | 1 + 1 file changed, 1 insertion(+) 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 463d50613..c8ac29196 100644 --- a/main/ui/src/main/resources/i18n/strings_zh_TW.properties +++ b/main/ui/src/main/resources/i18n/strings_zh_TW.properties @@ -202,6 +202,7 @@ stats.read.accessCount=總讀取：%d stats.write.throughput.idle=寫入：閒置 stats.write.throughput.kibs=寫入：%.2f kiB/s stats.write.throughput.mibs=寫入：%.2f MiB/s +stats.write.total.data.none=已寫入資料：- stats.write.total.data.kib=資料寫入：%.1f kiB stats.write.total.data.mib=資料寫入：%.1f MiB stats.write.total.data.gib=資料寫入：%.1f GiB From 24be36cccb737bdfc87db7d91c01e491bffff154 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 15 Feb 2021 18:19:27 +0100 Subject: [PATCH 39/95] New translations strings.properties (Spanish) [ci skip] --- main/ui/src/main/resources/i18n/strings_es.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/main/ui/src/main/resources/i18n/strings_es.properties b/main/ui/src/main/resources/i18n/strings_es.properties index 1d788bcb1..c6891c57c 100644 --- a/main/ui/src/main/resources/i18n/strings_es.properties +++ b/main/ui/src/main/resources/i18n/strings_es.properties @@ -202,6 +202,7 @@ stats.read.accessCount=Total leídos: %d stats.write.throughput.idle=Escritura: inactivo stats.write.throughput.kibs=Escritura: %.2f kiB/s stats.write.throughput.mibs=Escritura: %.2f MiB/s +stats.write.total.data.none=Datos escritos:- stats.write.total.data.kib=Datos escritos: %.1f kiB stats.write.total.data.mib=Datos escritos: %.1f MiB stats.write.total.data.gib=Datos escritos: %.1f GiB From bf51cc13d1f13cc35eee8efd40f904d77d41eaca Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Thu, 18 Feb 2021 09:15:19 +0100 Subject: [PATCH 40/95] renamed "save password" to "remember password", switched placements of "vault options" hyperlink/button and "password saved" label --- .../resources/fxml/vault_detail_locked.fxml | 17 +++++++++-------- .../src/main/resources/i18n/strings.properties | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml index aa4f5e855..d86defdf6 100644 --- a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml +++ b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml @@ -2,7 +2,6 @@ - @@ -25,18 +24,20 @@ - + + + - -