Merge branch 'develop' into feature/workspaces

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({
     id: 'global.notConnectedToTheInternet',
     defaultMessage: '!!!You are not connected to the internet.',
   },
+  spellcheckerLanguage: {
+    id: 'global.spellchecking.language',
+    defaultMessage: '!!!Spell checking language',
+  },
+  spellcheckerSystemDefault: {
+    id: 'global.spellchecker.useDefault',
+    defaultMessage: '!!!Use System Default ({default})',
+  },
+  spellcheckerAutomaticDetection: {
+    id: 'global.spellchecking.autodetect',
+    defaultMessage: '!!!Detect language automatically',
+  },
+  spellcheckerAutomaticDetectionShort: {
+    id: 'global.spellchecking.autodetect.short',
+    defaultMessage: '!!!Automatic',
+  },
 });
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 24c96cb26..fe16e916f 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1,6 +1,10 @@
 {
   "global.api.unhealthy": "Can't connect to Franz online services",
   "global.notConnectedToTheInternet": "You are not connected to the internet.",
+  "global.spellchecking.language": "Spell checking language",
+  "global.spellchecker.useDefault": "Use System Default ({default})",
+  "global.spellchecking.autodetect": "Detect language automatically",
+  "global.spellchecking.autodetect.short": "Automatic",
   "welcome.signupButton": "Create a free account",
   "welcome.loginButton": "Login to your account",
   "welcome.slogan": "Messaging that works for you",