Merge branch 'develop' into siriusxt_patch

README.md

@@ -67,6 +67,16 @@ To use TriliumNext on your desktop machine (Linux, MacOS, and Windows) you have
     * Currently only the latest versions of Chrome & Firefox are supported (and tested).
 * (Coming Soon) TriliumNext will also be provided as a Flatpak
 
+#### MacOS
+Currently when running TriliumNext/Notes on MacOS, you may get the following error:
+> Apple could not verify "TriliumNext Notes" is free of malware and may harm your Mac or compromise your privacy.
+
+You will need to run the command on your shell to resolve the error (documented [here](https://github.com/TriliumNext/Notes/issues/329#issuecomment-2287164137)):
+
+```bash
+xattr -c "/path/to/Trilium Next.app"
+```
+
 ### Mobile
 
 To use TriliumNext on a mobile device:

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "trilium",
-  "version": "0.90.10-beta",
+  "version": "0.90.11-beta",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "trilium",
-      "version": "0.90.10-beta",
+      "version": "0.90.11-beta",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@braintree/sanitize-url": "7.1.0",

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "TriliumNext Notes",
   "description": "Build your personal knowledge base with TriliumNext Notes",
-  "version": "0.90.10-beta",
+  "version": "0.90.11-beta",
   "license": "AGPL-3.0-only",
   "main": "./dist/electron-main.js",
   "author": {

src/public/translations/es/translation.json

@@ -1508,5 +1508,18 @@
   },
   "code_block": {
     "word_wrapping": "Ajuste de palabras"
+  },
+  "classic_editor_toolbar": {
+    "title": "Formato"
+  },
+  "editor": {
+    "title": "Editor"
+  },
+  "editing": {
+    "editor_type": {
+      "label": "Barra de herramientas de formato",
+      "floating": "Flotante (las herramientas de edición aparecen cerca del cursor)",
+      "fixed": "Fijo (las herramientas de edición aparecen en la pestaña de la cinta \"Formato\")"
+    }
   }
 }

translations/es/server.json

@@ -89,7 +89,8 @@
     "copy-without-formatting": "Copiar el texto seleccionado sin formatear",
     "force-save-revision": "Forzar la creación/guardado de una nueva revisión de nota de la nota activa",
     "show-help": "Muestra ayuda/hoja de referencia integrada",
-    "toggle-book-properties": "Alternar propiedades del libro"
+    "toggle-book-properties": "Alternar propiedades del libro",
+    "toggle-classic-editor-toolbar": "Alternar la pestaña de formato por el editor con barra de herramientas fija"
   },
   "login": {
     "title": "Iniciar sesión",