From b0e698520f0be4e054b8f3d1feff694d1ddf1779 Mon Sep 17 00:00:00 2001 From: Steliyan Stoyanov Date: Tue, 29 Oct 2019 20:34:19 +0200 Subject: Add "adaptable dark mode" checkbox --- src/components/settings/settings/EditSettingsForm.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 2be5c4ed7..d567a47d1 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -12,6 +12,7 @@ import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; import Input from '../../ui/Input'; import { FRANZ_TRANSLATION } from '../../../config'; +import { isMac } from '../../../environment'; function escapeHtml(unsafe) { return unsafe @@ -383,8 +384,10 @@ export default @observer class EditSettingsForm extends Component { + {isMac && } {isDarkmodeEnabled && ( <> +

Date: Tue, 26 Nov 2019 17:45:06 +0700 Subject: Enhance readability when teams not available --- src/components/settings/settings/EditSettingsForm.js | 3 +-- src/components/settings/team/TeamDashboard.js | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index d567a47d1..dacd4d9c0 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -384,10 +384,9 @@ export default @observer class EditSettingsForm extends Component { - {isMac && } {isDarkmodeEnabled && ( <> - + {isMac && }

{intl.formatMessage(messages.teamsUnavailable)} - {intl.formatMessage(messages.teamsUnavailableInfo)} +

+ {intl.formatMessage(messages.teamsUnavailableInfo)} +

); -- cgit v1.2.3-70-g09d2 From ce4cf753bf24a078f04bf3e32b5697bb603c1db2 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Tue, 26 Nov 2019 18:08:23 +0700 Subject: Enhance Settings readabiity (spacing) --- src/components/settings/settings/EditSettingsForm.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index dacd4d9c0..12822bae0 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -261,7 +261,11 @@ export default @observer class EditSettingsForm extends Component { autoFocus /> {isLoggedIn && ( -

{ intl.formatMessage(messages.serverInfo) }

+

+ { intl.formatMessage(messages.serverInfo) } +

)} {server === 'https://api.franzinfra.com' && (

this.submit(e)} field={form.$('todoServer')} /> -

{ intl.formatMessage(messages.todoServerInfo) }

+

+ { intl.formatMessage(messages.todoServerInfo) } +

)} -- cgit v1.2.3-70-g09d2 From e14638f2d0db12369b5de477cdc06511bbbfb6d7 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Wed, 27 Nov 2019 16:08:15 +0700 Subject: Run prepare code to fix formatting --- src/components/settings/settings/EditSettingsForm.js | 18 ++++++++++++------ src/components/settings/team/TeamDashboard.js | 9 ++++++--- src/lib/Menu.js | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 12822bae0..1a54f221d 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -261,9 +261,12 @@ export default @observer class EditSettingsForm extends Component { autoFocus /> {isLoggedIn && ( -

+

{ intl.formatMessage(messages.serverInfo) }

)} @@ -301,9 +304,12 @@ export default @observer class EditSettingsForm extends Component { onChange={e => this.submit(e)} field={form.$('todoServer')} /> -

+

{ intl.formatMessage(messages.todoServerInfo) }

diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 57db1dcbd..3d5358d89 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js @@ -210,9 +210,12 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon

{intl.formatMessage(messages.teamsUnavailable)}

-

+

{intl.formatMessage(messages.teamsUnavailableInfo)}

diff --git a/src/lib/Menu.js b/src/lib/Menu.js index d3b13e491..b8abf80bd 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -809,7 +809,7 @@ export default class FranzMenu { locked: false, }, }); - window.ferdi.menu.rebuild() + window.ferdi.menu.rebuild(); setTimeout(() => { actions.settings.update({ type: 'app', -- cgit v1.2.3-70-g09d2 From ecaa5841c3b52680208c243e02e80e8efc33b228 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Wed, 27 Nov 2019 16:08:33 +0700 Subject: Enhance settings readability (update/footer) --- src/components/settings/settings/EditSettingsForm.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 1a54f221d..3d0213f81 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -498,20 +498,17 @@ export default @observer class EditSettingsForm extends Component { loaded={!isCheckingForUpdates || !isUpdateAvailable} /> )} - {noUpdateAvailable && ( -

{intl.formatMessage(messages.updateStatusUpToDate)}

- )}
{intl.formatMessage(messages.currentVersion)} {' '} {remote.app.getVersion()} +
+
+ {noUpdateAvailable && intl.formatMessage(messages.updateStatusUpToDate)}

- - {intl.formatMessage(messages.languageDisclaimer)} -

-

+ Ferdi is based on @@ -522,6 +519,9 @@ export default @observer class EditSettingsForm extends Component { {' '} Apache-2.0 License +
+ + {intl.formatMessage(messages.languageDisclaimer)}

-- cgit v1.2.3-70-g09d2 From 7a0453ebd728092f05ee65abc1a7c3efdda168d1 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Wed, 27 Nov 2019 22:02:18 +0700 Subject: #232 Remove default lock password behavior, allow empty password --- src/components/auth/Locked.js | 2 -- src/config.js | 1 - src/containers/auth/LockedScreen.js | 5 +---- src/containers/settings/EditSettingsScreen.js | 4 ++-- src/i18n/locales/defaultMessages.json | 20 ++++++++++---------- src/i18n/messages/src/components/auth/Locked.json | 20 ++++++++++---------- 6 files changed, 23 insertions(+), 29 deletions(-) (limited to 'src/components') diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index 045621d0a..ca571f20e 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js @@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; import { defineMessages, intlShape } from 'react-intl'; import Form from '../../lib/Form'; -import { required } from '../../helpers/validation-helpers'; import Input from '../ui/Input'; import Button from '../ui/Button'; import Infobox from '../ui/Infobox'; @@ -50,7 +49,6 @@ export default @observer class Locked extends Component { password: { label: this.context.intl.formatMessage(messages.passwordLabel), value: '', - validators: [required], type: 'password', }, }, diff --git a/src/config.js b/src/config.js index bd67aee6b..fba4d6c2f 100644 --- a/src/config.js +++ b/src/config.js @@ -31,7 +31,6 @@ export const DEVELOPMENT_TODOS_FRONTEND_URL = 'https://development--franz-todos. export const GA_ID = !isDevMode ? 'UA-74126766-10' : 'UA-74126766-12'; -export const DEFAULT_LOCK_PASSWORD = 'ferdi'; export const KEEP_WS_LOADED_USID = '0a0aa000-0a0a-49a0-a000-a0a0a0a0a0a0'; export const HIBERNATION_STRATEGIES = { diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js index 94285fb06..671f2ccaf 100644 --- a/src/containers/auth/LockedScreen.js +++ b/src/containers/auth/LockedScreen.js @@ -3,7 +3,6 @@ import PropTypes from 'prop-types'; import { inject, observer } from 'mobx-react'; import Locked from '../../components/auth/Locked'; import SettingsStore from '../../stores/SettingsStore'; -import { DEFAULT_LOCK_PASSWORD } from '../../config'; import { globalError as globalErrorPropType } from '../../prop-types'; @@ -27,9 +26,7 @@ export default @inject('stores', 'actions') @observer class LockedScreen extends let correctPassword = this.props.stores.settings.all.app.lockedPassword; if (!correctPassword) { - // Lock feature was enabled but no password was set - // Use default lock password so user can exit - correctPassword = DEFAULT_LOCK_PASSWORD; + correctPassword = ''; } if (String(password) === String(correctPassword)) { diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 07efbb881..b64cd77be 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -10,7 +10,7 @@ import UserStore from '../../stores/UserStore'; import TodosStore from '../../features/todos/store'; import Form from '../../lib/Form'; import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages'; -import { DEFAULT_APP_SETTINGS, DEFAULT_LOCK_PASSWORD, HIBERNATION_STRATEGIES } from '../../config'; +import { DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES } from '../../config'; import { config as spellcheckerConfig } from '../../features/spellchecker'; import { getSelectOptions } from '../../helpers/i18n-helpers'; @@ -309,7 +309,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e lockedPassword: { label: intl.formatMessage(messages.lockPassword), value: settings.all.app.lockedPassword, - default: DEFAULT_LOCK_PASSWORD, + default: '', type: 'password', }, scheduledDNDEnabled: { diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 10092cd9e..e68ec41af 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -202,65 +202,65 @@ "defaultMessage": "!!!Locked", "end": { "column": 3, - "line": 18 + "line": 17 }, "file": "src/components/auth/Locked.js", "id": "locked.headline", "start": { "column": 12, - "line": 15 + "line": 14 } }, { "defaultMessage": "!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.", "end": { "column": 3, - "line": 22 + "line": 21 }, "file": "src/components/auth/Locked.js", "id": "locked.info", "start": { "column": 8, - "line": 19 + "line": 18 } }, { "defaultMessage": "!!!Password", "end": { "column": 3, - "line": 26 + "line": 25 }, "file": "src/components/auth/Locked.js", "id": "locked.password.label", "start": { "column": 17, - "line": 23 + "line": 22 } }, { "defaultMessage": "!!!Unlock", "end": { "column": 3, - "line": 30 + "line": 29 }, "file": "src/components/auth/Locked.js", "id": "locked.submit.label", "start": { "column": 21, - "line": 27 + "line": 26 } }, { "defaultMessage": "!!!Password invalid", "end": { "column": 3, - "line": 34 + "line": 33 }, "file": "src/components/auth/Locked.js", "id": "locked.invalidCredentials", "start": { "column": 22, - "line": 31 + "line": 30 } } ], diff --git a/src/i18n/messages/src/components/auth/Locked.json b/src/i18n/messages/src/components/auth/Locked.json index 86b1cae90..407e70484 100644 --- a/src/i18n/messages/src/components/auth/Locked.json +++ b/src/i18n/messages/src/components/auth/Locked.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Locked", "file": "src/components/auth/Locked.js", "start": { - "line": 15, + "line": 14, "column": 12 }, "end": { - "line": 18, + "line": 17, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.", "file": "src/components/auth/Locked.js", "start": { - "line": 19, + "line": 18, "column": 8 }, "end": { - "line": 22, + "line": 21, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Password", "file": "src/components/auth/Locked.js", "start": { - "line": 23, + "line": 22, "column": 17 }, "end": { - "line": 26, + "line": 25, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Unlock", "file": "src/components/auth/Locked.js", "start": { - "line": 27, + "line": 26, "column": 21 }, "end": { - "line": 30, + "line": 29, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Password invalid", "file": "src/components/auth/Locked.js", "start": { - "line": 31, + "line": 30, "column": 22 }, "end": { - "line": 34, + "line": 33, "column": 3 } } -- cgit v1.2.3-70-g09d2 From a7d054e71e5f7171804dd34f46f51b68353672e8 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Wed, 27 Nov 2019 23:32:27 +0700 Subject: Clear hibernation timeout in componentWillUnmount --- src/components/services/content/ServiceView.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src/components') diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 1fff5ef7a..860863d26 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js @@ -96,6 +96,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends componentWillUnmount() { this.autorunDisposer(); clearTimeout(this.forceRepaintTimeout); + clearTimeout(this.hibernationTimer); } updateTargetUrl = (event) => { -- cgit v1.2.3-70-g09d2 From 39805a4ea66da43f646e9117771c89b65c544b22 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Thu, 28 Nov 2019 04:16:51 +0700 Subject: Upgrade react-dropzone and review usage breaking changes --- package-lock.json | 28 +++++++++++++++++----------- package.json | 2 +- src/components/ui/ImageUpload.js | 12 +++++++----- 3 files changed, 25 insertions(+), 17 deletions(-) (limited to 'src/components') diff --git a/package-lock.json b/package-lock.json index c432b9d27..9e73f97ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6442,12 +6442,9 @@ "dev": true }, "attr-accept": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.3.tgz", - "integrity": "sha512-iT40nudw8zmCweivz6j58g+RT33I4KbaIvRUhjNmDwO2WmsQUxFEZZYZ5w3vXe5x5MX9D7mfvA/XaLOZYFR9EQ==", - "requires": { - "core-js": "^2.5.0" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.0.0.tgz", + "integrity": "sha512-I9SDP4Wvh2ItYYoafEg8hFpsBe96pfQ+eabceShXt3sw2fbIP96+Aoj9zZE0vkZNAkXXzHJATVRuWz+h9FxJxQ==" }, "auto-launch": { "version": "5.0.5", @@ -12103,6 +12100,14 @@ "object-assign": "^4.0.1" } }, + "file-selector": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.12.tgz", + "integrity": "sha512-Kx7RTzxyQipHuiqyZGf+Nz4vY9R1XGxuQl/hLoJwq+J4avk/9wxxgZyHKtbyIPJmbD4A66DWGYfyykWNpcYutQ==", + "requires": { + "tslib": "^1.9.0" + } + }, "file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", @@ -22315,12 +22320,13 @@ } }, "react-dropzone": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-7.0.1.tgz", - "integrity": "sha512-J4rbzhFZPVW7k7K9CVb0OcwSOJGLWa0y+0rvtB4rBLVkvq0agH/o3kPJ0DCkd6ZVzL2K1NFqIOvtQkwQKpmJBA==", + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-10.2.1.tgz", + "integrity": "sha512-Me5nOu8hK9/Xyg5easpdfJ6SajwUquqYR/2YTdMotsCUgJ1pHIIwNsv0n+qcIno0tWR2V2rVQtj2r/hXYs2TnQ==", "requires": { - "attr-accept": "^1.1.3", - "prop-types": "^15.6.2" + "attr-accept": "^2.0.0", + "file-selector": "^0.1.12", + "prop-types": "^15.7.2" } }, "react-electron-web-view": { diff --git a/package.json b/package.json index 024537020..f0d630813 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "react-addons-css-transition-group": "15.6.2", "react-confetti": "5.0.1", "react-dom": "16.12.0", - "react-dropzone": "7.0.1", + "react-dropzone": "10.2.1", "react-electron-web-view": "^2.0.1", "react-intl": "2.7.2", "react-jss": "8.6.1", diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js index 83a05554b..636d4fae3 100644 --- a/src/components/ui/ImageUpload.js +++ b/src/components/ui/ImageUpload.js @@ -89,14 +89,16 @@ export default @observer class ImageUpload extends Component { { this.dropzoneRef = node; }} onDrop={this.onDrop.bind(this)} - className={cssClasses} multiple={multiple} accept="image/jpeg, image/png" > - -

- {textUpload} -

+ {({ getRootProps, getInputProps }) => ( +
+ +

{textUpload}

+ +
+ )} )} -- cgit v1.2.3-70-g09d2 From 63c9095ebabcd7ead1cdbd483fe6f2d1ee15399e Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Thu, 28 Nov 2019 04:53:50 +0700 Subject: Revert "Upgrade react-dropzone and review usage breaking changes" This reverts commit 39805a4ea66da43f646e9117771c89b65c544b22. --- package-lock.json | 28 +++++++++++----------------- package.json | 2 +- src/components/ui/ImageUpload.js | 12 +++++------- 3 files changed, 17 insertions(+), 25 deletions(-) (limited to 'src/components') diff --git a/package-lock.json b/package-lock.json index 8c3207b2c..5f62342a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6220,9 +6220,12 @@ "dev": true }, "attr-accept": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.0.0.tgz", - "integrity": "sha512-I9SDP4Wvh2ItYYoafEg8hFpsBe96pfQ+eabceShXt3sw2fbIP96+Aoj9zZE0vkZNAkXXzHJATVRuWz+h9FxJxQ==" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.3.tgz", + "integrity": "sha512-iT40nudw8zmCweivz6j58g+RT33I4KbaIvRUhjNmDwO2WmsQUxFEZZYZ5w3vXe5x5MX9D7mfvA/XaLOZYFR9EQ==", + "requires": { + "core-js": "^2.5.0" + } }, "auto-launch": { "version": "5.0.5", @@ -11760,14 +11763,6 @@ "object-assign": "^4.0.1" } }, - "file-selector": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.12.tgz", - "integrity": "sha512-Kx7RTzxyQipHuiqyZGf+Nz4vY9R1XGxuQl/hLoJwq+J4avk/9wxxgZyHKtbyIPJmbD4A66DWGYfyykWNpcYutQ==", - "requires": { - "tslib": "^1.9.0" - } - }, "file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", @@ -21987,13 +21982,12 @@ } }, "react-dropzone": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-10.2.1.tgz", - "integrity": "sha512-Me5nOu8hK9/Xyg5easpdfJ6SajwUquqYR/2YTdMotsCUgJ1pHIIwNsv0n+qcIno0tWR2V2rVQtj2r/hXYs2TnQ==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-7.0.1.tgz", + "integrity": "sha512-J4rbzhFZPVW7k7K9CVb0OcwSOJGLWa0y+0rvtB4rBLVkvq0agH/o3kPJ0DCkd6ZVzL2K1NFqIOvtQkwQKpmJBA==", "requires": { - "attr-accept": "^2.0.0", - "file-selector": "^0.1.12", - "prop-types": "^15.7.2" + "attr-accept": "^1.1.3", + "prop-types": "^15.6.2" } }, "react-electron-web-view": { diff --git a/package.json b/package.json index 39345c3e1..5e2297602 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "react-addons-css-transition-group": "15.6.2", "react-confetti": "3.1.0", "react-dom": "16.12.0", - "react-dropzone": "10.2.1", + "react-dropzone": "7.0.1", "react-electron-web-view": "^2.0.1", "react-intl": "2.7.2", "react-jss": "8.6.1", diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js index 636d4fae3..83a05554b 100644 --- a/src/components/ui/ImageUpload.js +++ b/src/components/ui/ImageUpload.js @@ -89,16 +89,14 @@ export default @observer class ImageUpload extends Component { { this.dropzoneRef = node; }} onDrop={this.onDrop.bind(this)} + className={cssClasses} multiple={multiple} accept="image/jpeg, image/png" > - {({ getRootProps, getInputProps }) => ( -
- -

{textUpload}

- -
- )} + +

+ {textUpload} +

)} -- cgit v1.2.3-70-g09d2 From fd7710a395bcf3d3fc5f9760a48ded335e591ad9 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Fri, 29 Nov 2019 02:46:48 +0700 Subject: Rename Ferdi Lock to Password Lock for consistency --- src/components/settings/settings/EditSettingsForm.js | 4 ++-- src/containers/settings/EditSettingsScreen.js | 4 ++-- src/i18n/locales/af.json | 8 ++++---- src/i18n/locales/ar.json | 8 ++++---- src/i18n/locales/bs.json | 8 ++++---- src/i18n/locales/ca.json | 8 ++++---- src/i18n/locales/cs.json | 8 ++++---- src/i18n/locales/da.json | 8 ++++---- src/i18n/locales/defaultMessages.json | 8 ++++---- src/i18n/locales/el.json | 8 ++++---- src/i18n/locales/en-US.json | 8 ++++---- src/i18n/locales/en.json | 8 ++++---- src/i18n/locales/es.json | 8 ++++---- src/i18n/locales/fi.json | 8 ++++---- src/i18n/locales/ga.json | 8 ++++---- src/i18n/locales/he.json | 8 ++++---- src/i18n/locales/hr.json | 8 ++++---- src/i18n/locales/hu.json | 8 ++++---- src/i18n/locales/id.json | 8 ++++---- src/i18n/locales/it.json | 8 ++++---- src/i18n/locales/ja.json | 8 ++++---- src/i18n/locales/ka.json | 8 ++++---- src/i18n/locales/ko.json | 8 ++++---- src/i18n/locales/nl-BE.json | 8 ++++---- src/i18n/locales/nl.json | 8 ++++---- src/i18n/locales/no.json | 8 ++++---- src/i18n/locales/pl.json | 8 ++++---- src/i18n/locales/pt-BR.json | 4 ++-- src/i18n/locales/pt.json | 8 ++++---- src/i18n/locales/ro.json | 8 ++++---- src/i18n/locales/ru.json | 8 ++++---- src/i18n/locales/sk.json | 8 ++++---- src/i18n/locales/sl.json | 8 ++++---- src/i18n/locales/sr.json | 8 ++++---- src/i18n/locales/sv.json | 8 ++++---- src/i18n/locales/tr.json | 8 ++++---- src/i18n/locales/uk.json | 8 ++++---- src/i18n/locales/vi.json | 8 ++++---- src/i18n/locales/zh-HANT.json | 8 ++++---- src/i18n/locales/zh.json | 8 ++++---- .../src/components/settings/settings/EditSettingsForm.json | 4 ++-- src/i18n/messages/src/containers/settings/EditSettingsScreen.json | 4 ++-- 42 files changed, 158 insertions(+), 158 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 3d0213f81..74f5924ea 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -50,7 +50,7 @@ const messages = defineMessages({ }, lockedPassword: { id: 'settings.app.lockedPassword', - defaultMessage: '!!!Ferdi Lock Password', + defaultMessage: '!!!Password', }, lockedPasswordInfo: { id: 'settings.app.lockedPasswordInfo', @@ -58,7 +58,7 @@ const messages = defineMessages({ }, lockInfo: { id: 'settings.app.lockInfo', - defaultMessage: '!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.', + defaultMessage: '!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.', }, scheduledDNDTimeInfo: { id: 'settings.app.scheduledDNDTimeInfo', diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index b64cd77be..aa4de78e9 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -72,11 +72,11 @@ const messages = defineMessages({ }, enableLock: { id: 'settings.app.form.enableLock', - defaultMessage: '!!!Enable Ferdi password lock', + defaultMessage: '!!!Enable Password Lock', }, lockPassword: { id: 'settings.app.form.lockPassword', - defaultMessage: '!!!Ferdi Lock password', + defaultMessage: '!!!Password', }, scheduledDNDEnabled: { id: 'settings.app.form.scheduledDNDEnabled', diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/af.json +++ b/src/i18n/locales/af.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index c2c4a3b3c..b9294123d 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/bs.json +++ b/src/i18n/locales/bs.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json index f7de90243..3ecf0caaf 100644 --- a/src/i18n/locales/ca.json +++ b/src/i18n/locales/ca.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Inclou versions beta", "settings.app.form.darkMode": "Uneix-te al Cantó Fosc", "settings.app.form.enableGPUAcceleration": "Activar acceleració GPU", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Habilita la comprobació ortogràfica", "settings.app.form.enableSystemTray": "Mostra Ferdi a la safata del sistema", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Idioma", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimitza Ferdi a la safata del sistema", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Actualitzacions", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Els canvis requereixen reiniciar", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json index 7ec1ce369..0932ba6ae 100644 --- a/src/i18n/locales/cs.json +++ b/src/i18n/locales/cs.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Zahrnout beta verze", "settings.app.form.darkMode": "Připoj se k Temné straně", "settings.app.form.enableGPUAcceleration": "Aktivovat GPU zrychlení", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Zapnout kontrolu pravopisu", "settings.app.form.enableSystemTray": "Zobrazit Ferdi v systémové liště", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Jazyk", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimalizovat Ferdi do systémové lišty", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Aktualizace", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Změny vyžadují restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/da.json +++ b/src/i18n/locales/da.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index e68ec41af..cc60891c3 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -2683,7 +2683,7 @@ } }, { - "defaultMessage": "!!!Ferdi Lock Password", + "defaultMessage": "!!!Password", "end": { "column": 3, "line": 54 @@ -2709,7 +2709,7 @@ } }, { - "defaultMessage": "!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", "end": { "column": 3, "line": 62 @@ -4175,7 +4175,7 @@ } }, { - "defaultMessage": "!!!Enable Ferdi password lock", + "defaultMessage": "!!!Enable Password Lock", "end": { "column": 3, "line": 76 @@ -4188,7 +4188,7 @@ } }, { - "defaultMessage": "!!!Ferdi Lock password", + "defaultMessage": "!!!Password", "end": { "column": 3, "line": 80 diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json index c383a18fb..137bd93cb 100644 --- a/src/i18n/locales/el.json +++ b/src/i18n/locales/el.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Συμπεριλάβετε εκδόσεις beta", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Ενεργοποιήση Ενίσχυσης GPU ", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Ενεργοποίηση ορθογραφικού ελέγχου", "settings.app.form.enableSystemTray": "Εμφάνιση του Ferdi στη γραμμή ειδοποιήσεων", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Γλώσσα", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Ελαχιστοποίηση του Ferdi στη γραμμή ειδοποιήσεων", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Ενημερώσεις", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Οι αλλαγές απαιτούν επανεκκίνηση", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index b7d81356e..e586cb852 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json index 1fdc74380..235e12146 100644 --- a/src/i18n/locales/en.json +++ b/src/i18n/locales/en.json @@ -222,14 +222,14 @@ "settings.app.form.beta": "Cuir leagain béite san áireamh", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Cumasaigh luasghéarú APG", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Cumasaigh seiceáil litrithe", "settings.app.form.enableSystemTray": "Taispeáin Ferdi i dtráidire an chórais", "settings.app.form.enableTodos": "Enable Ferdi Todos", "settings.app.form.hibernate": "Enable service hibernation", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Teanga", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Íoslaghdaigh Ferdi chuig tráidire an chórais", "settings.app.form.privateNotifications": "Don't show message content in notifications", "settings.app.form.runInBackground": "Coimeád Ferdi sa chúlra nuair a dhúntar an fhuinneog", @@ -247,8 +247,8 @@ "settings.app.headlineLanguage": "Teanga", "settings.app.headlineUpdates": "Nuashonruithe", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Ní gá atosú chun athruithe a chur i bhfeidhm.", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index 462d74d39..6df814503 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Incluir versiones beta", "settings.app.form.darkMode": "Únete al Lado Oscuro", "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Activar corrección ortográfica", "settings.app.form.enableSystemTray": "Mostrar Ferdi en la bandeja del sistema", "settings.app.form.enableTodos": "Activar Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Mantener todas las Áreas de trabajo cargadas", "settings.app.form.language": "Idioma", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Actualizaciones", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Los cambios requieren reiniciar", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/fi.json +++ b/src/i18n/locales/fi.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json index ebc7b1dbe..a580a03c2 100644 --- a/src/i18n/locales/ga.json +++ b/src/i18n/locales/ga.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Cuir leagain béite san áireamh", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Cumasaigh luasghéarú APG", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Cumasaigh seiceáil litrithe", "settings.app.form.enableSystemTray": "Taispeáin Ferdi i dtráidire an chórais", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Teanga", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Íoslaghdaigh Ferdi chuig tráidire an chórais", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Nuashonruithe", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Ní gá atosú chun athruithe a chur i bhfeidhm.", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/he.json +++ b/src/i18n/locales/he.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json index 5d6f353f0..b94733de5 100644 --- a/src/i18n/locales/hr.json +++ b/src/i18n/locales/hr.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Obuhvati i beta verzije", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa", "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Jezik", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Smanji Franca u sustavsku traku", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Nadogradnje", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Promjene postavki zahtijevaju ponovni zagon", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json index 7695f5fc4..7dd0b4771 100644 --- a/src/i18n/locales/hu.json +++ b/src/i18n/locales/hu.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Béta verziók keresése", "settings.app.form.darkMode": "Csatlakozz a Sötét Oldalhoz", "settings.app.form.enableGPUAcceleration": "Hardveres gyorsítás engedélyezése", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Helyesírás-ellenőrzés engedélyezése", "settings.app.form.enableSystemTray": "Ferdi mutatása a tálcán", "settings.app.form.enableTodos": "Ferdi Tennivalók bekapcsolása", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Nyelv", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Ferdi kicsinyítése a tálcára", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Frissítések", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "A hivatalos fordítások angol és német nyelven elérhetőek. Minden más nyelv közösségi fordításon alapul.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Újraindítást igénylő módosítás", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json index e48458d07..68b37ca5b 100644 --- a/src/i18n/locales/id.json +++ b/src/i18n/locales/id.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Sertakan versi beta", "settings.app.form.darkMode": "Sisi Kelam menunggu Anda (Mode Gelap)", "settings.app.form.enableGPUAcceleration": "Aktifkan Akselerasi GPU", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Aktifkan pemeriksaan ejaan", "settings.app.form.enableSystemTray": "Tampilkan Ferdi di baki sistem", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Bahasa", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Perkecil Ferdi ke baki sistem", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Versi Baru", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Penerjemahan resmi dilakukan untuk Bahasa Inggris dan Jerman. Bahasa lainnya merupakan penerjemahan oleh komunitas.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Perubahan membutuhkan mulai ulang", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index 07a4dc98d..89e3a903e 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Includi versioni beta", "settings.app.form.darkMode": "Unisciti al Lato Oscuro", "settings.app.form.enableGPUAcceleration": "Attiva Accelerazione GPU", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Attiva controllo ortografico", "settings.app.form.enableSystemTray": "Mostra Ferdi nell'area di notifica", "settings.app.form.enableTodos": "Abilità le Attività Ferdi", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Mantieni tutti i workspace caricati", "settings.app.form.language": "Lingua", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimizza Ferdi nell'area di notifica", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Aggiornamenti", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Le traduzioni ufficiali sono in Inglese e Tedesco. Tutte le altre lingue sono tradotte dalla community.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Le modifiche richiedono un riavvio", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index 0f5a14be1..3dcdb75eb 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Betaバージョンを含める", "settings.app.form.darkMode": "ダークモードを有効にする", "settings.app.form.enableGPUAcceleration": "GPUアクセラレーションを有効にする", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "スペルチェックを有効にする", "settings.app.form.enableSystemTray": "Ferdiをシステムトレイに表示する", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "言語", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Ferdiをシステムトレイに最小化する", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "更新", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "変更には再起動が必要です", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json index 302b513d2..18d5d2da4 100644 --- a/src/i18n/locales/ka.json +++ b/src/i18n/locales/ka.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "ჩართეთ ბეტა ვერსიები", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "აჩვენეთ Ferdi სისტემის უჯრაში", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "ენა", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "ჩაკეცეთ Ferdi სისტემის უჯრაში", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "განახლებები", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/ko.json +++ b/src/i18n/locales/ko.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json index 80f33d583..f2a6895e6 100644 --- a/src/i18n/locales/nl-BE.json +++ b/src/i18n/locales/nl-BE.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Inclusief beta versies", "settings.app.form.darkMode": "Word lid van de Dark Side", "settings.app.form.enableGPUAcceleration": "GPU Acceleratie Activeren", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Spellingcontrole inschakelen", "settings.app.form.enableSystemTray": "Toon Ferdi in de systeembalk", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Taal", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar de systeembalk", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Officiële vertalingen zijn in het Engels en Duits. Alle andere tallen zijn op de gemeenschap gebaseerde vertalingen.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Deze wijziging heeft een herstart nodig", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json index c71954427..f9c00b899 100644 --- a/src/i18n/locales/nl.json +++ b/src/i18n/locales/nl.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Inclusief bètaversies", "settings.app.form.darkMode": "Stap over naar de donkere kant", "settings.app.form.enableGPUAcceleration": "Schakel videokaart-acceleratie in ", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Zet spellingcontrole aan", "settings.app.form.enableSystemTray": "Pictogram voor Ferdi in systeemvak tonen", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Taal", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar systeemvak", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Ferdi spreekt officieel Engels en Duits. Alle andere talen worden beheerd door de community.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Deze wijziging heeft een herstart nodig", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/no.json +++ b/src/i18n/locales/no.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json index e29e80e9f..e5496f0eb 100644 --- a/src/i18n/locales/pl.json +++ b/src/i18n/locales/pl.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Uwzględnij wersje beta", "settings.app.form.darkMode": "Przejdź na Ciemną Stronę", "settings.app.form.enableGPUAcceleration": "Włącz akcelerację GPU", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Włącz sprawdzanie pisowni", "settings.app.form.enableSystemTray": "Pokaż Ferdia w obszarze powiadomień", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Język", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Zminimalizuj aplikację Ferdi", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Aktualizacje", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Oficjalnymi językami są Angielski i Niemiecki. Inne języki są tłumaczone przez społeczność Ferdi.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Zmiany wymagają ponownego uruchomienia", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json index 591b35610..af344f4cc 100644 --- a/src/i18n/locales/pt-BR.json +++ b/src/i18n/locales/pt-BR.json @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Atualizações", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "As traduções oficiais são em inglês e alemão. As demais traduções são baseadas na ajuda da comunidade.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "As mudanças exigem reiniciar o sistema", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json index 3d14d5414..645bb2043 100644 --- a/src/i18n/locales/pt.json +++ b/src/i18n/locales/pt.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Incluir versões instáveis (beta)", "settings.app.form.darkMode": "Junta-te ao Lado Negro", "settings.app.form.enableGPUAcceleration": "Activar Aceleração de GPU", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Ativar verificação ortográfica", "settings.app.form.enableSystemTray": "Mostrar o Ferdi na barra do sistema", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Idioma", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimizar o Ferdi para a barra do sistema", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Atualizações", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Alterações requerem reinício", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/ro.json +++ b/src/i18n/locales/ro.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index 5d3636d9e..efd966ff8 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Включая бета версии", "settings.app.form.darkMode": "Перейти на Тёмную сторону", "settings.app.form.enableGPUAcceleration": "Включить ускорение GPU", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Включить проверку правописания", "settings.app.form.enableSystemTray": "Показывать Ferdi в системном трее", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Язык", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Сворачивать Ferdi в системный трей", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Обновления", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Официальная поддержка только для английского и немецкого языков. Остальные языки переведены сообществом.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Изменения требуют перезагрузки приложения", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json index b9805e2a6..0c47d3844 100644 --- a/src/i18n/locales/sk.json +++ b/src/i18n/locales/sk.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Vrátane beta verzií", "settings.app.form.darkMode": "Spustiť Dark Side", "settings.app.form.enableGPUAcceleration": "Zapnúť GPU zrýchlenie", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Zapnúť kontrolu pravopisu", "settings.app.form.enableSystemTray": "Zobrazovať Ferdi v systémovej lište", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Jazyk", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimalizovať Ferdi do systémovej lišty", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Aktualizácie", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Oficiálne preklady sú angličtina a nemčina. Všetky ostatné jazyky sú preklady založené na komunite.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Zmeny vyžadujú reštart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/sl.json +++ b/src/i18n/locales/sl.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json index f1257ac1e..39ce2e022 100644 --- a/src/i18n/locales/sr.json +++ b/src/i18n/locales/sr.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Obuhvati i beta verzije", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Омогући убрзање графичке јединице", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa", "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Jezik", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Smanji Franca u sustavsku traku", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Nadogradnje", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Promjene postavki zahtijevaju ponovni pogon", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/sv.json +++ b/src/i18n/locales/sv.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json index 34c406981..8edec5ce2 100644 --- a/src/i18n/locales/tr.json +++ b/src/i18n/locales/tr.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Beta versiyonları dahil et", "settings.app.form.darkMode": "Karanlık tarafa katıl", "settings.app.form.enableGPUAcceleration": "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Yazım denetimini etkinleştir", "settings.app.form.enableSystemTray": "Ferdi'ı sistem tepsisinde göster", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Dil", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Ferdi'ı sistem tepsisine küçült", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Güncellemeler", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Değişiklikler yeniden başlatmayı gerektiriyor", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json index c1657b2c0..1e61b1ea7 100644 --- a/src/i18n/locales/uk.json +++ b/src/i18n/locales/uk.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Включити бета-версії", "settings.app.form.darkMode": "Переходь на Темну Сторону", "settings.app.form.enableGPUAcceleration": "Ввімкнути прискорення GPU", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Увімкнути перевірку орфографії", "settings.app.form.enableSystemTray": "Показувати Ferdi у системному лотку", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Мова", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Мінімізувати Ferdi до системного лотка", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Оновлення", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Зміни потребують перезапуску", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/vi.json +++ b/src/i18n/locales/vi.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json index fd1ea9977..5c7ab6c50 100644 --- a/src/i18n/locales/zh-HANT.json +++ b/src/i18n/locales/zh-HANT.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "包含開發中版本", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "在系統匣上顯示", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "語言", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "最小化至系統匣", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "更新", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json index 8eb2053bc..00bb7de2c 100644 --- a/src/i18n/locales/zh.json +++ b/src/i18n/locales/zh.json @@ -261,7 +261,7 @@ "settings.app.form.beta": "Include beta versions", "settings.app.form.darkMode": "Join the Dark Side", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", - "settings.app.form.enableLock": "Enable Ferdi password lock", + "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.enableSystemTray": "Show Ferdi in system tray", "settings.app.form.enableTodos": "Enable Ferdi Todos", @@ -269,7 +269,7 @@ "settings.app.form.hibernationStrategy": "Hibernation strategy", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", - "settings.app.form.lockPassword": "Ferdi Lock password", + "settings.app.form.lockPassword": "Password", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.noUpdates": "Disable updates", "settings.app.form.privateNotifications": "Don't show message content in notifications", @@ -291,8 +291,8 @@ "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", - "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", - "settings.app.lockedPassword": "Ferdi Lock Password", + "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "settings.app.lockedPassword": "Password", "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json index 5bf9f0b31..1fdff93b9 100644 --- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json +++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json @@ -79,7 +79,7 @@ }, { "id": "settings.app.lockedPassword", - "defaultMessage": "!!!Ferdi Lock Password", + "defaultMessage": "!!!Password", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { "line": 51, @@ -105,7 +105,7 @@ }, { "id": "settings.app.lockInfo", - "defaultMessage": "!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", + "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { "line": 59, diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 411e35dab..d6cdb94c0 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -144,7 +144,7 @@ }, { "id": "settings.app.form.enableLock", - "defaultMessage": "!!!Enable Ferdi password lock", + "defaultMessage": "!!!Enable Password Lock", "file": "src/containers/settings/EditSettingsScreen.js", "start": { "line": 73, @@ -157,7 +157,7 @@ }, { "id": "settings.app.form.lockPassword", - "defaultMessage": "!!!Ferdi Lock password", + "defaultMessage": "!!!Password", "file": "src/containers/settings/EditSettingsScreen.js", "start": { "line": 77, -- cgit v1.2.3-70-g09d2 From 90736a11ffa547ba252acccae3fc9f28c5f471fd Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Fri, 29 Nov 2019 19:38:23 +0700 Subject: Disable/prevent access to some settings for non-logged users --- src/components/settings/navigation/SettingsNavigation.js | 4 ++++ src/components/settings/recipes/RecipesDashboard.js | 6 ++++-- src/components/ui/Link.js | 6 +++++- src/styles/settings.scss | 4 ++++ 4 files changed, 17 insertions(+), 3 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index 192cfde7a..eb3249fa0 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js @@ -119,6 +119,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e to="/settings/services" className="settings-navigation__link" activeClassName="is-active" + disabled={!isLoggedIn} > {intl.formatMessage(messages.yourServices)} {' '} @@ -134,6 +135,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e to="/settings/workspaces" className="settings-navigation__link" activeClassName="is-active" + disabled={!isLoggedIn} > {intl.formatMessage(messages.yourWorkspaces)} {' '} @@ -148,6 +150,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e to="/settings/user" className="settings-navigation__link" activeClassName="is-active" + disabled={!isLoggedIn} > {intl.formatMessage(messages.account)} @@ -155,6 +158,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e to="/settings/team" className="settings-navigation__link" activeClassName="is-active" + disabled={!isLoggedIn} > {intl.formatMessage(messages.team)} {!user.data.isPremium && ( diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index 877cbc588..d08e6cbc2 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js @@ -153,6 +153,8 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com const communityRecipes = recipes.filter(r => !r.isDevRecipe); const devRecipes = recipes.filter(r => r.isDevRecipe); + const isLoggedIn = Boolean(localStorage.getItem('authToken')); + return (
@@ -265,7 +267,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com showAddServiceInterface({ recipeId: recipe.id })} + onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })} /> ))}
@@ -278,7 +280,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com showAddServiceInterface({ recipeId: recipe.id })} + onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })} /> ))}
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js index 5f729844b..7930d98b4 100644 --- a/src/components/ui/Link.js +++ b/src/components/ui/Link.js @@ -11,7 +11,8 @@ import { matchRoute } from '../../helpers/routing-helpers'; // TODO: create container component for this component export default @inject('stores') @observer class Link extends Component { onClick(e) { - if (this.props.target === '_blank') { + if (this.props.disabled) e.preventDefault(); + else if (this.props.target === '_blank') { e.preventDefault(); shell.openExternal(this.props.to); } @@ -39,6 +40,7 @@ export default @inject('stores') @observer class Link extends Component { const linkClasses = classnames({ [`${className}`]: true, [`${activeClassName}`]: match, + 'is-disabled': this.props.disabled, }); return ( @@ -68,12 +70,14 @@ Link.wrappedComponent.propTypes = { strictFilter: PropTypes.bool, target: PropTypes.string, style: PropTypes.object, + disabled: PropTypes.bool, }; Link.wrappedComponent.defaultProps = { className: '', activeClassName: '', strictFilter: false, + disabled: false, target: '', style: {}, }; diff --git a/src/styles/settings.scss b/src/styles/settings.scss index 324175d0b..305450fd2 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss @@ -92,6 +92,10 @@ } } + &.is-disabled { + filter: grayscale(100%) opacity(.2); + } + &.is-active { background: $dark-theme-gray; color: $dark-theme-gray-smoke; -- cgit v1.2.3-70-g09d2 From fffa3875f888aef2109dc7d91dc681069786fc0b Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Wed, 18 Dec 2019 15:49:26 +0100 Subject: Better handling of account settings (if using without account) --- .../settings/account/AccountDashboard.js | 316 ++++++++++++--------- src/containers/settings/AccountScreen.js | 37 ++- src/i18n/locales/defaultMessages.json | 98 ++++--- src/i18n/locales/en-US.json | 2 + .../settings/account/AccountDashboard.json | 98 ++++--- 5 files changed, 335 insertions(+), 216 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 83dc34a52..7d6bad883 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js @@ -3,9 +3,7 @@ import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; import { defineMessages, intlShape } from 'react-intl'; import ReactTooltip from 'react-tooltip'; -import { - ProBadge, H1, H2, -} from '@meetfranz/ui'; +import { ProBadge, H1, H2 } from '@meetfranz/ui'; import moment from 'moment'; import Loader from '../../ui/Loader'; @@ -13,6 +11,7 @@ import Button from '../../ui/Button'; import Infobox from '../../ui/Infobox'; import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen'; import { i18nPlanName } from '../../../helpers/plan-helpers'; +import { LOCAL_SERVER } from '../../../config'; const messages = defineMessages({ headline: { @@ -69,11 +68,13 @@ const messages = defineMessages({ }, deleteInfo: { id: 'settings.account.deleteInfo', - defaultMessage: '!!!If you don\'t need your Ferdi account any longer, you can delete your account and all related data here.', + defaultMessage: + "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.", }, deleteEmailSent: { id: 'settings.account.deleteEmailSent', - defaultMessage: '!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!', + defaultMessage: + '!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!', }, trial: { id: 'settings.account.trial', @@ -89,7 +90,16 @@ const messages = defineMessages({ }, trialUpdateBillingInformation: { id: 'settings.account.trialUpdateBillingInfo', - defaultMessage: '!!!Please update your billing info to continue using {license} after your trial period.', + defaultMessage: + '!!!Please update your billing info to continue using {license} after your trial period.', + }, + accountUnavailable: { + id: 'settings.account.accountUnavailable', + defaultMessage: 'Account is unavailable', + }, + accountUnavailableInfo: { + id: 'settings.account.accountUnavailableInfo', + defaultMessage: 'You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.', }, }); @@ -110,6 +120,7 @@ class AccountDashboard extends Component { upgradeToPro: PropTypes.func.isRequired, openInvoices: PropTypes.func.isRequired, onCloseSubscriptionWindow: PropTypes.func.isRequired, + server: PropTypes.string.isRequired, }; static contextTypes = { @@ -132,6 +143,7 @@ class AccountDashboard extends Component { upgradeToPro, openInvoices, onCloseSubscriptionWindow, + server, } = this.props; const { intl } = this.context; @@ -141,6 +153,8 @@ class AccountDashboard extends Component { planName = i18nPlanName(user.team.plan, intl); } + const isUsingWithoutAccount = server === LOCAL_SERVER; + return (
@@ -149,154 +163,186 @@ class AccountDashboard extends Component {
- {isLoading && ( - + {isUsingWithoutAccount && ( + <> +

+ {intl.formatMessage(messages.accountUnavailable)} +

+

+ {intl.formatMessage(messages.accountUnavailableInfo)} +

+ )} + {!isUsingWithoutAccount && ( + <> + {isLoading && } - {!isLoading && userInfoRequestFailed && ( - - {intl.formatMessage(messages.userInfoRequestFailed)} - - )} + {!isLoading && userInfoRequestFailed && ( + + {intl.formatMessage(messages.userInfoRequestFailed)} + + )} - {!userInfoRequestFailed && ( - <> - {!isLoading && ( + {!userInfoRequestFailed && ( <> -
-
-
- -
-
-

- {`${user.firstname} ${user.lastname}`} - {user.isPremium && ( - <> - {' '} - - - )} -

-

- {user.organization && `${user.organization}, `} - {user.email} -

- {user.isPremium && ( -
+ {!isLoading && ( + <> +
+
+
+ +
+
+

+ {`${user.firstname} ${user.lastname}`} + {user.isPremium && ( + <> + {' '} + + + )} +

+

+ {user.organization && `${user.organization}, `} + {user.email} +

+ {user.isPremium && ( +
+
+ )} +
+ {!user.isPremium && (
- )} -
- {!user.isPremium && ( -
-
- {user.isPremium && user.isSubscriptionOwner && ( -
-
-

- {intl.formatMessage(messages.yourLicense)} -

-

- Franz - {' '} - {isPremiumOverrideUser ? 'Premium' : planName} - {user.team.isTrial && ( - <> - {' – '} - {intl.formatMessage(messages.trial)} - )} -

- {user.team.isTrial && ( - <> -
-

- {intl.formatMessage(messages.trialEndsIn, { - duration: moment.duration(moment().diff(user.team.trialEnd)).humanize(), - })} -

+
+
+ {user.isPremium && user.isSubscriptionOwner && ( +
+
+

{intl.formatMessage(messages.yourLicense)}

- {intl.formatMessage(messages.trialUpdateBillingInformation, { - license: planName, - })} + Franz + {' '} + {isPremiumOverrideUser ? 'Premium' : planName} + {user.team.isTrial && ( + <> + {' – '} + {intl.formatMessage(messages.trial)} + + )}

- - )} - {!isProUser && ( -
-
+ )} +
+
+
+
+ )} + {!user.isPremium && ( +
+
+
- )} -
-
+ )} + + )} + +
+
+

{intl.formatMessage(messages.headlineDangerZone)}

+ {!isDeleteAccountSuccessful && ( +
+

{intl.formatMessage(messages.deleteInfo)}

-
-
- )} - {!user.isPremium && ( -
-
- -
+ )} + {isDeleteAccountSuccessful && ( +

{intl.formatMessage(messages.deleteEmailSent)}

+ )}
- )} +
)} - -
-
-

{intl.formatMessage(messages.headlineDangerZone)}

- {!isDeleteAccountSuccessful && ( -
-

{intl.formatMessage(messages.deleteInfo)}

-
- )} - {isDeleteAccountSuccessful && ( -

{intl.formatMessage(messages.deleteEmailSent)}

- )} -
-
)}
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index 93ab44690..12c912bac 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js @@ -6,12 +6,16 @@ import PaymentStore from '../../stores/PaymentStore'; import UserStore from '../../stores/UserStore'; import AppStore from '../../stores/AppStore'; import FeaturesStore from '../../stores/FeaturesStore'; +import SettingsStore from '../../stores/SettingsStore'; import AccountDashboard from '../../components/settings/account/AccountDashboard'; import ErrorBoundary from '../../components/util/ErrorBoundary'; import { WEBSITE } from '../../environment'; -export default @inject('stores', 'actions') @observer class AccountScreen extends Component { +export default +@inject('stores', 'actions') +@observer +class AccountScreen extends Component { onCloseWindow() { const { user, features } = this.props.stores; user.getUserInfoRequest.invalidate({ immediately: true }); @@ -32,7 +36,9 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend let url; if (api === 'https://api.franzinfra.com') { - url = stores.user.getAuthURL(`${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`); + url = stores.user.getAuthURL( + `${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`, + ); } else { url = `${api}${route}`; } @@ -41,11 +47,13 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend } render() { - const { user, payment, features } = this.props.stores; const { - user: userActions, - payment: paymentActions, - } = this.props.actions; + user, + payment, + features, + settings, + } = this.props.stores; + const { user: userActions, payment: paymentActions } = this.props.actions; const isLoadingUserInfo = user.getUserInfoRequest.isExecuting; const isLoadingPlans = payment.plansRequest.isExecuting; @@ -55,19 +63,29 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend return ( this.reloadData()} onCloseSubscriptionWindow={() => this.onCloseWindow()} deleteAccount={userActions.delete} isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting} - isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError} + isDeleteAccountSuccessful={ + user.deleteAccountRequest.wasExecuted + && !user.deleteAccountRequest.isError + } openEditAccount={() => this.handleWebsiteLink('/user/profile')} - upgradeToPro={() => upgradeAccount({ planId: features.features.pricingConfig.plans.pro.yearly.id })} + upgradeToPro={() => upgradeAccount({ + planId: features.features.pricingConfig.plans.pro.yearly.id, + }) + } openBilling={() => this.handleWebsiteLink('/user/billing')} openInvoices={() => this.handleWebsiteLink('/user/invoices')} /> @@ -81,6 +99,7 @@ AccountScreen.wrappedComponent.propTypes = { user: PropTypes.instanceOf(UserStore).isRequired, features: PropTypes.instanceOf(FeaturesStore).isRequired, payment: PropTypes.instanceOf(PaymentStore).isRequired, + settings: PropTypes.instanceOf(SettingsStore).isRequired, app: PropTypes.instanceOf(AppStore).isRequired, }).isRequired, actions: PropTypes.shape({ diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index cc60891c3..429930278 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -1533,169 +1533,169 @@ "defaultMessage": "!!!Account", "end": { "column": 3, - "line": 21 + "line": 20 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.headline", "start": { "column": 12, - "line": 18 + "line": 17 } }, { "defaultMessage": "!!!Your Subscription", "end": { "column": 3, - "line": 25 + "line": 24 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.headlineSubscription", "start": { "column": 24, - "line": 22 + "line": 21 } }, { "defaultMessage": "!!Danger Zone", "end": { "column": 3, - "line": 29 + "line": 28 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.headlineDangerZone", "start": { "column": 22, - "line": 26 + "line": 25 } }, { "defaultMessage": "!!!Manage your subscription", "end": { "column": 3, - "line": 33 + "line": 32 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.manageSubscription.label", "start": { "column": 33, - "line": 30 + "line": 29 } }, { "defaultMessage": "!!!Upgrade to Franz Professional", "end": { "column": 3, - "line": 37 + "line": 36 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.upgradeToPro.label", "start": { "column": 23, - "line": 34 + "line": 33 } }, { "defaultMessage": "!!!Basic Account", "end": { "column": 3, - "line": 41 + "line": 40 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.accountType.basic", "start": { "column": 20, - "line": 38 + "line": 37 } }, { "defaultMessage": "!!!Premium Supporter Account", "end": { "column": 3, - "line": 45 + "line": 44 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.accountType.premium", "start": { "column": 22, - "line": 42 + "line": 41 } }, { "defaultMessage": "!!!Edit Account", "end": { "column": 3, - "line": 49 + "line": 48 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.account.editButton", "start": { "column": 21, - "line": 46 + "line": 45 } }, { "defaultMessage": "!!Invoices", "end": { "column": 3, - "line": 53 + "line": 52 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.headlineInvoices", "start": { "column": 18, - "line": 50 + "line": 49 } }, { "defaultMessage": "!!!Download", "end": { "column": 3, - "line": 57 + "line": 56 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.invoiceDownload", "start": { "column": 19, - "line": 54 + "line": 53 } }, { "defaultMessage": "!!!Could not load user information", "end": { "column": 3, - "line": 61 + "line": 60 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.userInfoRequestFailed", "start": { "column": 25, - "line": 58 + "line": 57 } }, { "defaultMessage": "!!!Try again", "end": { "column": 3, - "line": 65 + "line": 64 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.tryReloadUserInfoRequest", "start": { "column": 28, - "line": 62 + "line": 61 } }, { "defaultMessage": "!!!Delete account", "end": { "column": 3, - "line": 69 + "line": 68 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.deleteAccount", "start": { "column": 17, - "line": 66 + "line": 65 } }, { @@ -1708,14 +1708,14 @@ "id": "settings.account.deleteInfo", "start": { "column": 14, - "line": 70 + "line": 69 } }, { "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!", "end": { "column": 3, - "line": 77 + "line": 78 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.deleteEmailSent", @@ -1728,52 +1728,78 @@ "defaultMessage": "!!!Free Trial", "end": { "column": 3, - "line": 81 + "line": 82 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.trial", "start": { "column": 9, - "line": 78 + "line": 79 } }, { "defaultMessage": "!!!Your Franz License:", "end": { "column": 3, - "line": 85 + "line": 86 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.yourLicense", "start": { "column": 15, - "line": 82 + "line": 83 } }, { "defaultMessage": "!!!Your free trial ends in {duration}.", "end": { "column": 3, - "line": 89 + "line": 90 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.trialEndsIn", "start": { "column": 15, - "line": 86 + "line": 87 } }, { "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.", "end": { "column": 3, - "line": 93 + "line": 95 }, "file": "src/components/settings/account/AccountDashboard.js", "id": "settings.account.trialUpdateBillingInfo", "start": { "column": 33, - "line": 90 + "line": 91 + } + }, + { + "defaultMessage": "Account is unavailable", + "end": { + "column": 3, + "line": 99 + }, + "file": "src/components/settings/account/AccountDashboard.js", + "id": "settings.account.accountUnavailable", + "start": { + "column": 22, + "line": 96 + } + }, + { + "defaultMessage": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.", + "end": { + "column": 3, + "line": 103 + }, + "file": "src/components/settings/account/AccountDashboard.js", + "id": "settings.account.accountUnavailableInfo", + "start": { + "column": 26, + "line": 100 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index e586cb852..ee85566bb 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -224,6 +224,8 @@ "settings.account.account.editButton": "Edit account", "settings.account.accountType.basic": "Basic Account", "settings.account.accountType.premium": "Premium Supporter Account", + "settings.account.accountUnavailable": "Account is unavailable", + "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.", "settings.account.buttonSave": "Update profile", "settings.account.deleteAccount": "Delete account", "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!", diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json index 48078c18d..f0bb087d6 100644 --- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json +++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Account", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 18, + "line": 17, "column": 12 }, "end": { - "line": 21, + "line": 20, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Your Subscription", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 22, + "line": 21, "column": 24 }, "end": { - "line": 25, + "line": 24, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!Danger Zone", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 26, + "line": 25, "column": 22 }, "end": { - "line": 29, + "line": 28, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Manage your subscription", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 30, + "line": 29, "column": 33 }, "end": { - "line": 33, + "line": 32, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Upgrade to Franz Professional", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 34, + "line": 33, "column": 23 }, "end": { - "line": 37, + "line": 36, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!Basic Account", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 38, + "line": 37, "column": 20 }, "end": { - "line": 41, + "line": 40, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Premium Supporter Account", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 42, + "line": 41, "column": 22 }, "end": { - "line": 45, + "line": 44, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Edit Account", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 46, + "line": 45, "column": 21 }, "end": { - "line": 49, + "line": 48, "column": 3 } }, @@ -108,11 +108,11 @@ "defaultMessage": "!!Invoices", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 50, + "line": 49, "column": 18 }, "end": { - "line": 53, + "line": 52, "column": 3 } }, @@ -121,11 +121,11 @@ "defaultMessage": "!!!Download", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 54, + "line": 53, "column": 19 }, "end": { - "line": 57, + "line": 56, "column": 3 } }, @@ -134,11 +134,11 @@ "defaultMessage": "!!!Could not load user information", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 58, + "line": 57, "column": 25 }, "end": { - "line": 61, + "line": 60, "column": 3 } }, @@ -147,11 +147,11 @@ "defaultMessage": "!!!Try again", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 62, + "line": 61, "column": 28 }, "end": { - "line": 65, + "line": 64, "column": 3 } }, @@ -160,11 +160,11 @@ "defaultMessage": "!!!Delete account", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 66, + "line": 65, "column": 17 }, "end": { - "line": 69, + "line": 68, "column": 3 } }, @@ -173,7 +173,7 @@ "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 70, + "line": 69, "column": 14 }, "end": { @@ -190,7 +190,7 @@ "column": 19 }, "end": { - "line": 77, + "line": 78, "column": 3 } }, @@ -199,11 +199,11 @@ "defaultMessage": "!!!Free Trial", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 78, + "line": 79, "column": 9 }, "end": { - "line": 81, + "line": 82, "column": 3 } }, @@ -212,11 +212,11 @@ "defaultMessage": "!!!Your Franz License:", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 82, + "line": 83, "column": 15 }, "end": { - "line": 85, + "line": 86, "column": 3 } }, @@ -225,11 +225,11 @@ "defaultMessage": "!!!Your free trial ends in {duration}.", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 86, + "line": 87, "column": 15 }, "end": { - "line": 89, + "line": 90, "column": 3 } }, @@ -238,11 +238,37 @@ "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.", "file": "src/components/settings/account/AccountDashboard.js", "start": { - "line": 90, + "line": 91, "column": 33 }, "end": { - "line": 93, + "line": 95, + "column": 3 + } + }, + { + "id": "settings.account.accountUnavailable", + "defaultMessage": "Account is unavailable", + "file": "src/components/settings/account/AccountDashboard.js", + "start": { + "line": 96, + "column": 22 + }, + "end": { + "line": 99, + "column": 3 + } + }, + { + "id": "settings.account.accountUnavailableInfo", + "defaultMessage": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.", + "file": "src/components/settings/account/AccountDashboard.js", + "start": { + "line": 100, + "column": 26 + }, + "end": { + "line": 103, "column": 3 } } -- cgit v1.2.3-70-g09d2 From f319a1c9ba7a4a17a615d1b0f224603e57fdc25d Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Mon, 23 Dec 2019 15:46:11 +0100 Subject: Allow for more natural translation of loading message --- src/components/ui/WebviewLoader/index.js | 4 ++-- src/i18n/locales/defaultMessages.json | 2 +- src/i18n/messages/src/components/ui/WebviewLoader/index.json | 2 +- src/internal-server | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/components') diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js index 923f10327..c58d69374 100644 --- a/src/components/ui/WebviewLoader/index.js +++ b/src/components/ui/WebviewLoader/index.js @@ -10,7 +10,7 @@ import styles from './styles'; const messages = defineMessages({ loading: { id: 'service.webviewLoader.loading', - defaultMessage: '!!!Loading', + defaultMessage: '!!!Loading {service}', }, }); @@ -30,7 +30,7 @@ export default @injectSheet(styles) @observer class WebviewLoader extends Compon return ( ); } diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 393d295bd..fe324cd67 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -3809,7 +3809,7 @@ { "descriptors": [ { - "defaultMessage": "!!!Loading", + "defaultMessage": "!!!Loading {service}", "end": { "column": 3, "line": 14 diff --git a/src/i18n/messages/src/components/ui/WebviewLoader/index.json b/src/i18n/messages/src/components/ui/WebviewLoader/index.json index ef3e4b593..9caabef25 100644 --- a/src/i18n/messages/src/components/ui/WebviewLoader/index.json +++ b/src/i18n/messages/src/components/ui/WebviewLoader/index.json @@ -1,7 +1,7 @@ [ { "id": "service.webviewLoader.loading", - "defaultMessage": "!!!Loading", + "defaultMessage": "!!!Loading {service}", "file": "src/components/ui/WebviewLoader/index.js", "start": { "line": 11, diff --git a/src/internal-server b/src/internal-server index cca6cd984..48cb16fef 160000 --- a/src/internal-server +++ b/src/internal-server @@ -1 +1 @@ -Subproject commit cca6cd984caf729722153e58f44c01319c4bd633 +Subproject commit 48cb16fefe46ab66b1884f18e04c1f701a8e0c09 -- cgit v1.2.3-70-g09d2 From 4e01c44af17acfca5f27698c0a0b3c417b44285d Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Mon, 23 Dec 2019 17:59:06 +0100 Subject: #271 Allow SVG mimetype for service custom icon --- src/components/ui/ImageUpload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components') diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js index 83a05554b..e0b608b96 100644 --- a/src/components/ui/ImageUpload.js +++ b/src/components/ui/ImageUpload.js @@ -91,7 +91,7 @@ export default @observer class ImageUpload extends Component { onDrop={this.onDrop.bind(this)} className={cssClasses} multiple={multiple} - accept="image/jpeg, image/png" + accept="image/jpeg, image/png, image/svg+xml" >

-- cgit v1.2.3-70-g09d2 From 22d76adbe613fd474eb9671cf283edda7f723b76 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Mon, 23 Dec 2019 18:03:14 +0100 Subject: #269 Add auto-focus on lock screen password field --- src/components/auth/Locked.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src/components') diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index ca571f20e..e7f3dc78b 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js @@ -87,6 +87,7 @@ export default @observer class Locked extends Component { {error.code === 'invalid-credentials' && (

{intl.formatMessage(messages.invalidCredentials)}

-- cgit v1.2.3-70-g09d2 From 469bc0ee855f5ca46a781213f0959b7841fadaf3 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Wed, 29 Jan 2020 11:17:04 +0100 Subject: #179 Add inactivity timer --- .../settings/settings/EditSettingsForm.js | 32 ++++ src/config.js | 1 + src/containers/settings/EditSettingsScreen.js | 11 ++ src/i18n/locales/defaultMessages.json | 194 ++++++++++++--------- src/i18n/locales/en-US.json | 2 + .../settings/settings/EditSettingsForm.json | 117 +++++++------ .../containers/settings/EditSettingsScreen.json | 77 ++++---- src/stores/SettingsStore.js | 20 +++ 8 files changed, 286 insertions(+), 168 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 74f5924ea..9064ff234 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -36,6 +36,10 @@ const messages = defineMessages({ id: 'settings.app.hibernateInfo', defaultMessage: '!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.', }, + inactivityLockInfo: { + id: 'settings.app.inactivityLockInfo', + defaultMessage: '!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable', + }, serverInfo: { id: 'settings.app.serverInfo', defaultMessage: '!!!We advice you to logout after changing your server as your settings might not be saved otherwise.', @@ -142,6 +146,10 @@ const messages = defineMessages({ }, }); +const Hr = () => ( +
+); + export default @observer class EditSettingsForm extends Component { static propTypes = { checkForUpdates: PropTypes.func.isRequired, @@ -237,6 +245,9 @@ export default @observer class EditSettingsForm extends Component { + +
+ {hibernationEnabled && ( this.submit(e)} @@ -296,6 +311,10 @@ export default @observer class EditSettingsForm extends Component { {isWorkspaceEnabled && ( )} + + +
+ {isTodosEnabled && ( <> @@ -315,6 +334,8 @@ export default @observer class EditSettingsForm extends Component { )} +
+ {lockingFeatureEnabled && ( <> @@ -329,6 +350,16 @@ export default @observer class EditSettingsForm extends Component {

{ intl.formatMessage(messages.lockedPasswordInfo) }

+ + this.submit(e)} + field={form.$('inactivityLock')} + autoFocus + /> +

+ { intl.formatMessage(messages.inactivityLockInfo) } +

)}

+
{scheduledDNDEnabled && ( diff --git a/src/config.js b/src/config.js index 060b6e8cb..a788f0f54 100644 --- a/src/config.js +++ b/src/config.js @@ -73,6 +73,7 @@ export const DEFAULT_APP_SETTINGS = { scheduledDNDEnd: '09:00', hibernate: false, hibernationStrategy: 300, + inactivityLock: 0, noUpdates: false, showServiceNavigationBar: false, universalDarkMode: true, diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index aa4de78e9..c92ad4df0 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -78,6 +78,10 @@ const messages = defineMessages({ id: 'settings.app.form.lockPassword', defaultMessage: '!!!Password', }, + inactivityLock: { + id: 'settings.app.form.inactivityLock', + defaultMessage: '!!!Lock after inactivity', + }, scheduledDNDEnabled: { id: 'settings.app.form.scheduledDNDEnabled', defaultMessage: '!!!Enable scheduled Do-not-Disturb', @@ -178,6 +182,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e todoServer: settingsData.todoServer, lockingFeatureEnabled: settingsData.lockingFeatureEnabled, lockedPassword: settingsData.lockedPassword, + inactivityLock: settingsData.inactivityLock, scheduledDNDEnabled: settingsData.scheduledDNDEnabled, scheduledDNDStart: settingsData.scheduledDNDStart, scheduledDNDEnd: settingsData.scheduledDNDEnd, @@ -312,6 +317,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e default: '', type: 'password', }, + inactivityLock: { + label: intl.formatMessage(messages.inactivityLock), + value: settings.all.app.inactivityLock, + default: 0, + type: 'number', + }, scheduledDNDEnabled: { label: intl.formatMessage(messages.scheduledDNDEnabled), value: settings.all.app.scheduledDNDEnabled || false, diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index fe324cd67..22953ffb0 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -2670,341 +2670,354 @@ } }, { - "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.", + "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", "end": { "column": 3, "line": 42 }, "file": "src/components/settings/settings/EditSettingsForm.js", + "id": "settings.app.inactivityLockInfo", + "start": { + "column": 22, + "line": 39 + } + }, + { + "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.", + "end": { + "column": 3, + "line": 46 + }, + "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.serverInfo", "start": { "column": 14, - "line": 39 + "line": 43 } }, { "defaultMessage": "!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "end": { "column": 3, - "line": 46 + "line": 50 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.serverMoneyInfo", "start": { "column": 19, - "line": 43 + "line": 47 } }, { "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", "end": { "column": 3, - "line": 50 + "line": 54 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.todoServerInfo", "start": { "column": 18, - "line": 47 + "line": 51 } }, { "defaultMessage": "!!!Password", "end": { "column": 3, - "line": 54 + "line": 58 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockedPassword", "start": { "column": 18, - "line": 51 + "line": 55 } }, { "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "end": { "column": 3, - "line": 58 + "line": 62 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockedPasswordInfo", "start": { "column": 22, - "line": 55 + "line": 59 } }, { "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", "end": { "column": 3, - "line": 62 + "line": 66 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockInfo", "start": { "column": 12, - "line": 59 + "line": 63 } }, { "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "end": { "column": 3, - "line": 66 + "line": 70 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.scheduledDNDTimeInfo", "start": { "column": 24, - "line": 63 + "line": 67 } }, { "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "end": { "column": 3, - "line": 70 + "line": 74 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.scheduledDNDInfo", "start": { "column": 20, - "line": 67 + "line": 71 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 74 + "line": 78 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineLanguage", "start": { "column": 20, - "line": 71 + "line": 75 } }, { "defaultMessage": "!!!Updates", "end": { "column": 3, - "line": 78 + "line": 82 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineUpdates", "start": { "column": 19, - "line": 75 + "line": 79 } }, { "defaultMessage": "!!!Appearance", "end": { "column": 3, - "line": 82 + "line": 86 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineAppearance", "start": { "column": 22, - "line": 79 + "line": 83 } }, { "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", "end": { "column": 3, - "line": 86 + "line": 90 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.universalDarkModeInfo", "start": { "column": 25, - "line": 83 + "line": 87 } }, { "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)", "end": { "column": 3, - "line": 90 + "line": 94 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.accentColorInfo", "start": { "column": 19, - "line": 87 + "line": 91 } }, { "defaultMessage": "!!!Advanced", "end": { "column": 3, - "line": 94 + "line": 98 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineAdvanced", "start": { "column": 20, - "line": 91 + "line": 95 } }, { "defaultMessage": "!!!Help us to translate Ferdi into your language.", "end": { "column": 3, - "line": 98 + "line": 102 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.translationHelp", "start": { "column": 19, - "line": 95 + "line": 99 } }, { "defaultMessage": "!!!Cache", "end": { "column": 3, - "line": 102 + "line": 106 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.subheadlineCache", "start": { "column": 20, - "line": 99 + "line": 103 } }, { "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", "end": { "column": 3, - "line": 106 + "line": 110 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.cacheInfo", "start": { "column": 13, - "line": 103 + "line": 107 } }, { "defaultMessage": "!!!Clear cache", "end": { "column": 3, - "line": 110 + "line": 114 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonClearAllCache", "start": { "column": 23, - "line": 107 + "line": 111 } }, { "defaultMessage": "!!!Check for updates", "end": { "column": 3, - "line": 114 + "line": 118 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonSearchForUpdate", "start": { "column": 25, - "line": 111 + "line": 115 } }, { "defaultMessage": "!!!Restart & install update", "end": { "column": 3, - "line": 118 + "line": 122 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonInstallUpdate", "start": { "column": 23, - "line": 115 + "line": 119 } }, { "defaultMessage": "!!!Is searching for update", "end": { "column": 3, - "line": 122 + "line": 126 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusSearching", "start": { "column": 25, - "line": 119 + "line": 123 } }, { "defaultMessage": "!!!Update available, downloading...", "end": { "column": 3, - "line": 126 + "line": 130 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusAvailable", "start": { "column": 25, - "line": 123 + "line": 127 } }, { "defaultMessage": "!!!You are using the latest version of Ferdi", "end": { "column": 3, - "line": 130 + "line": 134 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusUpToDate", "start": { "column": 24, - "line": 127 + "line": 131 } }, { "defaultMessage": "!!!Current version:", "end": { "column": 3, - "line": 134 + "line": 138 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.currentVersion", "start": { "column": 18, - "line": 131 + "line": 135 } }, { "defaultMessage": "!!!Changes require restart", "end": { "column": 3, - "line": 138 + "line": 142 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.restartRequired", "start": { "column": 29, - "line": 135 + "line": 139 } }, { "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", "end": { "column": 3, - "line": 142 + "line": 146 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.languageDisclaimer", "start": { "column": 22, - "line": 139 + "line": 143 } } ], @@ -4227,211 +4240,224 @@ } }, { - "defaultMessage": "!!!Enable scheduled Do-not-Disturb", + "defaultMessage": "!!!Lock after inactivity", "end": { "column": 3, "line": 84 }, "file": "src/containers/settings/EditSettingsScreen.js", + "id": "settings.app.form.inactivityLock", + "start": { + "column": 18, + "line": 81 + } + }, + { + "defaultMessage": "!!!Enable scheduled Do-not-Disturb", + "end": { + "column": 3, + "line": 88 + }, + "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnabled", "start": { "column": 23, - "line": 81 + "line": 85 } }, { "defaultMessage": "!!!From", "end": { "column": 3, - "line": 88 + "line": 92 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDStart", "start": { "column": 21, - "line": 85 + "line": 89 } }, { "defaultMessage": "!!!To", "end": { "column": 3, - "line": 92 + "line": 96 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnd", "start": { "column": 19, - "line": 89 + "line": 93 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 96 + "line": 100 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.language", "start": { "column": 12, - "line": 93 + "line": 97 } }, { "defaultMessage": "!!!Dark Mode", "end": { "column": 3, - "line": 100 + "line": 104 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.darkMode", "start": { "column": 12, - "line": 97 + "line": 101 } }, { "defaultMessage": "!!!Enable adaptable Dark Mode", "end": { "column": 3, - "line": 104 + "line": 108 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.adaptableDarkMode", "start": { "column": 21, - "line": 101 + "line": 105 } }, { "defaultMessage": "!!!Enable universal Dark Mode", "end": { "column": 3, - "line": 108 + "line": 112 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.universalDarkMode", "start": { "column": 21, - "line": 105 + "line": 109 } }, { "defaultMessage": "!!!Accent color", "end": { "column": 3, - "line": 112 + "line": 116 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.accentColor", "start": { "column": 15, - "line": 109 + "line": 113 } }, { "defaultMessage": "!!!Display disabled services tabs", "end": { "column": 3, - "line": 116 + "line": 120 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showDisabledServices", "start": { "column": 24, - "line": 113 + "line": 117 } }, { "defaultMessage": "!!!Show unread message badge when notifications are disabled", "end": { "column": 3, - "line": 120 + "line": 124 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showMessagesBadgesWhenMuted", "start": { "column": 29, - "line": 117 + "line": 121 } }, { "defaultMessage": "!!!Enable spell checking", "end": { "column": 3, - "line": 124 + "line": 128 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSpellchecking", "start": { "column": 23, - "line": 121 + "line": 125 } }, { "defaultMessage": "!!!Enable GPU Acceleration", "end": { "column": 3, - "line": 128 + "line": 132 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableGPUAcceleration", "start": { "column": 25, - "line": 125 + "line": 129 } }, { "defaultMessage": "!!!Include beta versions", "end": { "column": 3, - "line": 132 + "line": 136 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.beta", "start": { "column": 8, - "line": 129 + "line": 133 } }, { "defaultMessage": "!!!Disable updates", "end": { "column": 3, - "line": 136 + "line": 140 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.noUpdates", "start": { "column": 13, - "line": 133 + "line": 137 } }, { "defaultMessage": "!!!Enable Franz Todos", "end": { "column": 3, - "line": 140 + "line": 144 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableTodos", "start": { "column": 15, - "line": 137 + "line": 141 } }, { "defaultMessage": "!!!Keep all workspaces loaded", "end": { "column": 3, - "line": 144 + "line": 148 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.keepAllWorkspacesLoaded", "start": { "column": 27, - "line": 141 + "line": 145 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 5acb277ef..510a29143 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -269,6 +269,7 @@ "settings.app.form.enableTodos": "Enable Ferdi Todos", "settings.app.form.hibernate": "Enable service hibernation", "settings.app.form.hibernationStrategy": "Hibernation strategy", + "settings.app.form.inactivityLock": "Lock after inactivity", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", "settings.app.form.lockPassword": "Password", @@ -292,6 +293,7 @@ "settings.app.headlineLanguage": "Language", "settings.app.headlineUpdates": "Updates", "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", + "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", "settings.app.lockedPassword": "Password", diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json index 1fdff93b9..9be6f507d 100644 --- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json +++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json @@ -38,16 +38,29 @@ "column": 3 } }, + { + "id": "settings.app.inactivityLockInfo", + "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", + "file": "src/components/settings/settings/EditSettingsForm.js", + "start": { + "line": 39, + "column": 22 + }, + "end": { + "line": 42, + "column": 3 + } + }, { "id": "settings.app.serverInfo", "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 39, + "line": 43, "column": 14 }, "end": { - "line": 42, + "line": 46, "column": 3 } }, @@ -56,11 +69,11 @@ "defaultMessage": "!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 43, + "line": 47, "column": 19 }, "end": { - "line": 46, + "line": 50, "column": 3 } }, @@ -69,11 +82,11 @@ "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 47, + "line": 51, "column": 18 }, "end": { - "line": 50, + "line": 54, "column": 3 } }, @@ -82,11 +95,11 @@ "defaultMessage": "!!!Password", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 51, + "line": 55, "column": 18 }, "end": { - "line": 54, + "line": 58, "column": 3 } }, @@ -95,11 +108,11 @@ "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 55, + "line": 59, "column": 22 }, "end": { - "line": 58, + "line": 62, "column": 3 } }, @@ -108,11 +121,11 @@ "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 59, + "line": 63, "column": 12 }, "end": { - "line": 62, + "line": 66, "column": 3 } }, @@ -121,11 +134,11 @@ "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 63, + "line": 67, "column": 24 }, "end": { - "line": 66, + "line": 70, "column": 3 } }, @@ -134,11 +147,11 @@ "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 67, + "line": 71, "column": 20 }, "end": { - "line": 70, + "line": 74, "column": 3 } }, @@ -147,11 +160,11 @@ "defaultMessage": "!!!Language", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 71, + "line": 75, "column": 20 }, "end": { - "line": 74, + "line": 78, "column": 3 } }, @@ -160,11 +173,11 @@ "defaultMessage": "!!!Updates", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 75, + "line": 79, "column": 19 }, "end": { - "line": 78, + "line": 82, "column": 3 } }, @@ -173,11 +186,11 @@ "defaultMessage": "!!!Appearance", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 79, + "line": 83, "column": 22 }, "end": { - "line": 82, + "line": 86, "column": 3 } }, @@ -186,11 +199,11 @@ "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 83, + "line": 87, "column": 25 }, "end": { - "line": 86, + "line": 90, "column": 3 } }, @@ -199,11 +212,11 @@ "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 87, + "line": 91, "column": 19 }, "end": { - "line": 90, + "line": 94, "column": 3 } }, @@ -212,11 +225,11 @@ "defaultMessage": "!!!Advanced", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 91, + "line": 95, "column": 20 }, "end": { - "line": 94, + "line": 98, "column": 3 } }, @@ -225,11 +238,11 @@ "defaultMessage": "!!!Help us to translate Ferdi into your language.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 95, + "line": 99, "column": 19 }, "end": { - "line": 98, + "line": 102, "column": 3 } }, @@ -238,11 +251,11 @@ "defaultMessage": "!!!Cache", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 99, + "line": 103, "column": 20 }, "end": { - "line": 102, + "line": 106, "column": 3 } }, @@ -251,11 +264,11 @@ "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 103, + "line": 107, "column": 13 }, "end": { - "line": 106, + "line": 110, "column": 3 } }, @@ -264,11 +277,11 @@ "defaultMessage": "!!!Clear cache", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 107, + "line": 111, "column": 23 }, "end": { - "line": 110, + "line": 114, "column": 3 } }, @@ -277,11 +290,11 @@ "defaultMessage": "!!!Check for updates", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 111, + "line": 115, "column": 25 }, "end": { - "line": 114, + "line": 118, "column": 3 } }, @@ -290,11 +303,11 @@ "defaultMessage": "!!!Restart & install update", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 115, + "line": 119, "column": 23 }, "end": { - "line": 118, + "line": 122, "column": 3 } }, @@ -303,11 +316,11 @@ "defaultMessage": "!!!Is searching for update", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 119, + "line": 123, "column": 25 }, "end": { - "line": 122, + "line": 126, "column": 3 } }, @@ -316,11 +329,11 @@ "defaultMessage": "!!!Update available, downloading...", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 123, + "line": 127, "column": 25 }, "end": { - "line": 126, + "line": 130, "column": 3 } }, @@ -329,11 +342,11 @@ "defaultMessage": "!!!You are using the latest version of Ferdi", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 127, + "line": 131, "column": 24 }, "end": { - "line": 130, + "line": 134, "column": 3 } }, @@ -342,11 +355,11 @@ "defaultMessage": "!!!Current version:", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 131, + "line": 135, "column": 18 }, "end": { - "line": 134, + "line": 138, "column": 3 } }, @@ -355,11 +368,11 @@ "defaultMessage": "!!!Changes require restart", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 135, + "line": 139, "column": 29 }, "end": { - "line": 138, + "line": 142, "column": 3 } }, @@ -368,11 +381,11 @@ "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 139, + "line": 143, "column": 22 }, "end": { - "line": 142, + "line": 146, "column": 3 } } diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index d6cdb94c0..06874d97e 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -168,16 +168,29 @@ "column": 3 } }, + { + "id": "settings.app.form.inactivityLock", + "defaultMessage": "!!!Lock after inactivity", + "file": "src/containers/settings/EditSettingsScreen.js", + "start": { + "line": 81, + "column": 18 + }, + "end": { + "line": 84, + "column": 3 + } + }, { "id": "settings.app.form.scheduledDNDEnabled", "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 81, + "line": 85, "column": 23 }, "end": { - "line": 84, + "line": 88, "column": 3 } }, @@ -186,11 +199,11 @@ "defaultMessage": "!!!From", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 85, + "line": 89, "column": 21 }, "end": { - "line": 88, + "line": 92, "column": 3 } }, @@ -199,11 +212,11 @@ "defaultMessage": "!!!To", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 89, + "line": 93, "column": 19 }, "end": { - "line": 92, + "line": 96, "column": 3 } }, @@ -212,11 +225,11 @@ "defaultMessage": "!!!Language", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 93, + "line": 97, "column": 12 }, "end": { - "line": 96, + "line": 100, "column": 3 } }, @@ -225,11 +238,11 @@ "defaultMessage": "!!!Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 97, + "line": 101, "column": 12 }, "end": { - "line": 100, + "line": 104, "column": 3 } }, @@ -238,11 +251,11 @@ "defaultMessage": "!!!Enable adaptable Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 101, + "line": 105, "column": 21 }, "end": { - "line": 104, + "line": 108, "column": 3 } }, @@ -251,11 +264,11 @@ "defaultMessage": "!!!Enable universal Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 105, + "line": 109, "column": 21 }, "end": { - "line": 108, + "line": 112, "column": 3 } }, @@ -264,11 +277,11 @@ "defaultMessage": "!!!Accent color", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 109, + "line": 113, "column": 15 }, "end": { - "line": 112, + "line": 116, "column": 3 } }, @@ -277,11 +290,11 @@ "defaultMessage": "!!!Display disabled services tabs", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 113, + "line": 117, "column": 24 }, "end": { - "line": 116, + "line": 120, "column": 3 } }, @@ -290,11 +303,11 @@ "defaultMessage": "!!!Show unread message badge when notifications are disabled", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 117, + "line": 121, "column": 29 }, "end": { - "line": 120, + "line": 124, "column": 3 } }, @@ -303,11 +316,11 @@ "defaultMessage": "!!!Enable spell checking", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 121, + "line": 125, "column": 23 }, "end": { - "line": 124, + "line": 128, "column": 3 } }, @@ -316,11 +329,11 @@ "defaultMessage": "!!!Enable GPU Acceleration", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 125, + "line": 129, "column": 25 }, "end": { - "line": 128, + "line": 132, "column": 3 } }, @@ -329,11 +342,11 @@ "defaultMessage": "!!!Include beta versions", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 129, + "line": 133, "column": 8 }, "end": { - "line": 132, + "line": 136, "column": 3 } }, @@ -342,11 +355,11 @@ "defaultMessage": "!!!Disable updates", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 133, + "line": 137, "column": 13 }, "end": { - "line": 136, + "line": 140, "column": 3 } }, @@ -355,11 +368,11 @@ "defaultMessage": "!!!Enable Franz Todos", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 137, + "line": 141, "column": 15 }, "end": { - "line": 140, + "line": 144, "column": 3 } }, @@ -368,11 +381,11 @@ "defaultMessage": "!!!Keep all workspaces loaded", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 141, + "line": 145, "column": 27 }, "end": { - "line": 144, + "line": 148, "column": 3 } } diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 051e86be2..8a5ee7204 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js @@ -79,6 +79,26 @@ export default class SettingsStore extends Store { }, ); + // Inactivity lock timer + let inactivityTimer; + remote.getCurrentWindow().on('blur', () => { + if (this.all.app.inactivityLock !== 0) { + inactivityTimer = setTimeout(() => { + this.actions.settings.update({ + type: 'app', + data: { + locked: true, + }, + }); + }, this.all.app.inactivityLock * 1000 * 60); + } + }); + remote.getCurrentWindow().on('focus', () => { + if (inactivityTimer) { + clearTimeout(inactivityTimer); + } + }); + // Make sure to lock app on launch if locking feature is enabled setTimeout(() => { const isLoggedIn = Boolean(localStorage.getItem('authToken')); -- cgit v1.2.3-70-g09d2 From d4ba692994467ca2c28cf27bb63b9a4c67f04195 Mon Sep 17 00:00:00 2001 From: Andrzej Ressel Date: Thu, 30 Jan 2020 00:03:02 +0100 Subject: Start in tray --- .../settings/settings/EditSettingsForm.js | 3 + src/config.js | 1 + src/containers/settings/EditSettingsScreen.js | 11 ++ .../containers/settings/EditSettingsScreen.json | 117 ++++++++++++--------- src/index.html | 2 +- src/index.js | 10 +- 6 files changed, 90 insertions(+), 54 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index d567a47d1..0badd3b98 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -162,6 +162,7 @@ export default @observer class EditSettingsForm extends Component { noUpdates: PropTypes.bool.isRequired, hibernationEnabled: PropTypes.bool.isRequired, isDarkmodeEnabled: PropTypes.bool.isRequired, + isTrayEnabled: PropTypes.bool.isRequired, openProcessManager: PropTypes.func.isRequired, }; @@ -199,6 +200,7 @@ export default @observer class EditSettingsForm extends Component { noUpdates, hibernationEnabled, isDarkmodeEnabled, + isTrayEnabled, openProcessManager, } = this.props; const { intl } = this.context; @@ -235,6 +237,7 @@ export default @observer class EditSettingsForm extends Component { + {isTrayEnabled && } diff --git a/src/config.js b/src/config.js index bd67aee6b..f877f4f2e 100644 --- a/src/config.js +++ b/src/config.js @@ -48,6 +48,7 @@ export const DEFAULT_APP_SETTINGS = { autoLaunchInBackground: false, runInBackground: true, enableSystemTray: true, + startMinimized: false, minimizeToSystemTray: false, privateNotifications: false, showDisabledServices: true, diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 07efbb881..c961d7541 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -38,6 +38,10 @@ const messages = defineMessages({ id: 'settings.app.form.runInBackground', defaultMessage: '!!!Keep Ferdi in background when closing the window', }, + startMinimized: { + id: 'settings.app.form.startMinimized', + defaultMessage: '!!!Start minimized' + }, enableSystemTray: { id: 'settings.app.form.enableSystemTray', defaultMessage: '!!!Show Ferdi in system tray', @@ -169,6 +173,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e data: { runInBackground: settingsData.runInBackground, enableSystemTray: settingsData.enableSystemTray, + startMinimized: settingsData.startMinimized, minimizeToSystemTray: settingsData.minimizeToSystemTray, privateNotifications: settingsData.privateNotifications, showServiceNavigationBar: settingsData.showServiceNavigationBar, @@ -260,6 +265,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e value: settings.all.app.runInBackground, default: DEFAULT_APP_SETTINGS.runInBackground, }, + startMinimized: { + label: intl.formatMessage(messages.startMinimized), + value: settings.all.app.startMinimized, + default: DEFAULT_APP_SETTINGS.startMinimized, + }, enableSystemTray: { label: intl.formatMessage(messages.enableSystemTray), value: settings.all.app.enableSystemTray, @@ -455,6 +465,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e noUpdates={this.props.stores.settings.app.noUpdates} hibernationEnabled={this.props.stores.settings.app.hibernate} isDarkmodeEnabled={this.props.stores.settings.app.darkMode} + isTrayEnabled={this.props.stores.settings.app.enableSystemTray} openProcessManager={() => this.openProcessManager()} /> diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 411e35dab..6a723ceca 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -38,16 +38,29 @@ "column": 3 } }, + { + "id": "settings.app.form.startMinimized", + "defaultMessage": "!!!Start minimized", + "file": "src/containers/settings/EditSettingsScreen.js", + "start": { + "line": 41, + "column": 18 + }, + "end": { + "line": 44, + "column": 3 + } + }, { "id": "settings.app.form.enableSystemTray", "defaultMessage": "!!!Show Ferdi in system tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 41, + "line": 45, "column": 20 }, "end": { - "line": 44, + "line": 48, "column": 3 } }, @@ -56,11 +69,11 @@ "defaultMessage": "!!!Minimize Ferdi to system tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 45, + "line": 49, "column": 24 }, "end": { - "line": 48, + "line": 52, "column": 3 } }, @@ -69,11 +82,11 @@ "defaultMessage": "!!!Don't show message content in notifications", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 49, + "line": 53, "column": 24 }, "end": { - "line": 52, + "line": 56, "column": 3 } }, @@ -82,11 +95,11 @@ "defaultMessage": "!!!Always show service navigation bar", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 53, + "line": 57, "column": 28 }, "end": { - "line": 56, + "line": 60, "column": 3 } }, @@ -95,11 +108,11 @@ "defaultMessage": "!!!Enable service hibernation", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 57, + "line": 61, "column": 13 }, "end": { - "line": 60, + "line": 64, "column": 3 } }, @@ -108,11 +121,11 @@ "defaultMessage": "!!!Hibernation strategy", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 61, + "line": 65, "column": 23 }, "end": { - "line": 64, + "line": 68, "column": 3 } }, @@ -121,11 +134,11 @@ "defaultMessage": "!!!Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 65, + "line": 69, "column": 10 }, "end": { - "line": 68, + "line": 72, "column": 3 } }, @@ -134,11 +147,11 @@ "defaultMessage": "!!!Todo Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 69, + "line": 73, "column": 14 }, "end": { - "line": 72, + "line": 76, "column": 3 } }, @@ -147,11 +160,11 @@ "defaultMessage": "!!!Enable Ferdi password lock", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 73, + "line": 77, "column": 14 }, "end": { - "line": 76, + "line": 80, "column": 3 } }, @@ -160,11 +173,11 @@ "defaultMessage": "!!!Ferdi Lock password", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 77, + "line": 81, "column": 16 }, "end": { - "line": 80, + "line": 84, "column": 3 } }, @@ -173,11 +186,11 @@ "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 81, + "line": 85, "column": 23 }, "end": { - "line": 84, + "line": 88, "column": 3 } }, @@ -186,11 +199,11 @@ "defaultMessage": "!!!From", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 85, + "line": 89, "column": 21 }, "end": { - "line": 88, + "line": 92, "column": 3 } }, @@ -199,11 +212,11 @@ "defaultMessage": "!!!To", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 89, + "line": 93, "column": 19 }, "end": { - "line": 92, + "line": 96, "column": 3 } }, @@ -212,11 +225,11 @@ "defaultMessage": "!!!Language", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 93, + "line": 97, "column": 12 }, "end": { - "line": 96, + "line": 100, "column": 3 } }, @@ -225,11 +238,11 @@ "defaultMessage": "!!!Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 97, + "line": 101, "column": 12 }, "end": { - "line": 100, + "line": 104, "column": 3 } }, @@ -238,11 +251,11 @@ "defaultMessage": "!!!Enable adaptable Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 101, + "line": 105, "column": 21 }, "end": { - "line": 104, + "line": 108, "column": 3 } }, @@ -251,11 +264,11 @@ "defaultMessage": "!!!Enable universal Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 105, + "line": 109, "column": 21 }, "end": { - "line": 108, + "line": 112, "column": 3 } }, @@ -264,11 +277,11 @@ "defaultMessage": "!!!Accent color", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 109, + "line": 113, "column": 15 }, "end": { - "line": 112, + "line": 116, "column": 3 } }, @@ -277,11 +290,11 @@ "defaultMessage": "!!!Display disabled services tabs", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 113, + "line": 117, "column": 24 }, "end": { - "line": 116, + "line": 120, "column": 3 } }, @@ -290,11 +303,11 @@ "defaultMessage": "!!!Show unread message badge when notifications are disabled", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 117, + "line": 121, "column": 29 }, "end": { - "line": 120, + "line": 124, "column": 3 } }, @@ -303,11 +316,11 @@ "defaultMessage": "!!!Enable spell checking", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 121, + "line": 125, "column": 23 }, "end": { - "line": 124, + "line": 128, "column": 3 } }, @@ -316,11 +329,11 @@ "defaultMessage": "!!!Enable GPU Acceleration", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 125, + "line": 129, "column": 25 }, "end": { - "line": 128, + "line": 132, "column": 3 } }, @@ -329,11 +342,11 @@ "defaultMessage": "!!!Include beta versions", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 129, + "line": 133, "column": 8 }, "end": { - "line": 132, + "line": 136, "column": 3 } }, @@ -342,11 +355,11 @@ "defaultMessage": "!!!Disable updates", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 133, + "line": 137, "column": 13 }, "end": { - "line": 136, + "line": 140, "column": 3 } }, @@ -355,11 +368,11 @@ "defaultMessage": "!!!Enable Franz Todos", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 137, + "line": 141, "column": 15 }, "end": { - "line": 140, + "line": 144, "column": 3 } }, @@ -368,11 +381,11 @@ "defaultMessage": "!!!Keep all workspaces loaded", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 141, + "line": 145, "column": 27 }, "end": { - "line": 144, + "line": 148, "column": 3 } } diff --git a/src/index.html b/src/index.html index 31e8aa553..6b67cc248 100644 --- a/src/index.html +++ b/src/index.html @@ -56,5 +56,5 @@ })(); } - diff --git a/src/index.js b/src/index.js index 12ea7f646..4c61c5c8e 100644 --- a/src/index.js +++ b/src/index.js @@ -91,7 +91,7 @@ if (!gotTheLock) { app.on('second-instance', (event, argv) => { // Someone tried to run a second instance, we should focus our window. if (mainWindow) { - mainWindow.show(); + //mainWindow.show(); if (mainWindow.isMinimized()) { mainWindow.restore(); } @@ -142,6 +142,8 @@ const createWindow = () => { const mainWindowState = windowStateKeeper({ defaultWidth: DEFAULT_WINDOW_OPTIONS.width, defaultHeight: DEFAULT_WINDOW_OPTIONS.height, + maximize: false, + fullScreen: false }); let posX = mainWindowState.x || DEFAULT_WINDOW_OPTIONS.x; @@ -168,6 +170,7 @@ const createWindow = () => { height: mainWindowState.height, minWidth: 600, minHeight: 500, + show: false, titleBarStyle: isMac ? 'hidden' : '', frame: isLinux, backgroundColor, @@ -298,6 +301,11 @@ const createWindow = () => { shell.openExternal(url); } }); + + if (!(settings.get('enableSystemTray') && settings.get('startMinimized'))) { + mainWindow.show(); + } + }; // Allow passing command line parameters/switches to electron -- cgit v1.2.3-70-g09d2 From eefda6c7b3e9f0e9b0cfc056efbf59d04a54be85 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 16:54:14 +0100 Subject: Improve dark mode behaviour on macOS --- src/components/settings/settings/EditSettingsForm.js | 8 +++++--- src/containers/settings/EditSettingsScreen.js | 3 ++- src/i18n/locales/en-US.json | 4 ++-- src/i18n/messages/src/containers/settings/EditSettingsScreen.json | 2 +- src/stores/UIStore.js | 1 - 5 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 9064ff234..61c31ac93 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -170,6 +170,7 @@ export default @observer class EditSettingsForm extends Component { noUpdates: PropTypes.bool.isRequired, hibernationEnabled: PropTypes.bool.isRequired, isDarkmodeEnabled: PropTypes.bool.isRequired, + isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, openProcessManager: PropTypes.func.isRequired, }; @@ -194,6 +195,7 @@ export default @observer class EditSettingsForm extends Component { installUpdate, form, isCheckingForUpdates, + isAdaptableDarkModeEnabled, isUpdateAvailable, noUpdateAvailable, updateIsReadyToInstall, @@ -429,10 +431,10 @@ export default @observer class EditSettingsForm extends Component {

