5 files changed, 18 insertions, 13 deletions

diff --git a/.travis.yml b/.travis.yml
index 1d328aad5..124a6fc8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,3 +26,4 @@ cache: npm
 branches:
   except:
     - i18n
+    - l10n_master
diff --git a/appveyor.yml b/appveyor.yml
index 157e35df3..39d7f793a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,3 +25,4 @@ artifacts:
 branches:
   except:
     - i18n
+    - l10n_master
diff --git a/electron-builder.yml b/electron-builder.yml
index e95eb47b7..b2c243e49 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -27,10 +27,10 @@ dmg:
 win:
   icon: ./build-helpers/images/icon.ico
   target:
-    target: nsis
-    arch:
-      - x64
-      - ia32
+    - target: nsis
+      arch: [x64, ia32]
+    - target: portable
+      arch: [x64, ia32]
 
 linux:
   icon: ./build-helpers/images/icons
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
index a9a87707b..1fd247d17 100644
--- a/src/components/ui/AppLoader/index.js
+++ b/src/components/ui/AppLoader/index.js
@@ -9,14 +9,13 @@ import { shuffleArray } from '../../../helpers/array-helpers';
 import styles from './styles';
 
 const textList = shuffleArray([
-  'Looking for Sisi',
-  'Contacting the herald',
-  'Saddling the unicorn',
-  'Learning the Waltz',
-  'Visiting Horst & Grete',
-  'Twisting my moustache',
-  'Playing the trumpet',
-  'Traveling through space & time',
+  'Adding free features',
+  'Making application usable',
+  'Removing unproductive paywalls',
+  'Creating custom server software',
+  'Increasing productivity',
+  'Listening to our userbase',
+  'Fixing bugs',
 ]);
 
 export default @injectSheet(styles) @withTheme class AppLoader extends Component {
diff --git a/src/index.js b/src/index.js
index 73fc6e299..1b982c77e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -11,7 +11,11 @@ import windowStateKeeper from 'electron-window-state';
 
 // Set app directory before loading user modules
 if (isDevMode) {
-  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+  app.setPath('userData', path.join(app.getPath('appData'), app.getName() + 'Dev'));
+} else if (process.env.FERDI_USERDATA_DIR != null) {
+  app.setPath('userData', process.env.FERDI_USERDATA_DIR)
+} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
+  app.setPath('userData', path.join(process.env.PORTABLE_EXECUTABLE_DIR, app.getName()));
 }
 
 /* eslint-disable import/first */