diff options
author | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-05-15 22:49:34 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-15 19:19:34 +0200 |
commit | 60378397678090d26193ba54e94db9814d4a0b5c (patch) | |
tree | 5b2c4606e8a411e6a24345a4e28e273e530467e3 | |
parent | New Crowdin updates (#1415) (diff) | |
download | ferdium-app-60378397678090d26193ba54e94db9814d4a0b5c.tar.gz ferdium-app-60378397678090d26193ba54e94db9814d4a0b5c.tar.zst ferdium-app-60378397678090d26193ba54e94db9814d4a0b5c.zip |
Separated privacy & security settings into its own tab in the preferences screen (#1416)
* Separated privacy & security settings into its own tab in the preferences screen.
* Fixing review comments.
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 120 | ||||
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 73 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 1 | ||||
-rw-r--r-- | src/i18n/messages/src/components/settings/settings/EditSettingsForm.json | 73 |
4 files changed, 156 insertions, 111 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index e0687be12..eef529730 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -88,6 +88,10 @@ const messages = defineMessages({ | |||
88 | id: 'settings.app.accentColorInfo', | 88 | id: 'settings.app.accentColorInfo', |
89 | defaultMessage: '!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})', | 89 | defaultMessage: '!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})', |
90 | }, | 90 | }, |
91 | headlinePrivacy: { | ||
92 | id: 'settings.app.headlinePrivacy', | ||
93 | defaultMessage: '!!!Privacy', | ||
94 | }, | ||
91 | headlineAdvanced: { | 95 | headlineAdvanced: { |
92 | id: 'settings.app.headlineAdvanced', | 96 | id: 'settings.app.headlineAdvanced', |
93 | defaultMessage: '!!!Advanced', | 97 | defaultMessage: '!!!Advanced', |
@@ -291,6 +295,13 @@ export default @observer class EditSettingsForm extends Component { | |||
291 | {intl.formatMessage(messages.headlineAppearance)} | 295 | {intl.formatMessage(messages.headlineAppearance)} |
292 | </h2> | 296 | </h2> |
293 | <h2 | 297 | <h2 |
298 | id="privacy" | ||
299 | className={this.state.activeSetttingsTab === 'privacy' ? 'badge badge--primary' : 'badge'} | ||
300 | onClick={() => { this.setActiveSettingsTab('privacy'); }} | ||
301 | > | ||
302 | {intl.formatMessage(messages.headlinePrivacy)} | ||
303 | </h2> | ||
304 | <h2 | ||
294 | id="language" | 305 | id="language" |
295 | className={this.state.activeSetttingsTab === 'language' ? 'badge badge--primary' : 'badge'} | 306 | className={this.state.activeSetttingsTab === 'language' ? 'badge badge--primary' : 'badge'} |
296 | onClick={() => { this.setActiveSettingsTab('language'); }} | 307 | onClick={() => { this.setActiveSettingsTab('language'); }} |
@@ -327,19 +338,10 @@ export default @observer class EditSettingsForm extends Component { | |||
327 | {isWindows && ( | 338 | {isWindows && ( |
328 | <Toggle field={form.$('closeToSystemTray')} /> | 339 | <Toggle field={form.$('closeToSystemTray')} /> |
329 | )} | 340 | )} |
330 | <Toggle field={form.$('privateNotifications')} /> | ||
331 | {(isWindows || isMac) && ( | ||
332 | <Toggle field={form.$('notifyTaskBarOnMessage')} />)} | ||
333 | <Select field={form.$('navigationBarBehaviour')} /> | 341 | <Select field={form.$('navigationBarBehaviour')} /> |
334 | 342 | ||
335 | <Hr /> | 343 | <Hr /> |
336 | 344 | ||
337 | <Select field={form.$('searchEngine')} /> | ||
338 | <Toggle field={form.$('sentry')} /> | ||
339 | <p>{intl.formatMessage(messages.sentryInfo)}</p> | ||
340 | |||
341 | <Hr /> | ||
342 | |||
343 | <Toggle field={form.$('hibernate')} /> | 345 | <Toggle field={form.$('hibernate')} /> |
344 | {hibernationEnabled && ( | 346 | {hibernationEnabled && ( |
345 | <> | 347 | <> |
@@ -394,48 +396,6 @@ export default @observer class EditSettingsForm extends Component { | |||
394 | </> | 396 | </> |
395 | )} | 397 | )} |
396 | 398 | ||
397 | <Hr /> | ||
398 | |||
399 | <Toggle field={form.$('lockingFeatureEnabled')} /> | ||
400 | {lockingFeatureEnabled && ( | ||
401 | <> | ||
402 | {isMac && systemPreferences.canPromptTouchID() && ( | ||
403 | <Toggle field={form.$('useTouchIdToUnlock')} /> | ||
404 | )} | ||
405 | |||
406 | <Input | ||
407 | placeholder={intl.formatMessage(messages.lockedPassword)} | ||
408 | onChange={e => this.submit(e)} | ||
409 | field={form.$('lockedPassword')} | ||
410 | type="password" | ||
411 | scorePassword | ||
412 | showPasswordToggle | ||
413 | /> | ||
414 | <p> | ||
415 | { intl.formatMessage(messages.lockedPasswordInfo) } | ||
416 | </p> | ||
417 | |||
418 | <Input | ||
419 | placeholder="Lock after inactivity" | ||
420 | onChange={e => this.submit(e)} | ||
421 | field={form.$('inactivityLock')} | ||
422 | autoFocus | ||
423 | /> | ||
424 | <p> | ||
425 | { intl.formatMessage(messages.inactivityLockInfo) } | ||
426 | </p> | ||
427 | </> | ||
428 | )} | ||
429 | <p | ||
430 | className="settings__message" | ||
431 | style={{ | ||
432 | borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem', | ||
433 | }} | ||
434 | > | ||
435 | <span> | ||
436 | { intl.formatMessage(messages.lockInfo) } | ||
437 | </span> | ||
438 | </p> | ||
439 | 399 | ||
440 | <Hr /> | 400 | <Hr /> |
441 | 401 | ||
@@ -543,6 +503,64 @@ export default @observer class EditSettingsForm extends Component { | |||
543 | </div> | 503 | </div> |
544 | )} | 504 | )} |
545 | 505 | ||
506 | {/* Privacy */} | ||
507 | { this.state.activeSetttingsTab === 'privacy' && ( | ||
508 | <div> | ||
509 | <Toggle field={form.$('privateNotifications')} /> | ||
510 | {(isWindows || isMac) && ( | ||
511 | <Toggle field={form.$('notifyTaskBarOnMessage')} />)} | ||
512 | |||
513 | <Hr /> | ||
514 | |||
515 | <Select field={form.$('searchEngine')} /> | ||
516 | <Toggle field={form.$('sentry')} /> | ||
517 | <p>{intl.formatMessage(messages.sentryInfo)}</p> | ||
518 | |||
519 | <Hr /> | ||
520 | |||
521 | <Toggle field={form.$('lockingFeatureEnabled')} /> | ||
522 | {lockingFeatureEnabled && ( | ||
523 | <> | ||
524 | {isMac && systemPreferences.canPromptTouchID() && ( | ||
525 | <Toggle field={form.$('useTouchIdToUnlock')} /> | ||
526 | )} | ||
527 | |||
528 | <Input | ||
529 | placeholder={intl.formatMessage(messages.lockedPassword)} | ||
530 | onChange={e => this.submit(e)} | ||
531 | field={form.$('lockedPassword')} | ||
532 | type="password" | ||
533 | scorePassword | ||
534 | showPasswordToggle | ||
535 | /> | ||
536 | <p> | ||
537 | { intl.formatMessage(messages.lockedPasswordInfo) } | ||
538 | </p> | ||
539 | |||
540 | <Input | ||
541 | placeholder="Lock after inactivity" | ||
542 | onChange={e => this.submit(e)} | ||
543 | field={form.$('inactivityLock')} | ||
544 | autoFocus | ||
545 | /> | ||
546 | <p> | ||
547 | { intl.formatMessage(messages.inactivityLockInfo) } | ||
548 | </p> | ||
549 | </> | ||
550 | )} | ||
551 | <p | ||
552 | className="settings__message" | ||
553 | style={{ | ||
554 | borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem', | ||
555 | }} | ||
556 | > | ||
557 | <span> | ||
558 | { intl.formatMessage(messages.lockInfo) } | ||
559 | </span> | ||
560 | </p> | ||
561 | </div> | ||
562 | )} | ||
563 | |||
546 | {/* Language */} | 564 | {/* Language */} |
547 | { this.state.activeSetttingsTab === 'language' && ( | 565 | { this.state.activeSetttingsTab === 'language' && ( |
548 | <div> | 566 | <div> |
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index adffa7f43..50e7871dd 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -3446,198 +3446,211 @@ | |||
3446 | } | 3446 | } |
3447 | }, | 3447 | }, |
3448 | { | 3448 | { |
3449 | "defaultMessage": "!!!Advanced", | 3449 | "defaultMessage": "!!!Privacy", |
3450 | "end": { | 3450 | "end": { |
3451 | "column": 3, | 3451 | "column": 3, |
3452 | "line": 94 | 3452 | "line": 94 |
3453 | }, | 3453 | }, |
3454 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3454 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3455 | "id": "settings.app.headlinePrivacy", | ||
3456 | "start": { | ||
3457 | "column": 19, | ||
3458 | "line": 91 | ||
3459 | } | ||
3460 | }, | ||
3461 | { | ||
3462 | "defaultMessage": "!!!Advanced", | ||
3463 | "end": { | ||
3464 | "column": 3, | ||
3465 | "line": 98 | ||
3466 | }, | ||
3467 | "file": "src/components/settings/settings/EditSettingsForm.js", | ||
3455 | "id": "settings.app.headlineAdvanced", | 3468 | "id": "settings.app.headlineAdvanced", |
3456 | "start": { | 3469 | "start": { |
3457 | "column": 20, | 3470 | "column": 20, |
3458 | "line": 91 | 3471 | "line": 95 |
3459 | } | 3472 | } |
3460 | }, | 3473 | }, |
3461 | { | 3474 | { |
3462 | "defaultMessage": "!!!Help us to translate Ferdi into your language.", | 3475 | "defaultMessage": "!!!Help us to translate Ferdi into your language.", |
3463 | "end": { | 3476 | "end": { |
3464 | "column": 3, | 3477 | "column": 3, |
3465 | "line": 98 | 3478 | "line": 102 |
3466 | }, | 3479 | }, |
3467 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3480 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3468 | "id": "settings.app.translationHelp", | 3481 | "id": "settings.app.translationHelp", |
3469 | "start": { | 3482 | "start": { |
3470 | "column": 19, | 3483 | "column": 19, |
3471 | "line": 95 | 3484 | "line": 99 |
3472 | } | 3485 | } |
3473 | }, | 3486 | }, |
3474 | { | 3487 | { |
3475 | "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.", | 3488 | "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.", |
3476 | "end": { | 3489 | "end": { |
3477 | "column": 3, | 3490 | "column": 3, |
3478 | "line": 102 | 3491 | "line": 106 |
3479 | }, | 3492 | }, |
3480 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3493 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3481 | "id": "settings.app.spellCheckerLanguageInfo", | 3494 | "id": "settings.app.spellCheckerLanguageInfo", |
3482 | "start": { | 3495 | "start": { |
3483 | "column": 28, | 3496 | "column": 28, |
3484 | "line": 99 | 3497 | "line": 103 |
3485 | } | 3498 | } |
3486 | }, | 3499 | }, |
3487 | { | 3500 | { |
3488 | "defaultMessage": "!!!Cache", | 3501 | "defaultMessage": "!!!Cache", |
3489 | "end": { | 3502 | "end": { |
3490 | "column": 3, | 3503 | "column": 3, |
3491 | "line": 106 | 3504 | "line": 110 |
3492 | }, | 3505 | }, |
3493 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3506 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3494 | "id": "settings.app.subheadlineCache", | 3507 | "id": "settings.app.subheadlineCache", |
3495 | "start": { | 3508 | "start": { |
3496 | "column": 20, | 3509 | "column": 20, |
3497 | "line": 103 | 3510 | "line": 107 |
3498 | } | 3511 | } |
3499 | }, | 3512 | }, |
3500 | { | 3513 | { |
3501 | "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", | 3514 | "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", |
3502 | "end": { | 3515 | "end": { |
3503 | "column": 3, | 3516 | "column": 3, |
3504 | "line": 110 | 3517 | "line": 114 |
3505 | }, | 3518 | }, |
3506 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3519 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3507 | "id": "settings.app.cacheInfo", | 3520 | "id": "settings.app.cacheInfo", |
3508 | "start": { | 3521 | "start": { |
3509 | "column": 13, | 3522 | "column": 13, |
3510 | "line": 107 | 3523 | "line": 111 |
3511 | } | 3524 | } |
3512 | }, | 3525 | }, |
3513 | { | 3526 | { |
3514 | "defaultMessage": "!!!Couldn't clear all cache", | 3527 | "defaultMessage": "!!!Couldn't clear all cache", |
3515 | "end": { | 3528 | "end": { |
3516 | "column": 3, | 3529 | "column": 3, |
3517 | "line": 114 | 3530 | "line": 118 |
3518 | }, | 3531 | }, |
3519 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3532 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3520 | "id": "settings.app.cacheNotCleared", | 3533 | "id": "settings.app.cacheNotCleared", |
3521 | "start": { | 3534 | "start": { |
3522 | "column": 19, | 3535 | "column": 19, |
3523 | "line": 111 | 3536 | "line": 115 |
3524 | } | 3537 | } |
3525 | }, | 3538 | }, |
3526 | { | 3539 | { |
3527 | "defaultMessage": "!!!Clear cache", | 3540 | "defaultMessage": "!!!Clear cache", |
3528 | "end": { | 3541 | "end": { |
3529 | "column": 3, | 3542 | "column": 3, |
3530 | "line": 118 | 3543 | "line": 122 |
3531 | }, | 3544 | }, |
3532 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3545 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3533 | "id": "settings.app.buttonClearAllCache", | 3546 | "id": "settings.app.buttonClearAllCache", |
3534 | "start": { | 3547 | "start": { |
3535 | "column": 23, | 3548 | "column": 23, |
3536 | "line": 115 | 3549 | "line": 119 |
3537 | } | 3550 | } |
3538 | }, | 3551 | }, |
3539 | { | 3552 | { |
3540 | "defaultMessage": "!!!Check for updates", | 3553 | "defaultMessage": "!!!Check for updates", |
3541 | "end": { | 3554 | "end": { |
3542 | "column": 3, | 3555 | "column": 3, |
3543 | "line": 122 | 3556 | "line": 126 |
3544 | }, | 3557 | }, |
3545 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3558 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3546 | "id": "settings.app.buttonSearchForUpdate", | 3559 | "id": "settings.app.buttonSearchForUpdate", |
3547 | "start": { | 3560 | "start": { |
3548 | "column": 25, | 3561 | "column": 25, |
3549 | "line": 119 | 3562 | "line": 123 |
3550 | } | 3563 | } |
3551 | }, | 3564 | }, |
3552 | { | 3565 | { |
3553 | "defaultMessage": "!!!Restart & install update", | 3566 | "defaultMessage": "!!!Restart & install update", |
3554 | "end": { | 3567 | "end": { |
3555 | "column": 3, | 3568 | "column": 3, |
3556 | "line": 126 | 3569 | "line": 130 |
3557 | }, | 3570 | }, |
3558 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3571 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3559 | "id": "settings.app.buttonInstallUpdate", | 3572 | "id": "settings.app.buttonInstallUpdate", |
3560 | "start": { | 3573 | "start": { |
3561 | "column": 23, | 3574 | "column": 23, |
3562 | "line": 123 | 3575 | "line": 127 |
3563 | } | 3576 | } |
3564 | }, | 3577 | }, |
3565 | { | 3578 | { |
3566 | "defaultMessage": "!!!Is searching for update", | 3579 | "defaultMessage": "!!!Is searching for update", |
3567 | "end": { | 3580 | "end": { |
3568 | "column": 3, | 3581 | "column": 3, |
3569 | "line": 130 | 3582 | "line": 134 |
3570 | }, | 3583 | }, |
3571 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3584 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3572 | "id": "settings.app.updateStatusSearching", | 3585 | "id": "settings.app.updateStatusSearching", |
3573 | "start": { | 3586 | "start": { |
3574 | "column": 25, | 3587 | "column": 25, |
3575 | "line": 127 | 3588 | "line": 131 |
3576 | } | 3589 | } |
3577 | }, | 3590 | }, |
3578 | { | 3591 | { |
3579 | "defaultMessage": "!!!Update available, downloading...", | 3592 | "defaultMessage": "!!!Update available, downloading...", |
3580 | "end": { | 3593 | "end": { |
3581 | "column": 3, | 3594 | "column": 3, |
3582 | "line": 134 | 3595 | "line": 138 |
3583 | }, | 3596 | }, |
3584 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3597 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3585 | "id": "settings.app.updateStatusAvailable", | 3598 | "id": "settings.app.updateStatusAvailable", |
3586 | "start": { | 3599 | "start": { |
3587 | "column": 25, | 3600 | "column": 25, |
3588 | "line": 131 | 3601 | "line": 135 |
3589 | } | 3602 | } |
3590 | }, | 3603 | }, |
3591 | { | 3604 | { |
3592 | "defaultMessage": "!!!You are using the latest version of Ferdi", | 3605 | "defaultMessage": "!!!You are using the latest version of Ferdi", |
3593 | "end": { | 3606 | "end": { |
3594 | "column": 3, | 3607 | "column": 3, |
3595 | "line": 138 | 3608 | "line": 142 |
3596 | }, | 3609 | }, |
3597 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3610 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3598 | "id": "settings.app.updateStatusUpToDate", | 3611 | "id": "settings.app.updateStatusUpToDate", |
3599 | "start": { | 3612 | "start": { |
3600 | "column": 24, | 3613 | "column": 24, |
3601 | "line": 135 | 3614 | "line": 139 |
3602 | } | 3615 | } |
3603 | }, | 3616 | }, |
3604 | { | 3617 | { |
3605 | "defaultMessage": "!!!Current version:", | 3618 | "defaultMessage": "!!!Current version:", |
3606 | "end": { | 3619 | "end": { |
3607 | "column": 3, | 3620 | "column": 3, |
3608 | "line": 142 | 3621 | "line": 146 |
3609 | }, | 3622 | }, |
3610 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3623 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3611 | "id": "settings.app.currentVersion", | 3624 | "id": "settings.app.currentVersion", |
3612 | "start": { | 3625 | "start": { |
3613 | "column": 18, | 3626 | "column": 18, |
3614 | "line": 139 | 3627 | "line": 143 |
3615 | } | 3628 | } |
3616 | }, | 3629 | }, |
3617 | { | 3630 | { |
3618 | "defaultMessage": "!!!Changes require restart", | 3631 | "defaultMessage": "!!!Changes require restart", |
3619 | "end": { | 3632 | "end": { |
3620 | "column": 3, | 3633 | "column": 3, |
3621 | "line": 146 | 3634 | "line": 150 |
3622 | }, | 3635 | }, |
3623 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3636 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3624 | "id": "settings.app.restartRequired", | 3637 | "id": "settings.app.restartRequired", |
3625 | "start": { | 3638 | "start": { |
3626 | "column": 29, | 3639 | "column": 29, |
3627 | "line": 143 | 3640 | "line": 147 |
3628 | } | 3641 | } |
3629 | }, | 3642 | }, |
3630 | { | 3643 | { |
3631 | "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", | 3644 | "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", |
3632 | "end": { | 3645 | "end": { |
3633 | "column": 3, | 3646 | "column": 3, |
3634 | "line": 150 | 3647 | "line": 154 |
3635 | }, | 3648 | }, |
3636 | "file": "src/components/settings/settings/EditSettingsForm.js", | 3649 | "file": "src/components/settings/settings/EditSettingsForm.js", |
3637 | "id": "settings.app.languageDisclaimer", | 3650 | "id": "settings.app.languageDisclaimer", |
3638 | "start": { | 3651 | "start": { |
3639 | "column": 22, | 3652 | "column": 22, |
3640 | "line": 147 | 3653 | "line": 151 |
3641 | } | 3654 | } |
3642 | } | 3655 | } |
3643 | ], | 3656 | ], |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index fc7f25249..1c1cbb882 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -334,6 +334,7 @@ | |||
334 | "settings.app.headlineAppearance": "Appearance", | 334 | "settings.app.headlineAppearance": "Appearance", |
335 | "settings.app.headlineGeneral": "General", | 335 | "settings.app.headlineGeneral": "General", |
336 | "settings.app.headlineLanguage": "Language", | 336 | "settings.app.headlineLanguage": "Language", |
337 | "settings.app.headlinePrivacy": "Privacy", | ||
337 | "settings.app.headlineUpdates": "Updates", | 338 | "settings.app.headlineUpdates": "Updates", |
338 | "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.", | 339 | "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.", |
339 | "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", | 340 | "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", |
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json index 569faa7fe..ecac749db 100644 --- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json +++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json | |||
@@ -208,15 +208,28 @@ | |||
208 | } | 208 | } |
209 | }, | 209 | }, |
210 | { | 210 | { |
211 | "id": "settings.app.headlinePrivacy", | ||
212 | "defaultMessage": "!!!Privacy", | ||
213 | "file": "src/components/settings/settings/EditSettingsForm.js", | ||
214 | "start": { | ||
215 | "line": 91, | ||
216 | "column": 19 | ||
217 | }, | ||
218 | "end": { | ||
219 | "line": 94, | ||
220 | "column": 3 | ||
221 | } | ||
222 | }, | ||
223 | { | ||
211 | "id": "settings.app.headlineAdvanced", | 224 | "id": "settings.app.headlineAdvanced", |
212 | "defaultMessage": "!!!Advanced", | 225 | "defaultMessage": "!!!Advanced", |
213 | "file": "src/components/settings/settings/EditSettingsForm.js", | 226 | "file": "src/components/settings/settings/EditSettingsForm.js", |
214 | "start": { | 227 | "start": { |
215 | "line": 91, | 228 | "line": 95, |
216 | "column": 20 | 229 | "column": 20 |
217 | }, | 230 | }, |
218 | "end": { | 231 | "end": { |
219 | "line": 94, | 232 | "line": 98, |
220 | "column": 3 | 233 | "column": 3 |
221 | } | 234 | } |
222 | }, | 235 | }, |
@@ -225,11 +238,11 @@ | |||
225 | "defaultMessage": "!!!Help us to translate Ferdi into your language.", | 238 | "defaultMessage": "!!!Help us to translate Ferdi into your language.", |
226 | "file": "src/components/settings/settings/EditSettingsForm.js", | 239 | "file": "src/components/settings/settings/EditSettingsForm.js", |
227 | "start": { | 240 | "start": { |
228 | "line": 95, | 241 | "line": 99, |
229 | "column": 19 | 242 | "column": 19 |
230 | }, | 243 | }, |
231 | "end": { | 244 | "end": { |
232 | "line": 98, | 245 | "line": 102, |
233 | "column": 3 | 246 | "column": 3 |
234 | } | 247 | } |
235 | }, | 248 | }, |
@@ -238,11 +251,11 @@ | |||
238 | "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.", | 251 | "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.", |
239 | "file": "src/components/settings/settings/EditSettingsForm.js", | 252 | "file": "src/components/settings/settings/EditSettingsForm.js", |
240 | "start": { | 253 | "start": { |
241 | "line": 99, | 254 | "line": 103, |
242 | "column": 28 | 255 | "column": 28 |
243 | }, | 256 | }, |
244 | "end": { | 257 | "end": { |
245 | "line": 102, | 258 | "line": 106, |
246 | "column": 3 | 259 | "column": 3 |
247 | } | 260 | } |
248 | }, | 261 | }, |
@@ -251,11 +264,11 @@ | |||
251 | "defaultMessage": "!!!Cache", | 264 | "defaultMessage": "!!!Cache", |
252 | "file": "src/components/settings/settings/EditSettingsForm.js", | 265 | "file": "src/components/settings/settings/EditSettingsForm.js", |
253 | "start": { | 266 | "start": { |
254 | "line": 103, | 267 | "line": 107, |
255 | "column": 20 | 268 | "column": 20 |
256 | }, | 269 | }, |
257 | "end": { | 270 | "end": { |
258 | "line": 106, | 271 | "line": 110, |
259 | "column": 3 | 272 | "column": 3 |
260 | } | 273 | } |
261 | }, | 274 | }, |
@@ -264,11 +277,11 @@ | |||
264 | "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", | 277 | "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", |
265 | "file": "src/components/settings/settings/EditSettingsForm.js", | 278 | "file": "src/components/settings/settings/EditSettingsForm.js", |
266 | "start": { | 279 | "start": { |
267 | "line": 107, | 280 | "line": 111, |
268 | "column": 13 | 281 | "column": 13 |
269 | }, | 282 | }, |
270 | "end": { | 283 | "end": { |
271 | "line": 110, | 284 | "line": 114, |
272 | "column": 3 | 285 | "column": 3 |
273 | } | 286 | } |
274 | }, | 287 | }, |
@@ -277,11 +290,11 @@ | |||
277 | "defaultMessage": "!!!Couldn't clear all cache", | 290 | "defaultMessage": "!!!Couldn't clear all cache", |
278 | "file": "src/components/settings/settings/EditSettingsForm.js", | 291 | "file": "src/components/settings/settings/EditSettingsForm.js", |
279 | "start": { | 292 | "start": { |
280 | "line": 111, | 293 | "line": 115, |
281 | "column": 19 | 294 | "column": 19 |
282 | }, | 295 | }, |
283 | "end": { | 296 | "end": { |
284 | "line": 114, | 297 | "line": 118, |
285 | "column": 3 | 298 | "column": 3 |
286 | } | 299 | } |
287 | }, | 300 | }, |
@@ -290,11 +303,11 @@ | |||
290 | "defaultMessage": "!!!Clear cache", | 303 | "defaultMessage": "!!!Clear cache", |
291 | "file": "src/components/settings/settings/EditSettingsForm.js", | 304 | "file": "src/components/settings/settings/EditSettingsForm.js", |
292 | "start": { | 305 | "start": { |
293 | "line": 115, | 306 | "line": 119, |
294 | "column": 23 | 307 | "column": 23 |
295 | }, | 308 | }, |
296 | "end": { | 309 | "end": { |
297 | "line": 118, | 310 | "line": 122, |
298 | "column": 3 | 311 | "column": 3 |
299 | } | 312 | } |
300 | }, | 313 | }, |
@@ -303,11 +316,11 @@ | |||
303 | "defaultMessage": "!!!Check for updates", | 316 | "defaultMessage": "!!!Check for updates", |
304 | "file": "src/components/settings/settings/EditSettingsForm.js", | 317 | "file": "src/components/settings/settings/EditSettingsForm.js", |
305 | "start": { | 318 | "start": { |
306 | "line": 119, | 319 | "line": 123, |
307 | "column": 25 | 320 | "column": 25 |
308 | }, | 321 | }, |
309 | "end": { | 322 | "end": { |
310 | "line": 122, | 323 | "line": 126, |
311 | "column": 3 | 324 | "column": 3 |
312 | } | 325 | } |
313 | }, | 326 | }, |
@@ -316,11 +329,11 @@ | |||
316 | "defaultMessage": "!!!Restart & install update", | 329 | "defaultMessage": "!!!Restart & install update", |
317 | "file": "src/components/settings/settings/EditSettingsForm.js", | 330 | "file": "src/components/settings/settings/EditSettingsForm.js", |
318 | "start": { | 331 | "start": { |
319 | "line": 123, | 332 | "line": 127, |
320 | "column": 23 | 333 | "column": 23 |
321 | }, | 334 | }, |
322 | "end": { | 335 | "end": { |
323 | "line": 126, | 336 | "line": 130, |
324 | "column": 3 | 337 | "column": 3 |
325 | } | 338 | } |
326 | }, | 339 | }, |
@@ -329,11 +342,11 @@ | |||
329 | "defaultMessage": "!!!Is searching for update", | 342 | "defaultMessage": "!!!Is searching for update", |
330 | "file": "src/components/settings/settings/EditSettingsForm.js", | 343 | "file": "src/components/settings/settings/EditSettingsForm.js", |
331 | "start": { | 344 | "start": { |
332 | "line": 127, | 345 | "line": 131, |
333 | "column": 25 | 346 | "column": 25 |
334 | }, | 347 | }, |
335 | "end": { | 348 | "end": { |
336 | "line": 130, | 349 | "line": 134, |
337 | "column": 3 | 350 | "column": 3 |
338 | } | 351 | } |
339 | }, | 352 | }, |
@@ -342,11 +355,11 @@ | |||
342 | "defaultMessage": "!!!Update available, downloading...", | 355 | "defaultMessage": "!!!Update available, downloading...", |
343 | "file": "src/components/settings/settings/EditSettingsForm.js", | 356 | "file": "src/components/settings/settings/EditSettingsForm.js", |
344 | "start": { | 357 | "start": { |
345 | "line": 131, | 358 | "line": 135, |
346 | "column": 25 | 359 | "column": 25 |
347 | }, | 360 | }, |
348 | "end": { | 361 | "end": { |
349 | "line": 134, | 362 | "line": 138, |
350 | "column": 3 | 363 | "column": 3 |
351 | } | 364 | } |
352 | }, | 365 | }, |
@@ -355,11 +368,11 @@ | |||
355 | "defaultMessage": "!!!You are using the latest version of Ferdi", | 368 | "defaultMessage": "!!!You are using the latest version of Ferdi", |
356 | "file": "src/components/settings/settings/EditSettingsForm.js", | 369 | "file": "src/components/settings/settings/EditSettingsForm.js", |
357 | "start": { | 370 | "start": { |
358 | "line": 135, | 371 | "line": 139, |
359 | "column": 24 | 372 | "column": 24 |
360 | }, | 373 | }, |
361 | "end": { | 374 | "end": { |
362 | "line": 138, | 375 | "line": 142, |
363 | "column": 3 | 376 | "column": 3 |
364 | } | 377 | } |
365 | }, | 378 | }, |
@@ -368,11 +381,11 @@ | |||
368 | "defaultMessage": "!!!Current version:", | 381 | "defaultMessage": "!!!Current version:", |
369 | "file": "src/components/settings/settings/EditSettingsForm.js", | 382 | "file": "src/components/settings/settings/EditSettingsForm.js", |
370 | "start": { | 383 | "start": { |
371 | "line": 139, | 384 | "line": 143, |
372 | "column": 18 | 385 | "column": 18 |
373 | }, | 386 | }, |
374 | "end": { | 387 | "end": { |
375 | "line": 142, | 388 | "line": 146, |
376 | "column": 3 | 389 | "column": 3 |
377 | } | 390 | } |
378 | }, | 391 | }, |
@@ -381,11 +394,11 @@ | |||
381 | "defaultMessage": "!!!Changes require restart", | 394 | "defaultMessage": "!!!Changes require restart", |
382 | "file": "src/components/settings/settings/EditSettingsForm.js", | 395 | "file": "src/components/settings/settings/EditSettingsForm.js", |
383 | "start": { | 396 | "start": { |
384 | "line": 143, | 397 | "line": 147, |
385 | "column": 29 | 398 | "column": 29 |
386 | }, | 399 | }, |
387 | "end": { | 400 | "end": { |
388 | "line": 146, | 401 | "line": 150, |
389 | "column": 3 | 402 | "column": 3 |
390 | } | 403 | } |
391 | }, | 404 | }, |
@@ -394,11 +407,11 @@ | |||
394 | "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", | 407 | "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", |
395 | "file": "src/components/settings/settings/EditSettingsForm.js", | 408 | "file": "src/components/settings/settings/EditSettingsForm.js", |
396 | "start": { | 409 | "start": { |
397 | "line": 147, | 410 | "line": 151, |
398 | "column": 22 | 411 | "column": 22 |
399 | }, | 412 | }, |
400 | "end": { | 413 | "end": { |
401 | "line": 150, | 414 | "line": 154, |
402 | "column": 3 | 415 | "column": 3 |
403 | } | 416 | } |
404 | } | 417 | } |