{intl.formatMessage(messages.headlineAppearance)}

- - {isDarkmodeEnabled && ( + {isMac && } + {!(isMac && isAdaptableDarkModeEnabled) && } + {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( <> - {isMac && }

this.openProcessManager()} /> diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 510a29143..f1acf9904 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -257,11 +257,11 @@ "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", - "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", + "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my Mac's dark mode setting", "settings.app.form.autoLaunchInBackground": "Open in background", "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", "settings.app.form.beta": "Include beta versions", - "settings.app.form.darkMode": "Join the Dark Side", + "settings.app.form.darkMode": "Enable dark mode", "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", "settings.app.form.enableLock": "Enable Password Lock", "settings.app.form.enableSpellchecking": "Enable spell checking", diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 06874d97e..82a9a7cd5 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -248,7 +248,7 @@ }, { "id": "settings.app.form.adaptableDarkMode", - "defaultMessage": "!!!Enable adaptable Dark Mode", + "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "file": "src/containers/settings/EditSettingsScreen.js", "start": { "line": 105, diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js index 5b9672798..6941cf086 100644 --- a/src/stores/UIStore.js +++ b/src/stores/UIStore.js @@ -57,7 +57,6 @@ export default class UIStore extends Store { @computed get isDarkThemeActive() { const isMacWithAdaptableInDarkMode = isMac - && this.stores.settings.all.app.darkMode && this.stores.settings.all.app.adaptableDarkMode && this.isOsDarkThemeActive; const isMacWithoutAdaptableInDarkMode = isMac -- cgit v1.2.3-70-g09d2 From c2a8dce24722528928d8e107bdf5f123138a1bf2 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 20:32:24 +0100 Subject: Change Sentry reporting to be opt-in only --- recipes | 2 +- .../settings/settings/EditSettingsForm.js | 6 + src/config.js | 1 + src/containers/settings/EditSettingsScreen.js | 10 + src/i18n/locales/defaultMessages.json | 230 ++++++++++++--------- src/i18n/locales/en-US.json | 2 + .../settings/settings/EditSettingsForm.json | 125 ++++++----- .../containers/settings/EditSettingsScreen.json | 105 +++++----- src/index.js | 6 +- 9 files changed, 281 insertions(+), 206 deletions(-) (limited to 'src/components') diff --git a/recipes b/recipes index dbc43bfd2..6ff794422 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit dbc43bfd258d4d7db25b36895a1bfc202361173b +Subproject commit 6ff794422f296f5370299e497792ee91eccb8dc6 diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index efb6eaa18..58ffd277e 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -32,6 +32,10 @@ const messages = defineMessages({ id: 'settings.app.headlineGeneral', defaultMessage: '!!!General', }, + sentryInfo: { + id: 'settings.app.sentryInfo', + defaultMessage: '!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.', + }, hibernateInfo: { id: 'settings.app.hibernateInfo', defaultMessage: '!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.', @@ -250,6 +254,8 @@ export default @observer class EditSettingsForm extends Component { {isTrayEnabled && } + +

{intl.formatMessage(messages.sentryInfo)}

diff --git a/src/config.js b/src/config.js index 8868d7c41..b4705105d 100644 --- a/src/config.js +++ b/src/config.js @@ -81,6 +81,7 @@ export const DEFAULT_APP_SETTINGS = { adaptableDarkMode: true, accentColor: '#7367f0', serviceRibbonWidth: 68, + sentry: false, }; export const DEFAULT_FEATURES_CONFIG = { diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 665444f50..595cfdcc7 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -58,6 +58,10 @@ const messages = defineMessages({ id: 'settings.app.form.showServiceNavigationBar', defaultMessage: '!!!Always show service navigation bar', }, + sentry: { + id: 'settings.app.form.sentry', + defaultMessage: '!!!Send telemetry data', + }, hibernate: { id: 'settings.app.form.hibernate', defaultMessage: '!!!Enable service hibernation', @@ -181,6 +185,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e minimizeToSystemTray: settingsData.minimizeToSystemTray, privateNotifications: settingsData.privateNotifications, showServiceNavigationBar: settingsData.showServiceNavigationBar, + sentry: settingsData.sentry, hibernate: settingsData.hibernate, hibernationStrategy: settingsData.hibernationStrategy, server: settingsData.server, @@ -295,6 +300,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e value: settings.all.app.showServiceNavigationBar, default: DEFAULT_APP_SETTINGS.showServiceNavigationBar, }, + sentry: { + label: intl.formatMessage(messages.sentry), + value: settings.all.app.sentry, + default: DEFAULT_APP_SETTINGS.sentry, + }, hibernate: { label: intl.formatMessage(messages.hibernate), value: settings.all.app.hibernate, diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 083148c3d..59930a054 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -2657,367 +2657,380 @@ } }, { - "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", + "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.", "end": { "column": 3, "line": 38 }, "file": "src/components/settings/settings/EditSettingsForm.js", + "id": "settings.app.sentryInfo", + "start": { + "column": 14, + "line": 35 + } + }, + { + "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", + "end": { + "column": 3, + "line": 42 + }, + "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.hibernateInfo", "start": { "column": 17, - "line": 35 + "line": 39 } }, { "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", "end": { "column": 3, - "line": 42 + "line": 46 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.inactivityLockInfo", "start": { "column": 22, - "line": 39 + "line": 43 } }, { "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.", "end": { "column": 3, - "line": 46 + "line": 50 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.serverInfo", "start": { "column": 14, - "line": 43 + "line": 47 } }, { "defaultMessage": "!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "end": { "column": 3, - "line": 50 + "line": 54 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.serverMoneyInfo", "start": { "column": 19, - "line": 47 + "line": 51 } }, { "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", "end": { "column": 3, - "line": 54 + "line": 58 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.todoServerInfo", "start": { "column": 18, - "line": 51 + "line": 55 } }, { "defaultMessage": "!!!Password", "end": { "column": 3, - "line": 58 + "line": 62 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockedPassword", "start": { "column": 18, - "line": 55 + "line": 59 } }, { "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "end": { "column": 3, - "line": 62 + "line": 66 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockedPasswordInfo", "start": { "column": 22, - "line": 59 + "line": 63 } }, { "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", "end": { "column": 3, - "line": 66 + "line": 70 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockInfo", "start": { "column": 12, - "line": 63 + "line": 67 } }, { "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "end": { "column": 3, - "line": 70 + "line": 74 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.scheduledDNDTimeInfo", "start": { "column": 24, - "line": 67 + "line": 71 } }, { "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "end": { "column": 3, - "line": 74 + "line": 78 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.scheduledDNDInfo", "start": { "column": 20, - "line": 71 + "line": 75 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 78 + "line": 82 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineLanguage", "start": { "column": 20, - "line": 75 + "line": 79 } }, { "defaultMessage": "!!!Updates", "end": { "column": 3, - "line": 82 + "line": 86 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineUpdates", "start": { "column": 19, - "line": 79 + "line": 83 } }, { "defaultMessage": "!!!Appearance", "end": { "column": 3, - "line": 86 + "line": 90 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineAppearance", "start": { "column": 22, - "line": 83 + "line": 87 } }, { "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", "end": { "column": 3, - "line": 90 + "line": 94 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.universalDarkModeInfo", "start": { "column": 25, - "line": 87 + "line": 91 } }, { "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)", "end": { "column": 3, - "line": 94 + "line": 98 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.accentColorInfo", "start": { "column": 19, - "line": 91 + "line": 95 } }, { "defaultMessage": "!!!Advanced", "end": { "column": 3, - "line": 98 + "line": 102 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineAdvanced", "start": { "column": 20, - "line": 95 + "line": 99 } }, { "defaultMessage": "!!!Help us to translate Ferdi into your language.", "end": { "column": 3, - "line": 102 + "line": 106 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.translationHelp", "start": { "column": 19, - "line": 99 + "line": 103 } }, { "defaultMessage": "!!!Cache", "end": { "column": 3, - "line": 106 + "line": 110 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.subheadlineCache", "start": { "column": 20, - "line": 103 + "line": 107 } }, { "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", "end": { "column": 3, - "line": 110 + "line": 114 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.cacheInfo", "start": { "column": 13, - "line": 107 + "line": 111 } }, { "defaultMessage": "!!!Clear cache", "end": { "column": 3, - "line": 114 + "line": 118 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonClearAllCache", "start": { "column": 23, - "line": 111 + "line": 115 } }, { "defaultMessage": "!!!Check for updates", "end": { "column": 3, - "line": 118 + "line": 122 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonSearchForUpdate", "start": { "column": 25, - "line": 115 + "line": 119 } }, { "defaultMessage": "!!!Restart & install update", "end": { "column": 3, - "line": 122 + "line": 126 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonInstallUpdate", "start": { "column": 23, - "line": 119 + "line": 123 } }, { "defaultMessage": "!!!Is searching for update", "end": { "column": 3, - "line": 126 + "line": 130 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusSearching", "start": { "column": 25, - "line": 123 + "line": 127 } }, { "defaultMessage": "!!!Update available, downloading...", "end": { "column": 3, - "line": 130 + "line": 134 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusAvailable", "start": { "column": 25, - "line": 127 + "line": 131 } }, { "defaultMessage": "!!!You are using the latest version of Ferdi", "end": { "column": 3, - "line": 134 + "line": 138 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusUpToDate", "start": { "column": 24, - "line": 131 + "line": 135 } }, { "defaultMessage": "!!!Current version:", "end": { "column": 3, - "line": 138 + "line": 142 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.currentVersion", "start": { "column": 18, - "line": 135 + "line": 139 } }, { "defaultMessage": "!!!Changes require restart", "end": { "column": 3, - "line": 142 + "line": 146 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.restartRequired", "start": { "column": 29, - "line": 139 + "line": 143 } }, { "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", "end": { "column": 3, - "line": 146 + "line": 150 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.languageDisclaimer", "start": { "column": 22, - "line": 143 + "line": 147 } } ], @@ -4175,302 +4188,315 @@ } }, { - "defaultMessage": "!!!Enable service hibernation", + "defaultMessage": "!!!Send telemetry data", "end": { "column": 3, "line": 64 }, "file": "src/containers/settings/EditSettingsScreen.js", + "id": "settings.app.form.sentry", + "start": { + "column": 10, + "line": 61 + } + }, + { + "defaultMessage": "!!!Enable service hibernation", + "end": { + "column": 3, + "line": 68 + }, + "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernate", "start": { "column": 13, - "line": 61 + "line": 65 } }, { "defaultMessage": "!!!Hibernation strategy", "end": { "column": 3, - "line": 68 + "line": 72 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernationStrategy", "start": { "column": 23, - "line": 65 + "line": 69 } }, { "defaultMessage": "!!!Server", "end": { "column": 3, - "line": 72 + "line": 76 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.server", "start": { "column": 10, - "line": 69 + "line": 73 } }, { "defaultMessage": "!!!Todo Server", "end": { "column": 3, - "line": 76 + "line": 80 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.todoServer", "start": { "column": 14, - "line": 73 + "line": 77 } }, { "defaultMessage": "!!!Enable Password Lock", "end": { "column": 3, - "line": 80 + "line": 84 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableLock", "start": { "column": 14, - "line": 77 + "line": 81 } }, { "defaultMessage": "!!!Password", "end": { "column": 3, - "line": 84 + "line": 88 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.lockPassword", "start": { "column": 16, - "line": 81 + "line": 85 } }, { "defaultMessage": "!!!Lock after inactivity", "end": { "column": 3, - "line": 88 + "line": 92 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.inactivityLock", "start": { "column": 18, - "line": 81 + "line": 89 } }, { "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "end": { "column": 3, - "line": 88 + "line": 96 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnabled", "start": { "column": 23, - "line": 85 + "line": 93 } }, { "defaultMessage": "!!!From", "end": { "column": 3, - "line": 92 + "line": 100 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDStart", "start": { "column": 21, - "line": 89 + "line": 97 } }, { "defaultMessage": "!!!To", "end": { "column": 3, - "line": 96 + "line": 104 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnd", "start": { "column": 19, - "line": 93 + "line": 101 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 100 + "line": 108 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.language", "start": { "column": 12, - "line": 97 + "line": 105 } }, { "defaultMessage": "!!!Dark Mode", "end": { "column": 3, - "line": 104 + "line": 112 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.darkMode", "start": { "column": 12, - "line": 101 + "line": 109 } }, { "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "end": { "column": 3, - "line": 108 + "line": 116 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.adaptableDarkMode", "start": { "column": 21, - "line": 105 + "line": 113 } }, { "defaultMessage": "!!!Enable universal Dark Mode", "end": { "column": 3, - "line": 112 + "line": 120 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.universalDarkMode", "start": { "column": 21, - "line": 109 + "line": 117 } }, { "defaultMessage": "!!!Accent color", "end": { "column": 3, - "line": 116 + "line": 124 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.accentColor", "start": { "column": 15, - "line": 113 + "line": 121 } }, { "defaultMessage": "!!!Display disabled services tabs", "end": { "column": 3, - "line": 120 + "line": 128 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showDisabledServices", "start": { "column": 24, - "line": 117 + "line": 125 } }, { "defaultMessage": "!!!Show unread message badge when notifications are disabled", "end": { "column": 3, - "line": 124 + "line": 132 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showMessagesBadgesWhenMuted", "start": { "column": 29, - "line": 121 + "line": 129 } }, { "defaultMessage": "!!!Enable spell checking", "end": { "column": 3, - "line": 128 + "line": 136 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSpellchecking", "start": { "column": 23, - "line": 125 + "line": 133 } }, { "defaultMessage": "!!!Enable GPU Acceleration", "end": { "column": 3, - "line": 132 + "line": 140 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableGPUAcceleration", "start": { "column": 25, - "line": 129 + "line": 137 } }, { "defaultMessage": "!!!Include beta versions", "end": { "column": 3, - "line": 136 + "line": 144 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.beta", "start": { "column": 8, - "line": 133 + "line": 141 } }, { "defaultMessage": "!!!Disable updates", "end": { "column": 3, - "line": 140 + "line": 148 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.noUpdates", "start": { "column": 13, - "line": 137 + "line": 145 } }, { "defaultMessage": "!!!Enable Franz Todos", "end": { "column": 3, - "line": 144 + "line": 152 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableTodos", "start": { "column": 15, - "line": 141 + "line": 149 } }, { "defaultMessage": "!!!Keep all workspaces loaded", "end": { "column": 3, - "line": 148 + "line": 156 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.keepAllWorkspacesLoaded", "start": { "column": 27, - "line": 145 + "line": 153 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index f077f23bc..1a8e9f743 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -280,6 +280,7 @@ "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb", "settings.app.form.scheduledDNDEnd": "To", "settings.app.form.scheduledDNDStart": "From", + "settings.app.form.sentry": "Send telemetry data", "settings.app.form.server": "Server", "settings.app.form.showDisabledServices": "Display disabled services tabs", "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", @@ -302,6 +303,7 @@ "settings.app.restartRequired": "Changes require restart", "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", + "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.", "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "settings.app.subheadlineCache": "Cache", diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json index 9be6f507d..8bdbf9f3a 100644 --- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json +++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json @@ -25,16 +25,29 @@ "column": 3 } }, + { + "id": "settings.app.sentryInfo", + "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.", + "file": "src/components/settings/settings/EditSettingsForm.js", + "start": { + "line": 35, + "column": 14 + }, + "end": { + "line": 38, + "column": 3 + } + }, { "id": "settings.app.hibernateInfo", "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 35, + "line": 39, "column": 17 }, "end": { - "line": 38, + "line": 42, "column": 3 } }, @@ -43,11 +56,11 @@ "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 39, + "line": 43, "column": 22 }, "end": { - "line": 42, + "line": 46, "column": 3 } }, @@ -56,11 +69,11 @@ "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 43, + "line": 47, "column": 14 }, "end": { - "line": 46, + "line": 50, "column": 3 } }, @@ -69,11 +82,11 @@ "defaultMessage": "!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 47, + "line": 51, "column": 19 }, "end": { - "line": 50, + "line": 54, "column": 3 } }, @@ -82,11 +95,11 @@ "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 51, + "line": 55, "column": 18 }, "end": { - "line": 54, + "line": 58, "column": 3 } }, @@ -95,11 +108,11 @@ "defaultMessage": "!!!Password", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 55, + "line": 59, "column": 18 }, "end": { - "line": 58, + "line": 62, "column": 3 } }, @@ -108,11 +121,11 @@ "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 59, + "line": 63, "column": 22 }, "end": { - "line": 62, + "line": 66, "column": 3 } }, @@ -121,11 +134,11 @@ "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 63, + "line": 67, "column": 12 }, "end": { - "line": 66, + "line": 70, "column": 3 } }, @@ -134,11 +147,11 @@ "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 67, + "line": 71, "column": 24 }, "end": { - "line": 70, + "line": 74, "column": 3 } }, @@ -147,11 +160,11 @@ "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 71, + "line": 75, "column": 20 }, "end": { - "line": 74, + "line": 78, "column": 3 } }, @@ -160,11 +173,11 @@ "defaultMessage": "!!!Language", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 75, + "line": 79, "column": 20 }, "end": { - "line": 78, + "line": 82, "column": 3 } }, @@ -173,11 +186,11 @@ "defaultMessage": "!!!Updates", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 79, + "line": 83, "column": 19 }, "end": { - "line": 82, + "line": 86, "column": 3 } }, @@ -186,11 +199,11 @@ "defaultMessage": "!!!Appearance", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 83, + "line": 87, "column": 22 }, "end": { - "line": 86, + "line": 90, "column": 3 } }, @@ -199,11 +212,11 @@ "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 87, + "line": 91, "column": 25 }, "end": { - "line": 90, + "line": 94, "column": 3 } }, @@ -212,11 +225,11 @@ "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 91, + "line": 95, "column": 19 }, "end": { - "line": 94, + "line": 98, "column": 3 } }, @@ -225,11 +238,11 @@ "defaultMessage": "!!!Advanced", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 95, + "line": 99, "column": 20 }, "end": { - "line": 98, + "line": 102, "column": 3 } }, @@ -238,11 +251,11 @@ "defaultMessage": "!!!Help us to translate Ferdi into your language.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 99, + "line": 103, "column": 19 }, "end": { - "line": 102, + "line": 106, "column": 3 } }, @@ -251,11 +264,11 @@ "defaultMessage": "!!!Cache", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 103, + "line": 107, "column": 20 }, "end": { - "line": 106, + "line": 110, "column": 3 } }, @@ -264,11 +277,11 @@ "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 107, + "line": 111, "column": 13 }, "end": { - "line": 110, + "line": 114, "column": 3 } }, @@ -277,11 +290,11 @@ "defaultMessage": "!!!Clear cache", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 111, + "line": 115, "column": 23 }, "end": { - "line": 114, + "line": 118, "column": 3 } }, @@ -290,11 +303,11 @@ "defaultMessage": "!!!Check for updates", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 115, + "line": 119, "column": 25 }, "end": { - "line": 118, + "line": 122, "column": 3 } }, @@ -303,11 +316,11 @@ "defaultMessage": "!!!Restart & install update", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 119, + "line": 123, "column": 23 }, "end": { - "line": 122, + "line": 126, "column": 3 } }, @@ -316,11 +329,11 @@ "defaultMessage": "!!!Is searching for update", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 123, + "line": 127, "column": 25 }, "end": { - "line": 126, + "line": 130, "column": 3 } }, @@ -329,11 +342,11 @@ "defaultMessage": "!!!Update available, downloading...", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 127, + "line": 131, "column": 25 }, "end": { - "line": 130, + "line": 134, "column": 3 } }, @@ -342,11 +355,11 @@ "defaultMessage": "!!!You are using the latest version of Ferdi", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 131, + "line": 135, "column": 24 }, "end": { - "line": 134, + "line": 138, "column": 3 } }, @@ -355,11 +368,11 @@ "defaultMessage": "!!!Current version:", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 135, + "line": 139, "column": 18 }, "end": { - "line": 138, + "line": 142, "column": 3 } }, @@ -368,11 +381,11 @@ "defaultMessage": "!!!Changes require restart", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 139, + "line": 143, "column": 29 }, "end": { - "line": 142, + "line": 146, "column": 3 } }, @@ -381,11 +394,11 @@ "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 143, + "line": 147, "column": 22 }, "end": { - "line": 146, + "line": 150, "column": 3 } } diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 0a0291037..22417f340 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -103,16 +103,29 @@ "column": 3 } }, + { + "id": "settings.app.form.sentry", + "defaultMessage": "!!!Send telemetry data", + "file": "src/containers/settings/EditSettingsScreen.js", + "start": { + "line": 61, + "column": 10 + }, + "end": { + "line": 64, + "column": 3 + } + }, { "id": "settings.app.form.hibernate", "defaultMessage": "!!!Enable service hibernation", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 61, + "line": 65, "column": 13 }, "end": { - "line": 64, + "line": 68, "column": 3 } }, @@ -121,11 +134,11 @@ "defaultMessage": "!!!Hibernation strategy", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 65, + "line": 69, "column": 23 }, "end": { - "line": 68, + "line": 72, "column": 3 } }, @@ -134,11 +147,11 @@ "defaultMessage": "!!!Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 69, + "line": 73, "column": 10 }, "end": { - "line": 72, + "line": 76, "column": 3 } }, @@ -147,11 +160,11 @@ "defaultMessage": "!!!Todo Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 73, + "line": 77, "column": 14 }, "end": { - "line": 76, + "line": 80, "column": 3 } }, @@ -160,11 +173,11 @@ "defaultMessage": "!!!Enable Password Lock", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 77, + "line": 81, "column": 14 }, "end": { - "line": 80, + "line": 84, "column": 3 } }, @@ -173,11 +186,11 @@ "defaultMessage": "!!!Password", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 81, + "line": 85, "column": 16 }, "end": { - "line": 84, + "line": 88, "column": 3 } }, @@ -186,11 +199,11 @@ "defaultMessage": "!!!Lock after inactivity", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 81, + "line": 89, "column": 18 }, "end": { - "line": 84, + "line": 92, "column": 3 } }, @@ -199,11 +212,11 @@ "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 85, + "line": 93, "column": 23 }, "end": { - "line": 88, + "line": 96, "column": 3 } }, @@ -212,11 +225,11 @@ "defaultMessage": "!!!From", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 89, + "line": 97, "column": 21 }, "end": { - "line": 92, + "line": 100, "column": 3 } }, @@ -225,11 +238,11 @@ "defaultMessage": "!!!To", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 93, + "line": 101, "column": 19 }, "end": { - "line": 96, + "line": 104, "column": 3 } }, @@ -238,11 +251,11 @@ "defaultMessage": "!!!Language", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 97, + "line": 105, "column": 12 }, "end": { - "line": 100, + "line": 108, "column": 3 } }, @@ -251,11 +264,11 @@ "defaultMessage": "!!!Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 101, + "line": 109, "column": 12 }, "end": { - "line": 104, + "line": 112, "column": 3 } }, @@ -264,11 +277,11 @@ "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 105, + "line": 113, "column": 21 }, "end": { - "line": 108, + "line": 116, "column": 3 } }, @@ -277,11 +290,11 @@ "defaultMessage": "!!!Enable universal Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 109, + "line": 117, "column": 21 }, "end": { - "line": 112, + "line": 120, "column": 3 } }, @@ -290,11 +303,11 @@ "defaultMessage": "!!!Accent color", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 113, + "line": 121, "column": 15 }, "end": { - "line": 116, + "line": 124, "column": 3 } }, @@ -303,11 +316,11 @@ "defaultMessage": "!!!Display disabled services tabs", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 117, + "line": 125, "column": 24 }, "end": { - "line": 120, + "line": 128, "column": 3 } }, @@ -316,11 +329,11 @@ "defaultMessage": "!!!Show unread message badge when notifications are disabled", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 121, + "line": 129, "column": 29 }, "end": { - "line": 124, + "line": 132, "column": 3 } }, @@ -329,11 +342,11 @@ "defaultMessage": "!!!Enable spell checking", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 125, + "line": 133, "column": 23 }, "end": { - "line": 128, + "line": 136, "column": 3 } }, @@ -342,11 +355,11 @@ "defaultMessage": "!!!Enable GPU Acceleration", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 129, + "line": 137, "column": 25 }, "end": { - "line": 132, + "line": 140, "column": 3 } }, @@ -355,11 +368,11 @@ "defaultMessage": "!!!Include beta versions", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 133, + "line": 141, "column": 8 }, "end": { - "line": 136, + "line": 144, "column": 3 } }, @@ -368,11 +381,11 @@ "defaultMessage": "!!!Disable updates", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 137, + "line": 145, "column": 13 }, "end": { - "line": 140, + "line": 148, "column": 3 } }, @@ -381,11 +394,11 @@ "defaultMessage": "!!!Enable Franz Todos", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 141, + "line": 149, "column": 15 }, "end": { - "line": 144, + "line": 152, "column": 3 } }, @@ -394,11 +407,11 @@ "defaultMessage": "!!!Keep all workspaces loaded", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 145, + "line": 153, "column": 27 }, "end": { - "line": 148, + "line": 156, "column": 3 } } diff --git a/src/index.js b/src/index.js index 7bc0be0ea..46230abd6 100644 --- a/src/index.js +++ b/src/index.js @@ -39,7 +39,6 @@ import handleDeepLink from './electron/deepLinking'; import { isPositionValid } from './electron/windowUtils'; import { appId } from './package.json'; // eslint-disable-line import/no-unresolved import './electron/exception'; -import './sentry'; import { DEFAULT_APP_SETTINGS, @@ -80,6 +79,11 @@ if (isWindows) { const settings = new Settings('app', DEFAULT_APP_SETTINGS); const proxySettings = new Settings('proxy'); +if (settings.get('sentry')) { + // eslint-disable-next-line global-require + require('./sentry'); +} + // add `liftSingleInstanceLock` to settings.json to override the single instance lock const liftSingleInstanceLock = settings.get('liftSingleInstanceLock') || false; -- cgit v1.2.3-70-g09d2 From dcc05d2e9e066ce0a64425b9b2c7772bf2add3aa Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 31 Jan 2020 20:41:35 +0100 Subject: Add more seperators to settings screen --- src/components/settings/settings/EditSettingsForm.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 58ffd277e..f7868db50 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -254,6 +254,9 @@ export default @observer class EditSettingsForm extends Component { {isTrayEnabled && } + +
+

{intl.formatMessage(messages.sentryInfo)}

@@ -319,6 +322,9 @@ export default @observer class EditSettingsForm extends Component { />

)} + +
+ {isWorkspaceEnabled && ( )} @@ -440,6 +446,9 @@ export default @observer class EditSettingsForm extends Component {

{intl.formatMessage(messages.headlineAppearance)}

+ +
+ {isMac && } {!(isMac && isAdaptableDarkModeEnabled) && } {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( @@ -458,6 +467,8 @@ export default @observer class EditSettingsForm extends Component { )} +
+ this.submit(e)} @@ -468,6 +479,9 @@ export default @observer class EditSettingsForm extends Component { {/* Language */}

{intl.formatMessage(messages.headlineLanguage)}