diff --git a/src/public/app/dialogs/options/advanced.js b/src/public/app/dialogs/options/advanced.js index b12f67268..19b67b83b 100644 --- a/src/public/app/dialogs/options/advanced.js +++ b/src/public/app/dialogs/options/advanced.js @@ -19,20 +19,20 @@ const TPL = `
This action will create a new copy of the database and anonymise it (remove all note content and leave only structure and some non-sensitive metadata) +
This action will create a new copy of the database and anonymize it (remove all note content and leave only structure and some non-sensitive metadata) for sharing online for debugging purposes without fear of leaking your personal data.
Trilium has automatic backup (daily, weekly, monthly), but you can also trigger backup manually here.
+Trilium has automatic backup (daily, weekly, monthly), but you can also trigger a manual backup here.
This will rebuild database which will typically result in smaller database file. No data will be actually changed.
+This will rebuild the database which will typically result in a smaller database file. No data will be actually changed.
`; diff --git a/src/public/app/dialogs/options/credentials.js b/src/public/app/dialogs/options/credentials.js index f32c4b390..524293ff0 100644 --- a/src/public/app/dialogs/options/credentials.js +++ b/src/public/app/dialogs/options/credentials.js @@ -20,7 +20,7 @@ const TPL = `Deleted notes are at first only marked as deleted and it is possible to recover them - from Recent Notes dialog. After period of time, deleted notes are "erased" which means + from Recent Notes dialog. After a period of time, deleted notes are "erased" which means their content is not recoverable anymore. This setting allows you to configure the length of the period between deleting and erasing the note.
@@ -56,8 +56,8 @@ const TPL = `Protected session timeout is a time period after which the protected session is wiped out from - browser's memory. This is measured from the last interaction with protected notes. See wiki for more info.
+Protected session timeout is a time period after which the protected session is wiped from + the browser's memory. This is measured from the last interaction with protected notes. See wiki for more info.
Note revision snapshot time interval is time in seconds after which new note revision will be created for the note. See wiki for more info.
+Note revision snapshot time interval is time in seconds after which a new note revision will be created for the note. See wiki for more info.
Note: If you leave proxy setting blank, system proxy will be used (applies to desktop/electron build only)
+Note: If you leave the proxy setting blank, the system proxy will be used (applies to desktop/electron build only)
This will test connection and handshake to the sync server. If sync server isn't initialized, this will set it up to sync with local document.
+This will test the connection and handshake to the sync server. If the sync server isn't initialized, this will set it up to sync with the local document.
`; @@ -78,4 +78,4 @@ export default class SyncOptions { return false; } -} \ No newline at end of file +} diff --git a/src/public/app/services/branches.js b/src/public/app/services/branches.js index d64e6d184..95d9e6510 100644 --- a/src/public/app/services/branches.js +++ b/src/public/app/services/branches.js @@ -75,7 +75,7 @@ async function deleteNotes(branchIdsToDelete) { const $deleteClonesCheckbox = $('