aboutsummaryrefslogtreecommitdiffstats
path: root/src/i18n
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-02-12 20:42:21 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-02-12 20:42:21 +0100
commit2d5a303b1cc559339c3ecc7a176e9d8bd66755ef (patch)
tree2a97c1db68a72b8e208bd177af7faad5df2c9f48 /src/i18n
parentfeat(Windows): Add option to quit Franz from Taskbar icon (diff)
parentfeat(Spell checking): Add option to automatically detect language (diff)
downloadferdium-app-2d5a303b1cc559339c3ecc7a176e9d8bd66755ef.tar.gz
ferdium-app-2d5a303b1cc559339c3ecc7a176e9d8bd66755ef.tar.zst
ferdium-app-2d5a303b1cc559339c3ecc7a176e9d8bd66755ef.zip
Merge branch 'feature/spellcheck-autodetect' into develop
Diffstat (limited to 'src/i18n')
-rw-r--r--src/i18n/globalMessages.js16
-rw-r--r--src/i18n/locales/en-US.json4
2 files changed, 20 insertions, 0 deletions
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index 2c724ff6f..7b1618602 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -13,4 +13,20 @@ export default defineMessages({
13 id: 'global.notConnectedToTheInternet', 13 id: 'global.notConnectedToTheInternet',
14 defaultMessage: '!!!You are not connected to the internet.', 14 defaultMessage: '!!!You are not connected to the internet.',
15 }, 15 },
16 spellcheckerLanguage: {
17 id: 'global.spellchecking.language',
18 defaultMessage: '!!!Spell checking language',
19 },
20 spellcheckerSystemDefault: {
21 id: 'global.spellchecker.useDefault',
22 defaultMessage: '!!!Use System Default ({default})',
23 },
24 spellcheckerAutomaticDetection: {
25 id: 'global.spellchecking.autodetect',
26 defaultMessage: '!!!Detect language automatically',
27 },
28 spellcheckerAutomaticDetectionShort: {
29 id: 'global.spellchecking.autodetect.short',
30 defaultMessage: '!!!Automatic',
31 },
16}); 32});
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 99df6a0ca..4e0c5575d 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1,6 +1,10 @@
1{ 1{
2 "global.api.unhealthy": "Can't connect to Franz online services", 2 "global.api.unhealthy": "Can't connect to Franz online services",
3 "global.notConnectedToTheInternet": "You are not connected to the internet.", 3 "global.notConnectedToTheInternet": "You are not connected to the internet.",
4 "global.spellchecking.language": "Spell checking language",
5 "global.spellchecker.useDefault": "Use System Default ({default})",
6 "global.spellchecking.autodetect": "Detect language automatically",
7 "global.spellchecking.autodetect.short": "Automatic",
4 "welcome.signupButton": "Create a free account", 8 "welcome.signupButton": "Create a free account",
5 "welcome.loginButton": "Login to your account", 9 "welcome.loginButton": "Login to your account",
6 "welcome.slogan": "Messaging that works for you", 10 "welcome.slogan": "Messaging that works for you",