chore: revert back unnecessary changes from unclean merge

c9d151289c

src/public/translations/en/translation.json

@@ -272,7 +272,7 @@
     "help_title": "Help on Note Revisions",
     "close": "Close",
     "revision_last_edited": "This revision was last edited on {{date}}",
-    "confirm_delete_all": "Do you want to delete all revisions of this note? This action will erase the revision title and content, but still preserve the revision metadata.",
+    "confirm_delete_all": "Do you want to delete all revisions of this note?",
     "no_revisions": "No revisions for this note yet...",
     "restore_button": "Restore",
     "confirm_restore": "Do you want to restore this revision? This will overwrite the current title and content of the note with this revision.",
@@ -376,7 +376,7 @@
     "auto_read_only_disabled": "text/code notes can be set automatically into read mode when they are too large. You can disable this behavior on per-note basis by adding this label to the note",
     "app_css": "marks CSS notes which are loaded into the Trilium application and can thus be used to modify Trilium's looks.",
     "app_theme": "marks CSS notes which are full Trilium themes and are thus available in Trilium options.",
-    "app_theme_base": "set to \"next\" in order to use the TriliumNext theme as a base for a custom theme instead of the legacy one.",
+    "app_theme_base": "set to \"next\", \"next-light\", or \"next-dark\" to use the corresponding TriliumNext theme (auto, light or dark) as the base for a custom theme, instead of the legacy one.",
     "css_class": "value of this label is then added as CSS class to the node representing given note in the tree. This can be useful for advanced theming. Can be used in template notes.",
     "icon_class": "value of this label is added as a CSS class to the icon on the tree which can help visually distinguish the notes in the tree. Example might be bx bx-home - icons are taken from boxicons. Can be used in template notes.",
     "page_size": "number of items per page in note listing",
@@ -1465,9 +1465,8 @@
   "etapi": {
     "title": "ETAPI",
     "description": "ETAPI is a REST API used to access Trilium instance programmatically, without UI.",
-    "see_more": "See more details on",
+    "see_more": "See more details in the {{- link_to_wiki}} and the {{- link_to_openapi_spec}} or the {{- link_to_swagger_ui }}.",
     "wiki": "wiki",
-    "and": "and",
     "openapi_spec": "ETAPI OpenAPI spec",
     "swagger_ui": "ETAPI Swagger UI",
     "create_token": "Create new ETAPI token",

src/routes/login.ts

@@ -51,8 +51,8 @@ function setPassword(req: Request, res: Response) {
     if (error) {
         res.render("set_password", {
             error,
-            assetPath: assetPath,
-            appPath: appPath
+            assetPath,
+            appPath
         });
         return;
     }

src/share/routes.ts

@@ -121,8 +121,8 @@ function renderImageAttachment(image: SNote, res: Response, attachmentName: stri
             && possibleSvgContent !== null
             && "svg" in possibleSvgContent
             && typeof possibleSvgContent.svg === "string")
-            ? possibleSvgContent.svg
-            : null;
+                ? possibleSvgContent.svg
+                : null;
 
         if (contentSvg) {
             svgString = contentSvg;