aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-07-06 14:01:09 +0530
committerLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-07-06 18:25:30 +0530
commit00cde9a46d93d3de247a46a4b824f9842220a736 (patch)
tree471b37ad6f50e27c79d093428340fc666eda7f92
parentBumped upto version same as nightly branch. [skip ci] (diff)
downloadferdium-app-00cde9a46d93d3de247a46a4b824f9842220a736.tar.gz
ferdium-app-00cde9a46d93d3de247a46a4b824f9842220a736.tar.zst
ferdium-app-00cde9a46d93d3de247a46a4b824f9842220a736.zip
Added new help text for lay-users to figure out what their user-agent value is.
-rw-r--r--src/components/settings/services/EditServiceForm.js8
-rw-r--r--src/components/settings/settings/EditSettingsForm.js4
-rw-r--r--src/i18n/globalMessages.js4
-rw-r--r--src/i18n/locales/defaultMessages.json257
-rw-r--r--src/i18n/locales/en-US.json1
-rw-r--r--src/i18n/messages/src/components/settings/services/EditServiceForm.json112
-rw-r--r--src/i18n/messages/src/components/settings/settings/EditSettingsForm.json128
-rw-r--r--src/i18n/messages/src/i18n/globalMessages.json17
-rw-r--r--src/styles/settings.scss5
9 files changed, 287 insertions, 249 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index a8501670b..513c75eed 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -21,6 +21,7 @@ import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
21import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox'; 21import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox';
22import { serviceLimitStore } from '../../../features/serviceLimit'; 22import { serviceLimitStore } from '../../../features/serviceLimit';
23import { isMac } from '../../../environment'; 23import { isMac } from '../../../environment';
24import globalMessages from '../../../i18n/globalMessages';
24 25
25const messages = defineMessages({ 26const messages = defineMessages({
26 saveService: { 27 saveService: {
@@ -351,7 +352,7 @@ export default @observer class EditServiceForm extends Component {
351 <h3>{intl.formatMessage(messages.headlineNotifications)}</h3> 352 <h3>{intl.formatMessage(messages.headlineNotifications)}</h3>
352 <Toggle field={form.$('isNotificationEnabled')} /> 353 <Toggle field={form.$('isNotificationEnabled')} />
353 <Toggle field={form.$('isMuted')} /> 354 <Toggle field={form.$('isMuted')} />
354 <p className="settings__help"> 355 <p className="settings__help indented__help">
355 {intl.formatMessage(messages.isMutedInfo)} 356 {intl.formatMessage(messages.isMutedInfo)}
356 </p> 357 </p>
357 </div> 358 </div>
@@ -362,7 +363,7 @@ export default @observer class EditServiceForm extends Component {
362 {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && ( 363 {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && (
363 <> 364 <>
364 <Toggle field={form.$('isIndirectMessageBadgeEnabled')} /> 365 <Toggle field={form.$('isIndirectMessageBadgeEnabled')} />
365 <p className="settings__help"> 366 <p className="settings__help indented__help">
366 {intl.formatMessage(messages.indirectMessageInfo)} 367 {intl.formatMessage(messages.indirectMessageInfo)}
367 </p> 368 </p>
368 </> 369 </>
@@ -375,7 +376,7 @@ export default @observer class EditServiceForm extends Component {
375 {isHibernationFeatureActive && ( 376 {isHibernationFeatureActive && (
376 <> 377 <>
377 <Toggle field={form.$('isHibernationEnabled')} /> 378 <Toggle field={form.$('isHibernationEnabled')} />
378 <p className="settings__help"> 379 <p className="settings__help indented__help">
379 {intl.formatMessage(messages.isHibernationEnabledInfo)} 380 {intl.formatMessage(messages.isHibernationEnabledInfo)}
380 </p> 381 </p>
381 </> 382 </>
@@ -456,6 +457,7 @@ export default @observer class EditServiceForm extends Component {
456 457
457 <div className="user-agent"> 458 <div className="user-agent">
458 <Input field={form.$('userAgentPref')} /> 459 <Input field={form.$('userAgentPref')} />
460 <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p>
459 </div> 461 </div>
460 </form> 462 </form>
461 463
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 98a119bfa..52b26d65b 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -18,6 +18,7 @@ import {
18 GITHUB_FRANZ_URL, 18 GITHUB_FRANZ_URL,
19} from '../../../config'; 19} from '../../../config';
20import { DEFAULT_APP_SETTINGS, isMac, isWindows } from '../../../environment'; 20import { DEFAULT_APP_SETTINGS, isMac, isWindows } from '../../../environment';
21import globalMessages from '../../../i18n/globalMessages';
21 22
22const messages = defineMessages({ 23const messages = defineMessages({
23 headline: { 24 headline: {
@@ -595,7 +596,7 @@ export default @observer class EditSettingsForm extends Component {
595 { this.state.activeSetttingsTab === 'advanced' && ( 596 { this.state.activeSetttingsTab === 'advanced' && (
596 <div> 597 <div>
597 <Toggle field={form.$('enableGPUAcceleration')} /> 598 <Toggle field={form.$('enableGPUAcceleration')} />
598 <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p> 599 <p className="settings__help indented__help">{intl.formatMessage(messages.appRestartRequired)}</p>
599 600
600 <Hr /> 601 <Hr />
601 602
@@ -604,6 +605,7 @@ export default @observer class EditSettingsForm extends Component {
604 onChange={e => this.submit(e)} 605 onChange={e => this.submit(e)}
605 field={form.$('userAgentPref')} 606 field={form.$('userAgentPref')}
606 /> 607 />
608 <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p>
607 <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p> 609 <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
608 610
609 <Hr /> 611 <Hr />
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index cc1239199..190417536 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -29,6 +29,10 @@ export default defineMessages({
29 id: 'global.userAgentPref', 29 id: 'global.userAgentPref',
30 defaultMessage: '!!!User Agent', 30 defaultMessage: '!!!User Agent',
31 }, 31 },
32 userAgentHelp: {
33 id: 'global.userAgentHelp',
34 defaultMessage: "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
35 },
32 proRequired: { 36 proRequired: {
33 id: 'global.franzProRequired', 37 id: 'global.franzProRequired',
34 defaultMessage: '!!!Franz Professional Required', 38 defaultMessage: '!!!Franz Professional Required',
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index b905d0a8b..4da9390a5 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2649,364 +2649,364 @@
2649 "defaultMessage": "!!!Save service", 2649 "defaultMessage": "!!!Save service",
2650 "end": { 2650 "end": {
2651 "column": 3, 2651 "column": 3,
2652 "line": 29 2652 "line": 30
2653 }, 2653 },
2654 "file": "src/components/settings/services/EditServiceForm.js", 2654 "file": "src/components/settings/services/EditServiceForm.js",
2655 "id": "settings.service.form.saveButton", 2655 "id": "settings.service.form.saveButton",
2656 "start": { 2656 "start": {
2657 "column": 15, 2657 "column": 15,
2658 "line": 26 2658 "line": 27
2659 } 2659 }
2660 }, 2660 },
2661 { 2661 {
2662 "defaultMessage": "!!!Delete Service", 2662 "defaultMessage": "!!!Delete Service",
2663 "end": { 2663 "end": {
2664 "column": 3, 2664 "column": 3,
2665 "line": 33 2665 "line": 34
2666 }, 2666 },
2667 "file": "src/components/settings/services/EditServiceForm.js", 2667 "file": "src/components/settings/services/EditServiceForm.js",
2668 "id": "settings.service.form.deleteButton", 2668 "id": "settings.service.form.deleteButton",
2669 "start": { 2669 "start": {
2670 "column": 17, 2670 "column": 17,
2671 "line": 30 2671 "line": 31
2672 } 2672 }
2673 }, 2673 },
2674 { 2674 {
2675 "defaultMessage": "!!!Open darkmode.css", 2675 "defaultMessage": "!!!Open darkmode.css",
2676 "end": { 2676 "end": {
2677 "column": 3, 2677 "column": 3,
2678 "line": 37 2678 "line": 38
2679 }, 2679 },
2680 "file": "src/components/settings/services/EditServiceForm.js", 2680 "file": "src/components/settings/services/EditServiceForm.js",
2681 "id": "settings.service.form.openDarkmodeCss", 2681 "id": "settings.service.form.openDarkmodeCss",
2682 "start": { 2682 "start": {
2683 "column": 19, 2683 "column": 19,
2684 "line": 34 2684 "line": 35
2685 } 2685 }
2686 }, 2686 },
2687 { 2687 {
2688 "defaultMessage": "!!!Open user.css", 2688 "defaultMessage": "!!!Open user.css",
2689 "end": { 2689 "end": {
2690 "column": 3, 2690 "column": 3,
2691 "line": 41 2691 "line": 42
2692 }, 2692 },
2693 "file": "src/components/settings/services/EditServiceForm.js", 2693 "file": "src/components/settings/services/EditServiceForm.js",
2694 "id": "settings.service.form.openUserCss", 2694 "id": "settings.service.form.openUserCss",
2695 "start": { 2695 "start": {
2696 "column": 15, 2696 "column": 15,
2697 "line": 38 2697 "line": 39
2698 } 2698 }
2699 }, 2699 },
2700 { 2700 {
2701 "defaultMessage": "!!!Open user.js", 2701 "defaultMessage": "!!!Open user.js",
2702 "end": { 2702 "end": {
2703 "column": 3, 2703 "column": 3,
2704 "line": 45 2704 "line": 46
2705 }, 2705 },
2706 "file": "src/components/settings/services/EditServiceForm.js", 2706 "file": "src/components/settings/services/EditServiceForm.js",
2707 "id": "settings.service.form.openUserJs", 2707 "id": "settings.service.form.openUserJs",
2708 "start": { 2708 "start": {
2709 "column": 14, 2709 "column": 14,
2710 "line": 42 2710 "line": 43
2711 } 2711 }
2712 }, 2712 },
2713 { 2713 {
2714 "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.", 2714 "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
2715 "end": { 2715 "end": {
2716 "column": 3, 2716 "column": 3,
2717 "line": 49 2717 "line": 50
2718 }, 2718 },
2719 "file": "src/components/settings/services/EditServiceForm.js", 2719 "file": "src/components/settings/services/EditServiceForm.js",
2720 "id": "settings.service.form.recipeFileInfo", 2720 "id": "settings.service.form.recipeFileInfo",
2721 "start": { 2721 "start": {
2722 "column": 18, 2722 "column": 18,
2723 "line": 46 2723 "line": 47
2724 } 2724 }
2725 }, 2725 },
2726 { 2726 {
2727 "defaultMessage": "!!!Available services", 2727 "defaultMessage": "!!!Available services",
2728 "end": { 2728 "end": {
2729 "column": 3, 2729 "column": 3,
2730 "line": 53 2730 "line": 54
2731 }, 2731 },
2732 "file": "src/components/settings/services/EditServiceForm.js", 2732 "file": "src/components/settings/services/EditServiceForm.js",
2733 "id": "settings.service.form.availableServices", 2733 "id": "settings.service.form.availableServices",
2734 "start": { 2734 "start": {
2735 "column": 21, 2735 "column": 21,
2736 "line": 50 2736 "line": 51
2737 } 2737 }
2738 }, 2738 },
2739 { 2739 {
2740 "defaultMessage": "!!!Your services", 2740 "defaultMessage": "!!!Your services",
2741 "end": { 2741 "end": {
2742 "column": 3, 2742 "column": 3,
2743 "line": 57 2743 "line": 58
2744 }, 2744 },
2745 "file": "src/components/settings/services/EditServiceForm.js", 2745 "file": "src/components/settings/services/EditServiceForm.js",
2746 "id": "settings.service.form.yourServices", 2746 "id": "settings.service.form.yourServices",
2747 "start": { 2747 "start": {
2748 "column": 16, 2748 "column": 16,
2749 "line": 54 2749 "line": 55
2750 } 2750 }
2751 }, 2751 },
2752 { 2752 {
2753 "defaultMessage": "!!!Add {name}", 2753 "defaultMessage": "!!!Add {name}",
2754 "end": { 2754 "end": {
2755 "column": 3, 2755 "column": 3,
2756 "line": 61 2756 "line": 62
2757 }, 2757 },
2758 "file": "src/components/settings/services/EditServiceForm.js", 2758 "file": "src/components/settings/services/EditServiceForm.js",
2759 "id": "settings.service.form.addServiceHeadline", 2759 "id": "settings.service.form.addServiceHeadline",
2760 "start": { 2760 "start": {
2761 "column": 22, 2761 "column": 22,
2762 "line": 58 2762 "line": 59
2763 } 2763 }
2764 }, 2764 },
2765 { 2765 {
2766 "defaultMessage": "!!!Edit {name}", 2766 "defaultMessage": "!!!Edit {name}",
2767 "end": { 2767 "end": {
2768 "column": 3, 2768 "column": 3,
2769 "line": 65 2769 "line": 66
2770 }, 2770 },
2771 "file": "src/components/settings/services/EditServiceForm.js", 2771 "file": "src/components/settings/services/EditServiceForm.js",
2772 "id": "settings.service.form.editServiceHeadline", 2772 "id": "settings.service.form.editServiceHeadline",
2773 "start": { 2773 "start": {
2774 "column": 23, 2774 "column": 23,
2775 "line": 62 2775 "line": 63
2776 } 2776 }
2777 }, 2777 },
2778 { 2778 {
2779 "defaultMessage": "!!!Hosted", 2779 "defaultMessage": "!!!Hosted",
2780 "end": { 2780 "end": {
2781 "column": 3, 2781 "column": 3,
2782 "line": 69 2782 "line": 70
2783 }, 2783 },
2784 "file": "src/components/settings/services/EditServiceForm.js", 2784 "file": "src/components/settings/services/EditServiceForm.js",
2785 "id": "settings.service.form.tabHosted", 2785 "id": "settings.service.form.tabHosted",
2786 "start": { 2786 "start": {
2787 "column": 13, 2787 "column": 13,
2788 "line": 66 2788 "line": 67
2789 } 2789 }
2790 }, 2790 },
2791 { 2791 {
2792 "defaultMessage": "!!!Self hosted ⭐️", 2792 "defaultMessage": "!!!Self hosted ⭐️",
2793 "end": { 2793 "end": {
2794 "column": 3, 2794 "column": 3,
2795 "line": 73 2795 "line": 74
2796 }, 2796 },
2797 "file": "src/components/settings/services/EditServiceForm.js", 2797 "file": "src/components/settings/services/EditServiceForm.js",
2798 "id": "settings.service.form.tabOnPremise", 2798 "id": "settings.service.form.tabOnPremise",
2799 "start": { 2799 "start": {
2800 "column": 16, 2800 "column": 16,
2801 "line": 70 2801 "line": 71
2802 } 2802 }
2803 }, 2803 },
2804 { 2804 {
2805 "defaultMessage": "!!!Use the hosted {name} service.", 2805 "defaultMessage": "!!!Use the hosted {name} service.",
2806 "end": { 2806 "end": {
2807 "column": 3, 2807 "column": 3,
2808 "line": 77 2808 "line": 78
2809 }, 2809 },
2810 "file": "src/components/settings/services/EditServiceForm.js", 2810 "file": "src/components/settings/services/EditServiceForm.js",
2811 "id": "settings.service.form.useHostedService", 2811 "id": "settings.service.form.useHostedService",
2812 "start": { 2812 "start": {
2813 "column": 20, 2813 "column": 20,
2814 "line": 74 2814 "line": 75
2815 } 2815 }
2816 }, 2816 },
2817 { 2817 {
2818 "defaultMessage": "!!!Could not validate custom {name} server.", 2818 "defaultMessage": "!!!Could not validate custom {name} server.",
2819 "end": { 2819 "end": {
2820 "column": 3, 2820 "column": 3,
2821 "line": 81 2821 "line": 82
2822 }, 2822 },
2823 "file": "src/components/settings/services/EditServiceForm.js", 2823 "file": "src/components/settings/services/EditServiceForm.js",
2824 "id": "settings.service.form.customUrlValidationError", 2824 "id": "settings.service.form.customUrlValidationError",
2825 "start": { 2825 "start": {
2826 "column": 28, 2826 "column": 28,
2827 "line": 78 2827 "line": 79
2828 } 2828 }
2829 }, 2829 },
2830 { 2830 {
2831 "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.", 2831 "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
2832 "end": { 2832 "end": {
2833 "column": 3, 2833 "column": 3,
2834 "line": 85 2834 "line": 86
2835 }, 2835 },
2836 "file": "src/components/settings/services/EditServiceForm.js", 2836 "file": "src/components/settings/services/EditServiceForm.js",
2837 "id": "settings.service.form.customUrlPremiumInfo", 2837 "id": "settings.service.form.customUrlPremiumInfo",
2838 "start": { 2838 "start": {
2839 "column": 24, 2839 "column": 24,
2840 "line": 82 2840 "line": 83
2841 } 2841 }
2842 }, 2842 },
2843 { 2843 {
2844 "defaultMessage": "!!!Upgrade your account", 2844 "defaultMessage": "!!!Upgrade your account",
2845 "end": { 2845 "end": {
2846 "column": 3, 2846 "column": 3,
2847 "line": 89 2847 "line": 90
2848 }, 2848 },
2849 "file": "src/components/settings/services/EditServiceForm.js", 2849 "file": "src/components/settings/services/EditServiceForm.js",
2850 "id": "settings.service.form.customUrlUpgradeAccount", 2850 "id": "settings.service.form.customUrlUpgradeAccount",
2851 "start": { 2851 "start": {
2852 "column": 27, 2852 "column": 27,
2853 "line": 86 2853 "line": 87
2854 } 2854 }
2855 }, 2855 },
2856 { 2856 {
2857 "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...", 2857 "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
2858 "end": { 2858 "end": {
2859 "column": 3, 2859 "column": 3,
2860 "line": 93 2860 "line": 94
2861 }, 2861 },
2862 "file": "src/components/settings/services/EditServiceForm.js", 2862 "file": "src/components/settings/services/EditServiceForm.js",
2863 "id": "settings.service.form.indirectMessageInfo", 2863 "id": "settings.service.form.indirectMessageInfo",
2864 "start": { 2864 "start": {
2865 "column": 23, 2865 "column": 23,
2866 "line": 90 2866 "line": 91
2867 } 2867 }
2868 }, 2868 },
2869 { 2869 {
2870 "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted", 2870 "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
2871 "end": { 2871 "end": {
2872 "column": 3, 2872 "column": 3,
2873 "line": 97 2873 "line": 98
2874 }, 2874 },
2875 "file": "src/components/settings/services/EditServiceForm.js", 2875 "file": "src/components/settings/services/EditServiceForm.js",
2876 "id": "settings.service.form.isMutedInfo", 2876 "id": "settings.service.form.isMutedInfo",
2877 "start": { 2877 "start": {
2878 "column": 15, 2878 "column": 15,
2879 "line": 94 2879 "line": 95
2880 } 2880 }
2881 }, 2881 },
2882 { 2882 {
2883 "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.", 2883 "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
2884 "end": { 2884 "end": {
2885 "column": 3, 2885 "column": 3,
2886 "line": 101 2886 "line": 102
2887 }, 2887 },
2888 "file": "src/components/settings/services/EditServiceForm.js", 2888 "file": "src/components/settings/services/EditServiceForm.js",
2889 "id": "settings.service.form.isHibernatedEnabledInfo", 2889 "id": "settings.service.form.isHibernatedEnabledInfo",
2890 "start": { 2890 "start": {
2891 "column": 28, 2891 "column": 28,
2892 "line": 98 2892 "line": 99
2893 } 2893 }
2894 }, 2894 },
2895 { 2895 {
2896 "defaultMessage": "!!!Notifications", 2896 "defaultMessage": "!!!Notifications",
2897 "end": { 2897 "end": {
2898 "column": 3, 2898 "column": 3,
2899 "line": 105 2899 "line": 106
2900 }, 2900 },
2901 "file": "src/components/settings/services/EditServiceForm.js", 2901 "file": "src/components/settings/services/EditServiceForm.js",
2902 "id": "settings.service.form.headlineNotifications", 2902 "id": "settings.service.form.headlineNotifications",
2903 "start": { 2903 "start": {
2904 "column": 25, 2904 "column": 25,
2905 "line": 102 2905 "line": 103
2906 } 2906 }
2907 }, 2907 },
2908 { 2908 {
2909 "defaultMessage": "!!!Unread message badges", 2909 "defaultMessage": "!!!Unread message badges",
2910 "end": { 2910 "end": {
2911 "column": 3, 2911 "column": 3,
2912 "line": 109 2912 "line": 110
2913 }, 2913 },
2914 "file": "src/components/settings/services/EditServiceForm.js", 2914 "file": "src/components/settings/services/EditServiceForm.js",
2915 "id": "settings.service.form.headlineBadges", 2915 "id": "settings.service.form.headlineBadges",
2916 "start": { 2916 "start": {
2917 "column": 18, 2917 "column": 18,
2918 "line": 106 2918 "line": 107
2919 } 2919 }
2920 }, 2920 },
2921 { 2921 {
2922 "defaultMessage": "!!!General", 2922 "defaultMessage": "!!!General",
2923 "end": { 2923 "end": {
2924 "column": 3, 2924 "column": 3,
2925 "line": 113 2925 "line": 114
2926 }, 2926 },
2927 "file": "src/components/settings/services/EditServiceForm.js", 2927 "file": "src/components/settings/services/EditServiceForm.js",
2928 "id": "settings.service.form.headlineGeneral", 2928 "id": "settings.service.form.headlineGeneral",
2929 "start": { 2929 "start": {
2930 "column": 19, 2930 "column": 19,
2931 "line": 110 2931 "line": 111
2932 } 2932 }
2933 }, 2933 },
2934 { 2934 {
2935 "defaultMessage": "!!!Dark Reader Settings", 2935 "defaultMessage": "!!!Dark Reader Settings",
2936 "end": { 2936 "end": {
2937 "column": 3, 2937 "column": 3,
2938 "line": 117 2938 "line": 118
2939 }, 2939 },
2940 "file": "src/components/settings/services/EditServiceForm.js", 2940 "file": "src/components/settings/services/EditServiceForm.js",
2941 "id": "settings.service.form.headlineDarkReaderSettings", 2941 "id": "settings.service.form.headlineDarkReaderSettings",
2942 "start": { 2942 "start": {
2943 "column": 30, 2943 "column": 30,
2944 "line": 114 2944 "line": 115
2945 } 2945 }
2946 }, 2946 },
2947 { 2947 {
2948 "defaultMessage": "!!!Delete", 2948 "defaultMessage": "!!!Delete",
2949 "end": { 2949 "end": {
2950 "column": 3, 2950 "column": 3,
2951 "line": 121 2951 "line": 122
2952 }, 2952 },
2953 "file": "src/components/settings/services/EditServiceForm.js", 2953 "file": "src/components/settings/services/EditServiceForm.js",
2954 "id": "settings.service.form.iconDelete", 2954 "id": "settings.service.form.iconDelete",
2955 "start": { 2955 "start": {
2956 "column": 14, 2956 "column": 14,
2957 "line": 118 2957 "line": 119
2958 } 2958 }
2959 }, 2959 },
2960 { 2960 {
2961 "defaultMessage": "!!!Drop your image, or click here", 2961 "defaultMessage": "!!!Drop your image, or click here",
2962 "end": { 2962 "end": {
2963 "column": 3, 2963 "column": 3,
2964 "line": 125 2964 "line": 126
2965 }, 2965 },
2966 "file": "src/components/settings/services/EditServiceForm.js", 2966 "file": "src/components/settings/services/EditServiceForm.js",
2967 "id": "settings.service.form.iconUpload", 2967 "id": "settings.service.form.iconUpload",
2968 "start": { 2968 "start": {
2969 "column": 14, 2969 "column": 14,
2970 "line": 122 2970 "line": 123
2971 } 2971 }
2972 }, 2972 },
2973 { 2973 {
2974 "defaultMessage": "!!!HTTP/HTTPS Proxy Settings", 2974 "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
2975 "end": { 2975 "end": {
2976 "column": 3, 2976 "column": 3,
2977 "line": 129 2977 "line": 130
2978 }, 2978 },
2979 "file": "src/components/settings/services/EditServiceForm.js", 2979 "file": "src/components/settings/services/EditServiceForm.js",
2980 "id": "settings.service.form.proxy.headline", 2980 "id": "settings.service.form.proxy.headline",
2981 "start": { 2981 "start": {
2982 "column": 17, 2982 "column": 17,
2983 "line": 126 2983 "line": 127
2984 } 2984 }
2985 }, 2985 },
2986 { 2986 {
2987 "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.", 2987 "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
2988 "end": { 2988 "end": {
2989 "column": 3, 2989 "column": 3,
2990 "line": 133 2990 "line": 134
2991 }, 2991 },
2992 "file": "src/components/settings/services/EditServiceForm.js", 2992 "file": "src/components/settings/services/EditServiceForm.js",
2993 "id": "settings.service.form.proxy.restartInfo", 2993 "id": "settings.service.form.proxy.restartInfo",
2994 "start": { 2994 "start": {
2995 "column": 20, 2995 "column": 20,
2996 "line": 130 2996 "line": 131
2997 } 2997 }
2998 }, 2998 },
2999 { 2999 {
3000 "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.", 3000 "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
3001 "end": { 3001 "end": {
3002 "column": 3, 3002 "column": 3,
3003 "line": 137 3003 "line": 138
3004 }, 3004 },
3005 "file": "src/components/settings/services/EditServiceForm.js", 3005 "file": "src/components/settings/services/EditServiceForm.js",
3006 "id": "settings.service.form.proxy.info", 3006 "id": "settings.service.form.proxy.info",
3007 "start": { 3007 "start": {
3008 "column": 13, 3008 "column": 13,
3009 "line": 134 3009 "line": 135
3010 } 3010 }
3011 } 3011 }
3012 ], 3012 ],
@@ -3241,416 +3241,416 @@
3241 "defaultMessage": "!!!Settings", 3241 "defaultMessage": "!!!Settings",
3242 "end": { 3242 "end": {
3243 "column": 3, 3243 "column": 3,
3244 "line": 26 3244 "line": 27
3245 }, 3245 },
3246 "file": "src/components/settings/settings/EditSettingsForm.js", 3246 "file": "src/components/settings/settings/EditSettingsForm.js",
3247 "id": "settings.app.headline", 3247 "id": "settings.app.headline",
3248 "start": { 3248 "start": {
3249 "column": 12, 3249 "column": 12,
3250 "line": 23 3250 "line": 24
3251 } 3251 }
3252 }, 3252 },
3253 { 3253 {
3254 "defaultMessage": "!!!General", 3254 "defaultMessage": "!!!General",
3255 "end": { 3255 "end": {
3256 "column": 3, 3256 "column": 3,
3257 "line": 30 3257 "line": 31
3258 }, 3258 },
3259 "file": "src/components/settings/settings/EditSettingsForm.js", 3259 "file": "src/components/settings/settings/EditSettingsForm.js",
3260 "id": "settings.app.headlineGeneral", 3260 "id": "settings.app.headlineGeneral",
3261 "start": { 3261 "start": {
3262 "column": 19, 3262 "column": 19,
3263 "line": 27 3263 "line": 28
3264 } 3264 }
3265 }, 3265 },
3266 { 3266 {
3267 "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.", 3267 "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.",
3268 "end": { 3268 "end": {
3269 "column": 3, 3269 "column": 3,
3270 "line": 34 3270 "line": 35
3271 }, 3271 },
3272 "file": "src/components/settings/settings/EditSettingsForm.js", 3272 "file": "src/components/settings/settings/EditSettingsForm.js",
3273 "id": "settings.app.sentryInfo", 3273 "id": "settings.app.sentryInfo",
3274 "start": { 3274 "start": {
3275 "column": 14, 3275 "column": 14,
3276 "line": 31 3276 "line": 32
3277 } 3277 }
3278 }, 3278 },
3279 { 3279 {
3280 "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.", 3280 "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.",
3281 "end": { 3281 "end": {
3282 "column": 3, 3282 "column": 3,
3283 "line": 38 3283 "line": 39
3284 }, 3284 },
3285 "file": "src/components/settings/settings/EditSettingsForm.js", 3285 "file": "src/components/settings/settings/EditSettingsForm.js",
3286 "id": "settings.app.hibernateInfo", 3286 "id": "settings.app.hibernateInfo",
3287 "start": { 3287 "start": {
3288 "column": 17, 3288 "column": 17,
3289 "line": 35 3289 "line": 36
3290 } 3290 }
3291 }, 3291 },
3292 { 3292 {
3293 "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", 3293 "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
3294 "end": { 3294 "end": {
3295 "column": 3, 3295 "column": 3,
3296 "line": 42 3296 "line": 43
3297 }, 3297 },
3298 "file": "src/components/settings/settings/EditSettingsForm.js", 3298 "file": "src/components/settings/settings/EditSettingsForm.js",
3299 "id": "settings.app.inactivityLockInfo", 3299 "id": "settings.app.inactivityLockInfo",
3300 "start": { 3300 "start": {
3301 "column": 22, 3301 "column": 22,
3302 "line": 39 3302 "line": 40
3303 } 3303 }
3304 }, 3304 },
3305 { 3305 {
3306 "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", 3306 "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
3307 "end": { 3307 "end": {
3308 "column": 3, 3308 "column": 3,
3309 "line": 46 3309 "line": 47
3310 }, 3310 },
3311 "file": "src/components/settings/settings/EditSettingsForm.js", 3311 "file": "src/components/settings/settings/EditSettingsForm.js",
3312 "id": "settings.app.todoServerInfo", 3312 "id": "settings.app.todoServerInfo",
3313 "start": { 3313 "start": {
3314 "column": 18, 3314 "column": 18,
3315 "line": 43 3315 "line": 44
3316 } 3316 }
3317 }, 3317 },
3318 { 3318 {
3319 "defaultMessage": "!!!Password", 3319 "defaultMessage": "!!!Password",
3320 "end": { 3320 "end": {
3321 "column": 3, 3321 "column": 3,
3322 "line": 50 3322 "line": 51
3323 }, 3323 },
3324 "file": "src/components/settings/settings/EditSettingsForm.js", 3324 "file": "src/components/settings/settings/EditSettingsForm.js",
3325 "id": "settings.app.lockedPassword", 3325 "id": "settings.app.lockedPassword",
3326 "start": { 3326 "start": {
3327 "column": 18, 3327 "column": 18,
3328 "line": 47 3328 "line": 48
3329 } 3329 }
3330 }, 3330 },
3331 { 3331 {
3332 "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", 3332 "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
3333 "end": { 3333 "end": {
3334 "column": 3, 3334 "column": 3,
3335 "line": 54 3335 "line": 55
3336 }, 3336 },
3337 "file": "src/components/settings/settings/EditSettingsForm.js", 3337 "file": "src/components/settings/settings/EditSettingsForm.js",
3338 "id": "settings.app.lockedPasswordInfo", 3338 "id": "settings.app.lockedPasswordInfo",
3339 "start": { 3339 "start": {
3340 "column": 22, 3340 "column": 22,
3341 "line": 51 3341 "line": 52
3342 } 3342 }
3343 }, 3343 },
3344 { 3344 {
3345 "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.", 3345 "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.",
3346 "end": { 3346 "end": {
3347 "column": 3, 3347 "column": 3,
3348 "line": 58 3348 "line": 59
3349 }, 3349 },
3350 "file": "src/components/settings/settings/EditSettingsForm.js", 3350 "file": "src/components/settings/settings/EditSettingsForm.js",
3351 "id": "settings.app.lockInfo", 3351 "id": "settings.app.lockInfo",
3352 "start": { 3352 "start": {
3353 "column": 12, 3353 "column": 12,
3354 "line": 55 3354 "line": 56
3355 } 3355 }
3356 }, 3356 },
3357 { 3357 {
3358 "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.", 3358 "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.",
3359 "end": { 3359 "end": {
3360 "column": 3, 3360 "column": 3,
3361 "line": 62 3361 "line": 63
3362 }, 3362 },
3363 "file": "src/components/settings/settings/EditSettingsForm.js", 3363 "file": "src/components/settings/settings/EditSettingsForm.js",
3364 "id": "settings.app.scheduledDNDTimeInfo", 3364 "id": "settings.app.scheduledDNDTimeInfo",
3365 "start": { 3365 "start": {
3366 "column": 24, 3366 "column": 24,
3367 "line": 59 3367 "line": 60
3368 } 3368 }
3369 }, 3369 },
3370 { 3370 {
3371 "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", 3371 "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
3372 "end": { 3372 "end": {
3373 "column": 3, 3373 "column": 3,
3374 "line": 66 3374 "line": 67
3375 }, 3375 },
3376 "file": "src/components/settings/settings/EditSettingsForm.js", 3376 "file": "src/components/settings/settings/EditSettingsForm.js",
3377 "id": "settings.app.scheduledDNDInfo", 3377 "id": "settings.app.scheduledDNDInfo",
3378 "start": { 3378 "start": {
3379 "column": 20, 3379 "column": 20,
3380 "line": 63 3380 "line": 64
3381 } 3381 }
3382 }, 3382 },
3383 { 3383 {
3384 "defaultMessage": "!!!Language", 3384 "defaultMessage": "!!!Language",
3385 "end": { 3385 "end": {
3386 "column": 3, 3386 "column": 3,
3387 "line": 70 3387 "line": 71
3388 }, 3388 },
3389 "file": "src/components/settings/settings/EditSettingsForm.js", 3389 "file": "src/components/settings/settings/EditSettingsForm.js",
3390 "id": "settings.app.headlineLanguage", 3390 "id": "settings.app.headlineLanguage",
3391 "start": { 3391 "start": {
3392 "column": 20, 3392 "column": 20,
3393 "line": 67 3393 "line": 68
3394 } 3394 }
3395 }, 3395 },
3396 { 3396 {
3397 "defaultMessage": "!!!Updates", 3397 "defaultMessage": "!!!Updates",
3398 "end": { 3398 "end": {
3399 "column": 3, 3399 "column": 3,
3400 "line": 74 3400 "line": 75
3401 }, 3401 },
3402 "file": "src/components/settings/settings/EditSettingsForm.js", 3402 "file": "src/components/settings/settings/EditSettingsForm.js",
3403 "id": "settings.app.headlineUpdates", 3403 "id": "settings.app.headlineUpdates",
3404 "start": { 3404 "start": {
3405 "column": 19, 3405 "column": 19,
3406 "line": 71 3406 "line": 72
3407 } 3407 }
3408 }, 3408 },
3409 { 3409 {
3410 "defaultMessage": "!!!Appearance", 3410 "defaultMessage": "!!!Appearance",
3411 "end": { 3411 "end": {
3412 "column": 3, 3412 "column": 3,
3413 "line": 78 3413 "line": 79
3414 }, 3414 },
3415 "file": "src/components/settings/settings/EditSettingsForm.js", 3415 "file": "src/components/settings/settings/EditSettingsForm.js",
3416 "id": "settings.app.headlineAppearance", 3416 "id": "settings.app.headlineAppearance",
3417 "start": { 3417 "start": {
3418 "column": 22, 3418 "column": 22,
3419 "line": 75 3419 "line": 76
3420 } 3420 }
3421 }, 3421 },
3422 { 3422 {
3423 "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", 3423 "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
3424 "end": { 3424 "end": {
3425 "column": 3, 3425 "column": 3,
3426 "line": 82 3426 "line": 83
3427 }, 3427 },
3428 "file": "src/components/settings/settings/EditSettingsForm.js", 3428 "file": "src/components/settings/settings/EditSettingsForm.js",
3429 "id": "settings.app.universalDarkModeInfo", 3429 "id": "settings.app.universalDarkModeInfo",
3430 "start": { 3430 "start": {
3431 "column": 25, 3431 "column": 25,
3432 "line": 79 3432 "line": 80
3433 } 3433 }
3434 }, 3434 },
3435 { 3435 {
3436 "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})", 3436 "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
3437 "end": { 3437 "end": {
3438 "column": 3, 3438 "column": 3,
3439 "line": 86 3439 "line": 87
3440 }, 3440 },
3441 "file": "src/components/settings/settings/EditSettingsForm.js", 3441 "file": "src/components/settings/settings/EditSettingsForm.js",
3442 "id": "settings.app.accentColorInfo", 3442 "id": "settings.app.accentColorInfo",
3443 "start": { 3443 "start": {
3444 "column": 19, 3444 "column": 19,
3445 "line": 83 3445 "line": 84
3446 } 3446 }
3447 }, 3447 },
3448 { 3448 {
3449 "defaultMessage": "!!!Privacy", 3449 "defaultMessage": "!!!Privacy",
3450 "end": { 3450 "end": {
3451 "column": 3, 3451 "column": 3,
3452 "line": 90 3452 "line": 91
3453 }, 3453 },
3454 "file": "src/components/settings/settings/EditSettingsForm.js", 3454 "file": "src/components/settings/settings/EditSettingsForm.js",
3455 "id": "settings.app.headlinePrivacy", 3455 "id": "settings.app.headlinePrivacy",
3456 "start": { 3456 "start": {
3457 "column": 19, 3457 "column": 19,
3458 "line": 87 3458 "line": 88
3459 } 3459 }
3460 }, 3460 },
3461 { 3461 {
3462 "defaultMessage": "!!!Advanced", 3462 "defaultMessage": "!!!Advanced",
3463 "end": { 3463 "end": {
3464 "column": 3, 3464 "column": 3,
3465 "line": 94 3465 "line": 95
3466 }, 3466 },
3467 "file": "src/components/settings/settings/EditSettingsForm.js", 3467 "file": "src/components/settings/settings/EditSettingsForm.js",
3468 "id": "settings.app.headlineAdvanced", 3468 "id": "settings.app.headlineAdvanced",
3469 "start": { 3469 "start": {
3470 "column": 20, 3470 "column": 20,
3471 "line": 91 3471 "line": 92
3472 } 3472 }
3473 }, 3473 },
3474 { 3474 {
3475 "defaultMessage": "!!!Help us to translate Ferdi into your language.", 3475 "defaultMessage": "!!!Help us to translate Ferdi into your language.",
3476 "end": { 3476 "end": {
3477 "column": 3, 3477 "column": 3,
3478 "line": 98 3478 "line": 99
3479 }, 3479 },
3480 "file": "src/components/settings/settings/EditSettingsForm.js", 3480 "file": "src/components/settings/settings/EditSettingsForm.js",
3481 "id": "settings.app.translationHelp", 3481 "id": "settings.app.translationHelp",
3482 "start": { 3482 "start": {
3483 "column": 19, 3483 "column": 19,
3484 "line": 95 3484 "line": 96
3485 } 3485 }
3486 }, 3486 },
3487 { 3487 {
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.", 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.",
3489 "end": { 3489 "end": {
3490 "column": 3, 3490 "column": 3,
3491 "line": 102 3491 "line": 103
3492 }, 3492 },
3493 "file": "src/components/settings/settings/EditSettingsForm.js", 3493 "file": "src/components/settings/settings/EditSettingsForm.js",
3494 "id": "settings.app.spellCheckerLanguageInfo", 3494 "id": "settings.app.spellCheckerLanguageInfo",
3495 "start": { 3495 "start": {
3496 "column": 28, 3496 "column": 28,
3497 "line": 99 3497 "line": 100
3498 } 3498 }
3499 }, 3499 },
3500 { 3500 {
3501 "defaultMessage": "!!!Cache", 3501 "defaultMessage": "!!!Cache",
3502 "end": { 3502 "end": {
3503 "column": 3, 3503 "column": 3,
3504 "line": 106 3504 "line": 107
3505 }, 3505 },
3506 "file": "src/components/settings/settings/EditSettingsForm.js", 3506 "file": "src/components/settings/settings/EditSettingsForm.js",
3507 "id": "settings.app.subheadlineCache", 3507 "id": "settings.app.subheadlineCache",
3508 "start": { 3508 "start": {
3509 "column": 20, 3509 "column": 20,
3510 "line": 103 3510 "line": 104
3511 } 3511 }
3512 }, 3512 },
3513 { 3513 {
3514 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", 3514 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
3515 "end": { 3515 "end": {
3516 "column": 3, 3516 "column": 3,
3517 "line": 110 3517 "line": 111
3518 }, 3518 },
3519 "file": "src/components/settings/settings/EditSettingsForm.js", 3519 "file": "src/components/settings/settings/EditSettingsForm.js",
3520 "id": "settings.app.cacheInfo", 3520 "id": "settings.app.cacheInfo",
3521 "start": { 3521 "start": {
3522 "column": 13, 3522 "column": 13,
3523 "line": 107 3523 "line": 108
3524 } 3524 }
3525 }, 3525 },
3526 { 3526 {
3527 "defaultMessage": "!!!Couldn't clear all cache", 3527 "defaultMessage": "!!!Couldn't clear all cache",
3528 "end": { 3528 "end": {
3529 "column": 3, 3529 "column": 3,
3530 "line": 114 3530 "line": 115
3531 }, 3531 },
3532 "file": "src/components/settings/settings/EditSettingsForm.js", 3532 "file": "src/components/settings/settings/EditSettingsForm.js",
3533 "id": "settings.app.cacheNotCleared", 3533 "id": "settings.app.cacheNotCleared",
3534 "start": { 3534 "start": {
3535 "column": 19, 3535 "column": 19,
3536 "line": 111 3536 "line": 112
3537 } 3537 }
3538 }, 3538 },
3539 { 3539 {
3540 "defaultMessage": "!!!Clear cache", 3540 "defaultMessage": "!!!Clear cache",
3541 "end": { 3541 "end": {
3542 "column": 3, 3542 "column": 3,
3543 "line": 118 3543 "line": 119
3544 }, 3544 },
3545 "file": "src/components/settings/settings/EditSettingsForm.js", 3545 "file": "src/components/settings/settings/EditSettingsForm.js",
3546 "id": "settings.app.buttonClearAllCache", 3546 "id": "settings.app.buttonClearAllCache",
3547 "start": { 3547 "start": {
3548 "column": 23, 3548 "column": 23,
3549 "line": 115 3549 "line": 116
3550 } 3550 }
3551 }, 3551 },
3552 { 3552 {
3553 "defaultMessage": "!!!Check for updates", 3553 "defaultMessage": "!!!Check for updates",
3554 "end": { 3554 "end": {
3555 "column": 3, 3555 "column": 3,
3556 "line": 122 3556 "line": 123
3557 }, 3557 },
3558 "file": "src/components/settings/settings/EditSettingsForm.js", 3558 "file": "src/components/settings/settings/EditSettingsForm.js",
3559 "id": "settings.app.buttonSearchForUpdate", 3559 "id": "settings.app.buttonSearchForUpdate",
3560 "start": { 3560 "start": {
3561 "column": 25, 3561 "column": 25,
3562 "line": 119 3562 "line": 120
3563 } 3563 }
3564 }, 3564 },
3565 { 3565 {
3566 "defaultMessage": "!!!Restart & install update", 3566 "defaultMessage": "!!!Restart & install update",
3567 "end": { 3567 "end": {
3568 "column": 3, 3568 "column": 3,
3569 "line": 126 3569 "line": 127
3570 }, 3570 },
3571 "file": "src/components/settings/settings/EditSettingsForm.js", 3571 "file": "src/components/settings/settings/EditSettingsForm.js",
3572 "id": "settings.app.buttonInstallUpdate", 3572 "id": "settings.app.buttonInstallUpdate",
3573 "start": { 3573 "start": {
3574 "column": 23, 3574 "column": 23,
3575 "line": 123 3575 "line": 124
3576 } 3576 }
3577 }, 3577 },
3578 { 3578 {
3579 "defaultMessage": "!!!Is searching for update", 3579 "defaultMessage": "!!!Is searching for update",
3580 "end": { 3580 "end": {
3581 "column": 3, 3581 "column": 3,
3582 "line": 130 3582 "line": 131
3583 }, 3583 },
3584 "file": "src/components/settings/settings/EditSettingsForm.js", 3584 "file": "src/components/settings/settings/EditSettingsForm.js",
3585 "id": "settings.app.updateStatusSearching", 3585 "id": "settings.app.updateStatusSearching",
3586 "start": { 3586 "start": {
3587 "column": 25, 3587 "column": 25,
3588 "line": 127 3588 "line": 128
3589 } 3589 }
3590 }, 3590 },
3591 { 3591 {
3592 "defaultMessage": "!!!Update available, downloading...", 3592 "defaultMessage": "!!!Update available, downloading...",
3593 "end": { 3593 "end": {
3594 "column": 3, 3594 "column": 3,
3595 "line": 134 3595 "line": 135
3596 }, 3596 },
3597 "file": "src/components/settings/settings/EditSettingsForm.js", 3597 "file": "src/components/settings/settings/EditSettingsForm.js",
3598 "id": "settings.app.updateStatusAvailable", 3598 "id": "settings.app.updateStatusAvailable",
3599 "start": { 3599 "start": {
3600 "column": 25, 3600 "column": 25,
3601 "line": 131 3601 "line": 132
3602 } 3602 }
3603 }, 3603 },
3604 { 3604 {
3605 "defaultMessage": "!!!You are using the latest version of Ferdi", 3605 "defaultMessage": "!!!You are using the latest version of Ferdi",
3606 "end": { 3606 "end": {
3607 "column": 3, 3607 "column": 3,
3608 "line": 138 3608 "line": 139
3609 }, 3609 },
3610 "file": "src/components/settings/settings/EditSettingsForm.js", 3610 "file": "src/components/settings/settings/EditSettingsForm.js",
3611 "id": "settings.app.updateStatusUpToDate", 3611 "id": "settings.app.updateStatusUpToDate",
3612 "start": { 3612 "start": {
3613 "column": 24, 3613 "column": 24,
3614 "line": 135 3614 "line": 136
3615 } 3615 }
3616 }, 3616 },
3617 { 3617 {
3618 "defaultMessage": "!!!Current version:", 3618 "defaultMessage": "!!!Current version:",
3619 "end": { 3619 "end": {
3620 "column": 3, 3620 "column": 3,
3621 "line": 142 3621 "line": 143
3622 }, 3622 },
3623 "file": "src/components/settings/settings/EditSettingsForm.js", 3623 "file": "src/components/settings/settings/EditSettingsForm.js",
3624 "id": "settings.app.currentVersion", 3624 "id": "settings.app.currentVersion",
3625 "start": { 3625 "start": {
3626 "column": 18, 3626 "column": 18,
3627 "line": 139 3627 "line": 140
3628 } 3628 }
3629 }, 3629 },
3630 { 3630 {
3631 "defaultMessage": "!!!Changes require restart", 3631 "defaultMessage": "!!!Changes require restart",
3632 "end": { 3632 "end": {
3633 "column": 3, 3633 "column": 3,
3634 "line": 146 3634 "line": 147
3635 }, 3635 },
3636 "file": "src/components/settings/settings/EditSettingsForm.js", 3636 "file": "src/components/settings/settings/EditSettingsForm.js",
3637 "id": "settings.app.restartRequired", 3637 "id": "settings.app.restartRequired",
3638 "start": { 3638 "start": {
3639 "column": 22, 3639 "column": 22,
3640 "line": 143 3640 "line": 144
3641 } 3641 }
3642 }, 3642 },
3643 { 3643 {
3644 "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.",
3645 "end": { 3645 "end": {
3646 "column": 3, 3646 "column": 3,
3647 "line": 150 3647 "line": 151
3648 }, 3648 },
3649 "file": "src/components/settings/settings/EditSettingsForm.js", 3649 "file": "src/components/settings/settings/EditSettingsForm.js",
3650 "id": "settings.app.languageDisclaimer", 3650 "id": "settings.app.languageDisclaimer",
3651 "start": { 3651 "start": {
3652 "column": 22, 3652 "column": 22,
3653 "line": 147 3653 "line": 148
3654 } 3654 }
3655 } 3655 }
3656 ], 3656 ],
@@ -7430,16 +7430,29 @@
7430 } 7430 }
7431 }, 7431 },
7432 { 7432 {
7433 "defaultMessage": "!!!Franz Professional Required", 7433 "defaultMessage": "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
7434 "end": { 7434 "end": {
7435 "column": 3, 7435 "column": 3,
7436 "line": 35 7436 "line": 35
7437 }, 7437 },
7438 "file": "src/i18n/globalMessages.js", 7438 "file": "src/i18n/globalMessages.js",
7439 "id": "global.userAgentHelp",
7440 "start": {
7441 "column": 17,
7442 "line": 32
7443 }
7444 },
7445 {
7446 "defaultMessage": "!!!Franz Professional Required",
7447 "end": {
7448 "column": 3,
7449 "line": 39
7450 },
7451 "file": "src/i18n/globalMessages.js",
7439 "id": "global.franzProRequired", 7452 "id": "global.franzProRequired",
7440 "start": { 7453 "start": {
7441 "column": 15, 7454 "column": 15,
7442 "line": 32 7455 "line": 36
7443 } 7456 }
7444 } 7457 }
7445 ], 7458 ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 05a8e7486..ab2be014b 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -75,6 +75,7 @@
75 "global.spellchecking.autodetect.short": "Automatic", 75 "global.spellchecking.autodetect.short": "Automatic",
76 "global.spellchecking.language": "Spell checking language", 76 "global.spellchecking.language": "Spell checking language",
77 "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional", 77 "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
78 "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
78 "global.userAgentPref": "User Agent", 79 "global.userAgentPref": "User Agent",
79 "import.headline": "Import your Ferdi 4 services", 80 "import.headline": "Import your Ferdi 4 services",
80 "import.notSupportedHeadline": "Services not yet supported in Ferdi 5", 81 "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
index 182678823..0aee52148 100644
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -4,11 +4,11 @@
4 "defaultMessage": "!!!Save service", 4 "defaultMessage": "!!!Save service",
5 "file": "src/components/settings/services/EditServiceForm.js", 5 "file": "src/components/settings/services/EditServiceForm.js",
6 "start": { 6 "start": {
7 "line": 26, 7 "line": 27,
8 "column": 15 8 "column": 15
9 }, 9 },
10 "end": { 10 "end": {
11 "line": 29, 11 "line": 30,
12 "column": 3 12 "column": 3
13 } 13 }
14 }, 14 },
@@ -17,11 +17,11 @@
17 "defaultMessage": "!!!Delete Service", 17 "defaultMessage": "!!!Delete Service",
18 "file": "src/components/settings/services/EditServiceForm.js", 18 "file": "src/components/settings/services/EditServiceForm.js",
19 "start": { 19 "start": {
20 "line": 30, 20 "line": 31,
21 "column": 17 21 "column": 17
22 }, 22 },
23 "end": { 23 "end": {
24 "line": 33, 24 "line": 34,
25 "column": 3 25 "column": 3
26 } 26 }
27 }, 27 },
@@ -30,11 +30,11 @@
30 "defaultMessage": "!!!Open darkmode.css", 30 "defaultMessage": "!!!Open darkmode.css",
31 "file": "src/components/settings/services/EditServiceForm.js", 31 "file": "src/components/settings/services/EditServiceForm.js",
32 "start": { 32 "start": {
33 "line": 34, 33 "line": 35,
34 "column": 19 34 "column": 19
35 }, 35 },
36 "end": { 36 "end": {
37 "line": 37, 37 "line": 38,
38 "column": 3 38 "column": 3
39 } 39 }
40 }, 40 },
@@ -43,11 +43,11 @@
43 "defaultMessage": "!!!Open user.css", 43 "defaultMessage": "!!!Open user.css",
44 "file": "src/components/settings/services/EditServiceForm.js", 44 "file": "src/components/settings/services/EditServiceForm.js",
45 "start": { 45 "start": {
46 "line": 38, 46 "line": 39,
47 "column": 15 47 "column": 15
48 }, 48 },
49 "end": { 49 "end": {
50 "line": 41, 50 "line": 42,
51 "column": 3 51 "column": 3
52 } 52 }
53 }, 53 },
@@ -56,11 +56,11 @@
56 "defaultMessage": "!!!Open user.js", 56 "defaultMessage": "!!!Open user.js",
57 "file": "src/components/settings/services/EditServiceForm.js", 57 "file": "src/components/settings/services/EditServiceForm.js",
58 "start": { 58 "start": {
59 "line": 42, 59 "line": 43,
60 "column": 14 60 "column": 14
61 }, 61 },
62 "end": { 62 "end": {
63 "line": 45, 63 "line": 46,
64 "column": 3 64 "column": 3
65 } 65 }
66 }, 66 },
@@ -69,11 +69,11 @@
69 "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.", 69 "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
70 "file": "src/components/settings/services/EditServiceForm.js", 70 "file": "src/components/settings/services/EditServiceForm.js",
71 "start": { 71 "start": {
72 "line": 46, 72 "line": 47,
73 "column": 18 73 "column": 18
74 }, 74 },
75 "end": { 75 "end": {
76 "line": 49, 76 "line": 50,
77 "column": 3 77 "column": 3
78 } 78 }
79 }, 79 },
@@ -82,11 +82,11 @@
82 "defaultMessage": "!!!Available services", 82 "defaultMessage": "!!!Available services",
83 "file": "src/components/settings/services/EditServiceForm.js", 83 "file": "src/components/settings/services/EditServiceForm.js",
84 "start": { 84 "start": {
85 "line": 50, 85 "line": 51,
86 "column": 21 86 "column": 21
87 }, 87 },
88 "end": { 88 "end": {
89 "line": 53, 89 "line": 54,
90 "column": 3 90 "column": 3
91 } 91 }
92 }, 92 },
@@ -95,11 +95,11 @@
95 "defaultMessage": "!!!Your services", 95 "defaultMessage": "!!!Your services",
96 "file": "src/components/settings/services/EditServiceForm.js", 96 "file": "src/components/settings/services/EditServiceForm.js",
97 "start": { 97 "start": {
98 "line": 54, 98 "line": 55,
99 "column": 16 99 "column": 16
100 }, 100 },
101 "end": { 101 "end": {
102 "line": 57, 102 "line": 58,
103 "column": 3 103 "column": 3
104 } 104 }
105 }, 105 },
@@ -108,11 +108,11 @@
108 "defaultMessage": "!!!Add {name}", 108 "defaultMessage": "!!!Add {name}",
109 "file": "src/components/settings/services/EditServiceForm.js", 109 "file": "src/components/settings/services/EditServiceForm.js",
110 "start": { 110 "start": {
111 "line": 58, 111 "line": 59,
112 "column": 22 112 "column": 22
113 }, 113 },
114 "end": { 114 "end": {
115 "line": 61, 115 "line": 62,
116 "column": 3 116 "column": 3
117 } 117 }
118 }, 118 },
@@ -121,11 +121,11 @@
121 "defaultMessage": "!!!Edit {name}", 121 "defaultMessage": "!!!Edit {name}",
122 "file": "src/components/settings/services/EditServiceForm.js", 122 "file": "src/components/settings/services/EditServiceForm.js",
123 "start": { 123 "start": {
124 "line": 62, 124 "line": 63,
125 "column": 23 125 "column": 23
126 }, 126 },
127 "end": { 127 "end": {
128 "line": 65, 128 "line": 66,
129 "column": 3 129 "column": 3
130 } 130 }
131 }, 131 },
@@ -134,11 +134,11 @@
134 "defaultMessage": "!!!Hosted", 134 "defaultMessage": "!!!Hosted",
135 "file": "src/components/settings/services/EditServiceForm.js", 135 "file": "src/components/settings/services/EditServiceForm.js",
136 "start": { 136 "start": {
137 "line": 66, 137 "line": 67,
138 "column": 13 138 "column": 13
139 }, 139 },
140 "end": { 140 "end": {
141 "line": 69, 141 "line": 70,
142 "column": 3 142 "column": 3
143 } 143 }
144 }, 144 },
@@ -147,11 +147,11 @@
147 "defaultMessage": "!!!Self hosted ⭐️", 147 "defaultMessage": "!!!Self hosted ⭐️",
148 "file": "src/components/settings/services/EditServiceForm.js", 148 "file": "src/components/settings/services/EditServiceForm.js",
149 "start": { 149 "start": {
150 "line": 70, 150 "line": 71,
151 "column": 16 151 "column": 16
152 }, 152 },
153 "end": { 153 "end": {
154 "line": 73, 154 "line": 74,
155 "column": 3 155 "column": 3
156 } 156 }
157 }, 157 },
@@ -160,11 +160,11 @@
160 "defaultMessage": "!!!Use the hosted {name} service.", 160 "defaultMessage": "!!!Use the hosted {name} service.",
161 "file": "src/components/settings/services/EditServiceForm.js", 161 "file": "src/components/settings/services/EditServiceForm.js",
162 "start": { 162 "start": {
163 "line": 74, 163 "line": 75,
164 "column": 20 164 "column": 20
165 }, 165 },
166 "end": { 166 "end": {
167 "line": 77, 167 "line": 78,
168 "column": 3 168 "column": 3
169 } 169 }
170 }, 170 },
@@ -173,11 +173,11 @@
173 "defaultMessage": "!!!Could not validate custom {name} server.", 173 "defaultMessage": "!!!Could not validate custom {name} server.",
174 "file": "src/components/settings/services/EditServiceForm.js", 174 "file": "src/components/settings/services/EditServiceForm.js",
175 "start": { 175 "start": {
176 "line": 78, 176 "line": 79,
177 "column": 28 177 "column": 28
178 }, 178 },
179 "end": { 179 "end": {
180 "line": 81, 180 "line": 82,
181 "column": 3 181 "column": 3
182 } 182 }
183 }, 183 },
@@ -186,11 +186,11 @@
186 "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.", 186 "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
187 "file": "src/components/settings/services/EditServiceForm.js", 187 "file": "src/components/settings/services/EditServiceForm.js",
188 "start": { 188 "start": {
189 "line": 82, 189 "line": 83,
190 "column": 24 190 "column": 24
191 }, 191 },
192 "end": { 192 "end": {
193 "line": 85, 193 "line": 86,
194 "column": 3 194 "column": 3
195 } 195 }
196 }, 196 },
@@ -199,11 +199,11 @@
199 "defaultMessage": "!!!Upgrade your account", 199 "defaultMessage": "!!!Upgrade your account",
200 "file": "src/components/settings/services/EditServiceForm.js", 200 "file": "src/components/settings/services/EditServiceForm.js",
201 "start": { 201 "start": {
202 "line": 86, 202 "line": 87,
203 "column": 27 203 "column": 27
204 }, 204 },
205 "end": { 205 "end": {
206 "line": 89, 206 "line": 90,
207 "column": 3 207 "column": 3
208 } 208 }
209 }, 209 },
@@ -212,11 +212,11 @@
212 "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...", 212 "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
213 "file": "src/components/settings/services/EditServiceForm.js", 213 "file": "src/components/settings/services/EditServiceForm.js",
214 "start": { 214 "start": {
215 "line": 90, 215 "line": 91,
216 "column": 23 216 "column": 23
217 }, 217 },
218 "end": { 218 "end": {
219 "line": 93, 219 "line": 94,
220 "column": 3 220 "column": 3
221 } 221 }
222 }, 222 },
@@ -225,11 +225,11 @@
225 "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted", 225 "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
226 "file": "src/components/settings/services/EditServiceForm.js", 226 "file": "src/components/settings/services/EditServiceForm.js",
227 "start": { 227 "start": {
228 "line": 94, 228 "line": 95,
229 "column": 15 229 "column": 15
230 }, 230 },
231 "end": { 231 "end": {
232 "line": 97, 232 "line": 98,
233 "column": 3 233 "column": 3
234 } 234 }
235 }, 235 },
@@ -238,11 +238,11 @@
238 "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.", 238 "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
239 "file": "src/components/settings/services/EditServiceForm.js", 239 "file": "src/components/settings/services/EditServiceForm.js",
240 "start": { 240 "start": {
241 "line": 98, 241 "line": 99,
242 "column": 28 242 "column": 28
243 }, 243 },
244 "end": { 244 "end": {
245 "line": 101, 245 "line": 102,
246 "column": 3 246 "column": 3
247 } 247 }
248 }, 248 },
@@ -251,11 +251,11 @@
251 "defaultMessage": "!!!Notifications", 251 "defaultMessage": "!!!Notifications",
252 "file": "src/components/settings/services/EditServiceForm.js", 252 "file": "src/components/settings/services/EditServiceForm.js",
253 "start": { 253 "start": {
254 "line": 102, 254 "line": 103,
255 "column": 25 255 "column": 25
256 }, 256 },
257 "end": { 257 "end": {
258 "line": 105, 258 "line": 106,
259 "column": 3 259 "column": 3
260 } 260 }
261 }, 261 },
@@ -264,11 +264,11 @@
264 "defaultMessage": "!!!Unread message badges", 264 "defaultMessage": "!!!Unread message badges",
265 "file": "src/components/settings/services/EditServiceForm.js", 265 "file": "src/components/settings/services/EditServiceForm.js",
266 "start": { 266 "start": {
267 "line": 106, 267 "line": 107,
268 "column": 18 268 "column": 18
269 }, 269 },
270 "end": { 270 "end": {
271 "line": 109, 271 "line": 110,
272 "column": 3 272 "column": 3
273 } 273 }
274 }, 274 },
@@ -277,11 +277,11 @@
277 "defaultMessage": "!!!General", 277 "defaultMessage": "!!!General",
278 "file": "src/components/settings/services/EditServiceForm.js", 278 "file": "src/components/settings/services/EditServiceForm.js",
279 "start": { 279 "start": {
280 "line": 110, 280 "line": 111,
281 "column": 19 281 "column": 19
282 }, 282 },
283 "end": { 283 "end": {
284 "line": 113, 284 "line": 114,
285 "column": 3 285 "column": 3
286 } 286 }
287 }, 287 },
@@ -290,11 +290,11 @@
290 "defaultMessage": "!!!Dark Reader Settings", 290 "defaultMessage": "!!!Dark Reader Settings",
291 "file": "src/components/settings/services/EditServiceForm.js", 291 "file": "src/components/settings/services/EditServiceForm.js",
292 "start": { 292 "start": {
293 "line": 114, 293 "line": 115,
294 "column": 30 294 "column": 30
295 }, 295 },
296 "end": { 296 "end": {
297 "line": 117, 297 "line": 118,
298 "column": 3 298 "column": 3
299 } 299 }
300 }, 300 },
@@ -303,11 +303,11 @@
303 "defaultMessage": "!!!Delete", 303 "defaultMessage": "!!!Delete",
304 "file": "src/components/settings/services/EditServiceForm.js", 304 "file": "src/components/settings/services/EditServiceForm.js",
305 "start": { 305 "start": {
306 "line": 118, 306 "line": 119,
307 "column": 14 307 "column": 14
308 }, 308 },
309 "end": { 309 "end": {
310 "line": 121, 310 "line": 122,
311 "column": 3 311 "column": 3
312 } 312 }
313 }, 313 },
@@ -316,11 +316,11 @@
316 "defaultMessage": "!!!Drop your image, or click here", 316 "defaultMessage": "!!!Drop your image, or click here",
317 "file": "src/components/settings/services/EditServiceForm.js", 317 "file": "src/components/settings/services/EditServiceForm.js",
318 "start": { 318 "start": {
319 "line": 122, 319 "line": 123,
320 "column": 14 320 "column": 14
321 }, 321 },
322 "end": { 322 "end": {
323 "line": 125, 323 "line": 126,
324 "column": 3 324 "column": 3
325 } 325 }
326 }, 326 },
@@ -329,11 +329,11 @@
329 "defaultMessage": "!!!HTTP/HTTPS Proxy Settings", 329 "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
330 "file": "src/components/settings/services/EditServiceForm.js", 330 "file": "src/components/settings/services/EditServiceForm.js",
331 "start": { 331 "start": {
332 "line": 126, 332 "line": 127,
333 "column": 17 333 "column": 17
334 }, 334 },
335 "end": { 335 "end": {
336 "line": 129, 336 "line": 130,
337 "column": 3 337 "column": 3
338 } 338 }
339 }, 339 },
@@ -342,11 +342,11 @@
342 "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.", 342 "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
343 "file": "src/components/settings/services/EditServiceForm.js", 343 "file": "src/components/settings/services/EditServiceForm.js",
344 "start": { 344 "start": {
345 "line": 130, 345 "line": 131,
346 "column": 20 346 "column": 20
347 }, 347 },
348 "end": { 348 "end": {
349 "line": 133, 349 "line": 134,
350 "column": 3 350 "column": 3
351 } 351 }
352 }, 352 },
@@ -355,11 +355,11 @@
355 "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.", 355 "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
356 "file": "src/components/settings/services/EditServiceForm.js", 356 "file": "src/components/settings/services/EditServiceForm.js",
357 "start": { 357 "start": {
358 "line": 134, 358 "line": 135,
359 "column": 13 359 "column": 13
360 }, 360 },
361 "end": { 361 "end": {
362 "line": 137, 362 "line": 138,
363 "column": 3 363 "column": 3
364 } 364 }
365 } 365 }
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index c96a1de22..a1e8c714e 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -4,11 +4,11 @@
4 "defaultMessage": "!!!Settings", 4 "defaultMessage": "!!!Settings",
5 "file": "src/components/settings/settings/EditSettingsForm.js", 5 "file": "src/components/settings/settings/EditSettingsForm.js",
6 "start": { 6 "start": {
7 "line": 23, 7 "line": 24,
8 "column": 12 8 "column": 12
9 }, 9 },
10 "end": { 10 "end": {
11 "line": 26, 11 "line": 27,
12 "column": 3 12 "column": 3
13 } 13 }
14 }, 14 },
@@ -17,11 +17,11 @@
17 "defaultMessage": "!!!General", 17 "defaultMessage": "!!!General",
18 "file": "src/components/settings/settings/EditSettingsForm.js", 18 "file": "src/components/settings/settings/EditSettingsForm.js",
19 "start": { 19 "start": {
20 "line": 27, 20 "line": 28,
21 "column": 19 21 "column": 19
22 }, 22 },
23 "end": { 23 "end": {
24 "line": 30, 24 "line": 31,
25 "column": 3 25 "column": 3
26 } 26 }
27 }, 27 },
@@ -30,11 +30,11 @@
30 "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.", 30 "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.",
31 "file": "src/components/settings/settings/EditSettingsForm.js", 31 "file": "src/components/settings/settings/EditSettingsForm.js",
32 "start": { 32 "start": {
33 "line": 31, 33 "line": 32,
34 "column": 14 34 "column": 14
35 }, 35 },
36 "end": { 36 "end": {
37 "line": 34, 37 "line": 35,
38 "column": 3 38 "column": 3
39 } 39 }
40 }, 40 },
@@ -43,11 +43,11 @@
43 "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.", 43 "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.",
44 "file": "src/components/settings/settings/EditSettingsForm.js", 44 "file": "src/components/settings/settings/EditSettingsForm.js",
45 "start": { 45 "start": {
46 "line": 35, 46 "line": 36,
47 "column": 17 47 "column": 17
48 }, 48 },
49 "end": { 49 "end": {
50 "line": 38, 50 "line": 39,
51 "column": 3 51 "column": 3
52 } 52 }
53 }, 53 },
@@ -56,11 +56,11 @@
56 "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", 56 "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
57 "file": "src/components/settings/settings/EditSettingsForm.js", 57 "file": "src/components/settings/settings/EditSettingsForm.js",
58 "start": { 58 "start": {
59 "line": 39, 59 "line": 40,
60 "column": 22 60 "column": 22
61 }, 61 },
62 "end": { 62 "end": {
63 "line": 42, 63 "line": 43,
64 "column": 3 64 "column": 3
65 } 65 }
66 }, 66 },
@@ -69,11 +69,11 @@
69 "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", 69 "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
70 "file": "src/components/settings/settings/EditSettingsForm.js", 70 "file": "src/components/settings/settings/EditSettingsForm.js",
71 "start": { 71 "start": {
72 "line": 43, 72 "line": 44,
73 "column": 18 73 "column": 18
74 }, 74 },
75 "end": { 75 "end": {
76 "line": 46, 76 "line": 47,
77 "column": 3 77 "column": 3
78 } 78 }
79 }, 79 },
@@ -82,11 +82,11 @@
82 "defaultMessage": "!!!Password", 82 "defaultMessage": "!!!Password",
83 "file": "src/components/settings/settings/EditSettingsForm.js", 83 "file": "src/components/settings/settings/EditSettingsForm.js",
84 "start": { 84 "start": {
85 "line": 47, 85 "line": 48,
86 "column": 18 86 "column": 18
87 }, 87 },
88 "end": { 88 "end": {
89 "line": 50, 89 "line": 51,
90 "column": 3 90 "column": 3
91 } 91 }
92 }, 92 },
@@ -95,11 +95,11 @@
95 "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", 95 "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
96 "file": "src/components/settings/settings/EditSettingsForm.js", 96 "file": "src/components/settings/settings/EditSettingsForm.js",
97 "start": { 97 "start": {
98 "line": 51, 98 "line": 52,
99 "column": 22 99 "column": 22
100 }, 100 },
101 "end": { 101 "end": {
102 "line": 54, 102 "line": 55,
103 "column": 3 103 "column": 3
104 } 104 }
105 }, 105 },
@@ -108,11 +108,11 @@
108 "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.", 108 "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.",
109 "file": "src/components/settings/settings/EditSettingsForm.js", 109 "file": "src/components/settings/settings/EditSettingsForm.js",
110 "start": { 110 "start": {
111 "line": 55, 111 "line": 56,
112 "column": 12 112 "column": 12
113 }, 113 },
114 "end": { 114 "end": {
115 "line": 58, 115 "line": 59,
116 "column": 3 116 "column": 3
117 } 117 }
118 }, 118 },
@@ -121,11 +121,11 @@
121 "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.", 121 "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.",
122 "file": "src/components/settings/settings/EditSettingsForm.js", 122 "file": "src/components/settings/settings/EditSettingsForm.js",
123 "start": { 123 "start": {
124 "line": 59, 124 "line": 60,
125 "column": 24 125 "column": 24
126 }, 126 },
127 "end": { 127 "end": {
128 "line": 62, 128 "line": 63,
129 "column": 3 129 "column": 3
130 } 130 }
131 }, 131 },
@@ -134,11 +134,11 @@
134 "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", 134 "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
135 "file": "src/components/settings/settings/EditSettingsForm.js", 135 "file": "src/components/settings/settings/EditSettingsForm.js",
136 "start": { 136 "start": {
137 "line": 63, 137 "line": 64,
138 "column": 20 138 "column": 20
139 }, 139 },
140 "end": { 140 "end": {
141 "line": 66, 141 "line": 67,
142 "column": 3 142 "column": 3
143 } 143 }
144 }, 144 },
@@ -147,11 +147,11 @@
147 "defaultMessage": "!!!Language", 147 "defaultMessage": "!!!Language",
148 "file": "src/components/settings/settings/EditSettingsForm.js", 148 "file": "src/components/settings/settings/EditSettingsForm.js",
149 "start": { 149 "start": {
150 "line": 67, 150 "line": 68,
151 "column": 20 151 "column": 20
152 }, 152 },
153 "end": { 153 "end": {
154 "line": 70, 154 "line": 71,
155 "column": 3 155 "column": 3
156 } 156 }
157 }, 157 },
@@ -160,11 +160,11 @@
160 "defaultMessage": "!!!Updates", 160 "defaultMessage": "!!!Updates",
161 "file": "src/components/settings/settings/EditSettingsForm.js", 161 "file": "src/components/settings/settings/EditSettingsForm.js",
162 "start": { 162 "start": {
163 "line": 71, 163 "line": 72,
164 "column": 19 164 "column": 19
165 }, 165 },
166 "end": { 166 "end": {
167 "line": 74, 167 "line": 75,
168 "column": 3 168 "column": 3
169 } 169 }
170 }, 170 },
@@ -173,11 +173,11 @@
173 "defaultMessage": "!!!Appearance", 173 "defaultMessage": "!!!Appearance",
174 "file": "src/components/settings/settings/EditSettingsForm.js", 174 "file": "src/components/settings/settings/EditSettingsForm.js",
175 "start": { 175 "start": {
176 "line": 75, 176 "line": 76,
177 "column": 22 177 "column": 22
178 }, 178 },
179 "end": { 179 "end": {
180 "line": 78, 180 "line": 79,
181 "column": 3 181 "column": 3
182 } 182 }
183 }, 183 },
@@ -186,11 +186,11 @@
186 "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", 186 "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
187 "file": "src/components/settings/settings/EditSettingsForm.js", 187 "file": "src/components/settings/settings/EditSettingsForm.js",
188 "start": { 188 "start": {
189 "line": 79, 189 "line": 80,
190 "column": 25 190 "column": 25
191 }, 191 },
192 "end": { 192 "end": {
193 "line": 82, 193 "line": 83,
194 "column": 3 194 "column": 3
195 } 195 }
196 }, 196 },
@@ -199,11 +199,11 @@
199 "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})", 199 "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
200 "file": "src/components/settings/settings/EditSettingsForm.js", 200 "file": "src/components/settings/settings/EditSettingsForm.js",
201 "start": { 201 "start": {
202 "line": 83, 202 "line": 84,
203 "column": 19 203 "column": 19
204 }, 204 },
205 "end": { 205 "end": {
206 "line": 86, 206 "line": 87,
207 "column": 3 207 "column": 3
208 } 208 }
209 }, 209 },
@@ -212,11 +212,11 @@
212 "defaultMessage": "!!!Privacy", 212 "defaultMessage": "!!!Privacy",
213 "file": "src/components/settings/settings/EditSettingsForm.js", 213 "file": "src/components/settings/settings/EditSettingsForm.js",
214 "start": { 214 "start": {
215 "line": 87, 215 "line": 88,
216 "column": 19 216 "column": 19
217 }, 217 },
218 "end": { 218 "end": {
219 "line": 90, 219 "line": 91,
220 "column": 3 220 "column": 3
221 } 221 }
222 }, 222 },
@@ -225,11 +225,11 @@
225 "defaultMessage": "!!!Advanced", 225 "defaultMessage": "!!!Advanced",
226 "file": "src/components/settings/settings/EditSettingsForm.js", 226 "file": "src/components/settings/settings/EditSettingsForm.js",
227 "start": { 227 "start": {
228 "line": 91, 228 "line": 92,
229 "column": 20 229 "column": 20
230 }, 230 },
231 "end": { 231 "end": {
232 "line": 94, 232 "line": 95,
233 "column": 3 233 "column": 3
234 } 234 }
235 }, 235 },
@@ -238,11 +238,11 @@
238 "defaultMessage": "!!!Help us to translate Ferdi into your language.", 238 "defaultMessage": "!!!Help us to translate Ferdi into your language.",
239 "file": "src/components/settings/settings/EditSettingsForm.js", 239 "file": "src/components/settings/settings/EditSettingsForm.js",
240 "start": { 240 "start": {
241 "line": 95, 241 "line": 96,
242 "column": 19 242 "column": 19
243 }, 243 },
244 "end": { 244 "end": {
245 "line": 98, 245 "line": 99,
246 "column": 3 246 "column": 3
247 } 247 }
248 }, 248 },
@@ -251,11 +251,11 @@
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.", 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.",
252 "file": "src/components/settings/settings/EditSettingsForm.js", 252 "file": "src/components/settings/settings/EditSettingsForm.js",
253 "start": { 253 "start": {
254 "line": 99, 254 "line": 100,
255 "column": 28 255 "column": 28
256 }, 256 },
257 "end": { 257 "end": {
258 "line": 102, 258 "line": 103,
259 "column": 3 259 "column": 3
260 } 260 }
261 }, 261 },
@@ -264,11 +264,11 @@
264 "defaultMessage": "!!!Cache", 264 "defaultMessage": "!!!Cache",
265 "file": "src/components/settings/settings/EditSettingsForm.js", 265 "file": "src/components/settings/settings/EditSettingsForm.js",
266 "start": { 266 "start": {
267 "line": 103, 267 "line": 104,
268 "column": 20 268 "column": 20
269 }, 269 },
270 "end": { 270 "end": {
271 "line": 106, 271 "line": 107,
272 "column": 3 272 "column": 3
273 } 273 }
274 }, 274 },
@@ -277,11 +277,11 @@
277 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", 277 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
278 "file": "src/components/settings/settings/EditSettingsForm.js", 278 "file": "src/components/settings/settings/EditSettingsForm.js",
279 "start": { 279 "start": {
280 "line": 107, 280 "line": 108,
281 "column": 13 281 "column": 13
282 }, 282 },
283 "end": { 283 "end": {
284 "line": 110, 284 "line": 111,
285 "column": 3 285 "column": 3
286 } 286 }
287 }, 287 },
@@ -290,11 +290,11 @@
290 "defaultMessage": "!!!Couldn't clear all cache", 290 "defaultMessage": "!!!Couldn't clear all cache",
291 "file": "src/components/settings/settings/EditSettingsForm.js", 291 "file": "src/components/settings/settings/EditSettingsForm.js",
292 "start": { 292 "start": {
293 "line": 111, 293 "line": 112,
294 "column": 19 294 "column": 19
295 }, 295 },
296 "end": { 296 "end": {
297 "line": 114, 297 "line": 115,
298 "column": 3 298 "column": 3
299 } 299 }
300 }, 300 },
@@ -303,11 +303,11 @@
303 "defaultMessage": "!!!Clear cache", 303 "defaultMessage": "!!!Clear cache",
304 "file": "src/components/settings/settings/EditSettingsForm.js", 304 "file": "src/components/settings/settings/EditSettingsForm.js",
305 "start": { 305 "start": {
306 "line": 115, 306 "line": 116,
307 "column": 23 307 "column": 23
308 }, 308 },
309 "end": { 309 "end": {
310 "line": 118, 310 "line": 119,
311 "column": 3 311 "column": 3
312 } 312 }
313 }, 313 },
@@ -316,11 +316,11 @@
316 "defaultMessage": "!!!Check for updates", 316 "defaultMessage": "!!!Check for updates",
317 "file": "src/components/settings/settings/EditSettingsForm.js", 317 "file": "src/components/settings/settings/EditSettingsForm.js",
318 "start": { 318 "start": {
319 "line": 119, 319 "line": 120,
320 "column": 25 320 "column": 25
321 }, 321 },
322 "end": { 322 "end": {
323 "line": 122, 323 "line": 123,
324 "column": 3 324 "column": 3
325 } 325 }
326 }, 326 },
@@ -329,11 +329,11 @@
329 "defaultMessage": "!!!Restart & install update", 329 "defaultMessage": "!!!Restart & install update",
330 "file": "src/components/settings/settings/EditSettingsForm.js", 330 "file": "src/components/settings/settings/EditSettingsForm.js",
331 "start": { 331 "start": {
332 "line": 123, 332 "line": 124,
333 "column": 23 333 "column": 23
334 }, 334 },
335 "end": { 335 "end": {
336 "line": 126, 336 "line": 127,
337 "column": 3 337 "column": 3
338 } 338 }
339 }, 339 },
@@ -342,11 +342,11 @@
342 "defaultMessage": "!!!Is searching for update", 342 "defaultMessage": "!!!Is searching for update",
343 "file": "src/components/settings/settings/EditSettingsForm.js", 343 "file": "src/components/settings/settings/EditSettingsForm.js",
344 "start": { 344 "start": {
345 "line": 127, 345 "line": 128,
346 "column": 25 346 "column": 25
347 }, 347 },
348 "end": { 348 "end": {
349 "line": 130, 349 "line": 131,
350 "column": 3 350 "column": 3
351 } 351 }
352 }, 352 },
@@ -355,11 +355,11 @@
355 "defaultMessage": "!!!Update available, downloading...", 355 "defaultMessage": "!!!Update available, downloading...",
356 "file": "src/components/settings/settings/EditSettingsForm.js", 356 "file": "src/components/settings/settings/EditSettingsForm.js",
357 "start": { 357 "start": {
358 "line": 131, 358 "line": 132,
359 "column": 25 359 "column": 25
360 }, 360 },
361 "end": { 361 "end": {
362 "line": 134, 362 "line": 135,
363 "column": 3 363 "column": 3
364 } 364 }
365 }, 365 },
@@ -368,11 +368,11 @@
368 "defaultMessage": "!!!You are using the latest version of Ferdi", 368 "defaultMessage": "!!!You are using the latest version of Ferdi",
369 "file": "src/components/settings/settings/EditSettingsForm.js", 369 "file": "src/components/settings/settings/EditSettingsForm.js",
370 "start": { 370 "start": {
371 "line": 135, 371 "line": 136,
372 "column": 24 372 "column": 24
373 }, 373 },
374 "end": { 374 "end": {
375 "line": 138, 375 "line": 139,
376 "column": 3 376 "column": 3
377 } 377 }
378 }, 378 },
@@ -381,11 +381,11 @@
381 "defaultMessage": "!!!Current version:", 381 "defaultMessage": "!!!Current version:",
382 "file": "src/components/settings/settings/EditSettingsForm.js", 382 "file": "src/components/settings/settings/EditSettingsForm.js",
383 "start": { 383 "start": {
384 "line": 139, 384 "line": 140,
385 "column": 18 385 "column": 18
386 }, 386 },
387 "end": { 387 "end": {
388 "line": 142, 388 "line": 143,
389 "column": 3 389 "column": 3
390 } 390 }
391 }, 391 },
@@ -394,11 +394,11 @@
394 "defaultMessage": "!!!Changes require restart", 394 "defaultMessage": "!!!Changes require restart",
395 "file": "src/components/settings/settings/EditSettingsForm.js", 395 "file": "src/components/settings/settings/EditSettingsForm.js",
396 "start": { 396 "start": {
397 "line": 143, 397 "line": 144,
398 "column": 22 398 "column": 22
399 }, 399 },
400 "end": { 400 "end": {
401 "line": 146, 401 "line": 147,
402 "column": 3 402 "column": 3
403 } 403 }
404 }, 404 },
@@ -407,11 +407,11 @@
407 "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.",
408 "file": "src/components/settings/settings/EditSettingsForm.js", 408 "file": "src/components/settings/settings/EditSettingsForm.js",
409 "start": { 409 "start": {
410 "line": 147, 410 "line": 148,
411 "column": 22 411 "column": 22
412 }, 412 },
413 "end": { 413 "end": {
414 "line": 150, 414 "line": 151,
415 "column": 3 415 "column": 3
416 } 416 }
417 } 417 }
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
index f816a0560..5778a3389 100644
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -91,15 +91,28 @@
91 } 91 }
92 }, 92 },
93 { 93 {
94 "id": "global.userAgentHelp",
95 "defaultMessage": "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
96 "file": "src/i18n/globalMessages.js",
97 "start": {
98 "line": 32,
99 "column": 17
100 },
101 "end": {
102 "line": 35,
103 "column": 3
104 }
105 },
106 {
94 "id": "global.franzProRequired", 107 "id": "global.franzProRequired",
95 "defaultMessage": "!!!Franz Professional Required", 108 "defaultMessage": "!!!Franz Professional Required",
96 "file": "src/i18n/globalMessages.js", 109 "file": "src/i18n/globalMessages.js",
97 "start": { 110 "start": {
98 "line": 32, 111 "line": 36,
99 "column": 15 112 "column": 15
100 }, 113 },
101 "end": { 114 "end": {
102 "line": 35, 115 "line": 39,
103 "column": 3 116 "column": 3
104 } 117 }
105 } 118 }
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index fd3151a96..a25759f48 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -294,7 +294,10 @@
294 color: $theme-gray-light; 294 color: $theme-gray-light;
295 font-size: 12px; 295 font-size: 12px;
296 font-style: italic; 296 font-style: italic;
297 margin: -10px 0 20px 55px;; 297 }
298
299 .indented__help {
300 margin: -10px 0 20px 55px;
298 } 301 }
299 302
300 .settings__controls { 303 .settings__controls {