Merge branch 'develop'

56 files changed, 206 insertions, 130 deletions

diff --git a/README.md b/README.md
index c2a4f4aeb..1f50307ba 100644
--- a/README.md
+++ b/README.md
@@ -104,6 +104,7 @@ If you use an AUR Helper e.g. yay, simply install it via `yay -S ferdi-bin`.
 - [x] Add CTRL+← and CTRL+→ shortcuts and menu options to go back and forward in the service browsing history([#39](https://github.com/getferdi/ferdi/issues/39))
 - [x] Add option to show a browser-like navigation bar on all services
 - [x] Add option to change accent color
+- [x] Add local [recipe repository](https://github.com/getferdi/recipes) that removes the need of downloading recipes from a remote server
 - [x] Add portable version for Windows
 - [x] Add Process Manager to find services using a lot of resources
 - [x] Add "npm run prepare-code" command for development to lint and beautify code
@@ -193,7 +194,9 @@ Deliverables will be available in the `out` folder.
 ### Release
 
 ```bash
-$ git checkout develop && git pull && git checkout master
+$ git checkout develop && git pull
+$ git submodule update --remote --force
+$ git checkout master
 $ git merge --no-ff develop
 $ git tag v5.3.4-beta.4
 $ git push --tags
diff --git a/appveyor.yml b/appveyor.yml
index 693fdb700..ff32387a6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 environment:
   APPVEYOR_CACHE_SKIP_RESTORE: true
 
-version: 5.4.1-beta.3.{build}
+version: 5.4.1-beta.4.{build}
 
 install:
   - git submodule update --init --recursive
diff --git a/build-helpers/entitlements.mas.inherit.plist b/build-helpers/entitlements.mas.inherit.plist
new file mode 100644
index 000000000..ef14228f0
--- /dev/null
+++ b/build-helpers/entitlements.mas.inherit.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+          <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.device.camera</key>
+    <true/>
+    <key>com.apple.security.device.microphone</key>
+    <true/>
+    <key>com.apple.security.device.audio-input</key>
+    <true/>
+    <key>com.apple.security.network.client</key>
+    <true/>
+  </dict>
+</plist>
\ No newline at end of file
diff --git a/build-helpers/entitlements.mas.plist b/build-helpers/entitlements.mas.plist
new file mode 100644
index 000000000..ef14228f0
--- /dev/null
+++ b/build-helpers/entitlements.mas.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+          <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.device.camera</key>
+    <true/>
+    <key>com.apple.security.device.microphone</key>
+    <true/>
+    <key>com.apple.security.device.audio-input</key>
+    <true/>
+    <key>com.apple.security.network.client</key>
+    <true/>
+  </dict>
+</plist>
\ No newline at end of file
diff --git a/build-helpers/images/icon.ico b/build-helpers/images/icon.ico
index b7667d97f..56120519d 100644
--- a/build-helpers/images/icon.ico
+++ b/build-helpers/images/icon.ico
diff --git a/electron-builder.yml b/electron-builder.yml
index 4fa6c0b15..23625c825 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -12,6 +12,11 @@ mac:
   category: public.app-category.productivity
   icon: ./build-helpers/images/icon.icns
   darkModeSupport: true
+  entitlements: "./build-helpers/entitlements.mas.plist"
+  entitlementsInherit: "./build-helpers/entitlements.mas.inherit.plist"
+  extendInfo:
+    NSMicrophoneUsageDescription: "This app requires camera access for video messaging services."
+    NSCameraUsageDescription: "This app requires microphone access for audio messaging services."
 
 afterSign: ./build-helpers/notarize.js
 
diff --git a/next_release.md b/next_release.md
deleted file mode 100644
index ae472bce9..000000000
--- a/next_release.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Next release
-Infos about the next release:
-
-## Beta
-v5.4.0-beta.5:
-- Updated translations
-- Remove "&" sign from window menu bar (#65)
-- Extend debug information
-- Use SSH for submodules
-- Move hibernation indicator to bottom left (#129 (comment))
-- Add fix for 1.1.1.1 hack (#146)
-- Fix darkmode not loading correctly (#158)
-- Add adaptable Dark Mode that will respect the system's darkmode setting ([#173](https://github.com/getferdi/ferdi/issues/173))
-
-## Minor
-v5.4.0
-
-### Features
-- **Merge Franz 5.4.0**
-- **Use Ferdi without an Account**: Simply choose "Use Ferdi without an Account" on the login screen
-- **Accent color**: Change Ferdi's accent color
-- **Darkmode**: 
-  - Easily open and edit any service's `darkmode.css` through the new "Open darkmode.css" button
-  - Add adaptable Dark Mode that will respect the system's darkmode setting ([#173](https://github.com/getferdi/ferdi/issues/173) - @steliyan)
-- **Hibernation**: Activate service hibernation to save battery
-- **Smaller file size**: Ferdi is now 17% smaller
-- **Annoucements**: Always get notified about the latest features of Ferdi
-- **Navigation bar**: Add option to always show a service navigation bar
-
-### Minor changes
-- Sorting applications in QuickSwitch by last used
-- Add info about teams only being available on Franz servers
-- Add toggle to disable dark mode on per-service basis
-- Add toggle to disable universal Dark Mode
-- Improve switching between accounts
-- Extend debug information
-- Add fix for 1.1.1.1 hack (#146)
-
-### Bug fixes
-- Fix universal darkmode for WhatsApp and Threema QR Codes
-- Fix darkmode not activating on reload
-- Fix disabling/enabling service not correctly reloading webview (#116)
-- Remove "&" sign from window menu bar (#65)
-
-### Changes in building Ferdi
-- Update Building Node Version
-- Use SSH for submodules
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 2ffd534e0..9c9b1aeb7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.4.1-beta.3",
+  "version": "5.4.1-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2641cb721..acf4852d2 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ferdi",
   "productName": "Ferdi",
   "appId": "com.kytwb.ferdi",
-  "version": "5.4.1-beta.3",
+  "version": "5.4.1-beta.5",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
diff --git a/recipes b/recipes
-Subproject ecf037c35f39f283bca2078486d5eb4ad42ec2d
+Subproject cea06d3a1645be7896659f06088caf9668ce783
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js
index ca571f20e..e7f3dc78b 100644
--- a/src/components/auth/Locked.js
+++ b/src/components/auth/Locked.js
@@ -87,6 +87,7 @@ export default @observer class Locked extends Component {
           <Input
             field={form.$('password')}
             showPasswordToggle
+            focus
           />
           {error.code === 'invalid-credentials' && (
             <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p>
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js
index 83a05554b..e0b608b96 100644
--- a/src/components/ui/ImageUpload.js
+++ b/src/components/ui/ImageUpload.js
@@ -91,7 +91,7 @@ export default @observer class ImageUpload extends Component {
               onDrop={this.onDrop.bind(this)}
               className={cssClasses}
               multiple={multiple}
-              accept="image/jpeg, image/png"
+              accept="image/jpeg, image/png, image/svg+xml"
             >
               <i className="mdi mdi-file-image" />
               <p>
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index 923f10327..c58d69374 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -10,7 +10,7 @@ import styles from './styles';
 const messages = defineMessages({
   loading: {
     id: 'service.webviewLoader.loading',
-    defaultMessage: '!!!Loading',
+    defaultMessage: '!!!Loading {service}',
   },
 });
 
@@ -30,7 +30,7 @@ export default @injectSheet(styles) @observer class WebviewLoader extends Compon
     return (
       <FullscreenLoader
         className={classes.component}
-        title={`${intl.formatMessage(messages.loading)} ${name}`}
+        title={`${intl.formatMessage(messages.loading, { service: name })}`}
       />
     );
   }
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index d18d7fb9b..99c40b086 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -51,7 +51,7 @@ const messages = defineMessages({
   },
   customUrl: {
     id: 'settings.service.form.customUrl',
-    defaultMessage: '!!!Custom server',
+    defaultMessage: '!!!Service URL',
   },
   indirectMessages: {
     id: 'settings.service.form.indirectMessages',
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index b9294123d..3b0227007 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 3ecf0caaf..f34984b12 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Introducció",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Editar Compte",
   "settings.account.accountType.basic": "Compte bàsic",
   "settings.account.accountType.premium": "Compte de Suport Premium",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Actualitzar el perfil",
   "settings.account.deleteAccount": "Esborrar compte",
   "settings.account.deleteEmailSent": "Has rebut un correu electrònic amb un enllaç per confirmar l'eliminació del compte. El teu compte i la seva informació no podran ser restaurats!",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 0932ba6ae..aef8b6837 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Začněme",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Upravit účet",
   "settings.account.accountType.basic": "Základní účet",
   "settings.account.accountType.premium": "Prémiový účet podporovatele",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Aktualizovat profil",
   "settings.account.deleteAccount": "Smazat účet",
   "settings.account.deleteEmailSent": "Na váš mail byl odeslán email s odkazem pro potvrzení smazání účtu. Váš účet a data poté nepůjde obnovit!",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 2905bba4c..34e0c5c37 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -21,8 +21,8 @@
   "feature.planSelection.fullscreen.dialog.message": "Du bist dabei, auf ein kostenloses Konto herunterzustufen. Bist du sicher? Klicke stattdessen hier, um mehr Dienste und Funktionen für nur {currency}{price} pro Monat zu erhalten.",
   "feature.planSelection.fullscreen.dialog.title": "Deinen Ferdi Plan herunterstufen",
   "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Ferdi works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}",
-  "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
+  "feature.planSelection.fullscreen.welcome": "Bist du bereit zu wählen, {name}",
+  "feature.planSelection.personal.text": "Weitere Dienste, keine Wartezeiten - ideal für den persönlichen Gebrauch.",
   "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
   "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.quickSwitch.info": "Wähle einen Service mit TAB, ↑ und ↓. Um einen Service zu öffnen, drücke ENTER.",
@@ -39,7 +39,7 @@
   "feature.todos.premium.info": "Ferdi Todos sind jetzt für Premium User verfügbar!",
   "feature.todos.premium.rollout": "Alle anderen müssen sich noch ein wenig gedulden.",
   "feature.todos.premium.upgrade": "Account Upgrade",
-  "feature.trialStatusBar.cta": "Upgrade now",
+  "feature.trialStatusBar.cta": "Jetzt upgraden",
   "feature.trialStatusBar.expired": "Your free Ferdi {plan} Trial has expired, please upgrade your account.",
   "feature.trialStatusBar.fullscreen.dialog.cta.downgrade": "Auf kostenlosen Plan herunterstufen",
   "feature.trialStatusBar.fullscreen.dialog.cta.upgrade": "Personal Plan wählen",
@@ -78,8 +78,8 @@
   "locked.password.label": "Passwort",
   "locked.submit.label": "Entsperren",
   "login.changeServer": "Server wechseln",
-  "login.customServerQuestion": "Du benutzt einen Franz Account zum anmelden?",
-  "login.customServerSuggestion": "Versuche, deinen Franz account zu importieren",
+  "login.customServerQuestion": "Du benutzt ein Franz-Konto zum Anmelden?",
+  "login.customServerSuggestion": "Versuche dein Franz-Konto in Ferdi zu importieren",
   "login.email.label": "E-Mail-Adresse",
   "login.headline": "Anmelden",
   "login.invalidCredentials": "E-Mail-Adresse oder Passwort ungültig",
@@ -163,20 +163,20 @@
   "password.submit.label": "Absenden",
   "password.successInfo": "Wir haben Dir eine E-Mail mit weiteren Anweisungen geschickt",
   "premiumFeature.button.upgradeAccount": "Account erweitern",
-  "pricing.features.accountSync": "Account Synchronisation",
+  "pricing.features.accountSync": "Konto-Synchronisierung",
   "pricing.features.adFree": "Keine Werbung",
   "pricing.features.appDelays": "Keine unnötigen Unterbrechungen",
   "pricing.features.customWebsites": "Hinzufügen von eigenen Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
+  "pricing.features.desktopNotifications": "Desktop Benachrichtigungen",
   "pricing.features.onPremise": "On-premise & andere Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
+  "pricing.features.recipes": "Wählen Sie aus mehr als 70 Diensten",
   "pricing.features.serviceProxies": "Service-Proxies",
   "pricing.features.spellchecker": "Rechtschreibprüfung",
   "pricing.features.teamManagement": "Team-Management",
   "pricing.features.thirdPartyServices": "Integration von Services über Drittanbieter",
   "pricing.features.unlimitedServices": "Unbegrenztes hinzufügen von Services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
+  "pricing.features.upToSixServices": "Bis zu 6 Dienste hinzufügen",
+  "pricing.features.upToThreeServices": "Bis zu 3 Dienste hinzufügen",
   "pricing.features.workspaces": "Arbeitsbereiche",
   "pricing.plan.free": "Ferdi kostenlos",
   "pricing.plan.legacy": "Ferdi Premium",
@@ -215,15 +215,17 @@
   "service.restrictedHandler.customUrl.text": "Bitte ein Upgrade zu Ferdi Professional durchführen um benutzerdefinierte URLs und Self Hosted Services verwenden zu können.",
   "service.restrictedHandler.serviceLimit.headline": "Du hast deine maximale Anzahl an Services erreicht.",
   "service.restrictedHandler.serviceLimit.text": "Bitte führe eine Upgrade deines Accounts durch um mehr als {count} Services verwenden zu können.",
-  "service.webviewLoader.loading": "Lade",
+  "service.webviewLoader.loading": "Lade {service}",
   "services.getStarted": "Los geht's!",
   "services.login": "Bitte melde dich an, um Ferdi zu benutzen.",
   "services.serverInfo": "Optional können Sie Ihren Ferdi-Server durch Klicken auf das Zahnrad unten-links ändern.",
-  "services.serverless": "Ferdi ohne einen Account verwenden",
+  "services.serverless": "Ferdi ohne ein Konto verwenden",
   "services.welcome": "Willkommen bei Ferdi!",
   "settings.account.account.editButton": "Konto bearbeiten",
   "settings.account.accountType.basic": "Basis-Konto",
   "settings.account.accountType.premium": "Premium Lizenz",
+  "settings.account.accountUnavailable": "Konto nicht verfügbar",
+  "settings.account.accountUnavailableInfo": "Du verwendest Ferdi ohne ein Konto. Wenn du Ferdi mit einem Konto verwenden möchtest und deine Dienste über alle verschiedene Computer hinweg synchronisieren möchtest, wählen bitte einen Server in den Einstellungen und melde dich danach an.",
   "settings.account.buttonSave": "Profil aktualisieren",
   "settings.account.deleteAccount": "Benutzerkonto löschen",
   "settings.account.deleteEmailSent": "Du hast eine E-Mail zur Bestätigung der Löschung Deines Benutzerkontos erhalten. Dein Benutzerkonto und Deine Daten können nach der Löschung nicht wiederhergestellt werden!",
@@ -236,7 +238,7 @@
   "settings.account.headlineProfile": "Profil aktualisieren",
   "settings.account.headlineSubscription": "Dein Abonnement",
   "settings.account.headlineTrialUpgrade": "Hol dir die kostenlose 14-tägige Ferdi Professional Testlizenz!",
-  "settings.account.headlineUpgradeAccount": "Hol dir ein Upgrade deines Accounts und bekomme alle Features von Ferdi!",
+  "settings.account.headlineUpgradeAccount": "Hol dir ein Upgrade deines Kontos und bekomme alle Features von Ferdi",
   "settings.account.invoiceDownload": "Herunterladen",
   "settings.account.manageSubscription.label": "Dein Abonnement verwalten",
   "settings.account.successInfo": "Deine Änderungen wurden gespeichert",
@@ -261,12 +263,12 @@
   "settings.app.form.beta": "Beta-Versionen einbeziehen",
   "settings.app.form.darkMode": "Die dunkle Seite erwartet dich! (Dark Mode)",
   "settings.app.form.enableGPUAcceleration": "Hardwarebeschleunigung aktivieren",
-  "settings.app.form.enableLock": "Enable Password Lock",
+  "settings.app.form.enableLock": "Passwort-Sperre aktivieren",
   "settings.app.form.enableSpellchecking": "Rechtschreibprüfung aktivieren",
   "settings.app.form.enableSystemTray": "Ferdi im Infobereich anzeigen",
   "settings.app.form.enableTodos": "Ferdi Todos aktivieren",
   "settings.app.form.hibernate": "\"Service Hibernation\" aktivieren",
-  "settings.app.form.hibernationStrategy": "\"Service Hibernation\" Zeit",
+  "settings.app.form.hibernationStrategy": "\"Service Hibernation\"-Strategie",
   "settings.app.form.keepAllWorkspacesLoaded": "Alle Arbeitsbereiche geladen lassen",
   "settings.app.form.language": "Sprache",
   "settings.app.form.lockPassword": "Passwort",
@@ -289,16 +291,16 @@
   "settings.app.headlineGeneral": "Allgemeines",
   "settings.app.headlineLanguage": "Sprache",
   "settings.app.headlineUpdates": "Updates",
-  "settings.app.hibernateInfo": "Standardmäßig öffnet Ferdi alle Ihre Dienste im Hintergrund, so dass diese bereit sind, wenn du sie verwenden möchtest. Service Hibernation wird Ihre Dienste nach einer bestimmten Zeitspanne schließen. Dies ist nützlich, um RAM zu speichern oder Dienste davon abzuhalten, deinen Computer zu verlangsamen.",
+  "settings.app.hibernateInfo": "Standardmäßig öffnet Ferdi alle deine Dienste im Hintergrund, sodass diese bereit sind, wenn du sie verwenden möchtest. \"Service Hibernation\" wird deine Dienste nach einer bestimmten Zeitspanne schließen. Dies ist nützlich, um RAM zu speichern oder Dienste davon abzuhalten, deinen Computer zu verlangsamen.",
   "settings.app.languageDisclaimer": "Offizielle Übersetzungen: Englisch & Deutsch. Alle anderen Sprachen sind Übersetzungen der Ferdi Community.",
-  "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+  "settings.app.lockInfo": "Die Passwort-Sperre erlaubt es dir, deine Nachrichten zu schützen.\nMit der Passwort-Sperre wirst du beim Starten von Ferdi und wenn du das Programm manuell sperrst, darum gebeten, dein Passwort einzugeben.\nDu kannst Ferdi über das Sperrsymbol in der unteren linken Ecke oder dem Shortcut CMD/CTRL+Shift+L sperren.",
   "settings.app.lockedPassword": "Passwort",
   "settings.app.lockedPasswordInfo": "Bitte stelle sicher, dass du ein Passwort setzt, an welches du dich erinnern kannst.\nSolltest du dieses Passwort vergessen, musst du Ferdi neu installieren.",
   "settings.app.restartRequired": "Änderungen werden erst nach einem Neustart wirksam.",
   "settings.app.scheduledDNDInfo": "Die geplante \"Nicht-stören\"-Funktion erlaubt es dir eine Zeitspanne festzulegen, in der du keine Benachrichtigungen von Ferdi erhalten möchtest.",
   "settings.app.scheduledDNDTimeInfo": "Zeiten im 24-Stunden-Format (z.B. 18:00). Endzeit kann vor Beginn der Startzeit sein (z.B. 17:00 Uhr, Ende 09:00), um die Funktion über Nacht zu aktivieren.",
   "settings.app.serverInfo": "Wir empfehlen dir, dich nach dem Ändern des Servers abzumelden, da Ihre Einstellungen möglicherweise sonst nicht auf dem Server gespeichert werden können.",
-  "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
+  "settings.app.serverMoneyInfo": "Du verwendest den Franz's offiziellen Server.\nWir wissen, dass Ferdi es dir erlaubt, alle Funktionen kostenlos zu nutzen, aber du verwendest immer noch Franz's Serverressourcen - für die Franz's Entwickler zahlen müssen.\nBitte überlege dir, [Link 1]für ein Franz Premium-Account zu zahlen[/Link] oder [Link 2]dir einen eigene Server einzurichten[/Link] (wenn du das Wissen und die Ressourcen dazu hast). \nDurch die Nutzung von Ferdi profitierst du noch immer stark von Franz's Diensten, Serverressourcen und seiner Entwicklung.",
   "settings.app.subheadlineCache": "Cache",
   "settings.app.todoServerInfo": "Dieser Server wird für die Funktion \"Ferdi Todo\" verwendet. (Standard: https://app.franztodos.com)",
   "settings.app.translationHelp": "Hilf uns, Ferdi in Deine Sprache zu übersetzen.",
@@ -443,9 +445,9 @@
   "subscription.cta.allOptions": "Alle Optionen anzeigen",
   "subscription.cta.choosePlan": "Wähle deine Lizenz",
   "subscription.includedProFeatures": "Die Ferdi Professional Lizenz beinhaltet:",
-  "subscription.interval.per": "per {interval}",
-  "subscription.interval.perMonth": "per month",
-  "subscription.interval.perMonthPerUser": "per month & user",
+  "subscription.interval.per": "pro {interval}",
+  "subscription.interval.perMonth": "pro Monat",
+  "subscription.interval.perMonthPerUser": "pro Monat und Benutzer",
   "subscription.planItem.upgradeAccount": "Account Upgrade",
   "subscription.teaser.includedFeatures": "Bezahlte Ferdi Lizenzen beinhalten:",
   "subscription.teaser.intro": "Ferdi 5 ist voll gepackt mit vielen neuen Features, damit du für jegliche kommunikative Eventualität gerüstet bist. Nimm dir was du brauchst und leg los!",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 429930278..fe324cd67 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -3809,7 +3809,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Loading",
+        "defaultMessage": "!!!Loading {service}",
         "end": {
           "column": 3,
           "line": 14
@@ -3936,7 +3936,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Custom server",
+        "defaultMessage": "!!!Service URL",
         "end": {
           "column": 3,
           "line": 55
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 137bd93cb..b31d971a6 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Ξεκινήστε",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Επεξεργασία λογαριασμού",
   "settings.account.accountType.basic": "Βασικός λογαριασμός",
   "settings.account.accountType.premium": "Λογαριασμός Premium Υποστηρικτή",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Ενημέρωση προφίλ",
   "settings.account.deleteAccount": "Διαγραφή λογαριασμού",
   "settings.account.deleteEmailSent": "Έχετε λάβει ένα email με έναν σύνδεσμο για την επιβεβαίωση της διαγραφής του λογαριασμού σας. Ο λογαριασμός και τα δεδομένα σας δεν μπορούν να ανακτηθούν!",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index ee85566bb..5acb277ef 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 6df814503..ddf2b89c7 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Por favor suscribase al Plan Ferdi Profesional para utilizar urls personalizadas y servicios auto alojados.",
   "service.restrictedHandler.serviceLimit.headline": "Ha llegado al límite del servicio.",
   "service.restrictedHandler.serviceLimit.text": "Por favor mejore su cuenta para poder utilizar más de {count} servicios.",
-  "service.webviewLoader.loading": "Cargando",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Primeros pasos",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Editar cuenta",
   "settings.account.accountType.basic": "Cuenta Básica",
   "settings.account.accountType.premium": "Cuenta Colaborador Premium",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Actualizar perfil",
   "settings.account.deleteAccount": "Eliminar cuenta",
   "settings.account.deleteEmailSent": "Has recibido un correo electrónico con un enlace para confirmar la eliminación de su cuenta. ¡Tu cuenta y datos no podrán ser restaurados!",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 84f8b3895..a69d8c834 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "S'il vous plaît améliorer au Plan Ferdi Professionnel pour utilisé les urls modifié et les services hébergé soi-même.",
   "service.restrictedHandler.serviceLimit.headline": "Vous avez atteint votre limite de service.",
   "service.restrictedHandler.serviceLimit.text": "S'il vous plaît améliorer votre compte pour utilisé plus que {count} services.",
-  "service.webviewLoader.loading": "Chargement",
+  "service.webviewLoader.loading": "Chargement de {service}",
   "services.getStarted": "Commencer",
   "services.login": "S'il vous plaît connectez-vous pour utiliser Ferdi.",
   "services.serverInfo": "Optionnellement, vous pouvez changer votre serveur Ferdi en cliquant sur la roue dentée en bas au coin gauche.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Modifier le compte",
   "settings.account.accountType.basic": "Compte de base",
   "settings.account.accountType.premium": "Compte supporteur premium",
+  "settings.account.accountUnavailable": "Compte indisponible",
+  "settings.account.accountUnavailableInfo": "Vous utilisez Ferdi sans compte. Si vous souhaitez utiliser Ferdi avec un compte et garder vos services synchronisés entre les installations, sélectionnez un serveur dans l'onglet Paramètres, puis connectez-vous.",
   "settings.account.buttonSave": "Mettre à jour le profil",
   "settings.account.deleteAccount": "Supprimer le compte",
   "settings.account.deleteEmailSent": "Vous avez reçu un email contenant le lien pour confirmer la suppression de votre compte. Votre compte et les données qui lui sont associés ne pourront être récupérés!",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index a580a03c2..f7ab2fb17 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Cuir tús",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Cuir cuntas in eagar",
   "settings.account.accountType.basic": "Bunchuntas",
   "settings.account.accountType.premium": "Cuntas Phŕeimhthacadóra Ferdi",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Nuashonraigh próifíl",
   "settings.account.deleteAccount": "Scrios cuntas",
   "settings.account.deleteEmailSent": "Fuair tú ríomhphost chun scriosadh do chuntais a dheimhniú. Ní féidir do chuntas agus do chuid sonraí a thabhairt ar ais!",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index b94733de5..e7fcdf4bb 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Započnimo!",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Uredi račun",
   "settings.account.accountType.basic": "Osnovni račun",
   "settings.account.accountType.premium": "Premium račun",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Ažuriraj profil",
   "settings.account.deleteAccount": "Izbrisati račun",
   "settings.account.deleteEmailSent": "Dobili ste email s linkom putem kojeg ćete potvrditi brisanje računa. Vaš račun i podatke neće biti moguće vratiti. ",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 7dd0b4771..fe21d1f90 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Betöltés",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Kezdj hozzá",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Fiók szerkesztése",
   "settings.account.accountType.basic": "Alap Fiók",
   "settings.account.accountType.premium": "Prémium Támogató Fiók",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Profil frissítése",
   "settings.account.deleteAccount": "Fiók törlése",
   "settings.account.deleteEmailSent": "A fiókod törléséhez egy e-mailt küldtük a törlést megerősítő linkkel. A linkre kattintást követően a fiókod és az adatait már nem állíthatók vissza többé!",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 68b37ca5b..dbaf2cba1 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Memuat",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Memulai",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit akun",
   "settings.account.accountType.basic": "Akun Dasar",
   "settings.account.accountType.premium": "Akun Pendukung Premium",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Perbarui profil",
   "settings.account.deleteAccount": "Hapus akun",
   "settings.account.deleteEmailSent": "Anda menerima email dengan tautan untuk mengonfirmasi penghapusan akun. Akun dan data Anda tidak bisa dipulihkan!",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 89e3a903e..359554996 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Per favore aggiorna al piano Ferdi Professional per usare url personalizzati e servizi da te ospitati.",
   "service.restrictedHandler.serviceLimit.headline": "Hai raggiunto il tuo limite di servizio.",
   "service.restrictedHandler.serviceLimit.text": "Per favore potenzia il tuo account per usare più di {count} servizi.",
-  "service.webviewLoader.loading": "Caricamento",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Iniziamo",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Modifica account",
   "settings.account.accountType.basic": "Account Base",
   "settings.account.accountType.premium": "Account Supporter Premium ",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Aggiorna profilo",
   "settings.account.deleteAccount": "Elimina account",
   "settings.account.deleteEmailSent": "Hai ricevuto un'email con un link per confermare l'eliminazione del tuo account. I dati del tuo account non potranno più essere ripristinati!",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 3dcdb75eb..2cd6d2c9d 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "はじめる",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "アカウントの編集",
   "settings.account.accountType.basic": "Basicアカウント",
   "settings.account.accountType.premium": "Premium Supporterアカウント",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "プロフィールの更新",
   "settings.account.deleteAccount": "アカウントを削除",
   "settings.account.deleteEmailSent": "アカウント削除の確認メールを送信しました。あなたのアカウントとデータは復旧できません！",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 18d5d2da4..47b083b69 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "დაწყება",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "ანგარიშის მართვა",
   "settings.account.accountType.basic": "ძირითადი ანგარიში",
   "settings.account.accountType.premium": "პრემიუმ მხარდამჭერის ანგარიში",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "პროფილის განახლება",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index f2a6895e6..a4f91e452 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Aan het laden",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Beginnen",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Account bewerken",
   "settings.account.accountType.basic": "Basis Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Profiel bijwerken",
   "settings.account.deleteAccount": "Account verwijderen",
   "settings.account.deleteEmailSent": "U heeft een email ontvangen met een bevestiginslink om uw account te verwijderen. Uw account en de bijhorende gegevens kunnen niet meer worden herstel na deze actie!",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index f9c00b899..354fb8ae1 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -72,11 +72,11 @@
   "invite.skip.label": "Ik wil dit later doen",
   "invite.submit.label": "Uitnodigingen verzenden",
   "invite.successInfo": "Uitnodigingen verzonden",
-  "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-  "locked.invalidCredentials": "Password invalid",
-  "locked.password.label": "Password",
-  "locked.submit.label": "Unlock",
+  "locked.headline": "Vergrendeld",
+  "locked.info": "Ferdi is momenteel vergrendeld. Ontgrendel Ferdi met je wachtwoord om je berichten te bekijken.",
+  "locked.invalidCredentials": "Verkeerd wachtwoord",
+  "locked.password.label": "Wachtwoord",
+  "locked.submit.label": "Ontgrendelen",
   "login.changeServer": "Change server",
   "login.customServerQuestion": "Using a custom Ferdi server?",
   "login.customServerSuggestion": "Try importing your Franz account",
@@ -85,7 +85,7 @@
   "login.invalidCredentials": "E-mailadres of wachtwoord ongeldig",
   "login.link.password": "Wachtwoord vergeten",
   "login.link.signup": "Maak een gratis account aan",
-  "login.password.label": "Password",
+  "login.password.label": "Wachtwoord",
   "login.serverLogout": "De sessie is verlopen, log alsjeblieft opnieuw in.",
   "login.submit.label": "Inloggen",
   "login.tokenExpired": "De sessie is verlopen, log alsjeblieft opnieuw in.",
@@ -136,7 +136,7 @@
   "menu.view.enterFullScreen": "Gebruik volledig scherm",
   "menu.view.exitFullScreen": "Volledig scherm verlaten",
   "menu.view.forward": "Forward",
-  "menu.view.lockFerdi": "Lock Ferdi",
+  "menu.view.lockFerdi": "Ferdi vergrendelen",
   "menu.view.openQuickSwitch": "Open Quick Switch",
   "menu.view.reloadFranz": "Herlaad Ferdi",
   "menu.view.reloadService": "Een service opnieuw laden",
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Aan het laden",
+  "service.webviewLoader.loading": "{service} wordt geladen",
   "services.getStarted": "Begin",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Bewerk account",
   "settings.account.accountType.basic": "Basisaccount",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profiel",
   "settings.account.deleteAccount": "Verwijder account",
   "settings.account.deleteEmailSent": "Je hebt een e-mail ontvangen met een link om het verwijderen van je account te bevestigen. Je accountgegevens en -data kunnen na verwijderen niet meer worden teruggehaald!",
@@ -269,10 +271,10 @@
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "Taal",
-  "settings.app.form.lockPassword": "Password",
+  "settings.app.form.lockPassword": "Wachtwoord",
   "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar systeemvak",
   "settings.app.form.noUpdates": "Disable updates",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
+  "settings.app.form.privateNotifications": "Toon geen bericht-inhoud in meldingen",
   "settings.app.form.runInBackground": "Houd Ferdi open op de achtergrond wanneer het venster gesloten wordt",
   "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
   "settings.app.form.scheduledDNDEnd": "To",
@@ -292,8 +294,8 @@
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.languageDisclaimer": "Ferdi spreekt officieel Engels en Duits. Alle andere talen worden beheerd door de community.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
-  "settings.app.lockedPassword": "Password",
-  "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
+  "settings.app.lockedPassword": "Wachtwoord",
+  "settings.app.lockedPasswordInfo": "Zorg ervoor dat je een wachtwoord instelt dat je niet vergeet.\nAls je dit wachtwoord verliest, moet je Ferdi opnieuw installeren.",
   "settings.app.restartRequired": "Deze wijziging heeft een herstart nodig",
   "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
   "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
@@ -421,7 +423,7 @@
   "sidebar.addNewService": "Voeg service toe",
   "sidebar.closeTodosDrawer": "Close Ferdi Todos",
   "sidebar.closeWorkspaceDrawer": "Werkruimtepagina sluiten",
-  "sidebar.lockFerdi": "Lock Ferdi",
+  "sidebar.lockFerdi": "Ferdi vergrendelen",
   "sidebar.muteApp": "Berichten & geluid uitschakelen",
   "sidebar.openTodosDrawer": "Open Ferdi Todos",
   "sidebar.openWorkspaceDrawer": "Werkruimtepagina openen",
@@ -436,7 +438,7 @@
   "signup.legal.privacy": "Privacyvoorwaarden",
   "signup.legal.terms": "Gebruiksvoorwaarden",
   "signup.link.login": "Heb je al een account? Log in!",
-  "signup.password.label": "Password",
+  "signup.password.label": "Wachtwoord",
   "signup.submit.label": "Account aanmaken",
   "subscription.bestValue": "Best value",
   "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index e5496f0eb..64b1f8b15 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Ładowanie",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Zacznij",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Modyfikuj konta",
   "settings.account.accountType.basic": "Podstawowe konto",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Uaktualnij profil",
   "settings.account.deleteAccount": "Usuń konto",
   "settings.account.deleteEmailSent": "Wysłaliśmy email z linkiem do potwierdzenia usunięcia konta. Konto oraz dane są usuwane trwale i nie można tego cofnąć!",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 6929864a0..de56a60a4 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Por favor suscribase al Plan Ferdi Profesional para utilizar urls personalizadas y servicios auto alojados.",
   "service.restrictedHandler.serviceLimit.headline": "Ha llegado al límite del servicio.",
   "service.restrictedHandler.serviceLimit.text": "Por favor mejore su cuenta para poder utilizar más de {count} servicios.",
-  "service.webviewLoader.loading": "Carregando",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Iniciar",
   "services.login": "Por favor, inicie sua sessão para usar Ferdi.",
   "services.serverInfo": "Opcionalmente, você pode mudar seu servidor Ferdi clicando no icon de roda dentada no canto inferior esquerdo.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Editar conta",
   "settings.account.accountType.basic": "Conta Básica",
   "settings.account.accountType.premium": "Conta Apoiador Premium",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Atualizar perfil",
   "settings.account.deleteAccount": "Excluir conta",
   "settings.account.deleteEmailSent": "Você recebeu um e-mail com um link para confirmar a exclusão da sua conta. Atenção! Sua conta e dados não poderão ser restaurados!",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 645bb2043..4a320588d 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "A ler",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Vamos começar",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Editar conta",
   "settings.account.accountType.basic": "Conta Básica",
   "settings.account.accountType.premium": "Conta Premium",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Atualizar o perfil",
   "settings.account.deleteAccount": "Apagar conta",
   "settings.account.deleteEmailSent": "Recebeu um email com um endereço para confirmar a remoção da sua conta. A sua conta e dados não poderão ser restaurados!",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 4828e8a37..171417689 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Загрузка",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Начать работу",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Редактировать аккаунт",
   "settings.account.accountType.basic": "Базовый аккаунт",
   "settings.account.accountType.premium": "Премиум аккаунт",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Обновить профиль",
   "settings.account.deleteAccount": "Удалить аккаунт",
   "settings.account.deleteEmailSent": "Вам выслано письмо с ссылкой для подтверждения удаления аккаунта. После этого ваш аккаунт и данные не смогут быть восстановлены!",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 0c47d3844..ccf2e7b0d 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Načítava",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Začíname",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Upraviť účet",
   "settings.account.accountType.basic": "Základný účet",
   "settings.account.accountType.premium": "Prémiový účet podporovateľa",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Aktualizovať profil",
   "settings.account.deleteAccount": "Odstrániť účet",
   "settings.account.deleteEmailSent": "Bol vám odoslaný e-mail s odkazom pre potvrdenie odstránenia vášho účtu. Váš účet a údaje sa nebudú dať obnoviť!",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 39ce2e022..c140ce73d 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Započnimo! ",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Uredi račun",
   "settings.account.accountType.basic": "Osnovni račun",
   "settings.account.accountType.premium": "Premium račun",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Ažuriraj profil",
   "settings.account.deleteAccount": "Обриши налог",
   "settings.account.deleteEmailSent": "Добили сте имејл са линком путем којег потврђујете брисање свог налога. Ваш налог и подаци не могу бити повраћени!",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index d4998a5e9..fd429bfde 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Yükleniyor",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Haydi başlayalım",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Hesabı düzenle",
   "settings.account.accountType.basic": "Basit Hesap",
   "settings.account.accountType.premium": "Premium Destekçi Hesabı",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Profili güncelle",
   "settings.account.deleteAccount": "Hesabı sil",
   "settings.account.deleteEmailSent": "Hesabınızın silinmesini onaylamanız için e-posta adresinize gönderilen bağlantıya tıklayınız. Bu işlem sonrasında hesabınız ve bilgileriniz geri getirilemez!",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 1e61b1ea7..1a5c56211 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Почати",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Редагувати акаунт",
   "settings.account.accountType.basic": "Базовий акаунт",
   "settings.account.accountType.premium": "Преміум Акаунт Прихильника",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Оновити профіль",
   "settings.account.deleteAccount": "Видалити обліковий запис",
   "settings.account.deleteEmailSent": "Ви отримали електронного листа з посиланням, щоб підтвердити видалення облікового запису. Ваш обліковий запис і дані не можна буде відновити!",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 5c7ab6c50..32effd8d8 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "開始使用",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "更改帳戶資訊",
   "settings.account.accountType.basic": "基本帳戶",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "更新帳戶資訊",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index 00bb7de2c..750ff9b89 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -215,7 +215,7 @@
   "service.restrictedHandler.customUrl.text": "Please upgrade to the Ferdi Professional plan to use custom urls & self hosted services.",
   "service.restrictedHandler.serviceLimit.headline": "You have reached your service limit.",
   "service.restrictedHandler.serviceLimit.text": "Please upgrade your account to use more than {count} services.",
-  "service.webviewLoader.loading": "Loading",
+  "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
@@ -224,6 +224,8 @@
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
+  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.",
   "settings.account.buttonSave": "Update profile",
   "settings.account.deleteAccount": "Delete account",
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
diff --git a/src/i18n/messages/src/components/ui/WebviewLoader/index.json b/src/i18n/messages/src/components/ui/WebviewLoader/index.json
index ef3e4b593..9caabef25 100644
--- a/src/i18n/messages/src/components/ui/WebviewLoader/index.json
+++ b/src/i18n/messages/src/components/ui/WebviewLoader/index.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "service.webviewLoader.loading",
-    "defaultMessage": "!!!Loading",
+    "defaultMessage": "!!!Loading {service}",
     "file": "src/components/ui/WebviewLoader/index.js",
     "start": {
       "line": 11,
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
index 42ca42125..9b46a1e6f 100644
--- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
@@ -79,7 +79,7 @@
   },
   {
     "id": "settings.service.form.customUrl",
-    "defaultMessage": "!!!Custom server",
+    "defaultMessage": "!!!Service URL",
     "file": "src/containers/settings/EditServiceScreen.js",
     "start": {
       "line": 52,
diff --git a/src/internal-server b/src/internal-server
-Subproject cca6cd984caf729722153e58f44c01319c4bd63
+Subproject f534147e00fc889769845b9207572ce63ef3cad