From e940c29110edbdfffedad7db502e5eec0a12141c Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 28 Nov 2023 12:44:42 +0100 Subject: [PATCH 01/10] Closes #3226 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 609c36eb4..fd433c2ce 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ org.ow2.asm,org.apache.jackrabbit,org.apache.httpcomponents - 2.6.7 + 2.6.8 1.3.0 1.2.4 1.2.2 From 5b1ca7a533cdbd660e145841ee84a9ac4994ff6f Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 28 Nov 2023 12:59:39 +0100 Subject: [PATCH 02/10] update dependabot config --- .github/dependabot.yml | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e15900880..0e12bbba9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,9 +8,36 @@ updates: time: "06:00" timezone: "UTC" groups: - maven-dependencies: + java-test-dependencies: + patterns: + - "org.junit.jupiter:*" + - "org.mockito:*" + - "org.hamcrest:*" + - "com.google.jimfs:jimfs" + maven-build-plugins: + patterns: + - "org.apache.maven.plugins:*" + - "org.jacoco:jacoco-maven-plugin" + - "org.owasp:dependency-check-maven" + - "me.fabriciorby:maven-surefire-junit5-tree-reporter" + - "org.codehaus.mojo:license-maven-plugin" + javafx: + patterns: + - "org.openjfx:*" + java-production-dependencies: patterns: - "*" + exclude-patterns: + - "org.openjfx:*" + - "org.apache.maven.plugins:*" + - "org.jacoco:jacoco-maven-plugin" + - "org.owasp:dependency-check-maven" + - "me.fabriciorby:maven-surefire-junit5-tree-reporter" + - "org.codehaus.mojo:license-maven-plugin" + - "org.junit.jupiter:*" + - "org.mockito:*" + - "org.hamcrest:*" + - "com.google.jimfs:jimfs" - package-ecosystem: "github-actions" directory: "/" # even for `.github/workflows` From dac3311b81009c8ca9c3e26639b5d0b259e8df6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:05:42 +0000 Subject: [PATCH 03/10] Bump the java-test-dependencies group with 2 updates (#3227) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fd433c2ce..6b27321c5 100644 --- a/pom.xml +++ b/pom.xml @@ -57,8 +57,8 @@ 1.8.2 - 5.10.0 - 5.6.0 + 5.10.1 + 5.7.0 2.2 From 93b09cf449b82c69b9a87f25ba112d358ac12736 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:19:58 +0000 Subject: [PATCH 04/10] Bump the java-production-dependencies group with 6 updates (#3230) --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 6b27321c5..ba72ba485 100644 --- a/pom.xml +++ b/pom.xml @@ -43,15 +43,15 @@ 2.0.5 - 3.13.0 + 3.14.0 2.48.1 2.2 32.1.3-jre - 2.15.3 + 2.16.0 20.0.2 4.4.0 - 9.37 - 1.4.11 + 9.37.1 + 1.4.12 2.0.9 0.8.0 1.8.2 @@ -62,7 +62,7 @@ 2.2 - 24.0.1 + 24.1.0 8.4.0 0.8.11 2.2.0 From 8382299a055b7fd01a2adafd0ebeafb68262529d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:20:39 +0000 Subject: [PATCH 05/10] Bump the maven-build-plugins group with 4 updates Bumps the maven-build-plugins group with 4 updates: [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin), [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire), [org.codehaus.mojo:license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) and [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck). Updates `org.apache.maven.plugins:maven-dependency-plugin` from 3.6.0 to 3.6.1 - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.6.1) Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.1.2 to 3.2.2 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.2...surefire-3.2.2) Updates `org.codehaus.mojo:license-maven-plugin` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/mojohaus/license-maven-plugin/releases) - [Commits](https://github.com/mojohaus/license-maven-plugin/compare/2.2.0...2.3.0) Updates `org.owasp:dependency-check-maven` from 8.4.0 to 9.0.1 - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](https://github.com/jeremylong/DependencyCheck/compare/v8.4.0...v9.0.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: maven-build-plugins - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: maven-build-plugins - dependency-name: org.codehaus.mojo:license-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: maven-build-plugins - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-major dependency-group: maven-build-plugins ... Signed-off-by: dependabot[bot] --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ba72ba485..2e0bbeeda 100644 --- a/pom.xml +++ b/pom.xml @@ -63,14 +63,14 @@ 24.1.0 - 8.4.0 + 9.0.1 0.8.11 - 2.2.0 + 2.3.0 1.2.1 3.11.0 3.3.1 - 3.6.0 - 3.1.2 + 3.6.1 + 3.2.2 3.3.0 From dbacbc8874fea826aa25ffb813979ca7ab9d9df4 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 28 Nov 2023 13:23:40 +0100 Subject: [PATCH 06/10] do not exectue dependency-check on CI (due to missing NVD API key) --- .github/workflows/appimage.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/debian.yml | 2 +- .github/workflows/mac-dmg.yml | 2 +- .github/workflows/pullrequest.yml | 2 +- .github/workflows/win-exe.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 5821a7fde..68127dbb6 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -68,7 +68,7 @@ jobs: - name: Set version run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven - run: mvn -B clean package -Pdependency-check,linux -DskipTests + run: mvn -B clean package -Plinux -DskipTests - name: Patch target dir run: | cp LICENSE.txt target diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fbb57cbbf..0d1eb5739 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: mvn -B verify jacoco:report org.sonarsource.scanner.maven:sonar-maven-plugin:sonar - -Pcoverage,dependency-check + -Pcoverage -Dsonar.projectKey=cryptomator_cryptomator -Dsonar.organization=cryptomator -Dsonar.host.url=https://sonarcloud.io diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index e8fd5da22..f1cffb96b 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -53,7 +53,7 @@ jobs: check-latest: true cache: 'maven' - name: Run maven - run: mvn -B clean package -Pdependency-check,linux -DskipTests + run: mvn -B clean package -Plinux -DskipTests - name: Download OpenJFX jmods id: download-jmods run: | diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 1372fe6ce..666e9f19c 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -79,7 +79,7 @@ jobs: - name: Set version run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven - run: mvn -B clean package -Pdependency-check,mac -DskipTests + run: mvn -B clean package -Pmac -DskipTests - name: Patch target dir run: | cp LICENSE.txt target diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 931817418..a8f4c5617 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -24,4 +24,4 @@ jobs: java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - name: Build and Test - run: xvfb-run mvn -B clean install jacoco:report -Pcoverage,dependency-check \ No newline at end of file + run: xvfb-run mvn -B clean install jacoco:report -Pcoverage \ No newline at end of file diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index dece30a8b..1002718d0 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -73,7 +73,7 @@ jobs: - name: Set version run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven - run: mvn -B clean package -Pdependency-check,win -DskipTests + run: mvn -B clean package -Pwin -DskipTests - name: Patch target dir run: | cp LICENSE.txt target From e994133177ec12148e78c8a67e0afc0948f9e5ef Mon Sep 17 00:00:00 2001 From: Cryptobot Date: Tue, 28 Nov 2023 13:32:08 +0100 Subject: [PATCH 07/10] New Crowdin updates (#3191) New translations strings.properties Bulgarian; Chinese Simplified; Chinese Traditional; Dutch; Filipino; French; Greek; Hungarian; Norwegian Bokmal; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Spanish; Swedish; Turkish; [ci skip] --- src/main/resources/i18n/strings_bg.properties | 4 ++++ src/main/resources/i18n/strings_el.properties | 2 ++ src/main/resources/i18n/strings_es.properties | 2 ++ src/main/resources/i18n/strings_fil.properties | 6 ++++++ src/main/resources/i18n/strings_fr.properties | 2 +- src/main/resources/i18n/strings_hu.properties | 2 ++ src/main/resources/i18n/strings_nb.properties | 6 ++++++ src/main/resources/i18n/strings_nl.properties | 4 ++++ src/main/resources/i18n/strings_pa.properties | 1 + src/main/resources/i18n/strings_pl.properties | 6 ++++++ src/main/resources/i18n/strings_pt.properties | 7 +++++++ src/main/resources/i18n/strings_pt_BR.properties | 2 ++ src/main/resources/i18n/strings_ro.properties | 5 +++++ src/main/resources/i18n/strings_sv.properties | 6 ++++++ src/main/resources/i18n/strings_tr.properties | 4 ++++ src/main/resources/i18n/strings_zh.properties | 4 +++- src/main/resources/i18n/strings_zh_TW.properties | 2 ++ 17 files changed, 63 insertions(+), 2 deletions(-) diff --git a/src/main/resources/i18n/strings_bg.properties b/src/main/resources/i18n/strings_bg.properties index 6ceb6c3bb..0a2eef368 100644 --- a/src/main/resources/i18n/strings_bg.properties +++ b/src/main/resources/i18n/strings_bg.properties @@ -169,6 +169,10 @@ hub.registerFailed.description=В процеса на именуване е до hub.unauthorized.message=Отказан достъп hub.unauthorized.description=Устройството не е упълномощено за достъп до това хранилище. Поискайте достъп от собственика. ### Requires Account Initialization +hub.requireAccountInit.message=Необходимо действие +hub.requireAccountInit.description.0=За да продължите завършене необходимите стъпки в +hub.requireAccountInit.description.1=профила в Hub +hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Лиценза за Hub е недействителен hub.invalidLicense.description=Лиценза на екземпляра на Концентратора на Криптоматор който вие използвате е лиценз. Информирайте администратора на Концентратора, за да поднови или надгради лиценза. diff --git a/src/main/resources/i18n/strings_el.properties b/src/main/resources/i18n/strings_el.properties index 029656ddc..bd7c0e725 100644 --- a/src/main/resources/i18n/strings_el.properties +++ b/src/main/resources/i18n/strings_el.properties @@ -170,6 +170,8 @@ hub.unauthorized.message=Δεν επιτρέπεται η πρόσβαση hub.unauthorized.description=Η συσκευή σας δεν έχει ακόμη εξουσιοδοτηθεί να έχει πρόσβαση σε αυτή την κρύπτη. Ζητήστε από τον κάτοχο της κρύπτης να την εξουσιοδοτήσει. ### Requires Account Initialization hub.requireAccountInit.message=Απαιτείται ενέργεια +hub.requireAccountInit.description.0=Για να συνεχίσετε, παρακαλούμε ολοκληρώστε τα βήματα που απαιτούνται στο δικό σας +hub.requireAccountInit.description.1=προφίλ χρήστη Hub hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Μη έγκυρη Άδεια Hub diff --git a/src/main/resources/i18n/strings_es.properties b/src/main/resources/i18n/strings_es.properties index fb804e757..32ff02f2c 100644 --- a/src/main/resources/i18n/strings_es.properties +++ b/src/main/resources/i18n/strings_es.properties @@ -169,8 +169,10 @@ hub.registerFailed.description=Ocurrió un error en el nombramiento. Para más d hub.unauthorized.message=Acceso denegado hub.unauthorized.description=Su dispositivo aún no ha sido autorizado para acceder a esta bóveda. Pídale al propietario de la bóveda que lo autorice. ### Requires Account Initialization +hub.requireAccountInit.message=Acción requerida hub.requireAccountInit.description.0=Para continuar, por favor complete los pasos necesarios en su hub.requireAccountInit.description.1=Perfil de usuario del Hub +hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Licencia del Hub inválida hub.invalidLicense.description=Su instancia del Hub de Cryptomator tiene una licencia inválida. Informe a un administrador del Hub para actualizar o renovar la licencia. diff --git a/src/main/resources/i18n/strings_fil.properties b/src/main/resources/i18n/strings_fil.properties index 56ce0c11d..59d7b136e 100644 --- a/src/main/resources/i18n/strings_fil.properties +++ b/src/main/resources/i18n/strings_fil.properties @@ -154,7 +154,9 @@ hub.receive.message=Pinoproseso ang tugon… hub.receive.description=Ang Cryptomator ay tumatanggap at nagpoproseso ng tugon mula sa Hub. Mangyaring maghintay. ### Register Device hub.register.message=Bagong Device +hub.register.description=Ito ang unang Hub access mula sa device na ito. Mangyaring pahintulutan ito gamit ang iyong Account Key. hub.register.nameLabel=Pangalan ng device +hub.register.invalidAccountKeyLabel=Di-wastong Account Key hub.register.occupiedMsg=Ang pangalan ay nagamit na hub.register.registerBtn=Kumpirmahin ### Registration Success @@ -167,6 +169,10 @@ hub.registerFailed.description=Nagkaroon ng error sa proseso ng pagbibigay ng pa hub.unauthorized.message=Walang pahintulot hub.unauthorized.description=Hindi pa pinahihintulutan ang iyong device na i-access ang vault na ito. Hilingin sa may-ari ng vault na pahintulutan ito. ### Requires Account Initialization +hub.requireAccountInit.message=Kinakailangan ang pagkilos +hub.requireAccountInit.description.0=Upang magpatuloy, mangyaring kumpletuhin ang mga hakbang na kinakailangan sa iyong +hub.requireAccountInit.description.1=Profile ng user ng hub +hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Di-wasto ang Lisensya ng Hub hub.invalidLicense.description=Ang iyong Cryptomator Hub instance ay may di-wastong lisensya. Mangyaring ipagbigay-alam sa administrator ng Hub na mag-upgrade o mag-renew ng lisensya. diff --git a/src/main/resources/i18n/strings_fr.properties b/src/main/resources/i18n/strings_fr.properties index bb08d22e2..0cfab5d03 100644 --- a/src/main/resources/i18n/strings_fr.properties +++ b/src/main/resources/i18n/strings_fr.properties @@ -171,7 +171,7 @@ hub.unauthorized.description=Votre appareil n'a pas encore été autorisé à ac ### Requires Account Initialization hub.requireAccountInit.message=Action requise hub.requireAccountInit.description.0=Pour continuer, veuillez compléter les étapes requises -hub.requireAccountInit.description.1=Profil utilisateur Hub +hub.requireAccountInit.description.1=Profil utilisateur de Hub hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Licence de Hub invalide diff --git a/src/main/resources/i18n/strings_hu.properties b/src/main/resources/i18n/strings_hu.properties index fdb53f898..49fb95409 100644 --- a/src/main/resources/i18n/strings_hu.properties +++ b/src/main/resources/i18n/strings_hu.properties @@ -154,7 +154,9 @@ hub.receive.message=Válasz feldolgozása… hub.receive.description=Cryptomator fogadja és feldolgozza a Hub válaszát. Kérem, várjon. ### Register Device hub.register.message=Új eszköz +hub.register.description=Ez az első Hub-hozzáférés erről az eszközről. Kérjük, engedélyezd a Fiókkulcsoddal. hub.register.nameLabel=Készülék neve +hub.register.invalidAccountKeyLabel=Érvénytelen fiókkulcs hub.register.occupiedMsg=Ez a név már használatban van hub.register.registerBtn=Megerősítés ### Registration Success diff --git a/src/main/resources/i18n/strings_nb.properties b/src/main/resources/i18n/strings_nb.properties index 600822e3a..a92b02919 100644 --- a/src/main/resources/i18n/strings_nb.properties +++ b/src/main/resources/i18n/strings_nb.properties @@ -154,7 +154,9 @@ hub.receive.message=Prosesserer svar… hub.receive.description=Cryptomator mottar og behandler svaret fra Hub. Vennligst vent. ### Register Device hub.register.message=Ny Enhet +hub.register.description=Dette er den første Hub-tilgangen fra denne enheten. Vennligst autoriser den ved hjelp av kontonøkkelen. hub.register.nameLabel=Enhetsnavn +hub.register.invalidAccountKeyLabel=Ugyldig kontonøkkel hub.register.occupiedMsg=Navnet er allerede i bruk hub.register.registerBtn=Bekreft ### Registration Success @@ -167,6 +169,10 @@ hub.registerFailed.description=Under navngivingsprosessen oppsto det en feilmeld hub.unauthorized.message=Ingen tilgang hub.unauthorized.description=Enheten din har ikke blitt autorisert til å få tilgang til dette hvelvet ennå. Spør hvelveieren om å tillate det. ### Requires Account Initialization +hub.requireAccountInit.message=Påkrevd handling +hub.requireAccountInit.description.0=For å fortsette, fullfør trinnene som kreves i din +hub.requireAccountInit.description.1=Hub brukerprofil +hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Hub-lisens er ugyldig hub.invalidLicense.description=Cryptomator Hub instansen din har en ugyldig lisens. Vennligst informer en Hub-administrator om å oppgradere eller fornye lisensen. diff --git a/src/main/resources/i18n/strings_nl.properties b/src/main/resources/i18n/strings_nl.properties index 82f4585bd..43660d4d8 100644 --- a/src/main/resources/i18n/strings_nl.properties +++ b/src/main/resources/i18n/strings_nl.properties @@ -154,7 +154,9 @@ hub.receive.message=Antwoord verwerken… hub.receive.description=Cryptomator ontvangt en verwerkt de reactie van Hub. Een ogenblik geduld. ### Register Device hub.register.message=Nieuw apparaat +hub.register.description=Dit is de eerste Hub toegang vanaf dit apparaat. Bevestig deze toegang met behulp van uw Account Key. hub.register.nameLabel=Apparaatnaam +hub.register.invalidAccountKeyLabel=Ongeldige Account Key hub.register.occupiedMsg=Naam al in gebruik hub.register.registerBtn=Bevestig ### Registration Success @@ -168,6 +170,8 @@ hub.unauthorized.message=Toegang geweigerd hub.unauthorized.description=Uw apparaat is nog niet gemachtigd om toegang te krijgen tot deze kluis. Vraag de eigenaar van de kluis om toestemming te geven. ### Requires Account Initialization hub.requireAccountInit.message=Actie vereist +hub.requireAccountInit.description.0=Om verder te gaan, gelieve de stappen te voltooien in uw +hub.requireAccountInit.description.1=Hub gebruikersprofiel hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Hub Licentie ongeldig diff --git a/src/main/resources/i18n/strings_pa.properties b/src/main/resources/i18n/strings_pa.properties index 98b2e4a4b..1953d2b59 100644 --- a/src/main/resources/i18n/strings_pa.properties +++ b/src/main/resources/i18n/strings_pa.properties @@ -99,6 +99,7 @@ unlock.success.revealBtn=ਡਰਾਇਵ ਦਿਖਾਓ ### Waiting ### Receive Key ### Register Device +hub.register.registerBtn=ਤਸਦੀਕ ### Registration Success ### Registration Failed ### Unauthorized diff --git a/src/main/resources/i18n/strings_pl.properties b/src/main/resources/i18n/strings_pl.properties index 73106ba00..484472562 100644 --- a/src/main/resources/i18n/strings_pl.properties +++ b/src/main/resources/i18n/strings_pl.properties @@ -154,7 +154,9 @@ hub.receive.message=Przetwarzanie odpowiedzi… hub.receive.description=Cryptomator odbiera i przetwarza odpowiedź z Huba, proszę czekać. ### Register Device hub.register.message=Nowe Urządzenie +hub.register.description=To jest pierwszy dostęp do Huba z tego urządzenia. Proszę autoryzować go za pomocą klucza konta. hub.register.nameLabel=Nazwa urządzenia +hub.register.invalidAccountKeyLabel=Błędny klucz konta hub.register.occupiedMsg=Nazwa jest już używana hub.register.registerBtn=Zatwierdź ### Registration Success @@ -167,6 +169,10 @@ hub.registerFailed.description=Wystąpił błąd podczas ustawiania nazwy. Aby u hub.unauthorized.message=Brak dostępu hub.unauthorized.description=Twoje urządzenie nie zostało jeszcze upoważnione do dostępu do tego sejfu. Poproś właściciela sejfu o autoryzację. ### Requires Account Initialization +hub.requireAccountInit.message=Wymagane działanie +hub.requireAccountInit.description.0=Aby kontynuować, wykonaj wymagane kroki w Twoim +hub.requireAccountInit.description.1=profilu użytkownika Hub +hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Nieważna licencja Huba hub.invalidLicense.description=Twoja instancja Hub ma nieprawidłową licencję. Poproś administratora Hub o uaktualnienie lub odnowienie licencji. diff --git a/src/main/resources/i18n/strings_pt.properties b/src/main/resources/i18n/strings_pt.properties index f237e11d5..0f461bf22 100644 --- a/src/main/resources/i18n/strings_pt.properties +++ b/src/main/resources/i18n/strings_pt.properties @@ -41,6 +41,7 @@ traymenu.vault.reveal=Revelar # Add Vault Wizard addvaultwizard.title=Adicionar Cofre ## New +addvaultwizard.new.title=Adicionar novo cofre ### Name addvaultwizard.new.nameInstruction=Escolha um nome para o cofre addvaultwizard.new.namePrompt=Nome do Cofre @@ -90,6 +91,7 @@ addvault.new.readme.accessLocation.2=Este é o local de acesso do seu cofre. addvault.new.readme.accessLocation.3=Qualquer ficheiro adicionado a este volume será encriptado pelo Cryptomator. Poderá trabalhar nestes normalmente como em qualquer outra unidade/pasta. Esta é apenas uma visualização desencriptada do seu conteúdo, os seus ficheiros continuam encriptados no seu disco rígido. addvault.new.readme.accessLocation.4=Sinta-se livre para remover este ficheiro. ## Existing +addvaultwizard.existing.title=Adicionar cofre existente addvaultwizard.existing.instruction=Escolha o ficheiro "vault.cryptomator" do seu cofre. Se encontrar unicamente o ficheiro "masterkey.cryptomator", selecione-o. addvaultwizard.existing.chooseBtn=Escolher… addvaultwizard.existing.filePickerTitle=Selecionar o ficheiro do cofre @@ -166,6 +168,8 @@ hub.unauthorized.message=Acesso negado hub.unauthorized.description=O seu dispositivo ainda não foi autorizado a aceder a este cofre. Peça ao proprietário do cofre para o autorizar. ### Requires Account Initialization hub.requireAccountInit.message=Ação requerida +hub.requireAccountInit.description.0=Para continuar, conclua as etapas necessárias no seu +hub.requireAccountInit.description.1=perfil de usuário do Hub hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Licença Hub inválida @@ -339,6 +343,9 @@ main.vaultlist.contextMenu.unlock=Desbloquear… main.vaultlist.contextMenu.unlockNow=Desbloquear agora main.vaultlist.contextMenu.vaultoptions=Mostrar opções do Cofre main.vaultlist.contextMenu.reveal=Revelar unidade +main.vaultlist.addVaultBtn=Adicionar +main.vaultlist.addVaultBtn.menuItemNew=Novo cofre... +main.vaultlist.addVaultBtn.menuItemExisting=Cofre Existente... ## Vault Detail ### Welcome main.vaultDetail.welcomeOnboarding=Obrigado por escolher Cryptomator para proteger os seus ficheiros. Se precisar de alguma ajuda, veja os nossos guias introdutórios: diff --git a/src/main/resources/i18n/strings_pt_BR.properties b/src/main/resources/i18n/strings_pt_BR.properties index ea8df1fbd..17f872e09 100644 --- a/src/main/resources/i18n/strings_pt_BR.properties +++ b/src/main/resources/i18n/strings_pt_BR.properties @@ -170,6 +170,8 @@ hub.unauthorized.message=Acesso negado hub.unauthorized.description=Seu dispositivo ainda não foi autorizado a acessar este cofre. Peça ao proprietário ou a um administrador deste cofre para autorizá-lo. ### Requires Account Initialization hub.requireAccountInit.message=Ação necessária +hub.requireAccountInit.description.0=Para prosseguir, por favor, complete os passos necessários +hub.requireAccountInit.description.1=Perfil de usuário do Hub hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Licença Invalida diff --git a/src/main/resources/i18n/strings_ro.properties b/src/main/resources/i18n/strings_ro.properties index f63ca5e7e..ac0f50739 100644 --- a/src/main/resources/i18n/strings_ro.properties +++ b/src/main/resources/i18n/strings_ro.properties @@ -153,6 +153,7 @@ hub.auth.loginLink=Nu ați fost redirecționat? Apăsați aici pentru a deschide hub.receive.message=Se procesează răspunsul… hub.receive.description=In acest moment Criptomatorul primește și procesează răspunsul de la Hub. Vă rugăm să așteptați. ### Register Device +hub.register.message=Dispozitiv nou hub.register.nameLabel=Numele dispozitivului hub.register.occupiedMsg=Acest nume este deja utilizat hub.register.registerBtn=Confirmați @@ -166,6 +167,10 @@ hub.registerFailed.description=O eroare a fost întâmpinata în procesul de den hub.unauthorized.message=Acces respins hub.unauthorized.description=Dispozitivul dvs. nu a fost autorizat să acceseze acest seif. Solicitați proprietarului seifului să va autorizeze accesul. ### Requires Account Initialization +hub.requireAccountInit.message=Acțiune necesară +hub.requireAccountInit.description.0=Pentru a continua, vă rugăm să finalizaţi paşii necesari în +hub.requireAccountInit.description.1=Profil utilizator Hub +hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Licență de Hub invalidă hub.invalidLicense.description=Instanța Hub are o licență invalidă. Vă rugăm să informați un administrator Hub să actualizeze sau să reînnoiască licența. diff --git a/src/main/resources/i18n/strings_sv.properties b/src/main/resources/i18n/strings_sv.properties index b30e9848b..3ac3a33cf 100644 --- a/src/main/resources/i18n/strings_sv.properties +++ b/src/main/resources/i18n/strings_sv.properties @@ -154,7 +154,9 @@ hub.receive.message=Bearbetar svar… hub.receive.description=Cryptomator tar emot och bearbetar svaret från Hub. Vänligen vänta. ### Register Device hub.register.message=Ny enhet +hub.register.description=Detta är den första navåtkomsten från den här enheten. Vänligen auktorisera den med din kontonyckel. hub.register.nameLabel=Enhetsnamn +hub.register.invalidAccountKeyLabel=Ogiltig kontonyckel hub.register.occupiedMsg=Namnet används redan hub.register.registerBtn=Bekräfta ### Registration Success @@ -167,6 +169,10 @@ hub.registerFailed.description=Ett fel uppstod i namngivningsprocessen. För mer hub.unauthorized.message=Åtkomst nekad hub.unauthorized.description=Din enhet har ännu inte behörighet att komma åt detta valv. Be valvägaren att godkänna det. ### Requires Account Initialization +hub.requireAccountInit.message=Åtgärd krävs +hub.requireAccountInit.description.0=För att fortsätta, vänligen fyll i de steg som krävs i din +hub.requireAccountInit.description.1=Hubb användarprofil +hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Din Hub-licens är ogiltig hub.invalidLicense.description=Din Cryptomator Hub-instans har en ogiltig licens. Vänligen informera en Hub administratör för att uppgradera eller förnya licensen. diff --git a/src/main/resources/i18n/strings_tr.properties b/src/main/resources/i18n/strings_tr.properties index 4c3d95e76..23a482a54 100644 --- a/src/main/resources/i18n/strings_tr.properties +++ b/src/main/resources/i18n/strings_tr.properties @@ -154,7 +154,9 @@ hub.receive.message=Yanıt işleniyor… hub.receive.description=Cryptomator, Hub'dan yanıtı alıyor ve işliyor. Lütfen bekleyin. ### Register Device hub.register.message=Yeni Cihaz +hub.register.description=Bu işlem bu cihazdan yapılan ilk Hub erişimidir. Lütfen kurulum kodunuzu kullanarak yetkilendirin. hub.register.nameLabel=Cihaz adı +hub.register.invalidAccountKeyLabel=Geçersiz Hesap Anahtarı hub.register.occupiedMsg=Ad zaten kullanımda hub.register.registerBtn=Onayla ### Registration Success @@ -167,8 +169,10 @@ hub.registerFailed.description=İsimlendirme işleminde bir hata oluştu. Daha f hub.unauthorized.message=Erişim engellendi hub.unauthorized.description=Cihazınıza henüz bu kasaya erişim yetkisi verilmedi. Kasa sahibinden yetkilendirmesini isteyin. ### Requires Account Initialization +hub.requireAccountInit.message=Eylem gerekli hub.requireAccountInit.description.0=Devam etmek için, lütfen gerekli adımları tamamlayın hub.requireAccountInit.description.1=Hub kullanıcı profili +hub.requireAccountInit.description.2=. ### License Exceeded hub.invalidLicense.message=Hub Lisansı geçersiz hub.invalidLicense.description=Cryptomator Hub örneğinizde geçersiz bir lisans var. Lisansı yükseltmesi veya yenilemesi için lütfen bir Hub yöneticisini bilgilendirin. diff --git a/src/main/resources/i18n/strings_zh.properties b/src/main/resources/i18n/strings_zh.properties index e3298d38c..8ebfa5ff6 100644 --- a/src/main/resources/i18n/strings_zh.properties +++ b/src/main/resources/i18n/strings_zh.properties @@ -170,6 +170,8 @@ hub.unauthorized.message=拒绝访问 hub.unauthorized.description=您的设备尚未授权访问此保险库，请联系保险库所有者， ### Requires Account Initialization hub.requireAccountInit.message=操作请求 +hub.requireAccountInit.description.0=要继续，请完成所需的步骤 +hub.requireAccountInit.description.1=Hub 用户中心 hub.requireAccountInit.description.2=。 ### License Exceeded hub.invalidLicense.message=Hub 许可证无效 @@ -295,7 +297,7 @@ preferences.volume=虚拟磁盘 preferences.volume.type=卷类型 preferences.volume.type.automatic=自动 preferences.volume.docsTooltip=打开文档以了解有关不同卷类型的更多信息 -preferences.volume.fuseRestartRequired=Cryptomator 需要重新启动以应用更改。 +preferences.volume.fuseRestartRequired=Cryptomator 需要重新启动以应用更改 preferences.volume.tcp.port=TCP 端口 preferences.volume.supportedFeatures=选定的卷类型支持以下功能： preferences.volume.feature.mountAuto=自动选择挂载点 diff --git a/src/main/resources/i18n/strings_zh_TW.properties b/src/main/resources/i18n/strings_zh_TW.properties index b8d231361..6be82f561 100644 --- a/src/main/resources/i18n/strings_zh_TW.properties +++ b/src/main/resources/i18n/strings_zh_TW.properties @@ -166,6 +166,8 @@ hub.registerFailed.description=命名過程中出現錯誤。更多詳情，請 hub.unauthorized.message=拒絕存取 hub.unauthorized.description=您的設備權限尚未允許存取檔案庫，請聯絡檔案庫擁有者 ### Requires Account Initialization +hub.requireAccountInit.description.0=請完成您的 +hub.requireAccountInit.description.1=Hub使用者資料 ### License Exceeded hub.invalidLicense.message=Hub 憑證無效 hub.invalidLicense.description=此 Cryptomator Hub 實例授權無效，請聯繫管理員升級或續訂授權。 From 7d281e2878b5aa9f7dd8af3b07d36b59f6592510 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 15:08:31 +0000 Subject: [PATCH 08/10] Bump the javafx group with 5 updates (#3229) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e0bbeeda..b6ff690ef 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 2.2 32.1.3-jre 2.16.0 - 20.0.2 + 21.0.1 4.4.0 9.37.1 1.4.12 From 1343099be6fccb3d9fac31fd3364f9f195e64f84 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 30 Nov 2023 09:26:11 +0100 Subject: [PATCH 09/10] [ci skip] correct dependabot config --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0e12bbba9..3d2f42f8d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,7 +6,7 @@ updates: interval: "weekly" day: "monday" time: "06:00" - timezone: "UTC" + timezone: "Etc/UTC" groups: java-test-dependencies: patterns: From c7839e2c46de4975197045ff09f5324628176aa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 14:26:07 +0000 Subject: [PATCH 10/10] Bump the java-production-dependencies group with 2 updates (#3234) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b6ff690ef..cae8f0517 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 21.0.1 4.4.0 9.37.1 - 1.4.12 + 1.4.13 2.0.9 0.8.0 1.8.2