Merge branch 'develop'

Author: JackGruber

.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

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## not released
 
+## v1.4.2 (2024-07-17)
+
+- 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

package-lock.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",

package.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",

src/locales/de_DE.json

@@ -21,15 +21,15 @@
   "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 exclusive to Joplin backups when the 'Create Subfolder' setting is disabled: there should be no other data in it!"
     },
     "exportPath": {
       "label": "Temporary export path",
       "description": "Temporary path for data export from Joplin, before the data is moved to the backup path"
     },
     "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,20 +52,20 @@
       "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",
       "description": "Create a subfolder within the backup directory for the current profile. This allows multiple profiles from the same Joplin installation to use the same backup directory without overwriting backups made from other profiles. All profiles that use the same backup directory must have this setting enabled."
     },
     "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",

src/locales/en_US.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",