aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Marouane Rassili <mrassili@aol.com>2020-03-29 12:20:44 +0100
committerLibravatar Marouane Rassili <mrassili@aol.com>2020-03-29 12:30:35 +0100
commit5893fd4fe7a97448d4edd38761aa10f17014d04c (patch)
treef035b5883c8728ab2a6445a074462fd4bfe1a993
parentMerge pull request #497 from getferdi/improve-premium-information (diff)
downloadferdium-app-5893fd4fe7a97448d4edd38761aa10f17014d04c.tar.gz
ferdium-app-5893fd4fe7a97448d4edd38761aa10f17014d04c.tar.zst
ferdium-app-5893fd4fe7a97448d4edd38761aa10f17014d04c.zip
Remove server setting from settings screen
-rw-r--r--src/components/settings/settings/EditSettingsForm.js64
-rw-r--r--src/containers/settings/EditSettingsScreen.js1
-rw-r--r--src/i18n/locales/defaultMessages.json142
-rw-r--r--src/i18n/locales/en-US.json2
-rw-r--r--src/i18n/messages/src/components/settings/settings/EditSettingsForm.json142
5 files changed, 116 insertions, 235 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 9564d837b..5478ce8bf 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -18,15 +18,6 @@ const {
18 systemPreferences, 18 systemPreferences,
19} = remote; 19} = remote;
20 20
21function escapeHtml(unsafe) {
22 return unsafe
23 .replace(/&/g, '&amp;')
24 .replace(/</g, '&lt;')
25 .replace(/>/g, '&gt;')
26 .replace(/"/g, '&quot;')
27 .replace(/'/g, '&#039;');
28}
29
30const messages = defineMessages({ 21const messages = defineMessages({
31 headline: { 22 headline: {
32 id: 'settings.app.headline', 23 id: 'settings.app.headline',
@@ -48,14 +39,6 @@ const messages = defineMessages({
48 id: 'settings.app.inactivityLockInfo', 39 id: 'settings.app.inactivityLockInfo',
49 defaultMessage: '!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable', 40 defaultMessage: '!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable',
50 }, 41 },
51 serverInfo: {
52 id: 'settings.app.serverInfo',
53 defaultMessage: '!!!We advice you to logout after changing your server as your settings might not be saved otherwise.',
54 },
55 serverMoneyInfo: {
56 id: 'settings.app.serverMoneyInfo',
57 defaultMessage: '!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz\'s server resources - which Franz\'s creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz\'s recipe store, server resources and its development.',
58 },
59 todoServerInfo: { 42 todoServerInfo: {
60 id: 'settings.app.todoServerInfo', 43 id: 'settings.app.todoServerInfo',
61 defaultMessage: '!!!This server will be used for the "Franz Todo" feature. (default: https://app.franztodos.com)', 44 defaultMessage: '!!!This server will be used for the "Franz Todo" feature. (default: https://app.franztodos.com)',
@@ -174,7 +157,6 @@ export default @observer class EditSettingsForm extends Component {
174 isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired, 157 isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired,
175 isTodosEnabled: PropTypes.bool.isRequired, 158 isTodosEnabled: PropTypes.bool.isRequired,
176 isWorkspaceEnabled: PropTypes.bool.isRequired, 159 isWorkspaceEnabled: PropTypes.bool.isRequired,
177 server: PropTypes.string.isRequired,
178 noUpdates: PropTypes.bool.isRequired, 160 noUpdates: PropTypes.bool.isRequired,
179 hibernationEnabled: PropTypes.bool.isRequired, 161 hibernationEnabled: PropTypes.bool.isRequired,
180 isDarkmodeEnabled: PropTypes.bool.isRequired, 162 isDarkmodeEnabled: PropTypes.bool.isRequired,
@@ -214,7 +196,6 @@ export default @observer class EditSettingsForm extends Component {
214 isSpellcheckerIncludedInCurrentPlan, 196 isSpellcheckerIncludedInCurrentPlan,
215 isTodosEnabled, 197 isTodosEnabled,
216 isWorkspaceEnabled, 198 isWorkspaceEnabled,
217 server,
218 noUpdates, 199 noUpdates,
219 hibernationEnabled, 200 hibernationEnabled,
220 isDarkmodeEnabled, 201 isDarkmodeEnabled,
@@ -232,8 +213,6 @@ export default @observer class EditSettingsForm extends Component {
232 updateButtonLabelMessage = messages.buttonSearchForUpdate; 213 updateButtonLabelMessage = messages.buttonSearchForUpdate;
233 } 214 }
234 215
235 const isLoggedIn = Boolean(localStorage.getItem('authToken'));
236
237 const { 216 const {
238 lockingFeatureEnabled, 217 lockingFeatureEnabled,
239 scheduledDNDEnabled, 218 scheduledDNDEnabled,
@@ -287,53 +266,10 @@ export default @observer class EditSettingsForm extends Component {
287 266
288 <Hr /> 267 <Hr />
289 268
290 <Input
291 placeholder="Server"
292 onChange={e => this.submit(e)}
293 field={form.$('server')}
294 autoFocus
295 />
296 {isLoggedIn && (
297 <p
298 className="settings__message"
299 style={{
300 borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
301 }}
302 >
303 { intl.formatMessage(messages.serverInfo) }
304 </p>
305 )}
306 {server === 'https://api.franzinfra.com' && (
307 <p
308 className="settings__message"
309 style={{
310 borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
311 }}
312 >
313 <span
314 dangerouslySetInnerHTML={{
315 __html:
316 // Needed to make links work
317 escapeHtml(
318 intl.formatMessage(messages.serverMoneyInfo),
319 ).replace('[Link 1]', '<a href="https://www.meetfranz.com/pricing" target="_blank">')
320 .replace('[Link 2]', '<a href="https://github.com/getferdi/server" target="_blank">')
321 .replace(/\[\/Link]/g, '</a>'),
322 }}
323 style={{
324 whiteSpace: 'pre-wrap',
325 }}
326 />
327 </p>
328 )}
329
330 <Hr />
331
332 {isWorkspaceEnabled && ( 269 {isWorkspaceEnabled && (
333 <Toggle field={form.$('keepAllWorkspacesLoaded')} /> 270 <Toggle field={form.$('keepAllWorkspacesLoaded')} />
334 )} 271 )}
335 272
336
337 <Hr /> 273 <Hr />
338 274
339 {isTodosEnabled && ( 275 {isTodosEnabled && (
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 5221b0694..ffefdda77 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -541,7 +541,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
541 isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} 541 isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan}
542 isTodosEnabled={todos.isFeatureActive} 542 isTodosEnabled={todos.isFeatureActive}
543 isWorkspaceEnabled={workspaces.isFeatureActive} 543 isWorkspaceEnabled={workspaces.isFeatureActive}
544 server={this.props.stores.settings.app.server}
545 lockingFeatureEnabled={lockingFeatureEnabled} 544 lockingFeatureEnabled={lockingFeatureEnabled}
546 noUpdates={this.props.stores.settings.app.noUpdates} 545 noUpdates={this.props.stores.settings.app.noUpdates}
547 hibernationEnabled={this.props.stores.settings.app.hibernate} 546 hibernationEnabled={this.props.stores.settings.app.hibernate}
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 274bebc3d..47bda3b1e 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2756,403 +2756,377 @@
2756 "defaultMessage": "!!!Settings", 2756 "defaultMessage": "!!!Settings",
2757 "end": { 2757 "end": {
2758 "column": 3, 2758 "column": 3,
2759 "line": 34 2759 "line": 25
2760 }, 2760 },
2761 "file": "src/components/settings/settings/EditSettingsForm.js", 2761 "file": "src/components/settings/settings/EditSettingsForm.js",
2762 "id": "settings.app.headline", 2762 "id": "settings.app.headline",
2763 "start": { 2763 "start": {
2764 "column": 12, 2764 "column": 12,
2765 "line": 31 2765 "line": 22
2766 } 2766 }
2767 }, 2767 },
2768 { 2768 {
2769 "defaultMessage": "!!!General", 2769 "defaultMessage": "!!!General",
2770 "end": { 2770 "end": {
2771 "column": 3, 2771 "column": 3,
2772 "line": 38 2772 "line": 29
2773 }, 2773 },
2774 "file": "src/components/settings/settings/EditSettingsForm.js", 2774 "file": "src/components/settings/settings/EditSettingsForm.js",
2775 "id": "settings.app.headlineGeneral", 2775 "id": "settings.app.headlineGeneral",
2776 "start": { 2776 "start": {
2777 "column": 19, 2777 "column": 19,
2778 "line": 35 2778 "line": 26
2779 } 2779 }
2780 }, 2780 },
2781 { 2781 {
2782 "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.", 2782 "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.",
2783 "end": { 2783 "end": {
2784 "column": 3, 2784 "column": 3,
2785 "line": 42 2785 "line": 33
2786 }, 2786 },
2787 "file": "src/components/settings/settings/EditSettingsForm.js", 2787 "file": "src/components/settings/settings/EditSettingsForm.js",
2788 "id": "settings.app.sentryInfo", 2788 "id": "settings.app.sentryInfo",
2789 "start": { 2789 "start": {
2790 "column": 14, 2790 "column": 14,
2791 "line": 39 2791 "line": 30
2792 } 2792 }
2793 }, 2793 },
2794 { 2794 {
2795 "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.", 2795 "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.",
2796 "end": { 2796 "end": {
2797 "column": 3, 2797 "column": 3,
2798 "line": 46 2798 "line": 37
2799 }, 2799 },
2800 "file": "src/components/settings/settings/EditSettingsForm.js", 2800 "file": "src/components/settings/settings/EditSettingsForm.js",
2801 "id": "settings.app.hibernateInfo", 2801 "id": "settings.app.hibernateInfo",
2802 "start": { 2802 "start": {
2803 "column": 17, 2803 "column": 17,
2804 "line": 43 2804 "line": 34
2805 } 2805 }
2806 }, 2806 },
2807 { 2807 {
2808 "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", 2808 "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
2809 "end": { 2809 "end": {
2810 "column": 3, 2810 "column": 3,
2811 "line": 50 2811 "line": 41
2812 }, 2812 },
2813 "file": "src/components/settings/settings/EditSettingsForm.js", 2813 "file": "src/components/settings/settings/EditSettingsForm.js",
2814 "id": "settings.app.inactivityLockInfo", 2814 "id": "settings.app.inactivityLockInfo",
2815 "start": { 2815 "start": {
2816 "column": 22, 2816 "column": 22,
2817 "line": 47 2817 "line": 38
2818 }
2819 },
2820 {
2821 "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.",
2822 "end": {
2823 "column": 3,
2824 "line": 54
2825 },
2826 "file": "src/components/settings/settings/EditSettingsForm.js",
2827 "id": "settings.app.serverInfo",
2828 "start": {
2829 "column": 14,
2830 "line": 51
2831 }
2832 },
2833 {
2834 "defaultMessage": "!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
2835 "end": {
2836 "column": 3,
2837 "line": 58
2838 },
2839 "file": "src/components/settings/settings/EditSettingsForm.js",
2840 "id": "settings.app.serverMoneyInfo",
2841 "start": {
2842 "column": 19,
2843 "line": 55
2844 } 2818 }
2845 }, 2819 },
2846 { 2820 {
2847 "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", 2821 "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
2848 "end": { 2822 "end": {
2849 "column": 3, 2823 "column": 3,
2850 "line": 62 2824 "line": 45
2851 }, 2825 },
2852 "file": "src/components/settings/settings/EditSettingsForm.js", 2826 "file": "src/components/settings/settings/EditSettingsForm.js",
2853 "id": "settings.app.todoServerInfo", 2827 "id": "settings.app.todoServerInfo",
2854 "start": { 2828 "start": {
2855 "column": 18, 2829 "column": 18,
2856 "line": 59 2830 "line": 42
2857 } 2831 }
2858 }, 2832 },
2859 { 2833 {
2860 "defaultMessage": "!!!Password", 2834 "defaultMessage": "!!!Password",
2861 "end": { 2835 "end": {
2862 "column": 3, 2836 "column": 3,
2863 "line": 66 2837 "line": 49
2864 }, 2838 },
2865 "file": "src/components/settings/settings/EditSettingsForm.js", 2839 "file": "src/components/settings/settings/EditSettingsForm.js",
2866 "id": "settings.app.lockedPassword", 2840 "id": "settings.app.lockedPassword",
2867 "start": { 2841 "start": {
2868 "column": 18, 2842 "column": 18,
2869 "line": 63 2843 "line": 46
2870 } 2844 }
2871 }, 2845 },
2872 { 2846 {
2873 "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", 2847 "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
2874 "end": { 2848 "end": {
2875 "column": 3, 2849 "column": 3,
2876 "line": 70 2850 "line": 53
2877 }, 2851 },
2878 "file": "src/components/settings/settings/EditSettingsForm.js", 2852 "file": "src/components/settings/settings/EditSettingsForm.js",
2879 "id": "settings.app.lockedPasswordInfo", 2853 "id": "settings.app.lockedPasswordInfo",
2880 "start": { 2854 "start": {
2881 "column": 22, 2855 "column": 22,
2882 "line": 67 2856 "line": 50
2883 } 2857 }
2884 }, 2858 },
2885 { 2859 {
2886 "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.", 2860 "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.",
2887 "end": { 2861 "end": {
2888 "column": 3, 2862 "column": 3,
2889 "line": 74 2863 "line": 57
2890 }, 2864 },
2891 "file": "src/components/settings/settings/EditSettingsForm.js", 2865 "file": "src/components/settings/settings/EditSettingsForm.js",
2892 "id": "settings.app.lockInfo", 2866 "id": "settings.app.lockInfo",
2893 "start": { 2867 "start": {
2894 "column": 12, 2868 "column": 12,
2895 "line": 71 2869 "line": 54
2896 } 2870 }
2897 }, 2871 },
2898 { 2872 {
2899 "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.", 2873 "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.",
2900 "end": { 2874 "end": {
2901 "column": 3, 2875 "column": 3,
2902 "line": 78 2876 "line": 61
2903 }, 2877 },
2904 "file": "src/components/settings/settings/EditSettingsForm.js", 2878 "file": "src/components/settings/settings/EditSettingsForm.js",
2905 "id": "settings.app.scheduledDNDTimeInfo", 2879 "id": "settings.app.scheduledDNDTimeInfo",
2906 "start": { 2880 "start": {
2907 "column": 24, 2881 "column": 24,
2908 "line": 75 2882 "line": 58
2909 } 2883 }
2910 }, 2884 },
2911 { 2885 {
2912 "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", 2886 "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
2913 "end": { 2887 "end": {
2914 "column": 3, 2888 "column": 3,
2915 "line": 82 2889 "line": 65
2916 }, 2890 },
2917 "file": "src/components/settings/settings/EditSettingsForm.js", 2891 "file": "src/components/settings/settings/EditSettingsForm.js",
2918 "id": "settings.app.scheduledDNDInfo", 2892 "id": "settings.app.scheduledDNDInfo",
2919 "start": { 2893 "start": {
2920 "column": 20, 2894 "column": 20,
2921 "line": 79 2895 "line": 62
2922 } 2896 }
2923 }, 2897 },
2924 { 2898 {
2925 "defaultMessage": "!!!Language", 2899 "defaultMessage": "!!!Language",
2926 "end": { 2900 "end": {
2927 "column": 3, 2901 "column": 3,
2928 "line": 86 2902 "line": 69
2929 }, 2903 },
2930 "file": "src/components/settings/settings/EditSettingsForm.js", 2904 "file": "src/components/settings/settings/EditSettingsForm.js",
2931 "id": "settings.app.headlineLanguage", 2905 "id": "settings.app.headlineLanguage",
2932 "start": { 2906 "start": {
2933 "column": 20, 2907 "column": 20,
2934 "line": 83 2908 "line": 66
2935 } 2909 }
2936 }, 2910 },
2937 { 2911 {
2938 "defaultMessage": "!!!Updates", 2912 "defaultMessage": "!!!Updates",
2939 "end": { 2913 "end": {
2940 "column": 3, 2914 "column": 3,
2941 "line": 90 2915 "line": 73
2942 }, 2916 },
2943 "file": "src/components/settings/settings/EditSettingsForm.js", 2917 "file": "src/components/settings/settings/EditSettingsForm.js",
2944 "id": "settings.app.headlineUpdates", 2918 "id": "settings.app.headlineUpdates",
2945 "start": { 2919 "start": {
2946 "column": 19, 2920 "column": 19,
2947 "line": 87 2921 "line": 70
2948 } 2922 }
2949 }, 2923 },
2950 { 2924 {
2951 "defaultMessage": "!!!Appearance", 2925 "defaultMessage": "!!!Appearance",
2952 "end": { 2926 "end": {
2953 "column": 3, 2927 "column": 3,
2954 "line": 94 2928 "line": 77
2955 }, 2929 },
2956 "file": "src/components/settings/settings/EditSettingsForm.js", 2930 "file": "src/components/settings/settings/EditSettingsForm.js",
2957 "id": "settings.app.headlineAppearance", 2931 "id": "settings.app.headlineAppearance",
2958 "start": { 2932 "start": {
2959 "column": 22, 2933 "column": 22,
2960 "line": 91 2934 "line": 74
2961 } 2935 }
2962 }, 2936 },
2963 { 2937 {
2964 "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", 2938 "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
2965 "end": { 2939 "end": {
2966 "column": 3, 2940 "column": 3,
2967 "line": 98 2941 "line": 81
2968 }, 2942 },
2969 "file": "src/components/settings/settings/EditSettingsForm.js", 2943 "file": "src/components/settings/settings/EditSettingsForm.js",
2970 "id": "settings.app.universalDarkModeInfo", 2944 "id": "settings.app.universalDarkModeInfo",
2971 "start": { 2945 "start": {
2972 "column": 25, 2946 "column": 25,
2973 "line": 95 2947 "line": 78
2974 } 2948 }
2975 }, 2949 },
2976 { 2950 {
2977 "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)", 2951 "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)",
2978 "end": { 2952 "end": {
2979 "column": 3, 2953 "column": 3,
2980 "line": 102 2954 "line": 85
2981 }, 2955 },
2982 "file": "src/components/settings/settings/EditSettingsForm.js", 2956 "file": "src/components/settings/settings/EditSettingsForm.js",
2983 "id": "settings.app.accentColorInfo", 2957 "id": "settings.app.accentColorInfo",
2984 "start": { 2958 "start": {
2985 "column": 19, 2959 "column": 19,
2986 "line": 99 2960 "line": 82
2987 } 2961 }
2988 }, 2962 },
2989 { 2963 {
2990 "defaultMessage": "!!!Advanced", 2964 "defaultMessage": "!!!Advanced",
2991 "end": { 2965 "end": {
2992 "column": 3, 2966 "column": 3,
2993 "line": 106 2967 "line": 89
2994 }, 2968 },
2995 "file": "src/components/settings/settings/EditSettingsForm.js", 2969 "file": "src/components/settings/settings/EditSettingsForm.js",
2996 "id": "settings.app.headlineAdvanced", 2970 "id": "settings.app.headlineAdvanced",
2997 "start": { 2971 "start": {
2998 "column": 20, 2972 "column": 20,
2999 "line": 103 2973 "line": 86
3000 } 2974 }
3001 }, 2975 },
3002 { 2976 {
3003 "defaultMessage": "!!!Help us to translate Ferdi into your language.", 2977 "defaultMessage": "!!!Help us to translate Ferdi into your language.",
3004 "end": { 2978 "end": {
3005 "column": 3, 2979 "column": 3,
3006 "line": 110 2980 "line": 93
3007 }, 2981 },
3008 "file": "src/components/settings/settings/EditSettingsForm.js", 2982 "file": "src/components/settings/settings/EditSettingsForm.js",
3009 "id": "settings.app.translationHelp", 2983 "id": "settings.app.translationHelp",
3010 "start": { 2984 "start": {
3011 "column": 19, 2985 "column": 19,
3012 "line": 107 2986 "line": 90
3013 } 2987 }
3014 }, 2988 },
3015 { 2989 {
3016 "defaultMessage": "!!!Cache", 2990 "defaultMessage": "!!!Cache",
3017 "end": { 2991 "end": {
3018 "column": 3, 2992 "column": 3,
3019 "line": 114 2993 "line": 97
3020 }, 2994 },
3021 "file": "src/components/settings/settings/EditSettingsForm.js", 2995 "file": "src/components/settings/settings/EditSettingsForm.js",
3022 "id": "settings.app.subheadlineCache", 2996 "id": "settings.app.subheadlineCache",
3023 "start": { 2997 "start": {
3024 "column": 20, 2998 "column": 20,
3025 "line": 111 2999 "line": 94
3026 } 3000 }
3027 }, 3001 },
3028 { 3002 {
3029 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", 3003 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
3030 "end": { 3004 "end": {
3031 "column": 3, 3005 "column": 3,
3032 "line": 118 3006 "line": 101
3033 }, 3007 },
3034 "file": "src/components/settings/settings/EditSettingsForm.js", 3008 "file": "src/components/settings/settings/EditSettingsForm.js",
3035 "id": "settings.app.cacheInfo", 3009 "id": "settings.app.cacheInfo",
3036 "start": { 3010 "start": {
3037 "column": 13, 3011 "column": 13,
3038 "line": 115 3012 "line": 98
3039 } 3013 }
3040 }, 3014 },
3041 { 3015 {
3042 "defaultMessage": "!!!Clear cache", 3016 "defaultMessage": "!!!Clear cache",
3043 "end": { 3017 "end": {
3044 "column": 3, 3018 "column": 3,
3045 "line": 122 3019 "line": 105
3046 }, 3020 },
3047 "file": "src/components/settings/settings/EditSettingsForm.js", 3021 "file": "src/components/settings/settings/EditSettingsForm.js",
3048 "id": "settings.app.buttonClearAllCache", 3022 "id": "settings.app.buttonClearAllCache",
3049 "start": { 3023 "start": {
3050 "column": 23, 3024 "column": 23,
3051 "line": 119 3025 "line": 102
3052 } 3026 }
3053 }, 3027 },
3054 { 3028 {
3055 "defaultMessage": "!!!Check for updates", 3029 "defaultMessage": "!!!Check for updates",
3056 "end": { 3030 "end": {
3057 "column": 3, 3031 "column": 3,
3058 "line": 126 3032 "line": 109
3059 }, 3033 },
3060 "file": "src/components/settings/settings/EditSettingsForm.js", 3034 "file": "src/components/settings/settings/EditSettingsForm.js",
3061 "id": "settings.app.buttonSearchForUpdate", 3035 "id": "settings.app.buttonSearchForUpdate",
3062 "start": { 3036 "start": {
3063 "column": 25, 3037 "column": 25,
3064 "line": 123 3038 "line": 106
3065 } 3039 }
3066 }, 3040 },
3067 { 3041 {
3068 "defaultMessage": "!!!Restart & install update", 3042 "defaultMessage": "!!!Restart & install update",
3069 "end": { 3043 "end": {
3070 "column": 3, 3044 "column": 3,
3071 "line": 130 3045 "line": 113
3072 }, 3046 },
3073 "file": "src/components/settings/settings/EditSettingsForm.js", 3047 "file": "src/components/settings/settings/EditSettingsForm.js",
3074 "id": "settings.app.buttonInstallUpdate", 3048 "id": "settings.app.buttonInstallUpdate",
3075 "start": { 3049 "start": {
3076 "column": 23, 3050 "column": 23,
3077 "line": 127 3051 "line": 110
3078 } 3052 }
3079 }, 3053 },
3080 { 3054 {
3081 "defaultMessage": "!!!Is searching for update", 3055 "defaultMessage": "!!!Is searching for update",
3082 "end": { 3056 "end": {
3083 "column": 3, 3057 "column": 3,
3084 "line": 134 3058 "line": 117
3085 }, 3059 },
3086 "file": "src/components/settings/settings/EditSettingsForm.js", 3060 "file": "src/components/settings/settings/EditSettingsForm.js",
3087 "id": "settings.app.updateStatusSearching", 3061 "id": "settings.app.updateStatusSearching",
3088 "start": { 3062 "start": {
3089 "column": 25, 3063 "column": 25,
3090 "line": 131 3064 "line": 114
3091 } 3065 }
3092 }, 3066 },
3093 { 3067 {
3094 "defaultMessage": "!!!Update available, downloading...", 3068 "defaultMessage": "!!!Update available, downloading...",
3095 "end": { 3069 "end": {
3096 "column": 3, 3070 "column": 3,
3097 "line": 138 3071 "line": 121
3098 }, 3072 },
3099 "file": "src/components/settings/settings/EditSettingsForm.js", 3073 "file": "src/components/settings/settings/EditSettingsForm.js",
3100 "id": "settings.app.updateStatusAvailable", 3074 "id": "settings.app.updateStatusAvailable",
3101 "start": { 3075 "start": {
3102 "column": 25, 3076 "column": 25,
3103 "line": 135 3077 "line": 118
3104 } 3078 }
3105 }, 3079 },
3106 { 3080 {
3107 "defaultMessage": "!!!You are using the latest version of Ferdi", 3081 "defaultMessage": "!!!You are using the latest version of Ferdi",
3108 "end": { 3082 "end": {
3109 "column": 3, 3083 "column": 3,
3110 "line": 142 3084 "line": 125
3111 }, 3085 },
3112 "file": "src/components/settings/settings/EditSettingsForm.js", 3086 "file": "src/components/settings/settings/EditSettingsForm.js",
3113 "id": "settings.app.updateStatusUpToDate", 3087 "id": "settings.app.updateStatusUpToDate",
3114 "start": { 3088 "start": {
3115 "column": 24, 3089 "column": 24,
3116 "line": 139 3090 "line": 122
3117 } 3091 }
3118 }, 3092 },
3119 { 3093 {
3120 "defaultMessage": "!!!Current version:", 3094 "defaultMessage": "!!!Current version:",
3121 "end": { 3095 "end": {
3122 "column": 3, 3096 "column": 3,
3123 "line": 146 3097 "line": 129
3124 }, 3098 },
3125 "file": "src/components/settings/settings/EditSettingsForm.js", 3099 "file": "src/components/settings/settings/EditSettingsForm.js",
3126 "id": "settings.app.currentVersion", 3100 "id": "settings.app.currentVersion",
3127 "start": { 3101 "start": {
3128 "column": 18, 3102 "column": 18,
3129 "line": 143 3103 "line": 126
3130 } 3104 }
3131 }, 3105 },
3132 { 3106 {
3133 "defaultMessage": "!!!Changes require restart", 3107 "defaultMessage": "!!!Changes require restart",
3134 "end": { 3108 "end": {
3135 "column": 3, 3109 "column": 3,
3136 "line": 150 3110 "line": 133
3137 }, 3111 },
3138 "file": "src/components/settings/settings/EditSettingsForm.js", 3112 "file": "src/components/settings/settings/EditSettingsForm.js",
3139 "id": "settings.app.restartRequired", 3113 "id": "settings.app.restartRequired",
3140 "start": { 3114 "start": {
3141 "column": 29, 3115 "column": 29,
3142 "line": 147 3116 "line": 130
3143 } 3117 }
3144 }, 3118 },
3145 { 3119 {
3146 "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", 3120 "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
3147 "end": { 3121 "end": {
3148 "column": 3, 3122 "column": 3,
3149 "line": 154 3123 "line": 137
3150 }, 3124 },
3151 "file": "src/components/settings/settings/EditSettingsForm.js", 3125 "file": "src/components/settings/settings/EditSettingsForm.js",
3152 "id": "settings.app.languageDisclaimer", 3126 "id": "settings.app.languageDisclaimer",
3153 "start": { 3127 "start": {
3154 "column": 22, 3128 "column": 22,
3155 "line": 151 3129 "line": 134
3156 } 3130 }
3157 } 3131 }
3158 ], 3132 ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 504018891..20b785fed 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -324,8 +324,6 @@
324 "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", 324 "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
325 "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", 325 "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
326 "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.", 326 "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.",
327 "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
328 "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
329 "settings.app.subheadlineCache": "Cache", 327 "settings.app.subheadlineCache": "Cache",
330 "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", 328 "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
331 "settings.app.translationHelp": "Help us to translate Ferdi into your language.", 329 "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index 994bb4fa5..cdc6ded7e 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": 31, 7 "line": 22,
8 "column": 12 8 "column": 12
9 }, 9 },
10 "end": { 10 "end": {
11 "line": 34, 11 "line": 25,
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": 35, 20 "line": 26,
21 "column": 19 21 "column": 19
22 }, 22 },
23 "end": { 23 "end": {
24 "line": 38, 24 "line": 29,
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": 39, 33 "line": 30,
34 "column": 14 34 "column": 14
35 }, 35 },
36 "end": { 36 "end": {
37 "line": 42, 37 "line": 33,
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": 43, 46 "line": 34,
47 "column": 17 47 "column": 17
48 }, 48 },
49 "end": { 49 "end": {
50 "line": 46, 50 "line": 37,
51 "column": 3 51 "column": 3
52 } 52 }
53 }, 53 },
@@ -56,37 +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": 47, 59 "line": 38,
60 "column": 22 60 "column": 22
61 }, 61 },
62 "end": { 62 "end": {
63 "line": 50, 63 "line": 41,
64 "column": 3
65 }
66 },
67 {
68 "id": "settings.app.serverInfo",
69 "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.",
70 "file": "src/components/settings/settings/EditSettingsForm.js",
71 "start": {
72 "line": 51,
73 "column": 14
74 },
75 "end": {
76 "line": 54,
77 "column": 3
78 }
79 },
80 {
81 "id": "settings.app.serverMoneyInfo",
82 "defaultMessage": "!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
83 "file": "src/components/settings/settings/EditSettingsForm.js",
84 "start": {
85 "line": 55,
86 "column": 19
87 },
88 "end": {
89 "line": 58,
90 "column": 3 64 "column": 3
91 } 65 }
92 }, 66 },
@@ -95,11 +69,11 @@
95 "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)",
96 "file": "src/components/settings/settings/EditSettingsForm.js", 70 "file": "src/components/settings/settings/EditSettingsForm.js",
97 "start": { 71 "start": {
98 "line": 59, 72 "line": 42,
99 "column": 18 73 "column": 18
100 }, 74 },
101 "end": { 75 "end": {
102 "line": 62, 76 "line": 45,
103 "column": 3 77 "column": 3
104 } 78 }
105 }, 79 },
@@ -108,11 +82,11 @@
108 "defaultMessage": "!!!Password", 82 "defaultMessage": "!!!Password",
109 "file": "src/components/settings/settings/EditSettingsForm.js", 83 "file": "src/components/settings/settings/EditSettingsForm.js",
110 "start": { 84 "start": {
111 "line": 63, 85 "line": 46,
112 "column": 18 86 "column": 18
113 }, 87 },
114 "end": { 88 "end": {
115 "line": 66, 89 "line": 49,
116 "column": 3 90 "column": 3
117 } 91 }
118 }, 92 },
@@ -121,11 +95,11 @@
121 "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.",
122 "file": "src/components/settings/settings/EditSettingsForm.js", 96 "file": "src/components/settings/settings/EditSettingsForm.js",
123 "start": { 97 "start": {
124 "line": 67, 98 "line": 50,
125 "column": 22 99 "column": 22
126 }, 100 },
127 "end": { 101 "end": {
128 "line": 70, 102 "line": 53,
129 "column": 3 103 "column": 3
130 } 104 }
131 }, 105 },
@@ -134,11 +108,11 @@
134 "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.",
135 "file": "src/components/settings/settings/EditSettingsForm.js", 109 "file": "src/components/settings/settings/EditSettingsForm.js",
136 "start": { 110 "start": {
137 "line": 71, 111 "line": 54,
138 "column": 12 112 "column": 12
139 }, 113 },
140 "end": { 114 "end": {
141 "line": 74, 115 "line": 57,
142 "column": 3 116 "column": 3
143 } 117 }
144 }, 118 },
@@ -147,11 +121,11 @@
147 "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.",
148 "file": "src/components/settings/settings/EditSettingsForm.js", 122 "file": "src/components/settings/settings/EditSettingsForm.js",
149 "start": { 123 "start": {
150 "line": 75, 124 "line": 58,
151 "column": 24 125 "column": 24
152 }, 126 },
153 "end": { 127 "end": {
154 "line": 78, 128 "line": 61,
155 "column": 3 129 "column": 3
156 } 130 }
157 }, 131 },
@@ -160,11 +134,11 @@
160 "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.",
161 "file": "src/components/settings/settings/EditSettingsForm.js", 135 "file": "src/components/settings/settings/EditSettingsForm.js",
162 "start": { 136 "start": {
163 "line": 79, 137 "line": 62,
164 "column": 20 138 "column": 20
165 }, 139 },
166 "end": { 140 "end": {
167 "line": 82, 141 "line": 65,
168 "column": 3 142 "column": 3
169 } 143 }
170 }, 144 },
@@ -173,11 +147,11 @@
173 "defaultMessage": "!!!Language", 147 "defaultMessage": "!!!Language",
174 "file": "src/components/settings/settings/EditSettingsForm.js", 148 "file": "src/components/settings/settings/EditSettingsForm.js",
175 "start": { 149 "start": {
176 "line": 83, 150 "line": 66,
177 "column": 20 151 "column": 20
178 }, 152 },
179 "end": { 153 "end": {
180 "line": 86, 154 "line": 69,
181 "column": 3 155 "column": 3
182 } 156 }
183 }, 157 },
@@ -186,11 +160,11 @@
186 "defaultMessage": "!!!Updates", 160 "defaultMessage": "!!!Updates",
187 "file": "src/components/settings/settings/EditSettingsForm.js", 161 "file": "src/components/settings/settings/EditSettingsForm.js",
188 "start": { 162 "start": {
189 "line": 87, 163 "line": 70,
190 "column": 19 164 "column": 19
191 }, 165 },
192 "end": { 166 "end": {
193 "line": 90, 167 "line": 73,
194 "column": 3 168 "column": 3
195 } 169 }
196 }, 170 },
@@ -199,11 +173,11 @@
199 "defaultMessage": "!!!Appearance", 173 "defaultMessage": "!!!Appearance",
200 "file": "src/components/settings/settings/EditSettingsForm.js", 174 "file": "src/components/settings/settings/EditSettingsForm.js",
201 "start": { 175 "start": {
202 "line": 91, 176 "line": 74,
203 "column": 22 177 "column": 22
204 }, 178 },
205 "end": { 179 "end": {
206 "line": 94, 180 "line": 77,
207 "column": 3 181 "column": 3
208 } 182 }
209 }, 183 },
@@ -212,11 +186,11 @@
212 "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.",
213 "file": "src/components/settings/settings/EditSettingsForm.js", 187 "file": "src/components/settings/settings/EditSettingsForm.js",
214 "start": { 188 "start": {
215 "line": 95, 189 "line": 78,
216 "column": 25 190 "column": 25
217 }, 191 },
218 "end": { 192 "end": {
219 "line": 98, 193 "line": 81,
220 "column": 3 194 "column": 3
221 } 195 }
222 }, 196 },
@@ -225,11 +199,11 @@
225 "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)", 199 "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)",
226 "file": "src/components/settings/settings/EditSettingsForm.js", 200 "file": "src/components/settings/settings/EditSettingsForm.js",
227 "start": { 201 "start": {
228 "line": 99, 202 "line": 82,
229 "column": 19 203 "column": 19
230 }, 204 },
231 "end": { 205 "end": {
232 "line": 102, 206 "line": 85,
233 "column": 3 207 "column": 3
234 } 208 }
235 }, 209 },
@@ -238,11 +212,11 @@
238 "defaultMessage": "!!!Advanced", 212 "defaultMessage": "!!!Advanced",
239 "file": "src/components/settings/settings/EditSettingsForm.js", 213 "file": "src/components/settings/settings/EditSettingsForm.js",
240 "start": { 214 "start": {
241 "line": 103, 215 "line": 86,
242 "column": 20 216 "column": 20
243 }, 217 },
244 "end": { 218 "end": {
245 "line": 106, 219 "line": 89,
246 "column": 3 220 "column": 3
247 } 221 }
248 }, 222 },
@@ -251,11 +225,11 @@
251 "defaultMessage": "!!!Help us to translate Ferdi into your language.", 225 "defaultMessage": "!!!Help us to translate Ferdi into your language.",
252 "file": "src/components/settings/settings/EditSettingsForm.js", 226 "file": "src/components/settings/settings/EditSettingsForm.js",
253 "start": { 227 "start": {
254 "line": 107, 228 "line": 90,
255 "column": 19 229 "column": 19
256 }, 230 },
257 "end": { 231 "end": {
258 "line": 110, 232 "line": 93,
259 "column": 3 233 "column": 3
260 } 234 }
261 }, 235 },
@@ -264,11 +238,11 @@
264 "defaultMessage": "!!!Cache", 238 "defaultMessage": "!!!Cache",
265 "file": "src/components/settings/settings/EditSettingsForm.js", 239 "file": "src/components/settings/settings/EditSettingsForm.js",
266 "start": { 240 "start": {
267 "line": 111, 241 "line": 94,
268 "column": 20 242 "column": 20
269 }, 243 },
270 "end": { 244 "end": {
271 "line": 114, 245 "line": 97,
272 "column": 3 246 "column": 3
273 } 247 }
274 }, 248 },
@@ -277,11 +251,11 @@
277 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", 251 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
278 "file": "src/components/settings/settings/EditSettingsForm.js", 252 "file": "src/components/settings/settings/EditSettingsForm.js",
279 "start": { 253 "start": {
280 "line": 115, 254 "line": 98,
281 "column": 13 255 "column": 13
282 }, 256 },
283 "end": { 257 "end": {
284 "line": 118, 258 "line": 101,
285 "column": 3 259 "column": 3
286 } 260 }
287 }, 261 },
@@ -290,11 +264,11 @@
290 "defaultMessage": "!!!Clear cache", 264 "defaultMessage": "!!!Clear cache",
291 "file": "src/components/settings/settings/EditSettingsForm.js", 265 "file": "src/components/settings/settings/EditSettingsForm.js",
292 "start": { 266 "start": {
293 "line": 119, 267 "line": 102,
294 "column": 23 268 "column": 23
295 }, 269 },
296 "end": { 270 "end": {
297 "line": 122, 271 "line": 105,
298 "column": 3 272 "column": 3
299 } 273 }
300 }, 274 },
@@ -303,11 +277,11 @@
303 "defaultMessage": "!!!Check for updates", 277 "defaultMessage": "!!!Check for updates",
304 "file": "src/components/settings/settings/EditSettingsForm.js", 278 "file": "src/components/settings/settings/EditSettingsForm.js",
305 "start": { 279 "start": {
306 "line": 123, 280 "line": 106,
307 "column": 25 281 "column": 25
308 }, 282 },
309 "end": { 283 "end": {
310 "line": 126, 284 "line": 109,
311 "column": 3 285 "column": 3
312 } 286 }
313 }, 287 },
@@ -316,11 +290,11 @@
316 "defaultMessage": "!!!Restart & install update", 290 "defaultMessage": "!!!Restart & install update",
317 "file": "src/components/settings/settings/EditSettingsForm.js", 291 "file": "src/components/settings/settings/EditSettingsForm.js",
318 "start": { 292 "start": {
319 "line": 127, 293 "line": 110,
320 "column": 23 294 "column": 23
321 }, 295 },
322 "end": { 296 "end": {
323 "line": 130, 297 "line": 113,
324 "column": 3 298 "column": 3
325 } 299 }
326 }, 300 },
@@ -329,11 +303,11 @@
329 "defaultMessage": "!!!Is searching for update", 303 "defaultMessage": "!!!Is searching for update",
330 "file": "src/components/settings/settings/EditSettingsForm.js", 304 "file": "src/components/settings/settings/EditSettingsForm.js",
331 "start": { 305 "start": {
332 "line": 131, 306 "line": 114,
333 "column": 25 307 "column": 25
334 }, 308 },
335 "end": { 309 "end": {
336 "line": 134, 310 "line": 117,
337 "column": 3 311 "column": 3
338 } 312 }
339 }, 313 },
@@ -342,11 +316,11 @@
342 "defaultMessage": "!!!Update available, downloading...", 316 "defaultMessage": "!!!Update available, downloading...",
343 "file": "src/components/settings/settings/EditSettingsForm.js", 317 "file": "src/components/settings/settings/EditSettingsForm.js",
344 "start": { 318 "start": {
345 "line": 135, 319 "line": 118,
346 "column": 25 320 "column": 25
347 }, 321 },
348 "end": { 322 "end": {
349 "line": 138, 323 "line": 121,
350 "column": 3 324 "column": 3
351 } 325 }
352 }, 326 },
@@ -355,11 +329,11 @@
355 "defaultMessage": "!!!You are using the latest version of Ferdi", 329 "defaultMessage": "!!!You are using the latest version of Ferdi",
356 "file": "src/components/settings/settings/EditSettingsForm.js", 330 "file": "src/components/settings/settings/EditSettingsForm.js",
357 "start": { 331 "start": {
358 "line": 139, 332 "line": 122,
359 "column": 24 333 "column": 24
360 }, 334 },
361 "end": { 335 "end": {
362 "line": 142, 336 "line": 125,
363 "column": 3 337 "column": 3
364 } 338 }
365 }, 339 },
@@ -368,11 +342,11 @@
368 "defaultMessage": "!!!Current version:", 342 "defaultMessage": "!!!Current version:",
369 "file": "src/components/settings/settings/EditSettingsForm.js", 343 "file": "src/components/settings/settings/EditSettingsForm.js",
370 "start": { 344 "start": {
371 "line": 143, 345 "line": 126,
372 "column": 18 346 "column": 18
373 }, 347 },
374 "end": { 348 "end": {
375 "line": 146, 349 "line": 129,
376 "column": 3 350 "column": 3
377 } 351 }
378 }, 352 },
@@ -381,11 +355,11 @@
381 "defaultMessage": "!!!Changes require restart", 355 "defaultMessage": "!!!Changes require restart",
382 "file": "src/components/settings/settings/EditSettingsForm.js", 356 "file": "src/components/settings/settings/EditSettingsForm.js",
383 "start": { 357 "start": {
384 "line": 147, 358 "line": 130,
385 "column": 29 359 "column": 29
386 }, 360 },
387 "end": { 361 "end": {
388 "line": 150, 362 "line": 133,
389 "column": 3 363 "column": 3
390 } 364 }
391 }, 365 },
@@ -394,11 +368,11 @@
394 "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", 368 "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
395 "file": "src/components/settings/settings/EditSettingsForm.js", 369 "file": "src/components/settings/settings/EditSettingsForm.js",
396 "start": { 370 "start": {
397 "line": 151, 371 "line": 134,
398 "column": 22 372 "column": 22
399 }, 373 },
400 "end": { 374 "end": {
401 "line": 154, 375 "line": 137,
402 "column": 3 376 "column": 3
403 } 377 }
404 } 378 }