From 0dc0e981296a8780a161faaf54d275a385b4f50c Mon Sep 17 00:00:00 2001 From: JackGruber <24863925+JackGruber@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:40:37 +0200 Subject: [PATCH 1/5] Update translation for setting.path --- src/locales/de_DE.json | 2 +- src/locales/en_US.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/de_DE.json b/src/locales/de_DE.json index 18e5b2c..655a453 100644 --- a/src/locales/de_DE.json +++ b/src/locales/de_DE.json @@ -20,7 +20,7 @@ "settings": { "path": { "label": "Sicherungs Pfad", - "description": "Speicherort für die Backups. " + "description": "Speicherort für die Backups. Dieser Pfad ist exklusiv für die Joplin Backups wenn die Einstellungen für 'Erstellen eines Unterordners' deaktiviert wird, es dürfen sich dann keine anderen Daten darin befinden!" }, "exportPath": { "label": "Temporärer Export Pfad", diff --git a/src/locales/en_US.json b/src/locales/en_US.json index 880c49e..89a6fed 100644 --- a/src/locales/en_US.json +++ b/src/locales/en_US.json @@ -21,7 +21,7 @@ "settings": { "path": { "label": "Backup path", - "description": "Storage location for the backups. Dieser Pfad ist exklusiv für die Joplin Backups, es sollten sich keine anderen Daten darin befinden, wenn die Einstellungen für 'Unterordner erstellen' deaktiviert wird!" + "description": "Storage location for the backups. This path is exclusively for the Joplin Backups if the settings for 'Create a subfolder' are deactivated, no other data should be in it!" }, "exportPath": { "label": "Temporary export path", From c659f9b66ba6a9f9da2849b38151312dd3d7fddf Mon Sep 17 00:00:00 2001 From: Terrance Date: Sun, 14 Jul 2024 23:31:39 +0100 Subject: [PATCH 2/5] Fix language of EN backup path string, fix typos --- src/locales/en_US.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/locales/en_US.json b/src/locales/en_US.json index 89a6fed..2dce6f2 100644 --- a/src/locales/en_US.json +++ b/src/locales/en_US.json @@ -21,7 +21,7 @@ "settings": { "path": { "label": "Backup path", - "description": "Storage location for the backups. This path is exclusively for the Joplin Backups if the settings for 'Create a subfolder' are deactivated, no other data should be in it!" + "description": "Storage location for the backups. This path is exclusive to Joplin backups when the 'Create Subfolder' setting is disabled: there should be no other data in it!" }, "exportPath": { "label": "Temporary export path", @@ -29,7 +29,7 @@ }, "backupRetention": { "label": "Keep x backups", - "description": "How many backups should be kept. If more than one version configured, folders are created in the Backup Path acording to 'Backup set name' setting" + "description": "How many backups should be kept. If more than one version configured, folders are created in the Backup Path according to 'Backup set name' setting" }, "backupInterval": { "label": "Backup interval in hours", @@ -52,12 +52,12 @@ "description": "Repeat password to validate" }, "fileLogLevel": { - "label": "Loglevel", - "description": "Loglevel for the backup logfile" + "label": "Log level", + "description": "Log level for the backup log file" }, "createSubfolder": { "label": "Create Subfolder", - "description": "Create a subfolder in the the configured {{backupPath}}. Deactivate only if there is no other data in the {{backupPath}}!" + "description": "Create a subfolder in the configured {{backupPath}}. Deactivate only if there is no other data in the {{backupPath}}!" }, "createSubfolderPerProfile": { "label": "Create subfolder for Joplin profile", @@ -65,7 +65,7 @@ }, "zipArchive": { "label": "Create archive", - "description": "Save backup data in a archive, if a password protected backups is set, an archive is always created" + "description": "Save backup data in an archive. If 'Password protected backups' is set, an archive is always created." }, "compressionLevel": { "label": "Compression level", From 85f74e6080c75774e78e40e0bb6b8657819df147 Mon Sep 17 00:00:00 2001 From: JackGruber <24863925+JackGruber@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:42:16 +0200 Subject: [PATCH 3/5] Add Changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba14d09..cabda4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## not released +- Fix: Some EN translations and typos #76 + ## v1.4.1 (2024-03-10) - Fix: Don't show `There is no Data to export` on empty profiles and automatic backups #71 From cd39e371aba84b613f24b11556bfd0331232d6ba Mon Sep 17 00:00:00 2001 From: JackGruber <24863925+JackGruber@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:44:47 +0200 Subject: [PATCH 4/5] Update Build an Test --- .github/workflows/buildAndTest.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index b719277..2fe1fe5 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -4,10 +4,8 @@ jobs: buildAndTest: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: "20" + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 - name: Install dependencies run: npm install - name: Build From 781a9c909c9d5850cac3e91f3c56d3ddd2fa3c41 Mon Sep 17 00:00:00 2001 From: JackGruber <24863925+JackGruber@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:56:27 +0200 Subject: [PATCH 5/5] bump version 1.4.2 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- src/manifest.json | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cabda4b..3ade2f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## not released +## v1.4.2 (2024-07-17) + - Fix: Some EN translations and typos #76 ## v1.4.1 (2024-03-10) diff --git a/package-lock.json b/package-lock.json index dc5cd8e..7e5cff2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "joplin-plugin-backup", - "version": "1.4.1", + "version": "1.4.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "joplin-plugin-backup", - "version": "1.4.1", + "version": "1.4.2", "license": "MIT", "dependencies": { "@types/i18n": "^0.13.6", diff --git a/package.json b/package.json index 35ce947..6cf74b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "joplin-plugin-backup", - "version": "1.4.1", + "version": "1.4.2", "scripts": { "dist": "webpack --env joplin-plugin-config=buildMain && webpack --env joplin-plugin-config=buildExtraScripts && webpack --env joplin-plugin-config=createArchive", "prepare": "npm run dist && husky install", diff --git a/src/manifest.json b/src/manifest.json index 4075dc9..60d160d 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 1, "id": "io.github.jackgruber.backup", "app_min_version": "2.1.3", - "version": "1.4.1", + "version": "1.4.2", "name": "Backup", "description": "Plugin to create manual and automatic backups.", "author": "JackGruber",