aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/components/settings/settings/EditSettingsForm.js8
-rw-r--r--src/i18n/locales/defaultMessages.json13
-rw-r--r--src/i18n/locales/en-US.json3
-rw-r--r--src/i18n/messages/src/components/settings/settings/EditSettingsForm.json13
4 files changed, 36 insertions, 1 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 8429d0ecb..efd453356 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -81,6 +81,10 @@ const messages = defineMessages({
81 id: 'settings.app.restartRequired', 81 id: 'settings.app.restartRequired',
82 defaultMessage: '!!!Changes require restart', 82 defaultMessage: '!!!Changes require restart',
83 }, 83 },
84 languageDisclaimer: {
85 id: 'settings.app.languageDisclaimer',
86 defaultMessage: '!!!Official translations are English & German. All other languages are community based translations.',
87 },
84}); 88});
85 89
86export default @observer class EditSettingsForm extends Component { 90export default @observer class EditSettingsForm extends Component {
@@ -239,6 +243,10 @@ export default @observer class EditSettingsForm extends Component {
239 {intl.formatMessage(messages.currentVersion)} 243 {intl.formatMessage(messages.currentVersion)}
240 {' '} 244 {' '}
241 {remote.app.getVersion()} 245 {remote.app.getVersion()}
246 <p className="settings__message">
247 <span className="mdi mdi-information" />
248 {intl.formatMessage(messages.languageDisclaimer)}
249 </p>
242 </form> 250 </form>
243 </div> 251 </div>
244 </div> 252 </div>
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 65799b614..bb7784257 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2237,6 +2237,19 @@
2237 "column": 29, 2237 "column": 29,
2238 "line": 80 2238 "line": 80
2239 } 2239 }
2240 },
2241 {
2242 "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
2243 "end": {
2244 "column": 3,
2245 "line": 87
2246 },
2247 "file": "src/components/settings/settings/EditSettingsForm.js",
2248 "id": "settings.app.languageDisclaimer",
2249 "start": {
2250 "column": 22,
2251 "line": 84
2252 }
2240 } 2253 }
2241 ], 2254 ],
2242 "path": "src/components/settings/settings/EditSettingsForm.json" 2255 "path": "src/components/settings/settings/EditSettingsForm.json"
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 84a71117a..a9d0f789d 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -162,6 +162,7 @@
162 "settings.app.headlineGeneral": "General", 162 "settings.app.headlineGeneral": "General",
163 "settings.app.headlineLanguage": "Language", 163 "settings.app.headlineLanguage": "Language",
164 "settings.app.headlineUpdates": "Updates", 164 "settings.app.headlineUpdates": "Updates",
165 "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
165 "settings.app.restartRequired": "Changes require restart", 166 "settings.app.restartRequired": "Changes require restart",
166 "settings.app.subheadlineCache": "Cache", 167 "settings.app.subheadlineCache": "Cache",
167 "settings.app.translationHelp": "Help us to translate Franz into your language.", 168 "settings.app.translationHelp": "Help us to translate Franz into your language.",
@@ -317,4 +318,4 @@
317 "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", 318 "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
318 "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", 319 "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
319 "workspaces.switchingIndicator.switchingTo": "Switching to" 320 "workspaces.switchingIndicator.switchingTo": "Switching to"
320} \ No newline at end of file 321}
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index c64f477be..fa21db10a 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -219,5 +219,18 @@
219 "line": 83, 219 "line": 83,
220 "column": 3 220 "column": 3
221 } 221 }
222 },
223 {
224 "id": "settings.app.languageDisclaimer",
225 "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
226 "file": "src/components/settings/settings/EditSettingsForm.js",
227 "start": {
228 "line": 84,
229 "column": 22
230 },
231 "end": {
232 "line": 87,
233 "column": 3
234 }
222 } 235 }
223] \ No newline at end of file 236] \ No newline at end of file