Merge branch 'develop' into feature/icon-upload

1 files changed, 9 insertions, 2 deletions

diff --git a/src/config.js b/src/config.js
index 1627993f5..e66594c59 100644
--- a/src/config.js
+++ b/src/config.js
@@ -7,11 +7,18 @@ export const GA_ID = 'UA-74126766-6';
 export const DEFAULT_APP_SETTINGS = {
   autoLaunchOnStart: true,
   autoLaunchInBackground: false,
-  runInBackground: false,
+  runInBackground: true,
   enableSystemTray: true,
   minimizeToSystemTray: false,
   showDisabledServices: true,
-  locale: 'en-US',
+  showMessageBadgeWhenMuted: true,
+  enableSpellchecking: true,
+  // spellcheckingLanguage: 'auto',
+  locale: '',
+  fallbackLocale: 'en-US',
   beta: false,
   isAppMuted: false,
 };
+
+export const FRANZ_SERVICE_REQUEST = 'http://bit.ly/franz-service-request';
+export const FRANZ_TRANSLATION = 'http://bit.ly/franz-translate';