From eb3cfd6e6a5339f8be814b8d4795e509623a68fe Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 6 Jul 2016 16:25:31 +0200 Subject: [PATCH 01/12] updated placeholders [ci skip] --- main/ui/src/main/resources/localization/de.txt | 2 +- main/ui/src/main/resources/localization/en.txt | 2 +- main/ui/src/main/resources/localization/es.txt | 2 +- main/ui/src/main/resources/localization/fr.txt | 2 +- main/ui/src/main/resources/localization/hu.txt | 2 +- main/ui/src/main/resources/localization/it.txt | 2 +- main/ui/src/main/resources/localization/kr.txt | 2 +- main/ui/src/main/resources/localization/nl.txt | 2 +- main/ui/src/main/resources/localization/ru.txt | 2 +- main/ui/src/main/resources/localization/sk.txt | 2 +- main/ui/src/main/resources/localization/tr.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/main/ui/src/main/resources/localization/de.txt b/main/ui/src/main/resources/localization/de.txt index f46a8f480..870f70ff3 100644 --- a/main/ui/src/main/resources/localization/de.txt +++ b/main/ui/src/main/resources/localization/de.txt @@ -19,7 +19,7 @@ main.addDirectory.contextMenu.new = Tresor erstellen main.addDirectory.contextMenu.open = Tresor öffnen # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = Prüfe auf Updates... -welcome.newVersionMessage = Version %s kann heruntergeladen werden. Momentane Version %s. +welcome.newVersionMessage = Version %1$s kann heruntergeladen werden. Momentane Version %2$s. # initialize.fxml initialize.label.password = Passwort initialize.label.retypePassword = Passwort bestätigen diff --git a/main/ui/src/main/resources/localization/en.txt b/main/ui/src/main/resources/localization/en.txt index a108831f7..6f8dc24a7 100644 --- a/main/ui/src/main/resources/localization/en.txt +++ b/main/ui/src/main/resources/localization/en.txt @@ -19,7 +19,7 @@ main.directoryList.remove.confirmation.content=The vault will only be removed fr # welcome.fxml welcome.checkForUpdates.label.currentlyChecking=Checking for Updates... -welcome.newVersionMessage=Version %s can be downloaded. This is %s. +welcome.newVersionMessage=Version %1$s can be downloaded. This is %2$s. # initialize.fxml initialize.label.password=Password diff --git a/main/ui/src/main/resources/localization/es.txt b/main/ui/src/main/resources/localization/es.txt index 6174e8c07..89f838820 100644 --- a/main/ui/src/main/resources/localization/es.txt +++ b/main/ui/src/main/resources/localization/es.txt @@ -16,7 +16,7 @@ main.addDirectory.contextMenu.new = Crear una nueva caja fuerte main.addDirectory.contextMenu.open = Abrir una caja fuerte existente # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = Chequando por actualizaciónes... -welcome.newVersionMessage = Se puede bajar version %s. Este es %s. +welcome.newVersionMessage = Se puede bajar version %1$s. Este es %2$s. # initialize.fxml initialize.label.password = Contraseña initialize.label.retypePassword = Reintroduzca contraseña diff --git a/main/ui/src/main/resources/localization/fr.txt b/main/ui/src/main/resources/localization/fr.txt index 862f79a80..9256ca74a 100644 --- a/main/ui/src/main/resources/localization/fr.txt +++ b/main/ui/src/main/resources/localization/fr.txt @@ -19,7 +19,7 @@ main.addDirectory.contextMenu.new = Créer un nouveau coffre main.addDirectory.contextMenu.open = Ouvrir un coffre existant # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = Recherche de mise à jour... -welcome.newVersionMessage = La version %s peut-être téléchargée. Il s'agit de %s. +welcome.newVersionMessage = La version %1$s peut-être téléchargée. Il s'agit de %2$s. # initialize.fxml initialize.label.password = Mot de passe initialize.label.retypePassword = Confirmation diff --git a/main/ui/src/main/resources/localization/hu.txt b/main/ui/src/main/resources/localization/hu.txt index 8574671db..10c2fc724 100644 --- a/main/ui/src/main/resources/localization/hu.txt +++ b/main/ui/src/main/resources/localization/hu.txt @@ -14,7 +14,7 @@ main.addDirectory.contextMenu.new = Új széf létrehozása main.addDirectory.contextMenu.open = Létező széf megnyitása # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = Frissítések keresése... -welcome.newVersionMessage = Új verzió érhető el\: %s. Jelenlegi verzió\: %s. +welcome.newVersionMessage = Új verzió érhető el\: %1$s. Jelenlegi verzió\: %2$s. # initialize.fxml initialize.label.password = Jelszó initialize.label.retypePassword = Jelszó ismét diff --git a/main/ui/src/main/resources/localization/it.txt b/main/ui/src/main/resources/localization/it.txt index 603e6fe15..66da14c67 100644 --- a/main/ui/src/main/resources/localization/it.txt +++ b/main/ui/src/main/resources/localization/it.txt @@ -14,7 +14,7 @@ main.addDirectory.contextMenu.new = Crea un nuovo vault main.addDirectory.contextMenu.open = Apri un vault # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = Verifica aggiornamenti... -welcome.newVersionMessage = La versione %s può essere scaricata. Questa è %s +welcome.newVersionMessage = La versione %2$s può essere scaricata. Questa è %1$s # initialize.fxml initialize.label.password = Password initialize.label.retypePassword = Conferma password diff --git a/main/ui/src/main/resources/localization/kr.txt b/main/ui/src/main/resources/localization/kr.txt index 9865f830a..e69dd53ce 100644 --- a/main/ui/src/main/resources/localization/kr.txt +++ b/main/ui/src/main/resources/localization/kr.txt @@ -14,7 +14,7 @@ main.addDirectory.contextMenu.new = 새 보관함 만들기 main.addDirectory.contextMenu.open = 기존 보관함 열기 # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = 업데이트 확인 중... -welcome.newVersionMessage = %s 버전이 새로 다운로드 가능합니다. 지금 버전은 %s 입니다. +welcome.newVersionMessage = %1$s 버전이 새로 다운로드 가능합니다. 지금 버전은 %2$s 입니다. # initialize.fxml initialize.label.password = 비밀번호 initialize.label.retypePassword = 비밀번호 재입력 diff --git a/main/ui/src/main/resources/localization/nl.txt b/main/ui/src/main/resources/localization/nl.txt index 5210c4314..87d4b2f96 100644 --- a/main/ui/src/main/resources/localization/nl.txt +++ b/main/ui/src/main/resources/localization/nl.txt @@ -14,7 +14,7 @@ main.addDirectory.contextMenu.new = Creeer nieuwe kluis main.addDirectory.contextMenu.open = Open bestaande kluis # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = Controleren op Updates... -welcome.newVersionMessage = Versie %s kan worden gedownload. Dit is %s. +welcome.newVersionMessage = Versie %1$s kan worden gedownload. Dit is %2$s. # initialize.fxml initialize.label.password = Wachtwoord initialize.label.retypePassword = Voer wachtwoord opnieuw in diff --git a/main/ui/src/main/resources/localization/ru.txt b/main/ui/src/main/resources/localization/ru.txt index 62e888039..665a60ffa 100644 --- a/main/ui/src/main/resources/localization/ru.txt +++ b/main/ui/src/main/resources/localization/ru.txt @@ -17,7 +17,7 @@ main.addDirectory.contextMenu.open = Открыть существующее х # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = Проверка обновлений... # Does the first %s mean the new version number, and the second %s - the current version user has? -welcome.newVersionMessage = Доступна версия %s. У вас %s. +welcome.newVersionMessage = Доступна версия %1$s. У вас %2$s. # initialize.fxml initialize.label.password = Пароль initialize.label.retypePassword = Введите пароль ещё раз diff --git a/main/ui/src/main/resources/localization/sk.txt b/main/ui/src/main/resources/localization/sk.txt index ebdefe7a0..6bc4b0515 100644 --- a/main/ui/src/main/resources/localization/sk.txt +++ b/main/ui/src/main/resources/localization/sk.txt @@ -15,7 +15,7 @@ main.addDirectory.contextMenu.new = Vytvoriť nový trezor main.addDirectory.contextMenu.open = Otvoriť existujúci trezor # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = Kontrolujú sa aktualizácie... -welcome.newVersionMessage = Verzia %s je pripravená na stiahnutie. Toto je verzia %s. +welcome.newVersionMessage = Verzia %1$s je pripravená na stiahnutie. Toto je verzia %2$s. # initialize.fxml initialize.label.password = Heslo initialize.label.retypePassword = Zadajte heslo znova diff --git a/main/ui/src/main/resources/localization/tr.txt b/main/ui/src/main/resources/localization/tr.txt index c13fbe669..4d4aa4837 100644 --- a/main/ui/src/main/resources/localization/tr.txt +++ b/main/ui/src/main/resources/localization/tr.txt @@ -14,7 +14,7 @@ main.addDirectory.contextMenu.new = Yeni bir kasa yarat main.addDirectory.contextMenu.open = Var olan kasayı aç # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = Güncellemeler kontrol ediliyor... -welcome.newVersionMessage = Sürüm %s indirilebilir. Şu anki sürüm\: %s +welcome.newVersionMessage = Sürüm %1$s indirilebilir. Şu anki sürüm\: %2$s # initialize.fxml initialize.label.password = Şifre initialize.label.retypePassword = Şifre (tekrar) From 8a3e09764ae34a65ac6ed6edef2441a13e2a2b93 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:25:55 +0200 Subject: [PATCH 02/12] only remove .cryptomator extension for vault version 3 --- .../UpgradeVersion3DropBundleExtension.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java index 125646069..04fa63f30 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java @@ -1,6 +1,7 @@ package org.cryptomator.ui.model; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -86,7 +87,24 @@ class UpgradeVersion3DropBundleExtension extends UpgradeStrategy { @Override public boolean isApplicable(Vault vault) { - return vault.path().getValue().getFileName().toString().endsWith(Vault.VAULT_FILE_EXTENSION); + Path vaultPath = vault.path().getValue(); + if (vaultPath.toString().endsWith(Vault.VAULT_FILE_EXTENSION)) { + final Path masterkeyFile = vaultPath.resolve(Constants.MASTERKEY_FILENAME); + try { + if (Files.isRegularFile(masterkeyFile)) { + final String keyContents = new String(Files.readAllBytes(masterkeyFile), StandardCharsets.UTF_8); + return keyContents.contains("\"version\":3") || keyContents.contains("\"version\": 3"); + } else { + LOG.warn("Not a file: {}", masterkeyFile); + return false; + } + } catch (IOException e) { + LOG.warn("Could not determine, whether upgrade is applicable.", e); + return false; + } + } else { + return false; + } } } From 67661f114b96dc4ab1fb8a79476083e45c5d81b7 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:28:39 +0200 Subject: [PATCH 03/12] Update nl.txt (POEditor.com) --- main/ui/src/main/resources/localization/nl.txt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/main/ui/src/main/resources/localization/nl.txt b/main/ui/src/main/resources/localization/nl.txt index 87d4b2f96..b86476fe5 100644 --- a/main/ui/src/main/resources/localization/nl.txt +++ b/main/ui/src/main/resources/localization/nl.txt @@ -1,10 +1,3 @@ -# Copyright (c) 2016 The Cryptomator Contributors -# This file is licensed under the terms of the MIT license. -# See the LICENSE.txt file for more info. -# -# Contributors: -# Pascal van Rossem - app.name = Cryptomator # main.fxml main.emptyListInstructions = Klik hier om een kluis toe te voegen @@ -19,13 +12,13 @@ welcome.newVersionMessage = Versie %1$s kan worden gedownload. Dit is %2$s. initialize.label.password = Wachtwoord initialize.label.retypePassword = Voer wachtwoord opnieuw in initialize.button.ok = Creëer kluis -initialize.messageLabel.alreadyInitialized = Kluis reeds geinitialiseerd +initialize.messageLabel.alreadyInitialized = Kluis reeds geïnitialiseerd initialize.messageLabel.initializationFailed = Kon kluis niet initialiseren. Zie logbestand voor details. # notfound.fxml notfound.label = Kluis kon niet gevonden worden. Is de kluis wellicht verplaatst? # upgrade.fxml upgrade.button = Upgrade kluis -upgrade.version3dropBundleExtension.msg = Deze kluis dient te worden gemigreerd naar een nieuwer formaat.\n"%1$s" zal worden hernoemd naar "%2$s".\nZorg ervoor dat de synchronisatie voltooid is alvorens door te gaan. +upgrade.version3dropBundleExtension.msg = Deze kluis dient te worden gemigreerd naar een nieuwer type.\n"%1$s" zal worden hernoemd naar "%2$s".\nZorg ervoor dat de synchronisatie voltooid is alvorens door te gaan. upgrade.version3dropBundleExtension.err.alreadyExists = Automatische migratie mislukt.\n"%s" bestaat al. # unlock.fxml unlock.label.password = Wachtwoord @@ -53,7 +46,7 @@ changePassword.errorMessage.decryptionFailed = Decoderen mislukt changePassword.infoMessage.success = Wachtwoord verandert # unlocked.fxml unlocked.button.lock = Vergrendel kluis -unlocked.moreOptions.reveal = Onthul schijf +unlocked.moreOptions.reveal = Maak schijf zichtbaar unlocked.moreOptions.copyUrl = Kopieer WebDAV URL unlocked.label.revealFailed = Commando mislukt unlocked.label.unmountFailed = Uitwerpen schijf mislukt @@ -86,4 +79,6 @@ initialize.messageLabel.passwordStrength.4 = Zeer sterk initialize.label.doNotForget = BELANGRIJK\: Indien je het wachtwoord vergeet, is er geen manier om je data te herstellen. main.directoryList.remove.confirmation.title = Verwijder Kluis main.directoryList.remove.confirmation.header = Weet je zeker dat je deze kluis wilt verwijderen? -main.directoryList.remove.confirmation.content = De kluis zal alleen van de lijst worden verwijdert. Verwijder de bestanden van het bestandssysteem voor permanente verwijdering. \ No newline at end of file +main.directoryList.remove.confirmation.content = De kluis zal alleen van de lijst worden verwijdert. Verwijder de bestanden van het bestandssysteem voor permanente verwijdering. +upgrade.version3to4.msg = Deze kluis dient gemigreerd te worden naar een nieuwer type. \nVersleutelde mapnamen zullen worden geüpdatet. \nZorg ervoor dat de synchronisatie voltooid is alvorens door te gaan. +upgrade.version3to4.err.io = Migratie mislukt door een I/O Exception. Zie logbestand voor details. \ No newline at end of file From f5cb82e21eff12d514d542f2630275431d485c93 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:28:40 +0200 Subject: [PATCH 04/12] Update fr.txt (POEditor.com) --- main/ui/src/main/resources/localization/fr.txt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/main/ui/src/main/resources/localization/fr.txt b/main/ui/src/main/resources/localization/fr.txt index 9256ca74a..ceebcb110 100644 --- a/main/ui/src/main/resources/localization/fr.txt +++ b/main/ui/src/main/resources/localization/fr.txt @@ -1,15 +1,3 @@ -# Copyright (c) 2016 The Cryptomator Contributors -# This file is licensed under the terms of the MIT license. -# See the LICENSE.txt file for more info. -# -# Contributors: -# Baptiste Peugnez -# Jean-Noël Charon -# M. B -# Maxence MOHR -# Olivier Thomasson -# vesparny - app.name = Cryptomator # main.fxml main.emptyListInstructions = Cliquez ici pour ajouter un coffre @@ -94,4 +82,6 @@ initialize.messageLabel.passwordStrength.4 = Très fort\n initialize.label.doNotForget = ATTENTION \: Si vous oubliez votre mot de passe, il n'y aura aucun moyen de récupérer vos données. main.directoryList.remove.confirmation.title = Retirer un coffre main.directoryList.remove.confirmation.header = Voulez-vous vraiment retirer ce coffre ? -main.directoryList.remove.confirmation.content = Le coffre sera simplement retiré de la liste. Pour le supprimer complètement, supprimez les fichiers depuis votre système de fichiers. \ No newline at end of file +main.directoryList.remove.confirmation.content = Le coffre sera simplement retiré de la liste. Pour le supprimer complètement, supprimez les fichiers depuis votre système de fichiers. +upgrade.version3to4.msg = Ce coffre doit être converti dans un nouveau format. Les noms de dossiers chiffrés seront mis à jour.\nMerci de vous assurer que la procédure de synchronisation est terminée avant de continuer. +upgrade.version3to4.err.io = La migration a échoué à cause d'une erreur d'entrée/sortie. Référez-vous au fichier log pour plus de détails. \ No newline at end of file From eed1b1cff04bb3287d10ecee0d7035f98b31a13b Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:28:42 +0200 Subject: [PATCH 05/12] Update de.txt (POEditor.com) --- main/ui/src/main/resources/localization/de.txt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/main/ui/src/main/resources/localization/de.txt b/main/ui/src/main/resources/localization/de.txt index 870f70ff3..f1143ea72 100644 --- a/main/ui/src/main/resources/localization/de.txt +++ b/main/ui/src/main/resources/localization/de.txt @@ -1,15 +1,3 @@ -# Copyright (c) 2016 The Cryptomator Contributors -# This file is licensed under the terms of the MIT license. -# See the LICENSE.txt file for more info. -# -# Contributors: -# Christian Schmickler -# Joscha Feth -# Markus Kreusch -# Michael Schmetter -# Sebastian Wiesendahl -# Tim Marius Wunderlich - app.name = Cryptomator # main.fxml main.emptyListInstructions = Klicken Sie hier, um neue Tresore hinzuzufügen @@ -92,4 +80,6 @@ initialize.messageLabel.passwordStrength.4 = Sehr stark initialize.label.doNotForget = WICHTIG\: Falls Sie Ihr Passwort vergessen, gibt es keine Möglichkeit Ihre Daten wiederherzustellen. main.directoryList.remove.confirmation.title = Tresor entfernen main.directoryList.remove.confirmation.header = Möchten Sie diesen Tresor wirklich entfernen? -main.directoryList.remove.confirmation.content = Dieser Tresor wird nur aus der Liste entfernt. Um den Tresor unwiderruflich zu löschen, entfernen Sie bitte die Dateien aus Ihrem Dateisystem. \ No newline at end of file +main.directoryList.remove.confirmation.content = Dieser Tresor wird nur aus der Liste entfernt. Um den Tresor unwiderruflich zu löschen, entfernen Sie bitte die Dateien aus Ihrem Dateisystem. +upgrade.version3to4.msg = Dieser Tresor muss auf ein neueres Format aktualisiert werden.\nVerschlüsselte Ordnernamen werden dabei aktualisiert.\nStellen Sie bitte sicher, dass derzeit keine Synchronisation stattfindet. +upgrade.version3to4.err.io = Migration aufgrund eines I/O-Fehlers fehlgeschlagen.\nWeitere Informationen in der Log-Datei. \ No newline at end of file From 1076d971ae01fb01d91b9a2db615fd1f1c7f334f Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:28:43 +0200 Subject: [PATCH 06/12] Update hu.txt (POEditor.com) --- main/ui/src/main/resources/localization/hu.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/main/ui/src/main/resources/localization/hu.txt b/main/ui/src/main/resources/localization/hu.txt index 10c2fc724..3539b25cb 100644 --- a/main/ui/src/main/resources/localization/hu.txt +++ b/main/ui/src/main/resources/localization/hu.txt @@ -1,10 +1,3 @@ -# Copyright (c) 2016 The Cryptomator Contributors -# This file is licensed under the terms of the MIT license. -# See the LICENSE.txt file for more info. -# -# Contributors: -# Roland Burda - app.name = Cryptomator # main.fxml main.emptyListInstructions = Kattints ide egy széf létrehozásához From fb4db2506b162e4f3a4a934e60d609bb2a9a5ae7 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:28:45 +0200 Subject: [PATCH 07/12] Update it.txt (POEditor.com) --- main/ui/src/main/resources/localization/it.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/main/ui/src/main/resources/localization/it.txt b/main/ui/src/main/resources/localization/it.txt index 66da14c67..e11ead4f3 100644 --- a/main/ui/src/main/resources/localization/it.txt +++ b/main/ui/src/main/resources/localization/it.txt @@ -1,10 +1,3 @@ -# Copyright (c) 2016 The Cryptomator Contributors -# This file is licensed under the terms of the MIT license. -# See the LICENSE.txt file for more info. -# -# Contributors: -# vesparny - app.name = Cryptomator # main.fxml main.emptyListInstructions = Clicca qui per aggiungere un vault @@ -14,7 +7,7 @@ main.addDirectory.contextMenu.new = Crea un nuovo vault main.addDirectory.contextMenu.open = Apri un vault # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = Verifica aggiornamenti... -welcome.newVersionMessage = La versione %2$s può essere scaricata. Questa è %1$s +welcome.newVersionMessage = La versione %1$s può essere scaricata. Questa è %2$s # initialize.fxml initialize.label.password = Password initialize.label.retypePassword = Conferma password From ace64117a2983fc0059673a816bc080fe7b9f5e1 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:28:46 +0200 Subject: [PATCH 08/12] Update kr.txt (POEditor.com) --- main/ui/src/main/resources/localization/kr.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/main/ui/src/main/resources/localization/kr.txt b/main/ui/src/main/resources/localization/kr.txt index e69dd53ce..45a0c8d0c 100644 --- a/main/ui/src/main/resources/localization/kr.txt +++ b/main/ui/src/main/resources/localization/kr.txt @@ -1,10 +1,3 @@ -# Copyright (c) 2016 The Cryptomator Contributors -# This file is licensed under the terms of the MIT license. -# See the LICENSE.txt file for more info. -# -# Contributors: -# ChangHwan Kim - app.name = Cryptomator # main.fxml main.emptyListInstructions = 여기를 클릭하여 보관함 추가하기 @@ -86,4 +79,6 @@ initialize.messageLabel.passwordStrength.4 = 매우 강력함 initialize.label.doNotForget = 중요\: 만약 비밀번호를 잊으셨다면, 여러분의 데이터를 복구할 수 없습니다. main.directoryList.remove.confirmation.title = 보관함 삭제 main.directoryList.remove.confirmation.header = 정말 이 보관함을 삭제하시겠습니까? -main.directoryList.remove.confirmation.content = 보관함이 목록에서만 제거되었습니다. 데이터를 완전히 제거하시려면, 여러분의 파일시스템이서 제거해 주시기 바랍니다. \ No newline at end of file +main.directoryList.remove.confirmation.content = 보관함이 목록에서만 제거되었습니다. 데이터를 완전히 제거하시려면, 여러분의 파일시스템이서 제거해 주시기 바랍니다. +upgrade.version3to4.msg = 이 보관함은 새로운 형식으로 바뀔 필요가 있습니다. 암호화된 폴더 이름이 업데이트 될 것입니다. 진행하기 전에 동기화가 완료되었는지 확인하기 바랍니다. +upgrade.version3to4.err.io = 입출력 예외 문제로 마이그레이션이 실패하였습니다. 자세한 사항은 로그 파일을 확인하세요. \ No newline at end of file From adc9c0256491eac1823608e295b7e83808180daa Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:28:48 +0200 Subject: [PATCH 09/12] Update ru.txt (POEditor.com) --- .../ui/src/main/resources/localization/ru.txt | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/main/ui/src/main/resources/localization/ru.txt b/main/ui/src/main/resources/localization/ru.txt index 665a60ffa..112688c82 100644 --- a/main/ui/src/main/resources/localization/ru.txt +++ b/main/ui/src/main/resources/localization/ru.txt @@ -1,29 +1,20 @@ -# Copyright (c) 2016 The Cryptomator Contributors -# This file is licensed under the terms of the MIT license. -# See the LICENSE.txt file for more info. -# -# Contributors: -# Garik -# Konstantine -# Dmitry - app.name = Cryptomator # main.fxml main.emptyListInstructions = Нажмите здесь, чтобы добавить хранилище main.directoryList.contextMenu.remove = Удалить из списка main.directoryList.contextMenu.changePassword = Сменить пароль main.addDirectory.contextMenu.new = Создать новое хранилище -main.addDirectory.contextMenu.open = Открыть существующее хранилище +main.addDirectory.contextMenu.open = Открыть имеющееся хранилище # welcome.fxml welcome.checkForUpdates.label.currentlyChecking = Проверка обновлений... # Does the first %s mean the new version number, and the second %s - the current version user has? -welcome.newVersionMessage = Доступна версия %1$s. У вас %2$s. +welcome.newVersionMessage = Доступна версия %1$s. У вас версия %2$s. # initialize.fxml initialize.label.password = Пароль initialize.label.retypePassword = Введите пароль ещё раз initialize.button.ok = Создать хранилище initialize.messageLabel.alreadyInitialized = Хранилище уже инициализировано -initialize.messageLabel.initializationFailed = Невозможно инициализировать хранилище. См. подробности в отчёте. +initialize.messageLabel.initializationFailed = Невозможно инициализировать хранилище. См. подробности в файле-отчёте. # notfound.fxml notfound.label = Хранилище не найдено. Оно было перемещено? # upgrade.fxml @@ -41,7 +32,7 @@ unlock.button.advancedOptions.show = Ещё настройки unlock.button.advancedOptions.hide = Убрать настройки unlock.choicebox.winDriveLetter.auto = Автоназначение unlock.errorMessage.wrongPassword = Неверный пароль -unlock.errorMessage.mountingFailed = Ошибка монтирования. См. подробности в отчёте. +unlock.errorMessage.mountingFailed = Ошибка монтирования. См. подробности в файле-отчёте. unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Неподдерживаемое хранилище. Оно было создано в более старой версии Cryptomator. unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Неподдерживаемое хранилище. Оно было создано в более новой версии Cryptomator. unlock.messageLabel.startServerFailed = Ошибка запуска сервера WebDAV. @@ -90,4 +81,6 @@ initialize.messageLabel.passwordStrength.4 = Очень сильный initialize.label.doNotForget = ВАЖНО\: Если вы забудете свой пароль, то восстановить данные будет невозможно. main.directoryList.remove.confirmation.title = Удаление хранилища main.directoryList.remove.confirmation.header = Вы действительно хотите удалить это хранилище? -main.directoryList.remove.confirmation.content = Хранилище будет удалено только из списка. Чтобы стереть его окончательно, удалите файлы из файловой системы. \ No newline at end of file +main.directoryList.remove.confirmation.content = Хранилище будет удалено только из списка. Чтобы стереть его окончательно, удалите файлы из файловой системы. +upgrade.version3to4.msg = Это хранилище требуется преобразовать в новый формат. Зашифрованные имена папок будут обновлены. Прежде чем продолжить, выполните синхронизацию. +upgrade.version3to4.err.io = Преобразование не выполнено из-за ошибки ввода-вывода. См. подробности в файле-отчёте. \ No newline at end of file From aa9fef29676f628690efac65ca68e09c9c3d4ad0 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:28:49 +0200 Subject: [PATCH 10/12] Update sk.txt (POEditor.com) --- main/ui/src/main/resources/localization/sk.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/main/ui/src/main/resources/localization/sk.txt b/main/ui/src/main/resources/localization/sk.txt index 6bc4b0515..b31a62a5b 100644 --- a/main/ui/src/main/resources/localization/sk.txt +++ b/main/ui/src/main/resources/localization/sk.txt @@ -1,11 +1,6 @@ -# Copyright (c) 2016 The Cryptomator Contributors -# This file is licensed under the terms of the MIT license. +# Copyright (c) 2016 The Cryptomator Contributors +# This file is licensed under the terms of the MIT license. # See the LICENSE.txt file for more info. -# -# Contributors: -# Filip Havrlent -# Tatiana Chovancová - app.name = Cryptomator # main.fxml main.emptyListInstructions = Pridať trezor From 41fb0d51a4570191cf8b7c06d5d81aaa310f0e38 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:28:51 +0200 Subject: [PATCH 11/12] Update es.txt (POEditor.com) --- main/ui/src/main/resources/localization/es.txt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/main/ui/src/main/resources/localization/es.txt b/main/ui/src/main/resources/localization/es.txt index 89f838820..aa60affa9 100644 --- a/main/ui/src/main/resources/localization/es.txt +++ b/main/ui/src/main/resources/localization/es.txt @@ -1,11 +1,3 @@ -# Copyright (c) 2016 The Cryptomator Contributors -# This file is licensed under the terms of the MIT license. -# See the LICENSE.txt file for more info. -# -# Contributos: -# Jay -# Sebastian Wiesendahl - app.name = Cryptomator # main.fxml main.emptyListInstructions = Click aquí para añadir una caja fuerte @@ -79,8 +71,8 @@ settings.requiresRestartLabel = * Cryptomator se necesita reiniciar tray.menu.open = Abrir tray.menu.quit = Salir tray.infoMsg.title = Todavía en ejecución -tray.infoMsg.msg = Cryptomator todavía esta en ejecución. Sale del icono del tray. -tray.infoMsg.msg.osx = Cryptomator todavía esta en ejecución. Sale del icono de la barra del menú. +tray.infoMsg.msg = Cryptomator todavía esta en ejecución. Para salir usa el icono del tray. +tray.infoMsg.msg.osx = Cryptomator todavía esta en ejecución. Para salir usa el icono de la barra del menú. initialize.messageLabel.passwordStrength.0 = muy débil initialize.messageLabel.passwordStrength.1 = débil initialize.messageLabel.passwordStrength.2 = suficiente @@ -89,4 +81,6 @@ initialize.messageLabel.passwordStrength.4 = muy fuerte initialize.label.doNotForget = IMPORTANTE\: Si olivdes tú contraseña no hay ninguna manera de recuperar tus datos. main.directoryList.remove.confirmation.title = Borrar caja fuerte main.directoryList.remove.confirmation.header = ¿Quieres de verdad borrar este caja fuerte? -main.directoryList.remove.confirmation.content = La caja fuerte solo se borra de la lista. Para eliminarla permanente por favor elimina los datos de tú sistema de archivos. \ No newline at end of file +main.directoryList.remove.confirmation.content = La caja fuerte solo se borra de la lista. Para eliminarla permanente por favor elimina los datos de tú sistema de archivos. +upgrade.version3to4.msg = Este caja fuerte se debe migrar a un formato más reciente.\nLos nombres de las carpetas cifradas se actualizan.\nPor favor asegurarse de que la sincronización ha terminado antes de seguir. +upgrade.version3to4.err.io = Migración ha fallado por causa de una excepción I/O. Para detalles revisa el archivo de registro. \ No newline at end of file From 392e474cfa9280ac31f4190fc6796848a8bf5615 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 7 Jul 2016 14:28:52 +0200 Subject: [PATCH 12/12] Update tr.txt (POEditor.com) --- main/ui/src/main/resources/localization/tr.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/main/ui/src/main/resources/localization/tr.txt b/main/ui/src/main/resources/localization/tr.txt index 4d4aa4837..4e5105457 100644 --- a/main/ui/src/main/resources/localization/tr.txt +++ b/main/ui/src/main/resources/localization/tr.txt @@ -1,10 +1,3 @@ -# Copyright (c) 2016 The Cryptomator Contributors -# This file is licensed under the terms of the MIT license. -# See the LICENSE.txt file for more info. -# -# Contributors: -# Cem KOÇ - app.name = Cryptomator # main.fxml main.emptyListInstructions = Kasa eklemek için tıkla @@ -86,4 +79,6 @@ initialize.messageLabel.passwordStrength.4 = Çok güçlü initialize.label.doNotForget = ÖNEMLİ\: Şifrenizi unutursanız, geri almanın bir yolu olmayacaktır. main.directoryList.remove.confirmation.title = Kasayı Sil main.directoryList.remove.confirmation.header = Kasayı silmek istediğinize emin misiniz ? -main.directoryList.remove.confirmation.content = Kasa yalnızca listeden silinecek. Tamamen silmek için dosya sisteminizden dosyaları elle siliniz. \ No newline at end of file +main.directoryList.remove.confirmation.content = Kasa yalnızca listeden silinecek. Tamamen silmek için dosya sisteminizden dosyaları elle siliniz. +upgrade.version3to4.msg = Bu kasanın yeni formata geçirilmesi gerekmekte. Şifreli klasör isimleri güncellenecek. Devam etmeden önce senkronizasyonun bittiğine emin olun. +upgrade.version3to4.err.io = Format değiştirme işlemi I/O Hatası dolayısı ile başarısız oldu. Detaylar için log dosyasına bakın \ No newline at end of file