Merge branch 'nightly' into release

author: Vijay A <vraravam@users.noreply.github.com> 2021-10-06 22:59:03 +0530
committer: Vijay A <vraravam@users.noreply.github.com> 2021-10-06 22:59:03 +0530
commit: 5fd7cd12cc62ceb6c4d654b3cb3b536412ed1216 (patch)
tree: 10cea6c608baea3481595ed9eb7be63ef03ca6c4 /src/i18n
parent: Bumped up version to: 5.6.2 (hotfix) (diff)
parent: 5.6.3-nightly.25 [skip ci] (diff)
download: ferdium-app-5fd7cd12cc62ceb6c4d654b3cb3b536412ed1216.tar.gz
ferdium-app-5fd7cd12cc62ceb6c4d654b3cb3b536412ed1216.tar.zst
ferdium-app-5fd7cd12cc62ceb6c4d654b3cb3b536412ed1216.zip
108 files changed, 1631 insertions, 15969 deletions
diff --git a/src/i18n/apply-branding.js b/src/i18n/apply-branding.ts
index 40a07ded0..801a4a525 100644
--- a/src/i18n/apply-branding.js
+++ b/src/i18n/apply-branding.ts
@@ -1,13 +1,13 @@
 /**
 * Apply Ferdi branding to i18n translations
 */
-const fs = require('fs-extra');
+import fs from 'fs-extra';
-const path = require('path');
+import path from 'path';
 console.log('Applying Ferdi branding to translations...');
 // Keys to ignore when applying branding
-const ignore = [
+const ignore = new Set([
  'login.customServerSuggestion',
  'login.customServerQuestion',
  'settings.app.todoServerInfo',
@@ -18,15 +18,10 @@ const ignore = [
  'settings.team.copy',
  'settings.team.manageAction',
  'settings.app.serverMoneyInfo',
-];
+]);
 // Files to ignore when applying branding
-const ignoreFiles = [
+const ignoreFiles = new Set(['.DS_Store', '.', '..']);
-  'defaultMessages.json',
-  '.DS_Store',
-  '.',
-  '..',
-];
 // What to replace
 const replace = {
@@ -43,14 +38,15 @@ const replaceFind = Object.keys(replace);
 const replaceReplaceWith = Object.values(replace);
 const replaceStr = (str, find, replaceWith) => {
-  for (let i = 0; i < find.length; i += 1) {
+  for (const [i, element] of find.entries()) {
-    str = str.replace(new RegExp(find[i], 'gi'), replaceWith[i]);
+    str = str.replace(new RegExp(element, 'gi'), replaceWith[i]);
  }
  return str;
 };
-files.forEach(async (file) => {
+// eslint-disable-next-line unicorn/no-array-for-each
-  if (ignoreFiles.includes(file)) return;
+files.forEach(async file => {
+  if (ignoreFiles.has(file)) return;
  // Read locale data
  const filePath = path.join(locales, file);
@@ -58,7 +54,7 @@ files.forEach(async (file) => {
  // Replace branding
  for (const key in locale) {
-    if (!ignore.includes(key)) {
+    if (!ignore.has(key)) {
      locale[key] = replaceStr(locale[key], replaceFind, replaceReplaceWith);
    }
  }
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.ts
index 66fce8d0f..8e1df10f7 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.ts
@@ -3,75 +3,75 @@ import { defineMessages } from 'react-intl';
 export default defineMessages({
  APIUnhealthy: {
    id: 'global.api.unhealthy',
-    defaultMessage: '!!!Can\'t connect to Ferdi Online Services',
+    defaultMessage: "Can't connect to Ferdi online services",
  },
  notConnectedToTheInternet: {
    id: 'global.notConnectedToTheInternet',
-    defaultMessage: '!!!You are not connected to the internet.',
+    defaultMessage: 'You are not connected to the internet.',
  },
  spellcheckerLanguage: {
    id: 'global.spellchecking.language',
-    defaultMessage: '!!!Spell checking language',
+    defaultMessage: 'Spell checking language',
  },
  spellcheckerSystemDefault: {
    id: 'global.spellchecker.useDefault',
-    defaultMessage: '!!!Use System Default ({default})',
+    defaultMessage: 'Use System Default ({default})',
  },
  spellcheckerAutomaticDetection: {
    id: 'global.spellchecking.autodetect',
-    defaultMessage: '!!!Detect language automatically',
+    defaultMessage: 'Detect language automatically',
  },
  spellcheckerAutomaticDetectionShort: {
    id: 'global.spellchecking.autodetect.short',
-    defaultMessage: '!!!Automatic',
+    defaultMessage: 'Automatic',
  },
  userAgentPref: {
    id: 'global.userAgentPref',
-    defaultMessage: '!!!User Agent',
+    defaultMessage: 'User Agent',
  },
  userAgentHelp: {
    id: 'global.userAgentHelp',
-    defaultMessage: "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
+    defaultMessage:
+      "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  },
  yes: {
    id: 'global.yes',
-    defaultMessage: '!!!Yes',
+    defaultMessage: 'Yes',
  },
  no: {
    id: 'global.no',
-    defaultMessage: '!!!No',
+    defaultMessage: 'No',
  },
  ok: {
    id: 'global.ok',
-    defaultMessage: '!!!Ok',
+    defaultMessage: 'Ok',
  },
  cancel: {
    id: 'global.cancel',
-    defaultMessage: '!!!Cancel',
+    defaultMessage: 'Cancel',
  },
  save: {
    id: 'global.save',
-    defaultMessage: '!!!Save',
+    defaultMessage: 'Save',
  },
  submit: {
    id: 'global.submit',
-    defaultMessage: '!!!Submit',
+    defaultMessage: 'Submit',
  },
  quit: {
    id: 'global.quit',
-    defaultMessage: '!!!Quit',
+    defaultMessage: 'Quit',
  },
  quitConfirmation: {
    id: 'global.quitConfirmation',
-    defaultMessage:
+    defaultMessage: 'Do you really want to quit Ferdi?',
-      '!!!Do you really want to quit Ferdi?',
  },
  settings: {
    id: 'global.settings',
-    defaultMessage: '!!!Settings',
+    defaultMessage: 'Settings',
  },
  edit: {
    id: 'global.edit',
-    defaultMessage: '!!!Edit',
+    defaultMessage: 'Edit',
  },
 });
diff --git a/src/i18n/languages.js b/src/i18n/languages.ts
index e7713b42b..e7713b42b 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.ts
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 2c145d6f4..041b02632 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Custom server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -45,7 +44,7 @@
  "import.headline": "Import your Ferdi 4 services",
  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
  "import.skip.label": "I want to add services manually",
-  "import.submit.label": "Import services",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Restart & install update",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Terms of Service",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -152,18 +151,7 @@
  "password.link.login": "Sign in to your account",
  "password.link.signup": "Create a free account",
  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Please check your email",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
  "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
  "settings.account.tryReloadServices": "Try again",
  "settings.account.tryReloadUserInfoRequest": "Try again",
  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Clear cache",
  "settings.app.buttonInstallUpdate": "Restart & install update",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index ae2952f86..2ab80e865 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "إعادة التحميل",
-  "app.errorHandler.headline": "لقد حدث خطب ما",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "خادم مخصص",
  "changeserver.headline": "تغيير الخادم",
  "changeserver.label": "خادم",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "ماذا حدث؟",
  "connectionLostBanner.message": "أوه لا! فقد فردي الاتصال بـ.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "نشر معلومات تصحيح الأخطاء",
  "feature.nightlyBuilds.activate": "تفعيل",
  "feature.nightlyBuilds.info": "الإصدارات الليلية هي إصدارات تجريبية للغاية من فردي والتي قد تحتوي على ميزات غير مصقولة أو غير كاملة. يتم استخدام هذه الإنشاءات الليلية بشكل أساسي من قبل المطورين لاختبار ميزاتهم المطورة حديثًا وكيفية أدائهم في التصميم النهائي. إذا كنت لا تعرف ما تفعله ، فنقترح عدم تنشيط الإنشاءات الليلية.",
  "feature.nightlyBuilds.title": "المباني الليلية",
@@ -24,30 +23,30 @@
  "feature.quickSwitch.info": "حدد خدمة من خلال زر تاب، ↑ و ↓. افتح الخدمة بالظغط على زر الدخول.",
  "feature.quickSwitch.search": "بحث...",
  "feature.quickSwitch.title": "تبديل سريع",
-  "global.api.unhealthy": "لا يمكن الإتصال بخدمات فردي عبر الإنترنت",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "إلغاء",
+  "global.cancel": "Cancel",
  "global.edit": "تعديل",
  "global.no": "No",
  "global.notConnectedToTheInternet": "أنت غير متصل بالإنترنت.",
  "global.ok": "Ok",
-  "global.quit": "خروج",
+  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "الإعدادات",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "إستخدم الإعدادت الافتراضية ({default})",
  "global.spellchecking.autodetect": "الكشف عن اللغة تلقائياً",
  "global.spellchecking.autodetect.short": "تلقائي",
  "global.spellchecking.language": "لغة التدقيق الإملائي",
-  "global.submit": "إرسال",
+  "global.submit": "Submit",
  "global.userAgentHelp": "استخدم 'https://whatmyuseragent.com/' (لاكتشاف) أو 'https://developers.whatismybrowser.com/useragents/explore/' (لاختار) وكيل المستخدم المنشود و نسخه لصقه هنا.",
  "global.userAgentPref": "وكيل المستخدم",
  "global.yes": "Yes",
  "import.headline": "استيراد خدمات فردي الأربع",
  "import.notSupportedHeadline": "الخدمات غير مدعومة بعد في فردي الإصدار 5",
  "import.skip.label": "أريد أن أضيف الخدمات يدوياً",
-  "import.submit.label": "خدمات الاستيراد",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "حدثت أخطاء أثناء محاولة تنفيذ طلب المصادقة. الرجاء محاولة تسجيل الخروج والدخول مرة أخرى إذا استمر هذا الخطأ.",
-  "infobar.buttonChangelog": "ما الجديد؟",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "إعادة التشغيل وتثبيت التحديث",
  "infobar.buttonReloadServices": "إعادة تحميل الخدمات",
  "infobar.hide": "إخفاء",
@@ -75,7 +74,7 @@
  "login.email.label": "البريد الإلكتروني",
  "login.headline": "تسجيل الدخول",
  "login.invalidCredentials": "البريد الإلكتروني أو كلمة المرور غير صالحة",
-  "login.link.password": "إعادة تعيين كلمة المرور",
+  "login.link.password": "Reset password",
  "login.link.signup": "إنشاء حساب مجاني",
  "login.password.label": "كلمة المرور",
  "login.serverLogout": "انتهت صلاحية جلستك، الرجاء تسجيل الدخول مرة أخرى.",
@@ -117,10 +116,10 @@
  "menu.help.support": "الدعم الفني",
  "menu.help.tos": "شروط الخدمة",
  "menu.services": "الخدمات",
-  "menu.services.activatePreviousService": "تفعيل الخدمة السابقة",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "إضافة خدمة جديدة",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "الرئيسية",
-  "menu.services.setNextServiceActive": "تفعيل الخدمة التالية",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "المهام",
  "menu.todos.enableTodos": "تفعيل المهام",
  "menu.view": "عرض",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "جميع الخدمات",
  "menu.workspaces.openWorkspaceDrawer": "فتحُ دُرجِ مساحة العمل",
  "password.email.label": "البريد الإلكتروني",
-  "password.headline": "إعادة تعيين كلمة المرور",
+  "password.headline": "Reset password",
  "password.link.login": "سجل الدخول لحسابك",
  "password.link.signup": "إنشاء حساب مجاني",
-  "password.noUser": "لم يُعثر على مُستخدمٍ بعنوانِ البريدِ هذا",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "رجاءً تحقق من عنوان بريدك الإلكتروني",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "مزامنةُ الحساب",
-  "pricing.features.customWebsites": "إضافة مواقع مخصصة",
-  "pricing.features.desktopNotifications": "إشعارات سطح المكتب",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "اختر من بين ما يزيد على 70 خدمة",
-  "pricing.features.serviceProxies": "وكلاء الخدمة",
-  "pricing.features.spellchecker": "دعم المدقق الإملائي",
-  "pricing.features.teamManagement": "فريق الإدارة",
-  "pricing.features.thirdPartyServices": "تنصيب خدمات الطرف الثالث",
-  "pricing.features.unlimitedServices": "إمكانية إضافة خدمات غير محدودة",
-  "pricing.features.workspaces": "مساحاتُ العمل",
  "service.crashHandler.action": "أعادة تحميل {name}",
  "service.crashHandler.autoReload": "محاولة الاستعادة التلقائية {name} في غضون {seconds} ثانية",
  "service.crashHandler.headline": "أوه لا!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "استخدام فردي بدون حساب",
  "services.welcome": "مرحبا بكم في فردي",
-  "settings.account.account.editButton": "تعديل الحساب",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "الحساب غير متوفر",
  "settings.account.accountUnavailableInfo": "أنت تستخدم فردي بدون حساب. إذا كنت ترغب في استخدام فردي مع حساب والحفاظ على مزامنة خدماتك عبر مختلف الحواسيب، الرجاء تحديد خادم في علامة تبويب الإعدادات ثم سجل الدخول.",
  "settings.account.buttonSave": "تحديث الملف الشخصي",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "لقد تلقيت رسالة بريد إلكتروني مع رابط لتأكيد حذف حسابك. لا يمكن استعادة حسابك وبياناتك!",
  "settings.account.deleteInfo": "إذا كنت لا تحتاج إلى حساب فردي الخاص بك بعد الآن، يمكنك حذف حسابك وجميع البيانات ذات الصلة من هنا.",
  "settings.account.headline": "الحساب",
-  "settings.account.headlineAccount": "معلومات الحساب",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "منطقة الخطر",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "الفواتير",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "تغيير كلمة المرور",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "تحديث الملف الشخصي",
  "settings.account.successInfo": "تم حفظ التغييرات الخاصة بك",
  "settings.account.tryReloadServices": "حاول مجددًا",
  "settings.account.tryReloadUserInfoRequest": "حاول مجددًا",
  "settings.account.userInfoRequestFailed": "تعذر تحميل معلومات المستخدم",
-  "settings.account.yourLicense": "رخصة فردي الخاصة بك",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "مسح ذاكرة التخزين المؤقت",
  "settings.app.buttonInstallUpdate": "إعادة التشغيل وتثبيت التحديث",
@@ -219,13 +207,13 @@
  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "خادم مهام مخصص",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "ت��عي�� الوضع المظلم",
+  "settings.app.form.darkMode": "ت�������� الوضع المظلم",
  "settings.app.form.enableGPUAcceleration": "تفعيل التسريع بوحدة معالجة الرسومات",
  "settings.app.form.enableLock": "تفعيل القفل بكلمة المرور",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "تفعيل التصحيح الإملائي",
-  "settings.app.form.enableSystemTray": "إظهار فردي في شريط النظام",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "تفعيل فردي للمهام",
  "settings.app.form.hibernateOnStartup": "الإبقاء على الخدمات في وضع النوم عند بدء التشغيل",
  "settings.app.form.hibernationStrategy": "استراتيجية وضع النوم",
@@ -251,9 +239,10 @@
  "settings.app.form.showDisabledServices": "عرض تبويبات الخدمات المعطلة",
  "settings.app.form.showDragArea": "إظهار المنطقة القابلة للسحب على النافذة",
  "settings.app.form.showMessagesBadgesWhenMuted": "إظهار شارة رسالة غير مقروءة عند تعطيل الإشعارات",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "البدء بنافذة مصغرة",
  "settings.app.form.universalDarkMode": "تمكين الوضع المظلم الكامل",
-  "settings.app.form.useTouchIdToUnlock": "السماح باستخدام TouchID لفتح فردي",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.form.useVerticalStyle": "استخدام النمط الأفقي",
  "settings.app.form.wakeUpStrategy": "Wake up strategy",
  "settings.app.headlineAdvanced": "متقدم",
@@ -267,7 +256,7 @@
  "settings.app.languageDisclaimer": "الترجمات الرسمية هي الإنكليزية والألمانية. وجميع اللغات الأخرى مبنية على ترجمات مساهمين.",
  "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 {lockShortcut}.",
  "settings.app.lockedPassword": "كلمة المرور",
-  "settings.app.lockedPasswordInfo": "الرجاء التأكد من تعيين كلمة مرور سوف تتذكرها.\nإذما فقدت كلمة المرور هذه، سوف تضطر إلى إعادة تثبيت فيردي.",
+  "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.restartRequired": "التغيرات تتطلب إعادة تشغيل",
  "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.",
@@ -294,9 +283,9 @@
  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
  "settings.recipes.customService.headline.customRecipes": "وصفات طرف ثالث مخصصة",
  "settings.recipes.customService.headline.devRecipes": "وصفات خدمة التطوير الخاصة بك",
-  "settings.recipes.customService.intro": "لإضافة خدمة مخصصة، انسخ وصفة الخدمة إلى:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "وثائق المطور",
-  "settings.recipes.customService.openFolder": "فتح المجلد",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "الخدمات المتاحة",
  "settings.recipes.missingService": "خدمة مفقودة؟",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "سطوع الشاشة في وضع القراءة المظلم",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "حذف الخدمة",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "تحرير {name}",
  "settings.service.form.enableAudio": "تمكين الصوت",
  "settings.service.form.enableBadge": "إظهار شارات الرسائل غير المقروءة",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "الاسم",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "فتح user.css",
  "settings.service.form.openUserJs": "فتح user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "استخدام بروكسي",
-  "settings.service.form.proxy.password": "كلمة المرور (اختياري)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "المنفذ",
  "settings.service.form.proxy.restartInfo": "الرجاء إعادة تشغيل فيردي بعد تغيير إعدادات البروكسي.",
-  "settings.service.form.proxy.user": "المستخدم (اختياري)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "حفظ الخدمة",
  "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "اكتشف الخدمات",
  "settings.services.headline": "خدماتك",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "تعذرَ تحميل خدماتك",
  "settings.services.tooltip.isDisabled": "الخدمة معطّلة",
  "settings.services.tooltip.isMuted": "تم كتم جميع الأصوات",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "غير ربحي",
  "settings.user.form.currentPassword": "الكلمة السرية الحالية",
  "settings.user.form.email": "البريد الألكتروني",
-  "settings.user.form.firstname": "الاسم الأول",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "اسم العائلة",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "كلمة سرّ جديدة",
  "settings.workspace.add.form.name": "الاسم",
  "settings.workspace.add.form.submitButton": "إنشاء مساحة عمل",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "تمكين الإشعارات والصوت",
  "signup.email.label": "البريد الإلكتروني",
  "signup.emailDuplicate": "مستخدم بهذا البريد الإلكتروني موجود بالفعل",
-  "signup.firstname.label": "الاسم الأول",
+  "signup.firstname.label": "First Name",
  "signup.headline": "التسجيل",
-  "signup.lastname.label": "اسم العائلة",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "من خلال إنشاء حساب فيردي فإنك تقبل",
  "signup.legal.privacy": "بيان الخصوصية",
  "signup.legal.terms": "بنود الخدمة",
@@ -430,11 +421,11 @@
  "signup.password.label": "كلمة المرور",
  "signup.submit.label": "أنشئ حساب",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "حذف الخدمة",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "تعطيل الصوت",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "تعطيل الإشعارات",
-  "tabs.item.disableService": "تعطيل الخدمة",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "تمكين الصوت",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "تفعيل الإشعارات",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "إعادة التحميل",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} غير صالح",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} يجب أن يكون على الأقل {length} حرفاً",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} مطلوب",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} ليس عنوان URL صالح",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "الرجوع",
  "webControls.forward": "تقدم",
  "webControls.goHome": "الرئيسية",
@@ -454,12 +445,12 @@
  "webControls.reload": "إعادة التحميل",
  "welcome.loginButton": "تسجيل الدخول إلى حسابك",
  "welcome.signupButton": "إنشاء حساب مجاني",
-  "workspaceDrawer.addNewWorkspaceLabel": "إضافة مساحة عمل جديدة",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "جميع الخدمات",
  "workspaceDrawer.headline": "مساحاتُ العمل",
  "workspaceDrawer.item.contextMenuEdit": "تعديل",
  "workspaceDrawer.item.noServicesAddedYet": "لم تضف أي خدمات بعد",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>يُمكنك فيردي من التركيز على ما هو مهم لديك الآن. أنشاء مجموعات مختلفة من الخدمات وإداراتها والتنقل بينها بسهولة في أي وقت.<p><p/>أنتَ  من يقرر أيّ الخدمات تحتاج ساعة تحتاج وأين تحتاج, لذا نستطيع مساعدتك لتبقى محافظ مع مستجدات ما تقوم به أو تستريح إن شئت.<p/>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "تعديل إعدادات مساحات العمل",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "التبديل إلى"
 }
diff --git a/src/i18n/locales/be.json b/src/i18n/locales/be.json
index 31a5111a9..8caf73fe6 100644
--- a/src/i18n/locales/be.json
+++ b/src/i18n/locales/be.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Абнавіць",
-  "app.errorHandler.headline": "Нешта пайшло не так",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Custom server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Паслужнік",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -45,7 +44,7 @@
  "import.headline": "Import your Ferdi 4 services",
  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
  "import.skip.label": "I want to add services manually",
-  "import.submit.label": "Import services",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Restart & install update",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Terms of Service",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -152,18 +151,7 @@
  "password.link.login": "Sign in to your account",
  "password.link.signup": "Create a free account",
  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Please check your email",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
  "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
  "settings.account.tryReloadServices": "Try again",
  "settings.account.tryReloadUserInfoRequest": "Try again",
  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Clear cache",
  "settings.app.buttonInstallUpdate": "Restart & install update",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 2c145d6f4..041b02632 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Custom server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -45,7 +44,7 @@
  "import.headline": "Import your Ferdi 4 services",
  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
  "import.skip.label": "I want to add services manually",
-  "import.submit.label": "Import services",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Restart & install update",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Terms of Service",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -152,18 +151,7 @@
  "password.link.login": "Sign in to your account",
  "password.link.signup": "Create a free account",
  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Please check your email",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
  "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
  "settings.account.tryReloadServices": "Try again",
  "settings.account.tryReloadUserInfoRequest": "Try again",
  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Clear cache",
  "settings.app.buttonInstallUpdate": "Restart & install update",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 3cb52af9b..6e33be919 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Recarrega",
-  "app.errorHandler.headline": "Quelcom ha anat malament",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Servidor personalitzat",
  "changeserver.headline": "Canvía de Servidor",
  "changeserver.label": "Servidor",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Què ha passat?",
  "connectionLostBanner.message": "Oh no! Ferdi ha perdut la connexió a {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Registra la informació de depuració",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Seleccioneu un servei amb TAB, ↑ i ↓. Obriu un servei amb ENTER.",
  "feature.quickSwitch.search": "Cerca...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "No es pot connectar amb els serveis en línia de Ferdi",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Cancel·la",
+  "global.cancel": "Cancel",
  "global.edit": "Edita",
  "global.no": "No",
  "global.notConnectedToTheInternet": "No esteu connectat a Internet.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Configuració",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Utilitzar el predeterminat del sistema ({default})",
  "global.spellchecking.autodetect": "Detectar l'idioma automàticament",
  "global.spellchecking.autodetect.short": "Automàtic",
  "global.spellchecking.language": "Corrector ortogràfic",
-  "global.submit": "Enviar",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Importa els teus serveis Ferdi 4",
  "import.notSupportedHeadline": "Serveis que encara no s'admeten a Ferdi 5",
  "import.skip.label": "Vull afegir serveis manualment",
-  "import.submit.label": "Importa serveis",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "S'han produït errors al intentar realitzar una sol·licitud autentificada. Proveu de tancar la sessió i tornar-hi si aquest error continua.",
-  "infobar.buttonChangelog": "Que hi ha de nou?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Reinicia i instal·la l'actualització",
  "infobar.buttonReloadServices": "Recarrega els serveis",
  "infobar.hide": "Amaga",
@@ -75,7 +74,7 @@
  "login.email.label": "Correu electrònic",
  "login.headline": "Accedir-hi",
  "login.invalidCredentials": "El correu electrònic o la contrasenya no són vàlids",
-  "login.link.password": "Restablir la contrasenya",
+  "login.link.password": "Reset password",
  "login.link.signup": "Crea un compte gratuït",
  "login.password.label": "Contrasenya",
  "login.serverLogout": "La teva sessió ha caducat, torna-la a iniciar.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Suport",
  "menu.help.tos": "Condicions del Servei",
  "menu.services": "Serveis",
-  "menu.services.activatePreviousService": "Activa el servei anterior",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Inici",
-  "menu.services.setNextServiceActive": "Activa el següent servei",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Tasques",
  "menu.todos.enableTodos": "Activar Tasques",
  "menu.view": "Visualitza",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Tots els serveis",
  "menu.workspaces.openWorkspaceDrawer": "Obrir el calaix d'espais de treball",
  "password.email.label": "Correu electrònic",
-  "password.headline": "Restablir la contrasenya",
+  "password.headline": "Reset password",
  "password.link.login": "Inicia la sessió al teu compte",
  "password.link.signup": "Crea un compte gratuït",
-  "password.noUser": "No s'ha trobat cap usuari amb aquesta adreça de correu electrònic",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Comproveu el vostre correu electrònic",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Sincronització de Conte",
-  "pricing.features.customWebsites": "Afegir llocs web personalitzats",
-  "pricing.features.desktopNotifications": "Notificacions a l'escriptori",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Espais de treball",
  "service.crashHandler.action": "Recarrega {name}",
  "service.crashHandler.autoReload": "Intentant restablir automàticament {name} en {seconds} segons",
  "service.crashHandler.headline": "Oh no!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Benvingut a Ferdi",
-  "settings.account.account.editButton": "Editar Compte",
+  "settings.account.account.editButton": "Edit 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": "Actualitzar el perfil",
@@ -189,16 +177,16 @@
  "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!",
  "settings.account.deleteInfo": "Si ja no necessites el teu compte de Ferdi, pots esborrar el teu compte i tota la seva informació emmagatzemada aquí.",
  "settings.account.headline": "Compte",
-  "settings.account.headlineAccount": "Informació del compte",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Zona de perill",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Factures",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Canvia la contrasenya",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Actualitzar el perfil",
  "settings.account.successInfo": "S'han desat els canvis",
  "settings.account.tryReloadServices": "Torna a provar-ho",
  "settings.account.tryReloadUserInfoRequest": "Torna a provar-ho",
  "settings.account.userInfoRequestFailed": "No s'ha pogut carregar la informació de l'usuari",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Buida la memòria cau",
  "settings.app.buttonInstallUpdate": "Reinicia i instal·la l'actualització",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Activar el Mode Fosc",
  "settings.app.form.enableGPUAcceleration": "Activar acceleració GPU",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Habilita la comprobació ortogràfica",
-  "settings.app.form.enableSystemTray": "Mostra Ferdi a la safata del sistema",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Mostra les pestanyes dels serveis desactivats",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Mostra la insígnia de missatges no llegits quan les notificacions estiguin desactivades",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Suprimeix el servei",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Edita {name}",
  "settings.service.form.enableAudio": "Activa l'àudio",
  "settings.service.form.enableBadge": "Mostra les insígnies als missatges no llegits.",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Quan es desactiva, tots els sons de notificació i reproducció d'àudio es silenciaran",
  "settings.service.form.name": "Nom",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "Ajustaments Proxy HTTP/HTTPS",
  "settings.service.form.proxy.host": "Host Proxy / IP",
-  "settings.service.form.proxy.info": "Els ajustaments del Proxy no es sincronitzaran amb els servidors de Ferdi",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Utilitzar Proxy",
-  "settings.service.form.proxy.password": "Contrasenya (opcional)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Siusplau, reinicieu el Ferdi després de canviar els ajustaments de proxy",
-  "settings.service.form.proxy.user": "Usuari (opcional)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "Desa el servei",
  "settings.service.form.tabHosted": "Allotjat",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Descobrir serveis",
  "settings.services.headline": "Els vostres serveis",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "El servei està desactivat",
  "settings.services.tooltip.isMuted": "Tots els sons estan desactivats",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Sense ànim de lucre",
  "settings.user.form.currentPassword": "Contrasenya actual",
  "settings.user.form.email": "Correu electrònic",
-  "settings.user.form.firstname": "Nom",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Cognoms",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Nova contrasenya",
  "settings.workspace.add.form.name": "Nom",
  "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Activar notificacions i àudio",
  "signup.email.label": "Correu electrònic",
  "signup.emailDuplicate": "Ja existeix un usuari amb aquesta adreça de correu electrònic",
-  "signup.firstname.label": "Nom",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Donar-se d'alta",
-  "signup.lastname.label": "Cognoms",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "En crear un compte de Ferdi, accepteu",
  "signup.legal.privacy": "Declaració de privacitat",
  "signup.legal.terms": "Termes del Servei",
@@ -430,11 +421,11 @@
  "signup.password.label": "Contrasenya",
  "signup.submit.label": "Crea un compte",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Suprimeix el servei",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Desactiva l'àudio",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Desactiva les notificacions",
-  "tabs.item.disableService": "Desactiva el servei",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Activa l'àudio",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Activa les notificacions",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Recarrega",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} no es vàlid",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} ha de ser al menys {length} caràcters de llargada",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} es requerit",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} es una URL no vàlida",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Enrere",
  "webControls.forward": "Endavant",
  "webControls.goHome": "Inici",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 1a82d3016..08468e307 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Obnovit",
-  "app.errorHandler.headline": "Něco se pokazilo",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Vlastní server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "Search...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Nemůžeme připojit Ferdi k online službám",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Zrušit",
+  "global.cancel": "Cancel",
  "global.edit": "Upravit",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Připojení k internetu není k dispozici.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Nastavení",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Use System Default ({default})",
  "global.spellchecking.autodetect": "Automaticky rozpoznat jazyk",
  "global.spellchecking.autodetect.short": "Automaticky",
  "global.spellchecking.language": "Oprava překlepů jazyka",
-  "global.submit": "Odeslat",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Importovat služby z Ferdi 4",
  "import.notSupportedHeadline": "Služby nejsou podporovány ve verzi Ferdi 5",
  "import.skip.label": "Chci přidat službu ručně",
-  "import.submit.label": "Importovat služby",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Co je nového?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Restartovat a nainstalovat aktualizace",
  "infobar.buttonReloadServices": "Obnovit služby",
  "infobar.hide": "Skrýt",
@@ -75,7 +74,7 @@
  "login.email.label": "E-mailová adresa",
  "login.headline": "Přihlásit se",
  "login.invalidCredentials": "Email nebo heslo nesouhlasí",
-  "login.link.password": "Obnovit heslo",
+  "login.link.password": "Reset password",
  "login.link.signup": "Vytvořit uživatelský účet zdarma",
  "login.password.label": "Password",
  "login.serverLogout": "Sezení vypršelo, je třeba se znovu přihlásit.",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Podmínky použití",
  "menu.services": "Služby",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Všechny služby",
  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
  "password.email.label": "E-mailová adresa",
-  "password.headline": "Obnovit heslo",
+  "password.headline": "Reset password",
  "password.link.login": "Přihlásit se k účtu",
  "password.link.signup": "Vytvořit uživatelský účet zdarma",
-  "password.noUser": "Pro emailovou adresu nebyl nalezený žádný uživatel",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Prosím, zkontrolujte svůj e-mail",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Načíst znovu {name}",
  "service.crashHandler.autoReload": "Pokus o automatické obnovení {name} za {seconds} sekund",
  "service.crashHandler.headline": "Ale ne!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Vítejte v programu Ferdi",
-  "settings.account.account.editButton": "Upravit účet",
+  "settings.account.account.editButton": "Edit 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": "Aktualizovat profil",
@@ -189,16 +177,16 @@
  "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!",
  "settings.account.deleteInfo": "Pokud již nepotřebujete váš Ferdi účet, můžete zde váš účet, a všechna data v něm, smazat.",
  "settings.account.headline": "Účet",
-  "settings.account.headlineAccount": "Informace o účtu",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Nebezpečná zóna",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Faktury",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Změnit heslo",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Aktualizovat profil",
  "settings.account.successInfo": "Vaše změny byly uloženy",
  "settings.account.tryReloadServices": "Zkusit opět",
  "settings.account.tryReloadUserInfoRequest": "Zkusit opět",
  "settings.account.userInfoRequestFailed": "Nelze načíst informace o uživateli.",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Vyprázdnit mezipaměti",
  "settings.app.buttonInstallUpdate": "Restartovat a nainstalovat aktualizace",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Povolit Tmavý vzhled",
  "settings.app.form.enableGPUAcceleration": "Aktivovat GPU zrychlení",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Zapnout kontrolu pravopisu",
-  "settings.app.form.enableSystemTray": "Zobrazit Ferdi v systémové liště",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Zobrazit záložky vypnutých služeb",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Zobrazit odznak pro nepřečtené zprávy když jsou upozornění vypnutá",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Odstranit službu",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Upravit {name}",
  "settings.service.form.enableAudio": "Zapnout zvuk",
  "settings.service.form.enableBadge": "Ukázat odznaky nepřečtených zpráv",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Pokud je vypnuto, všechny zvuky notifikací a jiného audia budou ztišeny",
  "settings.service.form.name": "Jméno",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "Nastavení HTTP/HTTPS Proxy",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Objevte služby",
  "settings.services.headline": "Vaše služby",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Služba je zakázána",
  "settings.services.tooltip.isMuted": "Všechny zvuky jsou ztišeny",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Nezisková organizace",
  "settings.user.form.currentPassword": "Aktuální heslo",
  "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Jméno",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Příjmení",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Nové heslo",
  "settings.workspace.add.form.name": "Jméno",
  "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Zapnout upozornění a zvuky",
  "signup.email.label": "E-mailová adresa",
  "signup.emailDuplicate": "Uživatel s touto emailovou adresou již existuje",
-  "signup.firstname.label": "Jméno",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Přihlásit se",
-  "signup.lastname.label": "Příjmení",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Vytvořením účtu Ferdi souhlasíte s",
  "signup.legal.privacy": "Prohlášení o ochraně soukromí",
  "signup.legal.terms": "Podmínky služby",
@@ -430,11 +421,11 @@
  "signup.password.label": "Password",
  "signup.submit.label": "Vytvořit účet",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Odstranit službu",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Vypnout zvuk",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Zakázat upozornění",
-  "tabs.item.disableService": "Zakázat službu",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Zapnout zvuk",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Povolit upozornění",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Obnovit",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} není validní",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} musí být alespoň {length} znaků dlouhé",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} je povinné",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} není validní URL",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Back",
  "webControls.forward": "Forward",
  "webControls.goHome": "Home",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 31271cae5..9a6d0cf7e 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Genindlæs",
-  "app.errorHandler.headline": "Noget gik galt",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Brugerdefineret server",
  "changeserver.headline": "Skift server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Hvad skete der?",
  "connectionLostBanner.message": "Åh nej! Ferdi mistede forbindelsen til {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Udgiv fejlfindingsoplysninger",
  "feature.nightlyBuilds.activate": "Aktiver",
  "feature.nightlyBuilds.info": "Natlige byg af Ferdi er meget eksperimentelle versioner, der kan indeholde ikke polerede eller ufærdige funktioner. Disse natlige byg bruges hovedsageligt af udviklere til at teste deres nyudviklede funktioner, og hvordan de vil opføre sig i den endelige version. Hvis du er usikker, foreslår vi ikke at aktivere natlige byg.",
  "feature.nightlyBuilds.title": "Natlige byg",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Vælg en tjeneste med TAB, ↑ og ↓. Åbn en tjeneste med ENTER.",
  "feature.quickSwitch.search": "Søg...",
  "feature.quickSwitch.title": "Hurtigskift",
-  "global.api.unhealthy": "Kan ikke oprette forbindelse til Ferdi onlinetjenester",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Annuller",
+  "global.cancel": "Cancel",
  "global.edit": "Rediger",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Du har ikke forbindelse til internettet.",
@@ -33,7 +32,7 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Indstillinger",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Benyt systemstandard ({default})",
  "global.spellchecking.autodetect": "Vælg sprog automatisk",
  "global.spellchecking.autodetect.short": "Automatisk",
@@ -45,9 +44,9 @@
  "import.headline": "Importer dine Ferdi 4-tjenester",
  "import.notSupportedHeadline": "Tjenester endnu ikke understøttet i Ferdi 5",
  "import.skip.label": "Jeg ønsker at tilføje tjenester manuelt",
-  "import.submit.label": "Importer tjenester",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "Der var fejl under forsøget på at udføre en godkendt anmodning. Prøv at logge ud og ind igen hvis fejlen fortsætter.",
-  "infobar.buttonChangelog": "Hvad er nyt?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Genstart og installer opdatering",
  "infobar.buttonReloadServices": "Genindlæs tjenester",
  "infobar.hide": "Skjul",
@@ -75,7 +74,7 @@
  "login.email.label": "Mailadresse",
  "login.headline": "Log ind",
  "login.invalidCredentials": "Ugyldig mail eller adgangskode",
-  "login.link.password": "Nulstil adgangskode",
+  "login.link.password": "Reset password",
  "login.link.signup": "Opret en gratis konto",
  "login.password.label": "Adgangskode",
  "login.serverLogout": "Din session er udløbet, log ind igen.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Support",
  "menu.help.tos": "Servicevilkår",
  "menu.services": "Tjenester",
-  "menu.services.activatePreviousService": "Gå til forrige tjeneste",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Hjem",
-  "menu.services.setNextServiceActive": "Gå til næste tjeneste",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Aktiver Todos",
  "menu.view": "Vis",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Alle tjenester",
  "menu.workspaces.openWorkspaceDrawer": "Åbn arbejdsrumspanel",
  "password.email.label": "Mailadresse",
-  "password.headline": "Nulstil adgangskode",
+  "password.headline": "Reset password",
  "password.link.login": "Log ind på din konto",
  "password.link.signup": "Opret en gratis konto",
-  "password.noUser": "Der blev ikke fundet nogen bruger med den mailadresse",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Tjek venligst din mail",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Kontosynkronisering",
-  "pricing.features.customWebsites": "Tilføj brugerdefinerede hjemmesider",
-  "pricing.features.desktopNotifications": "Skrivebordsnotifikationer",
-  "pricing.features.onPremise": "Lokale- & andre hostede tjenester",
-  "pricing.features.recipes": "Vælg mellem mere end 70 tjenester",
-  "pricing.features.serviceProxies": "Tjeneste-proxyer",
-  "pricing.features.spellchecker": "Understøttelse af stavekontrol",
-  "pricing.features.teamManagement": "Teamhåndtering",
-  "pricing.features.thirdPartyServices": "Installer tredjeparts tjenester",
-  "pricing.features.unlimitedServices": "Tilføj ubegrænsede tjenester",
-  "pricing.features.workspaces": "Arbejdsrum",
  "service.crashHandler.action": "Genindlæs {name}",
  "service.crashHandler.autoReload": "Forsøger automatisk at gendanne {name} om {seconds} sekunder",
  "service.crashHandler.headline": "Åh nej!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Brug Ferdi uden en konto",
  "services.welcome": "Velkommen til Ferdi",
-  "settings.account.account.editButton": "Rediger konto",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Konto utilgængelig",
  "settings.account.accountUnavailableInfo": "Du bruger Ferdi uden en konto. Hvis du ønsker at bruge Ferdi med en konto og holde dine tjenester synkroniseret på tværs af enheder, vælg en server under fanen Indstillinger, og log derefter ind.",
  "settings.account.buttonSave": "Opdater profil",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "Du har modtaget en mail med et link til at bekræfte sletning af din konto. Din konto og data kan ikke gendannes!",
  "settings.account.deleteInfo": "Hvis du ikke længere har brug for din Ferdi-konto, kan du slette den og alle relaterede data her.",
  "settings.account.headline": "Konto",
-  "settings.account.headlineAccount": "Kontooplysninger",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Farezone",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Fakturaer",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Skift adgangskode",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Opdater profil",
  "settings.account.successInfo": "Dine ændringer er blevet gemt",
  "settings.account.tryReloadServices": "Prøv igen",
  "settings.account.tryReloadUserInfoRequest": "Prøv igen",
  "settings.account.userInfoRequestFailed": "Kunne ikke indlæse brugerinformation",
-  "settings.account.yourLicense": "Din Ferdi-licens",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Ryd cache",
  "settings.app.buttonInstallUpdate": "Genstart og installer opdatering",
@@ -219,13 +207,13 @@
  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
  "settings.app.form.closeToSystemTray": "Luk Ferdi til systembakken",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "Brugerdefineret Todo server",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
  "settings.app.form.darkMode": "Aktiver mørk tilstand",
  "settings.app.form.enableGPUAcceleration": "Aktiver GPU-acceleration",
  "settings.app.form.enableLock": "Aktiver adgangskodelås",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Aktiver stavekontrol",
-  "settings.app.form.enableSystemTray": "Vis Ferdi i systembakken",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Aktiver Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Sæt tjenester i dvale ved opstart",
  "settings.app.form.hibernationStrategy": "Dvale strategi",
@@ -251,9 +239,10 @@
  "settings.app.form.showDisabledServices": "Vis faneblade for deaktiverede tjenester",
  "settings.app.form.showDragArea": "Vis trækområde i vinduet",
  "settings.app.form.showMessagesBadgesWhenMuted": "Vis ulæst beskedikon når notifikationer er deaktiveret",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimeret",
  "settings.app.form.universalDarkMode": "Aktiver universel mørk tilstand",
-  "settings.app.form.useTouchIdToUnlock": "Tillad brug af TouchID for at låse Ferdi op",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.form.useVerticalStyle": "Use horizontal style",
  "settings.app.form.wakeUpStrategy": "Wake up strategy",
  "settings.app.headlineAdvanced": "Avanceret",
@@ -267,7 +256,7 @@
  "settings.app.languageDisclaimer": "Officielle oversættelser er engelske og tyske. Alle andre sprog er fællesskabsstyrede oversættelser.",
  "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 {lockShortcut}.",
  "settings.app.lockedPassword": "Adgangskode",
-  "settings.app.lockedPasswordInfo": "Sørg for at angive en adgangskode, du husker.\nHvis du mister denne adgangskode, vil du blive nødt til at geninstallere Ferdi.",
+  "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.restartRequired": "Ændringer kræver genstart",
  "settings.app.scheduledDNDInfo": "Planlagt Forstyr ikke giver dig mulighed for at definere et tidsrum, hvor du ikke ønsker at få meddelelser fra Ferdi.",
  "settings.app.scheduledDNDTimeInfo": "Tider er i 24-timer format. Sluttidspunktet kan være før starttidspunktet (f.eks. fra 17:00 til 09:00) for at aktivere Forstyr ikke natten over.",
@@ -275,7 +264,7 @@
  "settings.app.spellCheckerLanguageInfo": "Ferdi bruger din Macs indbyggede stavekontrol. Hvis du ønsker at ændre de sprog, stavekontrollen kontrollerer for, kan du gøre det i din Macs systemindstillinger.",
  "settings.app.subheadlineCache": "Cache",
  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Denne server vil blive brugt til funktionen \"Ferdi Todo\".",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
  "settings.app.translationHelp": "Hjælp os med at oversætte Ferdi til dit sprog.",
  "settings.app.universalDarkModeInfo": "Universel mørk tilstand forsøger at dynamisk generere mørk tilstand stilarter for tjenester, der ellers ikke er understøttet.",
  "settings.app.updateStatusAvailable": "Opdatering tilgængelig, downloader...",
@@ -294,9 +283,9 @@
  "settings.recipes.customService.headline.communityRecipes": "Fællesskabstyrede Tredjepartsopskrifter",
  "settings.recipes.customService.headline.customRecipes": "Brugerdefinerede Tredjepartsopskrifter",
  "settings.recipes.customService.headline.devRecipes": "Dine Udviklingsopskrifter",
-  "settings.recipes.customService.intro": "For at tilføje en brugerdefineret tjeneste, kopier tjenestens opskrift til:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Udvikler Dokumentation",
-  "settings.recipes.customService.openFolder": "Åbn mappe",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Tilgængelige tjenester",
  "settings.recipes.missingService": "Mangler du en service?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Mørk læser lysstyrke",
  "settings.service.form.darkReaderContrast": "Mørk læser kontrast",
  "settings.service.form.darkReaderSepia": "Mørk læser sepia",
-  "settings.service.form.deleteButton": "Slet tjeneste",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Rediger {name}",
  "settings.service.form.enableAudio": "Aktiver lyd",
  "settings.service.form.enableBadge": "Vis ulæste beskedbadges",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Når deaktiveret, er alle notifikationslyde og lydafspilning slået fra",
  "settings.service.form.name": "Navn",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Åbn darkmode.css",
  "settings.service.form.openUserCss": "Åbn user.css",
  "settings.service.form.openUserJs": "Åbn user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS proxyindstillinger",
  "settings.service.form.proxy.host": "Proxy vært/IP",
-  "settings.service.form.proxy.info": "Proxyindstillinger synkroniseres ikke med Ferdi serverne.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Brug Proxy",
-  "settings.service.form.proxy.password": "Adgangskode (valgfri)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Genstart Ferdi efter ændring af proxyindstillinger.",
-  "settings.service.form.proxy.user": "Bruger (valgfri)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Dine brugerfiler vil blive indsat i websiden, så du kan tilpasse tjenester lige som du ønsker. Brugerfiler gemmes kun lokalt og overføres ikke til andre enheder der bruger samme konto.",
  "settings.service.form.saveButton": "Gem service",
  "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Opdag tjenester",
  "settings.services.headline": "Dine tjenester",
  "settings.services.noServicesAdded": "Start med at tilføje en tjeneste.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Kunne ikke indlæse dine tjenester",
  "settings.services.tooltip.isDisabled": "Tjenesten er deaktiveret",
  "settings.services.tooltip.isMuted": "Alle lyde er slået fra",
@@ -362,12 +353,12 @@
  "settings.supportFerdi.aboutIntro": "<p>Ferdi er et \"open source\" og fællesskabsstyret program.</p><p>Tak til de personer, der gør dette muligt:</p>",
  "settings.supportFerdi.bannerText": "Vil du hjælpe os med at forbedre Ferdi?",
  "settings.supportFerdi.headline": "Om Ferdi",
-  "settings.supportFerdi.openSurvey": "Åbn undersøgelse",
+  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "Hvis du har lyst til at støtte Ferdi's udviklere med en donation, kan du gøre det på både,",
  "settings.supportFerdi.textDonationAnd": "og",
  "settings.supportFerdi.textExpenses": "Omend frivillige gør det meste af arbejdet, er vi stadig nødt til at betale for servere og certifikater. Som et fællesskab er vi fuldt ud gennemsigtige med hensyn til de midler, vi indsamler og bruger - se vores",
  "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsors",
-  "settings.supportFerdi.textListContributors": "Fuld liste over bidragsydere",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
  "settings.supportFerdi.textListContributorsHere": "her",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
  "settings.supportFerdi.textSupportWelcome": "Støtte er altid velkommen. Du kan finde en liste over den hjælp, vi har brug for",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Nonprofit",
  "settings.user.form.currentPassword": "Nuværende adgangskode",
  "settings.user.form.email": "Mailadresse",
-  "settings.user.form.firstname": "Fornavn",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Efternavn",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Ny adgangskode",
  "settings.workspace.add.form.name": "Navn",
  "settings.workspace.add.form.submitButton": "Opret arbejdsrum",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Prøv igen",
  "settings.workspaces.updatedInfo": "Dine ændringer er blevet gemt",
  "settings.workspaces.workspaceFeatureHeadline": "Mindre er mere: Introducerer Ferdi arbejdsrum",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi Arbejdsrum lader dig fokusere på, hvad der er vigtigt lige nu. Konfigurer forskellige sæt af tjenester og skift nemt mellem dem til enhver tid. Du bestemmer hvilke tjenester du har brug for hvor og hvornår, så vi kan hjælpe dig med at holde dig på toppen - eller nemt lukke ned for arbejdet, når du vil.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Kunne ikke indlæse dine arbejdsrum",
  "setupAssistant.headline": "Let's get started",
  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Aktiver notifikationer og lyd",
  "signup.email.label": "Mailadresse",
  "signup.emailDuplicate": "Der findes allerede en bruger med den mailadresse",
-  "signup.firstname.label": "Fornavn",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Tilmeld dig",
-  "signup.lastname.label": "Efternavn",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Ved at oprette en Ferdi konto accepterer du",
  "signup.legal.privacy": "Privatlivspolitik",
  "signup.legal.terms": "Servicevilkårene",
@@ -430,11 +421,11 @@
  "signup.password.label": "Adgangskode",
  "signup.submit.label": "Opret konto",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Slet tjeneste",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Deaktiver lyd",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Deaktiver notifikationer",
-  "tabs.item.disableService": "Deaktiver tjeneste",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Aktiver lyd",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Aktiver notifikationer",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Genindlæs",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} er ugyldigt",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} skal være på mindst {length} tegn",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Mindst én er påkrævet",
-  "validation.required": "{field} er obligatorisk",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} er ikke en gyldig URL",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Tilbage",
  "webControls.forward": "Fremad",
  "webControls.goHome": "Hjem",
@@ -454,12 +445,12 @@
  "webControls.reload": "Genindlæs",
  "welcome.loginButton": "Log ind på din konto",
  "welcome.signupButton": "Opret en gratis konto",
-  "workspaceDrawer.addNewWorkspaceLabel": "Tilføj nyt arbejdsrum",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Alle tjenester",
  "workspaceDrawer.headline": "Arbejdsrum",
  "workspaceDrawer.item.contextMenuEdit": "rediger",
  "workspaceDrawer.item.noServicesAddedYet": "Ingen tjenester tilføjet endnu",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Arbejdsrum lader dig fokusere på, hvad der er vigtigt lige nu. Konfigurer forskellige sæt af tjenester og skift nemt mellem dem til enhver tid.</p>\n<p>Du bestemmer hvilke tjenester du har brug for hvor og hvornår, så vi kan hjælpe dig med at holde dig på toppen - eller nemt lukke ned for arbejdet, når du vil.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Rediger indstillinger for arbejdsrum",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Skifter til"
 }
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 1deee8e54..0baa4cf5e 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Neu laden",
-  "app.errorHandler.headline": "Es ist ein Fehler aufgetreten",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Eigener Server",
  "changeserver.headline": "Server wechseln",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Was ist passiert?",
  "connectionLostBanner.message": "Oh nein! Ferdi hat die Verbindung zu {name} verloren.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Debug-Informationen veröffentlichen",
  "feature.nightlyBuilds.activate": "Aktivieren",
  "feature.nightlyBuilds.info": "Nightly builds sind experimentelle Versionen von Ferdi die unfertige Funktionen enthalten kann. Nightly builds werden hauptsächlich von Entwicklern genutzt um neu entwickelte Features zu testen und zu sehen wie sie sich in der finalen Version verhalten. Wenn du nicht genau weisst was du tust, empfehlen wir dir Nightly Builds nicht zu aktivieren.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Wähle einen Service mit TAB, ↑ und ↓. Um einen Service zu öffnen, drücke ENTER.",
  "feature.quickSwitch.search": "Suchen...",
  "feature.quickSwitch.title": "Schnellauswahl",
-  "global.api.unhealthy": "Verbindung zu den Ferdi Online Services fehlgeschlagen",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Abbrechen",
+  "global.cancel": "Cancel",
  "global.edit": "Bearbeiten",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Du bist nicht mit dem Internet verbunden.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Einstellungen",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Standard benutzen ({default})",
  "global.spellchecking.autodetect": "Sprache automatisch erkennen",
  "global.spellchecking.autodetect.short": "Automatisch",
  "global.spellchecking.language": "Sprache für Rechtschreibprüfung",
-  "global.submit": "Absenden",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Benutze 'https://whatmyuseragent.com/' (für das Entdecken) oder 'https://developers.whatismybrowser.com/useragents/explore/' (für die Wahl) deines gewünschten User Agenten und kopiere ihn hier hinein.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Deine Ferdi-4-Dienste importieren",
  "import.notSupportedHeadline": "Dienste, die noch nicht von Ferdi 5 unterstützt werden",
  "import.skip.label": "Ich möchte Dienste selbst hinzufügen",
-  "import.submit.label": "Dienste importieren",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "Es sind Fehler während einem authentifizierten Anfrage an den Ferdi Server aufgetreten. Sollte dieser Fehler bestehen, logge dich bitte aus und wieder ein.",
-  "infobar.buttonChangelog": "Was gibt es Neues?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Neu starten & Update installieren",
  "infobar.buttonReloadServices": "Dienste neu laden",
  "infobar.hide": "Ausblenden",
@@ -75,7 +74,7 @@
  "login.email.label": "E-Mail-Adresse",
  "login.headline": "Anmelden",
  "login.invalidCredentials": "E-Mail-Adresse oder Passwort ungültig",
-  "login.link.password": "Passwort zurücksetzen",
+  "login.link.password": "Reset password",
  "login.link.signup": "Kostenloses Konto erstellen",
  "login.password.label": "Passwort",
  "login.serverLogout": "Deine Sitzung ist abgelaufen, bitte melde Dich erneut an.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Hilfe",
  "menu.help.tos": "Nutzungsbedingungen",
  "menu.services": "Dienste",
-  "menu.services.activatePreviousService": "Vorheriger Dienst",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Neuen Dienst hinzufügen",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Startseite",
-  "menu.services.setNextServiceActive": "Nächster Dienst",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Todos aktivieren",
  "menu.view": "Darstellung",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Alle Dienste",
  "menu.workspaces.openWorkspaceDrawer": "Workspaces schließen",
  "password.email.label": "E-Mail-Adresse",
-  "password.headline": "Passwort zurücksetzen",
+  "password.headline": "Reset password",
  "password.link.login": "Mit deinem Konto anmelden",
  "password.link.signup": "Kostenloses Konto erstellen",
-  "password.noUser": "Es wurde kein Benutzer mit dieser E-Mail-Adresse gefunden",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Wir haben Dir eine E-Mail mit weiteren Anweisungen geschickt",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Konto-Synchronisierung",
-  "pricing.features.customWebsites": "Hinzufügen von eigenen Websites",
-  "pricing.features.desktopNotifications": "Desktop Benachrichtigungen",
-  "pricing.features.onPremise": "On-premise & andere Hosted 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.workspaces": "Arbeitsbereiche",
  "service.crashHandler.action": "{name} neu laden",
  "service.crashHandler.autoReload": "{name} wird in {seconds} Sekunden automatisch wiederhergestellt",
  "service.crashHandler.headline": "Oh nein!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Ferdi ohne ein Konto verwenden",
  "services.welcome": "Willkommen bei Ferdi!",
-  "settings.account.account.editButton": "Konto bearbeiten",
+  "settings.account.account.editButton": "Edit account",
  "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",
@@ -189,16 +177,16 @@
  "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!",
  "settings.account.deleteInfo": "Wenn du dein Ferdi-Benutzerkonto nicht mehr länger benötigst, kannst du es hier mit allen dazugehörigen Daten löschen.",
  "settings.account.headline": "Konto",
-  "settings.account.headlineAccount": "Konto-Informationen",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Benutzerkonto löschen",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Rechnungen",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Passwort ändern",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Profil aktualisieren",
  "settings.account.successInfo": "Deine Änderungen wurden gespeichert",
  "settings.account.tryReloadServices": "Erneut versuchen",
  "settings.account.tryReloadUserInfoRequest": "Erneut versuchen",
  "settings.account.userInfoRequestFailed": "Benutzerinformationen konnten nicht geladen werden",
-  "settings.account.yourLicense": "Deine Ferdi Lizenz",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Schreibe deine Akzentfarbe in einem CSS-kompatiblen Format. (Standard: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Cache leeren",
  "settings.app.buttonInstallUpdate": "Neu starten & Update installieren",
@@ -219,13 +207,13 @@
  "settings.app.form.clipboardNotifications": "Keine Benachrichtigungen für Zwischenablagenereignisse anzeigen",
  "settings.app.form.closeToSystemTray": "Ferdi in Infobereich minimieren",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "Eigener Todo Server",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Dunkles Design verwenden",
+  "settings.app.form.darkMode": "Dark Mode aktivieren",
  "settings.app.form.enableGPUAcceleration": "Hardwarebeschleunigung aktivieren",
  "settings.app.form.enableLock": "Passwort-Sperre aktivieren",
  "settings.app.form.enableMenuBar": "Ferdi immer in der Menüleiste anzeigen",
  "settings.app.form.enableSpellchecking": "Rechtschreibprüfung aktivieren",
-  "settings.app.form.enableSystemTray": "Ferdi im Infobereich anzeigen",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Ferdi Todos aktivieren",
  "settings.app.form.hibernateOnStartup": "Behalte Dienste im Ruhezustand beim Start",
  "settings.app.form.hibernationStrategy": "\"Service Hibernation\"-Strategie",
@@ -251,9 +239,10 @@
  "settings.app.form.showDisabledServices": "Deaktivierte Services-Tabs anzeigen",
  "settings.app.form.showDragArea": "Zeige ziehbare Fläche im Fenster",
  "settings.app.form.showMessagesBadgesWhenMuted": "Ungelesene Nachrichten zeigen, wenn die Benachrichtigungen deaktiviert sind",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Minimiert starten",
  "settings.app.form.universalDarkMode": "Universellen Dark Mode aktivieren",
-  "settings.app.form.useTouchIdToUnlock": "Verwenden von Touch ID zum Entsperren von Ferdi erlauben",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.form.useVerticalStyle": "Use horizontal style",
  "settings.app.form.wakeUpStrategy": "Wake up strategy",
  "settings.app.headlineAdvanced": "Erweitert",
@@ -267,7 +256,7 @@
  "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 {lockShortcut}.",
  "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.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "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.",
@@ -275,7 +264,7 @@
  "settings.app.spellCheckerLanguageInfo": "Ferdi verwendet den eingebauten Rechtschreibprüfer deines Macs, um nach Tippfehlern zu suchen. Wenn du die zu überprüfenden Sprachen ändern möchtest, kannst du das in deinen Systemeinstellungen tun.",
  "settings.app.subheadlineCache": "Cache",
  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Dieser Server wird für die \"Ferdi Todo\"-Funktion verwendet.",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
  "settings.app.translationHelp": "Hilf uns, Ferdi in Deine Sprache zu übersetzen.",
  "settings.app.universalDarkModeInfo": "Universeller Dark Mode versucht dynamisch Dienste abzudunkeln, die vom normalen Dark Mode noch nicht unterstützt werden.",
  "settings.app.updateStatusAvailable": "Update verfügbar, lädt herunter ...",
@@ -294,12 +283,12 @@
  "settings.recipes.customService.headline.communityRecipes": "Community Recipes",
  "settings.recipes.customService.headline.customRecipes": "Benutzerdefinierte Recipes",
  "settings.recipes.customService.headline.devRecipes": "Eigene Recipes",
-  "settings.recipes.customService.intro": "Um ein benutzerdefiniertes Service hinzuzufügen, kopiere das Service Recipe nach:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Entwicklerdokumentation",
-  "settings.recipes.customService.openFolder": "Ordner öffnen",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Verfügbare Dienste",
  "settings.recipes.missingService": "Fehlt ein Dienst?",
-  "settings.recipes.nothingFound": "Leider hat kein Dienst zu deinem Suchbegriff gepasst - aber du kannst ihn wahrscheinlich trotzdem über die Option \"Eigene Website\" hinzufügen. Bitte beachte, dass die Website möglicherweise weitere Dienste anzeigt, die seit deiner aktuellen Version zu Ferdi hinzugefügt wurden. Um diese neuen Dienste zu erhalten, erwäge bitte ein Upgrade auf eine neuere Version von Ferdi.",
+  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.recipes.servicesSuccessfulAddedInfo": "Dienst erfolgreich hinzugefügt",
  "settings.searchService": "Dienst suchen",
  "settings.service.error.goBack": "Zurück zu den Diensten",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Helligkeit",
  "settings.service.form.darkReaderContrast": "Dark Reader Kontrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Dienst löschen",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "{name} bearbeiten",
  "settings.service.form.enableAudio": "Audio aktivieren",
  "settings.service.form.enableBadge": "Nachrichten-Badge anzeigen",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "Wenn aktiviert, wird ein Dienst nach einer Zeitspanne heruntergefahren, um Systemressourcen zu sparen.",
  "settings.service.form.isMutedInfo": "Sämtliche Wiedergabe von Tönen wird deaktiviert",
  "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Öffne darkmode.css",
  "settings.service.form.openUserCss": "Öffne user.css",
  "settings.service.form.openUserJs": "Öffne user.js",
  "settings.service.form.proxy.headline": "HTTP-/HTTPS-Proxy-Einstellungen",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy-Einstellungen werden nicht mit den Ferdi Servern synchronisiert.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Proxy-Server verwenden",
-  "settings.service.form.proxy.password": "Passwort (optional)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Bitte starte Ferdi nach dem Ändern der Proxy-Einstellungen neu.",
-  "settings.service.form.proxy.user": "Benutzer (optional)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Deine \"user\" Dateien werden in die Webseite eingefügt, so dass du die Dienste in beliebiger Weise anpassen können. \"user\" Dateien werden nur lokal gespeichert und nicht auf andere Computer, welche das gleiche Konto nutzen, übertragen.",
  "settings.service.form.saveButton": "Dienst speichern",
  "settings.service.form.tabHosted": "Gehostet",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Dienste entdecken",
  "settings.services.headline": "Deine Dienste",
  "settings.services.noServicesAdded": "Beginne indem du einen Dienst hinzufügst.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Dienste konnten nicht geladen werden",
  "settings.services.tooltip.isDisabled": "Dienst ist deaktiviert",
  "settings.services.tooltip.isMuted": "Alle Töne sind deaktiviert",
@@ -362,12 +353,12 @@
  "settings.supportFerdi.aboutIntro": "<p>Ferdi ist eine Open-Source und von der Community-geführte Anwendung.</p><p>Danke an die Personen, die das möglich machen:</p>",
  "settings.supportFerdi.bannerText": "Willst du uns helfen, Ferdi zu verbessern?",
  "settings.supportFerdi.headline": "Über Ferdi",
-  "settings.supportFerdi.openSurvey": "Umfrage öffnen",
+  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "Wenn du Lust hast, die Entwicklung von Ferdi mit einer Spende zu unterstützen, kannst du dies auf folgenden Seiten tun,",
  "settings.supportFerdi.textDonationAnd": "und",
  "settings.supportFerdi.textExpenses": "Während die meiste Arbeit von Freiwilligen geleistet wird, müssen wir dennoch für Server und Zertifikate bezahlen. Als Community sind wir völlig transparent über die Gelder, die wir sammeln und ausgeben - siehe unsere",
  "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsoren",
-  "settings.supportFerdi.textListContributors": "Vollständige Liste der Mitwirkenden",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
  "settings.supportFerdi.textListContributorsHere": "hier",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
  "settings.supportFerdi.textSupportWelcome": "Unterstützung ist immer willkommen. Du findest eine Liste über Unterstützungen die wir benötigen",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Non-Profit",
  "settings.user.form.currentPassword": "Aktuelles Passwort",
  "settings.user.form.email": "E-Mail",
-  "settings.user.form.firstname": "Vorname",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Nachname",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Neues Passwort",
  "settings.workspace.add.form.name": "Name",
  "settings.workspace.add.form.submitButton": "Workspace erstellen",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Erneut versuchen",
  "settings.workspaces.updatedInfo": "Deine Änderungen wurden gespeichert",
  "settings.workspaces.workspaceFeatureHeadline": "Weniger ist mehr: Ferdi Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "Mit Ferdi Workspaces hast du alles im Blick, was gerade wichtig ist - und nur das. Erstelle unterschiedliche Sets von Services, und wechsle jederzeit zwischen ihnen hin und her. Du entscheidest welche Services du wann und wo brauchst, um ungestört arbeiten zu können - oder zu Hause besser abzuschalten.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Workspaces konnte nicht geladen werden",
  "setupAssistant.headline": "Los geht's",
  "setupAssistant.subheadline": "Wähle von unseren meistgenutzten Diensten und bekomm deine Nachrichten wieder in den Griff.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Benachrichtigungen & Audio aktivieren",
  "signup.email.label": "E-Mail-Adresse",
  "signup.emailDuplicate": "Es existiert bereits ein Benutzer mit dieser E-Mail Adresse.",
-  "signup.firstname.label": "Vorname",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Anmelden",
-  "signup.lastname.label": "Nachname",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Mit der Erstellung eines Ferdi-Kontos akzeptierst Du die",
  "signup.legal.privacy": "Datenschutzerklärung",
  "signup.legal.terms": "Nutzungsbedingungen",
@@ -430,11 +421,11 @@
  "signup.password.label": "Passwort",
  "signup.submit.label": "Konto erstellen",
  "tabs.item.confirmDeleteService": "Willst du den {serviceName} Dienst wirklich löschen?",
-  "tabs.item.deleteService": "Dienst löschen",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Audio deaktivieren",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Benachrichtigungen deaktivieren",
-  "tabs.item.disableService": "Dienst deaktivieren",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Audio aktivieren",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Benachrichtigungen aktivieren",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Neu laden",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} ist ungültig",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} muss mindestens {length} Zeichen enthalten",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Mindestens ein Wert wird benötigt",
-  "validation.required": "{field} wird benötigt",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} ist keine gültige URL",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Zurück",
  "webControls.forward": "Vorwärts",
  "webControls.goHome": "Startseite",
@@ -454,12 +445,12 @@
  "webControls.reload": "Neu laden",
  "welcome.loginButton": "Bei Ferdi einloggen",
  "welcome.signupButton": "Kostenloses Konto erstellen",
-  "workspaceDrawer.addNewWorkspaceLabel": "Neuen Workspace hinzufügen",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Alle Dienste",
  "workspaceDrawer.headline": "Arbeitsbereiche",
  "workspaceDrawer.item.contextMenuEdit": "Bearbeiten",
  "workspaceDrawer.item.noServicesAddedYet": "Noch keine Services hinzugefügt",
-  "workspaceDrawer.workspaceFeatureInfo": "Mit Ferdi Workspaces hast du alles im Blick, was gerade wichtig ist - und nur das. Erstelle unterschiedliche Sets von Services, und wechsle jederzeit zwischen ihnen hin und her. Du entscheidest welche Services du wann und wo brauchst, um ungestört arbeiten zu können - oder zu Hause besser abzuschalten.",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Workspaces bearbeiten",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Wechsle zu"
 }
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
deleted file mode 100644
index 3a41c66f6..000000000
--- a/src/i18n/locales/defaultMessages.json
+++ /dev/null
@@ -1,6862 +0,0 @@
-[
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!A new update for Ferdi is available.",
-        "end": {
-          "column": 3,
-          "line": 13
-        },
-        "file": "src/components/AppUpdateInfoBar.js",
-        "id": "infobar.updateAvailable",
-        "start": {
-          "column": 19,
-          "line": 10
-        }
-      },
-      {
-        "defaultMessage": "!!!Changelog",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/AppUpdateInfoBar.js",
-        "id": "infobar.buttonChangelog",
-        "start": {
-          "column": 13,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Restart & install update",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/AppUpdateInfoBar.js",
-        "id": "infobar.buttonInstallUpdate",
-        "start": {
-          "column": 23,
-          "line": 18
-        }
-      }
-    ],
-    "path": "src/components/AppUpdateInfoBar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Change server",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Server",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.label",
-        "start": {
-          "column": 9,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.warning",
-        "start": {
-          "column": 11,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom server",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.customServerLabel",
-        "start": {
-          "column": 21,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Enter a valid URL",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/auth/ChangeServer.js",
-        "id": "changeserver.urlError",
-        "start": {
-          "column": 12,
-          "line": 31
-        }
-      }
-    ],
-    "path": "src/components/auth/ChangeServer.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Import your Ferdi 4 services",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.headline",
-        "start": {
-          "column": 12,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Services not yet supported in Ferdi 5",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.notSupportedHeadline",
-        "start": {
-          "column": 24,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Import {count} services",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.submit.label",
-        "start": {
-          "column": 21,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!I want to add services manually",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/auth/Import.js",
-        "id": "import.skip.label",
-        "start": {
-          "column": 19,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/components/auth/Import.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Invite Friends",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "settings.invite.headline",
-        "start": {
-          "column": 20,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.headline.friends",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.name.label",
-        "start": {
-          "column": 13,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.email.label",
-        "start": {
-          "column": 14,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Send invites",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.submit.label",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!I want to do this later",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.skip.label",
-        "start": {
-          "column": 19,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Invitations sent successfully",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Invite.js",
-        "id": "invite.successInfo",
-        "start": {
-          "column": 21,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/auth/Invite.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Locked",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.headline",
-        "start": {
-          "column": 12,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.info",
-        "start": {
-          "column": 8,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock with Touch ID",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.touchId",
-        "start": {
-          "column": 11,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!unlock via Touch ID",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.touchIdPrompt",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.password.label",
-        "start": {
-          "column": 17,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.submit.label",
-        "start": {
-          "column": 21,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock with Password",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.unlockWithPassword",
-        "start": {
-          "column": 22,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Password invalid",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/auth/Locked.js",
-        "id": "locked.invalidCredentials",
-        "start": {
-          "column": 22,
-          "line": 44
-        }
-      }
-    ],
-    "path": "src/components/auth/Locked.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Sign in",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.headline",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.email.label",
-        "start": {
-          "column": 14,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.password.label",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Sign in",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.submit.label",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Email or password not valid",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.invalidCredentials",
-        "start": {
-          "column": 22,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Using a Franz account to log in?",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.customServerQuestion",
-        "start": {
-          "column": 24,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Try importing your Franz account into Ferdi",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.customServerSuggestion",
-        "start": {
-          "column": 26,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Your session expired, please login again.",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.tokenExpired",
-        "start": {
-          "column": 16,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Your session expired, please login again.",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.serverLogout",
-        "start": {
-          "column": 16,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Create a free account",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.link.signup",
-        "start": {
-          "column": 14,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Change server",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.changeServer",
-        "start": {
-          "column": 16,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Forgot password",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/components/auth/Login.js",
-        "id": "login.link.password",
-        "start": {
-          "column": 16,
-          "line": 68
-        }
-      }
-    ],
-    "path": "src/components/auth/Login.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Forgot password",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.email.label",
-        "start": {
-          "column": 14,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Your new password was sent to your email address",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.successInfo",
-        "start": {
-          "column": 15,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!No user affiliated with that email address",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.noUser",
-        "start": {
-          "column": 10,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Create a free account",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.link.signup",
-        "start": {
-          "column": 14,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Sign in to your account",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/auth/Password.js",
-        "id": "password.link.login",
-        "start": {
-          "column": 13,
-          "line": 35
-        }
-      }
-    ],
-    "path": "src/components/auth/Password.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Invite Friends",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "settings.invite.headline",
-        "start": {
-          "column": 20,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.headline.friends",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.name.label",
-        "start": {
-          "column": 13,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.email.label",
-        "start": {
-          "column": 14,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Send invites",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.submit.label",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!I want to do this later",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.skip.label",
-        "start": {
-          "column": 19,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Invitations sent successfully",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/ServiceAssistant.js",
-        "id": "invite.successInfo",
-        "start": {
-          "column": 21,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/auth/ServiceAssistant.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Let's get started",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "setupAssistant.headline",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "setupAssistant.subheadline",
-        "start": {
-          "column": 15,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Let's go",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "setupAssistant.submit.label",
-        "start": {
-          "column": 21,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Invitations sent successfully",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/auth/SetupAssistant.js",
-        "id": "invite.successInfo",
-        "start": {
-          "column": 21,
-          "line": 33
-        }
-      }
-    ],
-    "path": "src/components/auth/SetupAssistant.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Sign up",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.headline",
-        "start": {
-          "column": 12,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Firstname",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.firstname.label",
-        "start": {
-          "column": 18,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Lastname",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.lastname.label",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Email address",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.email.label",
-        "start": {
-          "column": 14,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.password.label",
-        "start": {
-          "column": 17,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!By creating a Ferdi account you accept the",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.legal.info",
-        "start": {
-          "column": 13,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Terms of service",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.legal.terms",
-        "start": {
-          "column": 9,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy Statement",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.legal.privacy",
-        "start": {
-          "column": 11,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Create account",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.submit.label",
-        "start": {
-          "column": 21,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Already have an account, sign in?",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.link.login",
-        "start": {
-          "column": 13,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Change server",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "login.changeServer",
-        "start": {
-          "column": 16,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!A user with that email address already exists",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/components/auth/Signup.js",
-        "id": "signup.emailDuplicate",
-        "start": {
-          "column": 18,
-          "line": 72
-        }
-      }
-    ],
-    "path": "src/components/auth/Signup.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Create a free account",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/auth/Welcome.js",
-        "id": "welcome.signupButton",
-        "start": {
-          "column": 16,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Login to your account",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/auth/Welcome.js",
-        "id": "welcome.loginButton",
-        "start": {
-          "column": 15,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/auth/Welcome.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 19
-        }
-      }
-    ],
-    "path": "src/components/auth/Welcome.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your services have been updated.",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.servicesUpdated",
-        "start": {
-          "column": 19,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload services",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.buttonReloadServices",
-        "start": {
-          "column": 24,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load services and user information",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.requiredRequestsFailed",
-        "start": {
-          "column": 26,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/components/layout/AppLayout.js",
-        "id": "infobar.authRequestFailed",
-        "start": {
-          "column": 21,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/layout/AppLayout.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Add new service",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.addNewService",
-        "start": {
-          "column": 17,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.muteApp",
-        "start": {
-          "column": 8,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.unmuteApp",
-        "start": {
-          "column": 10,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!Open workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.openWorkspaceDrawer",
-        "start": {
-          "column": 23,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Close workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.closeWorkspaceDrawer",
-        "start": {
-          "column": 24,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Ferdi Todos",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.openTodosDrawer",
-        "start": {
-          "column": 19,
-          "line": 38
-        }
-      },
-      {
-        "defaultMessage": "!!!Close Ferdi Todos",
-        "end": {
-          "column": 3,
-          "line": 45
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.closeTodosDrawer",
-        "start": {
-          "column": 20,
-          "line": 42
-        }
-      },
-      {
-        "defaultMessage": "!!!Lock Ferdi",
-        "end": {
-          "column": 3,
-          "line": 49
-        },
-        "file": "src/components/layout/Sidebar.js",
-        "id": "sidebar.lockFerdi",
-        "start": {
-          "column": 13,
-          "line": 46
-        }
-      }
-    ],
-    "path": "src/components/layout/Sidebar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/content/ConnectionBanner.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/components/services/content/ConnectionBanner.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/content/ConnectionLost.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/components/services/content/ConnectionLost.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ConnectionLostBanner.js",
-        "id": "connectionLostBanner.message",
-        "start": {
-          "column": 8,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!What happened?",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/ConnectionLostBanner.js",
-        "id": "connectionLostBanner.informationLink",
-        "start": {
-          "column": 19,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Service",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/ConnectionLostBanner.js",
-        "id": "connectionLostBanner.cta",
-        "start": {
-          "column": 7,
-          "line": 21
-        }
-      }
-    ],
-    "path": "src/components/services/content/ConnectionLostBanner.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Oh no!",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!{name} has failed to load.",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.text",
-        "start": {
-          "column": 8,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload {name}",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.action",
-        "start": {
-          "column": 10,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit {name}",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.editAction",
-        "start": {
-          "column": 14,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Error:",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-        "id": "service.errorHandler.message",
-        "start": {
-          "column": 16,
-          "line": 28
-        }
-      }
-    ],
-    "path": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!{name} is disabled",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/components/services/content/ServiceDisabled.js",
-        "id": "service.disabledHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable {name}",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/ServiceDisabled.js",
-        "id": "service.disabledHandler.action",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      }
-    ],
-    "path": "src/components/services/content/ServiceDisabled.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Welcome to Ferdi",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.welcome",
-        "start": {
-          "column": 11,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Get started",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.getStarted",
-        "start": {
-          "column": 14,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Please login to use Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.login",
-        "start": {
-          "column": 9,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Ferdi without an Account",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.serverless",
-        "start": {
-          "column": 14,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/services/content/Services.js",
-        "id": "services.serverInfo",
-        "start": {
-          "column": 14,
-          "line": 31
-        }
-      }
-    ],
-    "path": "src/components/services/content/Services.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/content/WebControls.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/components/services/content/WebControls.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Oh no!",
-        "end": {
-          "column": 3,
-          "line": 13
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 10
-        }
-      },
-      {
-        "defaultMessage": "!!!{name} has caused an error.",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.text",
-        "start": {
-          "column": 8,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload {name}",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.action",
-        "start": {
-          "column": 10,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Trying to automatically restore {name} in {seconds} seconds",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/services/content/WebviewCrashHandler.js",
-        "id": "service.crashHandler.autoReload",
-        "start": {
-          "column": 14,
-          "line": 22
-        }
-      }
-    ],
-    "path": "src/components/services/content/WebviewCrashHandler.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.reload",
-        "start": {
-          "column": 10,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable notifications",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableNotifications",
-        "start": {
-          "column": 24,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable notifications",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableNotification",
-        "start": {
-          "column": 23,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable audio",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableAudio",
-        "start": {
-          "column": 16,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable audio",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableAudio",
-        "start": {
-          "column": 15,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Dark mode",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableDarkMode",
-        "start": {
-          "column": 18,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable Dark mode",
-        "end": {
-          "column": 3,
-          "line": 48
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableDarkMode",
-        "start": {
-          "column": 19,
-          "line": 45
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable Service",
-        "end": {
-          "column": 3,
-          "line": 52
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.disableService",
-        "start": {
-          "column": 18,
-          "line": 49
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Service",
-        "end": {
-          "column": 3,
-          "line": 56
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.enableService",
-        "start": {
-          "column": 17,
-          "line": 53
-        }
-      },
-      {
-        "defaultMessage": "!!!Hibernate Service",
-        "end": {
-          "column": 3,
-          "line": 60
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.hibernateService",
-        "start": {
-          "column": 20,
-          "line": 57
-        }
-      },
-      {
-        "defaultMessage": "!!!Wake Up Service",
-        "end": {
-          "column": 3,
-          "line": 64
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.wakeUpService",
-        "start": {
-          "column": 17,
-          "line": 61
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete Service",
-        "end": {
-          "column": 3,
-          "line": 68
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.deleteService",
-        "start": {
-          "column": 17,
-          "line": 65
-        }
-      },
-      {
-        "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
-        "end": {
-          "column": 3,
-          "line": 73
-        },
-        "file": "src/components/services/tabs/TabItem.js",
-        "id": "tabs.item.confirmDeleteService",
-        "start": {
-          "column": 24,
-          "line": 69
-        }
-      }
-    ],
-    "path": "src/components/services/tabs/TabItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Account",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headline",
-        "start": {
-          "column": 12,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!Danger Zone",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headlineDangerZone",
-        "start": {
-          "column": 22,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit Account",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.account.editButton",
-        "start": {
-          "column": 21,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!Invoices",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headlineInvoices",
-        "start": {
-          "column": 18,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load user information",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.userInfoRequestFailed",
-        "start": {
-          "column": 25,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Try again",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.tryReloadUserInfoRequest",
-        "start": {
-          "column": 28,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete account",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.deleteAccount",
-        "start": {
-          "column": 17,
-          "line": 38
-        }
-      },
-      {
-        "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.deleteInfo",
-        "start": {
-          "column": 14,
-          "line": 42
-        }
-      },
-      {
-        "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.deleteEmailSent",
-        "start": {
-          "column": 19,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!Your Franz License:",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.yourLicense",
-        "start": {
-          "column": 15,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "Account is unavailable",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.accountUnavailable",
-        "start": {
-          "column": 22,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "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.",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.accountUnavailableInfo",
-        "start": {
-          "column": 26,
-          "line": 60
-        }
-      }
-    ],
-    "path": "src/components/settings/account/AccountDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Available services",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.availableServices",
-        "start": {
-          "column": 21,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Your services",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.yourServices",
-        "start": {
-          "column": 16,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Your workspaces",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.yourWorkspaces",
-        "start": {
-          "column": 18,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Account",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.account",
-        "start": {
-          "column": 11,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Manage Team",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.team",
-        "start": {
-          "column": 8,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!About Ferdi",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.supportFerdi",
-        "start": {
-          "column": 16,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Logout",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/settings/navigation/SettingsNavigation.js",
-        "id": "settings.navigation.logout",
-        "start": {
-          "column": 10,
-          "line": 40
-        }
-      }
-    ],
-    "path": "src/components/settings/navigation/SettingsNavigation.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Available Services",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.headline",
-        "start": {
-          "column": 12,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Search service",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.searchService",
-        "start": {
-          "column": 17,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!All services",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.all",
-        "start": {
-          "column": 14,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom Services",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.custom",
-        "start": {
-          "column": 17,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.nothingFound",
-        "start": {
-          "column": 16,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Service successfully added",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.servicesSuccessfulAddedInfo",
-        "start": {
-          "column": 31,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Missing a service?",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.missingService",
-        "start": {
-          "column": 18,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.intro",
-        "start": {
-          "column": 21,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!Open directory",
-        "end": {
-          "column": 3,
-          "line": 54
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.openFolder",
-        "start": {
-          "column": 14,
-          "line": 51
-        }
-      },
-      {
-        "defaultMessage": "!!!Developer Documentation",
-        "end": {
-          "column": 3,
-          "line": 58
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.openDevDocs",
-        "start": {
-          "column": 15,
-          "line": 55
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom 3rd Party Recipes",
-        "end": {
-          "column": 3,
-          "line": 62
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.headline.customRecipes",
-        "start": {
-          "column": 25,
-          "line": 59
-        }
-      },
-      {
-        "defaultMessage": "!!!Community 3rd Party Recipes",
-        "end": {
-          "column": 3,
-          "line": 66
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.headline.communityRecipes",
-        "start": {
-          "column": 28,
-          "line": 63
-        }
-      },
-      {
-        "defaultMessage": "!!!Your Development Service Recipes",
-        "end": {
-          "column": 3,
-          "line": 70
-        },
-        "file": "src/components/settings/recipes/RecipesDashboard.js",
-        "id": "settings.recipes.customService.headline.devRecipes",
-        "start": {
-          "column": 22,
-          "line": 67
-        }
-      }
-    ],
-    "path": "src/components/settings/recipes/RecipesDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Save service",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.saveButton",
-        "start": {
-          "column": 15,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete Service",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.deleteButton",
-        "start": {
-          "column": 17,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Open darkmode.css",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.openDarkmodeCss",
-        "start": {
-          "column": 19,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Open user.css",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.openUserCss",
-        "start": {
-          "column": 15,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Open user.js",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.openUserJs",
-        "start": {
-          "column": 14,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.recipeFileInfo",
-        "start": {
-          "column": 18,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!Available services",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.availableServices",
-        "start": {
-          "column": 21,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!Your services",
-        "end": {
-          "column": 3,
-          "line": 54
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.yourServices",
-        "start": {
-          "column": 16,
-          "line": 51
-        }
-      },
-      {
-        "defaultMessage": "!!!Add {name}",
-        "end": {
-          "column": 3,
-          "line": 58
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.addServiceHeadline",
-        "start": {
-          "column": 22,
-          "line": 55
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit {name}",
-        "end": {
-          "column": 3,
-          "line": 62
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.editServiceHeadline",
-        "start": {
-          "column": 23,
-          "line": 59
-        }
-      },
-      {
-        "defaultMessage": "!!!Hosted",
-        "end": {
-          "column": 3,
-          "line": 66
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.tabHosted",
-        "start": {
-          "column": 13,
-          "line": 63
-        }
-      },
-      {
-        "defaultMessage": "!!!Self hosted ⭐️",
-        "end": {
-          "column": 3,
-          "line": 70
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.tabOnPremise",
-        "start": {
-          "column": 16,
-          "line": 67
-        }
-      },
-      {
-        "defaultMessage": "!!!Use the hosted {name} service.",
-        "end": {
-          "column": 3,
-          "line": 74
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.useHostedService",
-        "start": {
-          "column": 20,
-          "line": 71
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not validate custom {name} server.",
-        "end": {
-          "column": 3,
-          "line": 78
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.customUrlValidationError",
-        "start": {
-          "column": 28,
-          "line": 75
-        }
-      },
-      {
-        "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-        "end": {
-          "column": 3,
-          "line": 82
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.indirectMessageInfo",
-        "start": {
-          "column": 23,
-          "line": 79
-        }
-      },
-      {
-        "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
-        "end": {
-          "column": 3,
-          "line": 86
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.isMutedInfo",
-        "start": {
-          "column": 15,
-          "line": 83
-        }
-      },
-      {
-        "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
-        "end": {
-          "column": 3,
-          "line": 90
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.isHibernatedEnabledInfo",
-        "start": {
-          "column": 28,
-          "line": 87
-        }
-      },
-      {
-        "defaultMessage": "!!!Notifications",
-        "end": {
-          "column": 3,
-          "line": 94
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineNotifications",
-        "start": {
-          "column": 25,
-          "line": 91
-        }
-      },
-      {
-        "defaultMessage": "!!!Unread message badges",
-        "end": {
-          "column": 3,
-          "line": 98
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineBadges",
-        "start": {
-          "column": 18,
-          "line": 95
-        }
-      },
-      {
-        "defaultMessage": "!!!General",
-        "end": {
-          "column": 3,
-          "line": 102
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineGeneral",
-        "start": {
-          "column": 19,
-          "line": 99
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Settings",
-        "end": {
-          "column": 3,
-          "line": 106
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.headlineDarkReaderSettings",
-        "start": {
-          "column": 30,
-          "line": 103
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete",
-        "end": {
-          "column": 3,
-          "line": 110
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.iconDelete",
-        "start": {
-          "column": 14,
-          "line": 107
-        }
-      },
-      {
-        "defaultMessage": "!!!Drop your image, or click here",
-        "end": {
-          "column": 3,
-          "line": 114
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.iconUpload",
-        "start": {
-          "column": 14,
-          "line": 111
-        }
-      },
-      {
-        "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
-        "end": {
-          "column": 3,
-          "line": 118
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.proxy.headline",
-        "start": {
-          "column": 17,
-          "line": 115
-        }
-      },
-      {
-        "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
-        "end": {
-          "column": 3,
-          "line": 122
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.proxy.restartInfo",
-        "start": {
-          "column": 20,
-          "line": 119
-        }
-      },
-      {
-        "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
-        "end": {
-          "column": 3,
-          "line": 126
-        },
-        "file": "src/components/settings/services/EditServiceForm.js",
-        "id": "settings.service.form.proxy.info",
-        "start": {
-          "column": 13,
-          "line": 123
-        }
-      }
-    ],
-    "path": "src/components/settings/services/EditServiceForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Error",
-        "end": {
-          "column": 3,
-          "line": 13
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.error.headline",
-        "start": {
-          "column": 12,
-          "line": 10
-        }
-      },
-      {
-        "defaultMessage": "!!!Back to services",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.error.goBack",
-        "start": {
-          "column": 10,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Available services",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.form.availableServices",
-        "start": {
-          "column": 21,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load service recipe.",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/settings/services/ServiceError.js",
-        "id": "settings.service.error.message",
-        "start": {
-          "column": 16,
-          "line": 22
-        }
-      }
-    ],
-    "path": "src/components/settings/services/ServiceError.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Service is disabled",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/settings/services/ServiceItem.js",
-        "id": "settings.services.tooltip.isDisabled",
-        "start": {
-          "column": 21,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Notifications are disabled",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/services/ServiceItem.js",
-        "id": "settings.services.tooltip.notificationsDisabled",
-        "start": {
-          "column": 32,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!All sounds are muted",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/services/ServiceItem.js",
-        "id": "settings.services.tooltip.isMuted",
-        "start": {
-          "column": 18,
-          "line": 19
-        }
-      }
-    ],
-    "path": "src/components/settings/services/ServiceItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your services",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Search service",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.searchService",
-        "start": {
-          "column": 17,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Start by adding a service.",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.noServicesAdded",
-        "start": {
-          "column": 19,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.recipes.nothingFound",
-        "start": {
-          "column": 18,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Discover services",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.discoverServices",
-        "start": {
-          "column": 20,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load your services",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.servicesRequestFailed",
-        "start": {
-          "column": 25,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Try again",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.account.tryReloadServices",
-        "start": {
-          "column": 21,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Your changes have been saved",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.updatedInfo",
-        "start": {
-          "column": 15,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!Service has been deleted",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/services/ServicesDashboard.js",
-        "id": "settings.services.deletedInfo",
-        "start": {
-          "column": 15,
-          "line": 47
-        }
-      }
-    ],
-    "path": "src/components/settings/services/ServicesDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!General",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineGeneral",
-        "start": {
-          "column": 19,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.sentryInfo",
-        "start": {
-          "column": 14,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!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.",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.hibernateInfo",
-        "start": {
-          "column": 17,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.inactivityLockInfo",
-        "start": {
-          "column": 22,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.todoServerInfo",
-        "start": {
-          "column": 18,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.lockedPassword",
-        "start": {
-          "column": 18,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 48
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.lockedPasswordInfo",
-        "start": {
-          "column": 22,
-          "line": 45
-        }
-      },
-      {
-        "defaultMessage": "!!!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 {lockShortcut}.",
-        "end": {
-          "column": 3,
-          "line": 52
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.lockInfo",
-        "start": {
-          "column": 12,
-          "line": 49
-        }
-      },
-      {
-        "defaultMessage": "!!!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.",
-        "end": {
-          "column": 3,
-          "line": 56
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.scheduledDNDTimeInfo",
-        "start": {
-          "column": 24,
-          "line": 53
-        }
-      },
-      {
-        "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
-        "end": {
-          "column": 3,
-          "line": 60
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.scheduledDNDInfo",
-        "start": {
-          "column": 20,
-          "line": 57
-        }
-      },
-      {
-        "defaultMessage": "!!!Language",
-        "end": {
-          "column": 3,
-          "line": 64
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineLanguage",
-        "start": {
-          "column": 20,
-          "line": 61
-        }
-      },
-      {
-        "defaultMessage": "!!!Updates",
-        "end": {
-          "column": 3,
-          "line": 68
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineUpdates",
-        "start": {
-          "column": 19,
-          "line": 65
-        }
-      },
-      {
-        "defaultMessage": "!!!Appearance",
-        "end": {
-          "column": 3,
-          "line": 72
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineAppearance",
-        "start": {
-          "column": 22,
-          "line": 69
-        }
-      },
-      {
-        "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
-        "end": {
-          "column": 3,
-          "line": 76
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.universalDarkModeInfo",
-        "start": {
-          "column": 25,
-          "line": 73
-        }
-      },
-      {
-        "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
-        "end": {
-          "column": 3,
-          "line": 80
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.accentColorInfo",
-        "start": {
-          "column": 19,
-          "line": 77
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy",
-        "end": {
-          "column": 3,
-          "line": 84
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlinePrivacy",
-        "start": {
-          "column": 19,
-          "line": 81
-        }
-      },
-      {
-        "defaultMessage": "!!!Advanced",
-        "end": {
-          "column": 3,
-          "line": 88
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.headlineAdvanced",
-        "start": {
-          "column": 20,
-          "line": 85
-        }
-      },
-      {
-        "defaultMessage": "!!!Help us to translate Ferdi into your language.",
-        "end": {
-          "column": 3,
-          "line": 92
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.translationHelp",
-        "start": {
-          "column": 19,
-          "line": 89
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
-        "end": {
-          "column": 3,
-          "line": 96
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.spellCheckerLanguageInfo",
-        "start": {
-          "column": 28,
-          "line": 93
-        }
-      },
-      {
-        "defaultMessage": "!!!Cache",
-        "end": {
-          "column": 3,
-          "line": 100
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.subheadlineCache",
-        "start": {
-          "column": 20,
-          "line": 97
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
-        "end": {
-          "column": 3,
-          "line": 104
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.cacheInfo",
-        "start": {
-          "column": 13,
-          "line": 101
-        }
-      },
-      {
-        "defaultMessage": "!!!Couldn't clear all cache",
-        "end": {
-          "column": 3,
-          "line": 108
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.cacheNotCleared",
-        "start": {
-          "column": 19,
-          "line": 105
-        }
-      },
-      {
-        "defaultMessage": "!!!Clear cache",
-        "end": {
-          "column": 3,
-          "line": 112
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonClearAllCache",
-        "start": {
-          "column": 23,
-          "line": 109
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi Profile",
-        "end": {
-          "column": 3,
-          "line": 116
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.subheadlineFerdiProfile",
-        "start": {
-          "column": 27,
-          "line": 113
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Profile folder",
-        "end": {
-          "column": 3,
-          "line": 120
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonOpenFerdiProfileFolder",
-        "start": {
-          "column": 32,
-          "line": 117
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Service Recipes folder",
-        "end": {
-          "column": 3,
-          "line": 124
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonOpenFerdiServiceRecipesFolder",
-        "start": {
-          "column": 39,
-          "line": 121
-        }
-      },
-      {
-        "defaultMessage": "!!!Check for updates",
-        "end": {
-          "column": 3,
-          "line": 128
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonSearchForUpdate",
-        "start": {
-          "column": 25,
-          "line": 125
-        }
-      },
-      {
-        "defaultMessage": "!!!Restart & install update",
-        "end": {
-          "column": 3,
-          "line": 132
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.buttonInstallUpdate",
-        "start": {
-          "column": 23,
-          "line": 129
-        }
-      },
-      {
-        "defaultMessage": "!!!Is searching for update",
-        "end": {
-          "column": 3,
-          "line": 136
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.updateStatusSearching",
-        "start": {
-          "column": 25,
-          "line": 133
-        }
-      },
-      {
-        "defaultMessage": "!!!Update available, downloading...",
-        "end": {
-          "column": 3,
-          "line": 140
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.updateStatusAvailable",
-        "start": {
-          "column": 25,
-          "line": 137
-        }
-      },
-      {
-        "defaultMessage": "!!!You are using the latest version of Ferdi",
-        "end": {
-          "column": 3,
-          "line": 144
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.updateStatusUpToDate",
-        "start": {
-          "column": 24,
-          "line": 141
-        }
-      },
-      {
-        "defaultMessage": "!!!Current version:",
-        "end": {
-          "column": 3,
-          "line": 148
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.currentVersion",
-        "start": {
-          "column": 18,
-          "line": 145
-        }
-      },
-      {
-        "defaultMessage": "!!!Changes require restart",
-        "end": {
-          "column": 3,
-          "line": 152
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.restartRequired",
-        "start": {
-          "column": 22,
-          "line": 149
-        }
-      },
-      {
-        "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
-        "end": {
-          "column": 3,
-          "line": 156
-        },
-        "file": "src/components/settings/settings/EditSettingsForm.js",
-        "id": "settings.app.languageDisclaimer",
-        "start": {
-          "column": 22,
-          "line": 153
-        }
-      }
-    ],
-    "path": "src/components/settings/settings/EditSettingsForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Close settings",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/settings/SettingsLayout.js",
-        "id": "settings.app.closeSettings",
-        "start": {
-          "column": 17,
-          "line": 11
-        }
-      }
-    ],
-    "path": "src/components/settings/SettingsLayout.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!About Ferdi",
-        "end": {
-          "column": 3,
-          "line": 10
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.headline",
-        "start": {
-          "column": 12,
-          "line": 7
-        }
-      },
-      {
-        "defaultMessage": "!!!Do you like Ferdi?",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.title",
-        "start": {
-          "column": 9,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.aboutIntro",
-        "start": {
-          "column": 14,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Full list of contributor",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textListContributors",
-        "start": {
-          "column": 24,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!here",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textListContributorsHere",
-        "start": {
-          "column": 28,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textVolunteers",
-        "start": {
-          "column": 18,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Support is always welcome. You can find a list of the help we need",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textSupportWelcome",
-        "start": {
-          "column": 22,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!here",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textSupportWelcomeHere",
-        "start": {
-          "column": 26,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textExpenses",
-        "start": {
-          "column": 16,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Collective",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textOpenCollective",
-        "start": {
-          "column": 22,
-          "line": 43
-        }
-      },
-      {
-        "defaultMessage": "!!!If you feel like supporting Ferdi development with a donation, you can do so on both,",
-        "end": {
-          "column": 3,
-          "line": 50
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textDonation",
-        "start": {
-          "column": 16,
-          "line": 47
-        }
-      },
-      {
-        "defaultMessage": "!!!and",
-        "end": {
-          "column": 3,
-          "line": 54
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textDonationAnd",
-        "start": {
-          "column": 19,
-          "line": 51
-        }
-      },
-      {
-        "defaultMessage": "!!!GitHub Sponsors",
-        "end": {
-          "column": 3,
-          "line": 58
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.textGitHubSponsors",
-        "start": {
-          "column": 22,
-          "line": 55
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Survey",
-        "end": {
-          "column": 3,
-          "line": 62
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.openSurvey",
-        "start": {
-          "column": 14,
-          "line": 59
-        }
-      },
-      {
-        "defaultMessage": "!!!Do you want to help us improve Ferdi?",
-        "end": {
-          "column": 3,
-          "line": 66
-        },
-        "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-        "id": "settings.supportFerdi.bannerText",
-        "start": {
-          "column": 14,
-          "line": 63
-        }
-      }
-    ],
-    "path": "src/components/settings/supportFerdi/SupportFerdiDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Team",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Team Management",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.contentHeadline",
-        "start": {
-          "column": 19,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.intro",
-        "start": {
-          "column": 9,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.copy",
-        "start": {
-          "column": 8,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Manage your Team on meetfranz.com",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.manageAction",
-        "start": {
-          "column": 16,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Teams are unavailable",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.teamsUnavailable",
-        "start": {
-          "column": 20,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.teamsUnavailableInfo",
-        "start": {
-          "column": 24,
-          "line": 39
-        }
-      }
-    ],
-    "path": "src/components/settings/team/TeamDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Account",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!Update Profile",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headlineProfile",
-        "start": {
-          "column": 19,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Account Information",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headlineAccount",
-        "start": {
-          "column": 19,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Change Password",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.headlinePassword",
-        "start": {
-          "column": 20,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Your changes have been saved",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.successInfo",
-        "start": {
-          "column": 15,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Update profile",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/components/settings/user/EditUserForm.js",
-        "id": "settings.account.buttonSave",
-        "start": {
-          "column": 14,
-          "line": 35
-        }
-      }
-    ],
-    "path": "src/components/settings/user/EditUserForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Choose from more than 70 Services",
-        "end": {
-          "column": 3,
-          "line": 11
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.recipes",
-        "start": {
-          "column": 20,
-          "line": 8
-        }
-      },
-      {
-        "defaultMessage": "!!!Account Synchronisation",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.accountSync",
-        "start": {
-          "column": 15,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!Desktop Notifications",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.desktopNotifications",
-        "start": {
-          "column": 24,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Add unlimited services",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.unlimitedServices",
-        "start": {
-          "column": 21,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Spellchecker support",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.spellchecker",
-        "start": {
-          "column": 16,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspaces",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.workspaces",
-        "start": {
-          "column": 14,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Add Custom Websites",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.customWebsites",
-        "start": {
-          "column": 18,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!On-premise & other Hosted Services",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.onPremise",
-        "start": {
-          "column": 13,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Install 3rd party services",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.thirdPartyServices",
-        "start": {
-          "column": 22,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Service Proxies",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.serviceProxies",
-        "start": {
-          "column": 18,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Team Management",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/components/ui/FeatureList.js",
-        "id": "pricing.features.teamManagement",
-        "start": {
-          "column": 18,
-          "line": 48
-        }
-      }
-    ],
-    "path": "src/components/ui/FeatureList.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Hide",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/components/ui/InfoBar.js",
-        "id": "infobar.hide",
-        "start": {
-          "column": 8,
-          "line": 12
-        }
-      }
-    ],
-    "path": "src/components/ui/InfoBar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Dismiss",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/components/ui/Infobox.js",
-        "id": "infobox.dismiss",
-        "start": {
-          "column": 11,
-          "line": 9
-        }
-      }
-    ],
-    "path": "src/components/ui/Infobox.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Password toggle",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/ui/Input.js",
-        "id": "settings.app.form.passwordToggle",
-        "start": {
-          "column": 18,
-          "line": 11
-        }
-      }
-    ],
-    "path": "src/components/ui/Input.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Loading {service}",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/ui/WebviewLoader/index.js",
-        "id": "service.webviewLoader.loading",
-        "start": {
-          "column": 11,
-          "line": 11
-        }
-      }
-    ],
-    "path": "src/components/ui/WebviewLoader/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Something went wrong.",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/components/util/ErrorBoundary/index.js",
-        "id": "app.errorHandler.headline",
-        "start": {
-          "column": 12,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/components/util/ErrorBoundary/index.js",
-        "id": "app.errorHandler.action",
-        "start": {
-          "column": 10,
-          "line": 15
-        }
-      }
-    ],
-    "path": "src/components/util/ErrorBoundary/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.name",
-        "start": {
-          "column": 8,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable service",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableService",
-        "start": {
-          "column": 17,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable hibernation",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableHibernation",
-        "start": {
-          "column": 21,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Notifications",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableNotification",
-        "start": {
-          "column": 22,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Show unread message badges",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableBadge",
-        "start": {
-          "column": 15,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable audio",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableAudio",
-        "start": {
-          "column": 15,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Team",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.team",
-        "start": {
-          "column": 8,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Service URL",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.customUrl",
-        "start": {
-          "column": 13,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Show message badge for all new messages",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.indirectMessages",
-        "start": {
-          "column": 20,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom icon",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.icon",
-        "start": {
-          "column": 8,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.enableDarkMode",
-        "start": {
-          "column": 18,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Brightness",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.darkReaderBrightness",
-        "start": {
-          "column": 24,
-          "line": 72
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Contrast",
-        "end": {
-          "column": 3,
-          "line": 79
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.darkReaderContrast",
-        "start": {
-          "column": 22,
-          "line": 76
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Reader Sepia",
-        "end": {
-          "column": 3,
-          "line": 83
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.darkReaderSepia",
-        "start": {
-          "column": 19,
-          "line": 80
-        }
-      },
-      {
-        "defaultMessage": "!!!Use Proxy",
-        "end": {
-          "column": 3,
-          "line": 87
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.isEnabled",
-        "start": {
-          "column": 15,
-          "line": 84
-        }
-      },
-      {
-        "defaultMessage": "!!!Proxy Host/IP",
-        "end": {
-          "column": 3,
-          "line": 91
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.host",
-        "start": {
-          "column": 13,
-          "line": 88
-        }
-      },
-      {
-        "defaultMessage": "!!!Port",
-        "end": {
-          "column": 3,
-          "line": 95
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.port",
-        "start": {
-          "column": 13,
-          "line": 92
-        }
-      },
-      {
-        "defaultMessage": "!!!User",
-        "end": {
-          "column": 3,
-          "line": 99
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.user",
-        "start": {
-          "column": 13,
-          "line": 96
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 103
-        },
-        "file": "src/containers/settings/EditServiceScreen.js",
-        "id": "settings.service.form.proxy.password",
-        "start": {
-          "column": 17,
-          "line": 100
-        }
-      }
-    ],
-    "path": "src/containers/settings/EditServiceScreen.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Launch Ferdi on start",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.autoLaunchOnStart",
-        "start": {
-          "column": 21,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in background",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.autoLaunchInBackground",
-        "start": {
-          "column": 26,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep Ferdi in background when closing the window",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.runInBackground",
-        "start": {
-          "column": 19,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Start minimized",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.startMinimized",
-        "start": {
-          "column": 18,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Confirm when quitting Ferdi",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.confirmOnQuit",
-        "start": {
-          "column": 17,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Always show Ferdi in System Tray",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableSystemTray",
-        "start": {
-          "column": 20,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Always show Ferdi in Menu Bar",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableMenuBar",
-        "start": {
-          "column": 17,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Ferdi after system resume",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.reloadAfterResume",
-        "start": {
-          "column": 21,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Minimize Ferdi to system tray",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.minimizeToSystemTray",
-        "start": {
-          "column": 24,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Close Ferdi to system tray",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.closeToSystemTray",
-        "start": {
-          "column": 21,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!Don't show message content in notifications",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.privateNotifications",
-        "start": {
-          "column": 24,
-          "line": 72
-        }
-      },
-      {
-        "defaultMessage": "!!!Don't show notifications for clipboard events",
-        "end": {
-          "column": 3,
-          "line": 79
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.clipboardNotifications",
-        "start": {
-          "column": 26,
-          "line": 76
-        }
-      },
-      {
-        "defaultMessage": "!!!Notify TaskBar/Dock on new message",
-        "end": {
-          "column": 3,
-          "line": 83
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.notifyTaskBarOnMessage",
-        "start": {
-          "column": 26,
-          "line": 80
-        }
-      },
-      {
-        "defaultMessage": "!!!Navigation bar behaviour",
-        "end": {
-          "column": 3,
-          "line": 87
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.navigationBarBehaviour",
-        "start": {
-          "column": 26,
-          "line": 84
-        }
-      },
-      {
-        "defaultMessage": "!!!Search engine",
-        "end": {
-          "column": 3,
-          "line": 91
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.searchEngine",
-        "start": {
-          "column": 16,
-          "line": 88
-        }
-      },
-      {
-        "defaultMessage": "!!!Send telemetry data",
-        "end": {
-          "column": 3,
-          "line": 95
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.sentry",
-        "start": {
-          "column": 10,
-          "line": 92
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep services in hibernation on startup",
-        "end": {
-          "column": 3,
-          "line": 99
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.hibernateOnStartup",
-        "start": {
-          "column": 22,
-          "line": 96
-        }
-      },
-      {
-        "defaultMessage": "!!!Hibernation strategy",
-        "end": {
-          "column": 3,
-          "line": 103
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.hibernationStrategy",
-        "start": {
-          "column": 23,
-          "line": 100
-        }
-      },
-      {
-        "defaultMessage": "!!!Wake up strategy",
-        "end": {
-          "column": 3,
-          "line": 107
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.wakeUpStrategy",
-        "start": {
-          "column": 18,
-          "line": 104
-        }
-      },
-      {
-        "defaultMessage": "!!!Todo Server",
-        "end": {
-          "column": 3,
-          "line": 111
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.predefinedTodoServer",
-        "start": {
-          "column": 24,
-          "line": 108
-        }
-      },
-      {
-        "defaultMessage": "!!!Custom TodoServer",
-        "end": {
-          "column": 3,
-          "line": 115
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.customTodoServer",
-        "start": {
-          "column": 20,
-          "line": 112
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Password Lock",
-        "end": {
-          "column": 3,
-          "line": 119
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableLock",
-        "start": {
-          "column": 14,
-          "line": 116
-        }
-      },
-      {
-        "defaultMessage": "!!!Password",
-        "end": {
-          "column": 3,
-          "line": 123
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.lockPassword",
-        "start": {
-          "column": 16,
-          "line": 120
-        }
-      },
-      {
-        "defaultMessage": "!!!Allow using Touch ID to unlock",
-        "end": {
-          "column": 3,
-          "line": 127
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.useTouchIdToUnlock",
-        "start": {
-          "column": 22,
-          "line": 124
-        }
-      },
-      {
-        "defaultMessage": "!!!Lock after inactivity",
-        "end": {
-          "column": 3,
-          "line": 131
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.inactivityLock",
-        "start": {
-          "column": 18,
-          "line": 128
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
-        "end": {
-          "column": 3,
-          "line": 135
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.scheduledDNDEnabled",
-        "start": {
-          "column": 23,
-          "line": 132
-        }
-      },
-      {
-        "defaultMessage": "!!!From",
-        "end": {
-          "column": 3,
-          "line": 139
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.scheduledDNDStart",
-        "start": {
-          "column": 21,
-          "line": 136
-        }
-      },
-      {
-        "defaultMessage": "!!!To",
-        "end": {
-          "column": 3,
-          "line": 143
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.scheduledDNDEnd",
-        "start": {
-          "column": 19,
-          "line": 140
-        }
-      },
-      {
-        "defaultMessage": "!!!Language",
-        "end": {
-          "column": 3,
-          "line": 147
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.language",
-        "start": {
-          "column": 12,
-          "line": 144
-        }
-      },
-      {
-        "defaultMessage": "!!!Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 151
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.darkMode",
-        "start": {
-          "column": 12,
-          "line": 148
-        }
-      },
-      {
-        "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
-        "end": {
-          "column": 3,
-          "line": 155
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.adaptableDarkMode",
-        "start": {
-          "column": 21,
-          "line": 152
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable universal Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 159
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.universalDarkMode",
-        "start": {
-          "column": 21,
-          "line": 156
-        }
-      },
-      {
-        "defaultMessage": "!!!Sidebar width",
-        "end": {
-          "column": 3,
-          "line": 163
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.serviceRibbonWidth",
-        "start": {
-          "column": 22,
-          "line": 160
-        }
-      },
-      {
-        "defaultMessage": "!!!Service icon size",
-        "end": {
-          "column": 3,
-          "line": 167
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.iconSize",
-        "start": {
-          "column": 12,
-          "line": 164
-        }
-      },
-      {
-        "defaultMessage": "!!!Use horizontal style",
-        "end": {
-          "column": 3,
-          "line": 171
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.useVerticalStyle",
-        "start": {
-          "column": 20,
-          "line": 168
-        }
-      },
-      {
-        "defaultMessage": "!!!Always show workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 175
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.alwaysShowWorkspaces",
-        "start": {
-          "column": 24,
-          "line": 172
-        }
-      },
-      {
-        "defaultMessage": "!!!Accent color",
-        "end": {
-          "column": 3,
-          "line": 179
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.accentColor",
-        "start": {
-          "column": 15,
-          "line": 176
-        }
-      },
-      {
-        "defaultMessage": "!!!Display disabled services tabs",
-        "end": {
-          "column": 3,
-          "line": 183
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showDisabledServices",
-        "start": {
-          "column": 24,
-          "line": 180
-        }
-      },
-      {
-        "defaultMessage": "!!!Show unread message badge when notifications are disabled",
-        "end": {
-          "column": 3,
-          "line": 187
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showMessagesBadgesWhenMuted",
-        "start": {
-          "column": 29,
-          "line": 184
-        }
-      },
-      {
-        "defaultMessage": "!!!Show draggable area on window",
-        "end": {
-          "column": 3,
-          "line": 191
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.showDragArea",
-        "start": {
-          "column": 16,
-          "line": 188
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable spell checking",
-        "end": {
-          "column": 3,
-          "line": 195
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableSpellchecking",
-        "start": {
-          "column": 23,
-          "line": 192
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable GPU Acceleration",
-        "end": {
-          "column": 3,
-          "line": 199
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableGPUAcceleration",
-        "start": {
-          "column": 25,
-          "line": 196
-        }
-      },
-      {
-        "defaultMessage": "!!!Include beta versions",
-        "end": {
-          "column": 3,
-          "line": 203
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.beta",
-        "start": {
-          "column": 8,
-          "line": 200
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable updates",
-        "end": {
-          "column": 3,
-          "line": 207
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.automaticUpdates",
-        "start": {
-          "column": 20,
-          "line": 204
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Franz Todos",
-        "end": {
-          "column": 3,
-          "line": 211
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.enableTodos",
-        "start": {
-          "column": 15,
-          "line": 208
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep all workspaces loaded",
-        "end": {
-          "column": 3,
-          "line": 215
-        },
-        "file": "src/containers/settings/EditSettingsScreen.js",
-        "id": "settings.app.form.keepAllWorkspacesLoaded",
-        "start": {
-          "column": 27,
-          "line": 212
-        }
-      }
-    ],
-    "path": "src/containers/settings/EditSettingsScreen.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Firstname",
-        "end": {
-          "column": 3,
-          "line": 17
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.firstname",
-        "start": {
-          "column": 13,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Lastname",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.lastname",
-        "start": {
-          "column": 12,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!Email",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.email",
-        "start": {
-          "column": 9,
-          "line": 22
-        }
-      },
-      {
-        "defaultMessage": "!!!Account type",
-        "end": {
-          "column": 3,
-          "line": 29
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.label",
-        "start": {
-          "column": 20,
-          "line": 26
-        }
-      },
-      {
-        "defaultMessage": "!!!Individual",
-        "end": {
-          "column": 3,
-          "line": 33
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.individual",
-        "start": {
-          "column": 25,
-          "line": 30
-        }
-      },
-      {
-        "defaultMessage": "!!!Non-Profit",
-        "end": {
-          "column": 3,
-          "line": 37
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.non-profit",
-        "start": {
-          "column": 24,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Company",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.accountType.company",
-        "start": {
-          "column": 22,
-          "line": 38
-        }
-      },
-      {
-        "defaultMessage": "!!!Current password",
-        "end": {
-          "column": 3,
-          "line": 45
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.currentPassword",
-        "start": {
-          "column": 19,
-          "line": 42
-        }
-      },
-      {
-        "defaultMessage": "!!!New password",
-        "end": {
-          "column": 3,
-          "line": 49
-        },
-        "file": "src/containers/settings/EditUserScreen.js",
-        "id": "settings.user.form.newPassword",
-        "start": {
-          "column": 15,
-          "line": 46
-        }
-      }
-    ],
-    "path": "src/containers/settings/EditUserScreen.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Sign In",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/features/basicAuth/Component.js",
-        "id": "feature.basicAuth.signIn",
-        "start": {
-          "column": 10,
-          "line": 24
-        }
-      }
-    ],
-    "path": "src/features/basicAuth/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Publish debugging information",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/debugger/Component.js",
-        "id": "feature.debugger.title",
-        "start": {
-          "column": 9,
-          "line": 16
-        }
-      }
-    ],
-    "path": "src/features/debugger/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Nightly Builds",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/nightlyBuilds/Component.js",
-        "id": "feature.nightlyBuilds.title",
-        "start": {
-          "column": 9,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/nightlyBuilds/Component.js",
-        "id": "feature.nightlyBuilds.info",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Activate",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/nightlyBuilds/Component.js",
-        "id": "feature.nightlyBuilds.activate",
-        "start": {
-          "column": 12,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/features/nightlyBuilds/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Publish debug information",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.title",
-        "start": {
-          "column": 9,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.info",
-        "start": {
-          "column": 8,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.error",
-        "start": {
-          "column": 9,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy policy",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.privacy",
-        "start": {
-          "column": 11,
-          "line": 31
-        }
-      },
-      {
-        "defaultMessage": "!!!Terms of service",
-        "end": {
-          "column": 3,
-          "line": 38
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.terms",
-        "start": {
-          "column": 9,
-          "line": 35
-        }
-      },
-      {
-        "defaultMessage": "!!!Accept and publish",
-        "end": {
-          "column": 3,
-          "line": 42
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.publish",
-        "start": {
-          "column": 11,
-          "line": 39
-        }
-      },
-      {
-        "defaultMessage": "!!!Your debug log was published and is now availible at",
-        "end": {
-          "column": 3,
-          "line": 46
-        },
-        "file": "src/features/publishDebugInfo/Component.js",
-        "id": "feature.publishDebugInfo.published",
-        "start": {
-          "column": 13,
-          "line": 43
-        }
-      }
-    ],
-    "path": "src/features/publishDebugInfo/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!QuickSwitch",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/quickSwitch/Component.js",
-        "id": "feature.quickSwitch.title",
-        "start": {
-          "column": 9,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Search...",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/quickSwitch/Component.js",
-        "id": "feature.quickSwitch.search",
-        "start": {
-          "column": 10,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/quickSwitch/Component.js",
-        "id": "feature.quickSwitch.info",
-        "start": {
-          "column": 8,
-          "line": 25
-        }
-      }
-    ],
-    "path": "src/features/quickSwitch/Component.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/recipeConnectionLost/components/WebControls.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 29
-        }
-      }
-    ],
-    "path": "src/features/recipeConnectionLost/components/WebControls.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.goHome",
-        "start": {
-          "column": 10,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!Open in Browser",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.openInBrowser",
-        "start": {
-          "column": 17,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.back",
-        "start": {
-          "column": 8,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.forward",
-        "start": {
-          "column": 11,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/features/webControls/components/WebControls.js",
-        "id": "webControls.reload",
-        "start": {
-          "column": 10,
-          "line": 33
-        }
-      }
-    ],
-    "path": "src/features/webControls/components/WebControls.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Create workspace",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-        "id": "settings.workspace.add.form.submitButton",
-        "start": {
-          "column": 16,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-        "id": "settings.workspace.add.form.name",
-        "start": {
-          "column": 8,
-          "line": 16
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/CreateWorkspaceForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Delete workspace",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.buttonDelete",
-        "start": {
-          "column": 16,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Save workspace",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.buttonSave",
-        "start": {
-          "column": 14,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Name",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.name",
-        "start": {
-          "column": 8,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Your workspaces",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.yourWorkspaces",
-        "start": {
-          "column": 18,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Keep this workspace loaded*",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.keepLoaded",
-        "start": {
-          "column": 14,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
-        "end": {
-          "column": 3,
-          "line": 45
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.keepLoadedInfo",
-        "start": {
-          "column": 18,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Services in this Workspace",
-        "end": {
-          "column": 3,
-          "line": 49
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.workspace.form.servicesInWorkspaceHeadline",
-        "start": {
-          "column": 31,
-          "line": 46
-        }
-      },
-      {
-        "defaultMessage": "!!!Start by adding a service.",
-        "end": {
-          "column": 3,
-          "line": 53
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.services.noServicesAdded",
-        "start": {
-          "column": 19,
-          "line": 50
-        }
-      },
-      {
-        "defaultMessage": "!!!Discover services",
-        "end": {
-          "column": 3,
-          "line": 57
-        },
-        "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-        "id": "settings.services.discoverServices",
-        "start": {
-          "column": 20,
-          "line": 54
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/EditWorkspaceForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Workspaces",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.headline",
-        "start": {
-          "column": 12,
-          "line": 15
-        }
-      },
-      {
-        "defaultMessage": "!!!All services",
-        "end": {
-          "column": 3,
-          "line": 22
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.allServices",
-        "start": {
-          "column": 15,
-          "line": 19
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspaces settings",
-        "end": {
-          "column": 3,
-          "line": 26
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.workspacesSettingsTooltip",
-        "start": {
-          "column": 29,
-          "line": 23
-        }
-      },
-      {
-        "defaultMessage": "!!!Info about workspace feature",
-        "end": {
-          "column": 3,
-          "line": 30
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.workspaceFeatureInfo",
-        "start": {
-          "column": 24,
-          "line": 27
-        }
-      },
-      {
-        "defaultMessage": "!!!add new workspace",
-        "end": {
-          "column": 3,
-          "line": 34
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-        "id": "workspaceDrawer.addNewWorkspaceLabel",
-        "start": {
-          "column": 24,
-          "line": 31
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspaceDrawer.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!No services added yet",
-        "end": {
-          "column": 3,
-          "line": 14
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-        "id": "workspaceDrawer.item.noServicesAddedYet",
-        "start": {
-          "column": 22,
-          "line": 11
-        }
-      },
-      {
-        "defaultMessage": "!!!edit",
-        "end": {
-          "column": 3,
-          "line": 18
-        },
-        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-        "id": "workspaceDrawer.item.contextMenuEdit",
-        "start": {
-          "column": 19,
-          "line": 15
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspaceDrawerItem.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Your workspaces",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.headline",
-        "start": {
-          "column": 12,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!You haven't created any workspaces yet.",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.noWorkspacesAdded",
-        "start": {
-          "column": 19,
-          "line": 21
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not load your workspaces",
-        "end": {
-          "column": 3,
-          "line": 28
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.workspacesRequestFailed",
-        "start": {
-          "column": 27,
-          "line": 25
-        }
-      },
-      {
-        "defaultMessage": "!!!Try again",
-        "end": {
-          "column": 3,
-          "line": 32
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.tryReloadWorkspaces",
-        "start": {
-          "column": 23,
-          "line": 29
-        }
-      },
-      {
-        "defaultMessage": "!!!Your changes have been saved",
-        "end": {
-          "column": 3,
-          "line": 36
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.updatedInfo",
-        "start": {
-          "column": 15,
-          "line": 33
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspace has been deleted",
-        "end": {
-          "column": 3,
-          "line": 40
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.deletedInfo",
-        "start": {
-          "column": 15,
-          "line": 37
-        }
-      },
-      {
-        "defaultMessage": "!!!Info about workspace feature",
-        "end": {
-          "column": 3,
-          "line": 44
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.workspaceFeatureInfo",
-        "start": {
-          "column": 24,
-          "line": 41
-        }
-      },
-      {
-        "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
-        "end": {
-          "column": 3,
-          "line": 48
-        },
-        "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-        "id": "settings.workspaces.workspaceFeatureHeadline",
-        "start": {
-          "column": 28,
-          "line": 45
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspacesDashboard.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Switching to",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/features/workspaces/components/WorkspaceSwitchingIndicator.js",
-        "id": "workspaces.switchingIndicator.switchingTo",
-        "start": {
-          "column": 15,
-          "line": 12
-        }
-      }
-    ],
-    "path": "src/features/workspaces/components/WorkspaceSwitchingIndicator.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Field is required",
-        "end": {
-          "column": 3,
-          "line": 8
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.required",
-        "start": {
-          "column": 12,
-          "line": 5
-        }
-      },
-      {
-        "defaultMessage": "!!!Email not valid",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.email",
-        "start": {
-          "column": 9,
-          "line": 9
-        }
-      },
-      {
-        "defaultMessage": "!!!Not a valid URL",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.url",
-        "start": {
-          "column": 7,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Too few characters",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.minLength",
-        "start": {
-          "column": 13,
-          "line": 17
-        }
-      },
-      {
-        "defaultMessage": "!!!At least one is required",
-        "end": {
-          "column": 3,
-          "line": 24
-        },
-        "file": "src/helpers/validation-helpers.js",
-        "id": "validation.oneRequired",
-        "start": {
-          "column": 15,
-          "line": 21
-        }
-      }
-    ],
-    "path": "src/helpers/validation-helpers.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Can't connect to Ferdi Online Services",
-        "end": {
-          "column": 3,
-          "line": 7
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.api.unhealthy",
-        "start": {
-          "column": 16,
-          "line": 4
-        }
-      },
-      {
-        "defaultMessage": "!!!You are not connected to the internet.",
-        "end": {
-          "column": 3,
-          "line": 11
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.notConnectedToTheInternet",
-        "start": {
-          "column": 29,
-          "line": 8
-        }
-      },
-      {
-        "defaultMessage": "!!!Spell checking language",
-        "end": {
-          "column": 3,
-          "line": 15
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecking.language",
-        "start": {
-          "column": 24,
-          "line": 12
-        }
-      },
-      {
-        "defaultMessage": "!!!Use System Default ({default})",
-        "end": {
-          "column": 3,
-          "line": 19
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecker.useDefault",
-        "start": {
-          "column": 29,
-          "line": 16
-        }
-      },
-      {
-        "defaultMessage": "!!!Detect language automatically",
-        "end": {
-          "column": 3,
-          "line": 23
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecking.autodetect",
-        "start": {
-          "column": 34,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Automatic",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.spellchecking.autodetect.short",
-        "start": {
-          "column": 39,
-          "line": 24
-        }
-      },
-      {
-        "defaultMessage": "!!!User Agent",
-        "end": {
-          "column": 3,
-          "line": 31
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.userAgentPref",
-        "start": {
-          "column": 17,
-          "line": 28
-        }
-      },
-      {
-        "defaultMessage": "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.userAgentHelp",
-        "start": {
-          "column": 17,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Yes",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.yes",
-        "start": {
-          "column": 7,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!No",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.no",
-        "start": {
-          "column": 6,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Ok",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.ok",
-        "start": {
-          "column": 6,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Cancel",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.cancel",
-        "start": {
-          "column": 10,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Save",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.save",
-        "start": {
-          "column": 8,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Submit",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.submit",
-        "start": {
-          "column": 10,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Quit",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.quit",
-        "start": {
-          "column": 8,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Do you really want to quit Ferdi?",
-        "end": {
-          "column": 3,
-          "line": 68
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.quitConfirmation",
-        "start": {
-          "column": 20,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Settings",
-        "end": {
-          "column": 3,
-          "line": 72
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.settings",
-        "start": {
-          "column": 12,
-          "line": 69
-        }
-      },
-      {
-        "defaultMessage": "!!!Edit",
-        "end": {
-          "column": 3,
-          "line": 76
-        },
-        "file": "src/i18n/globalMessages.js",
-        "id": "global.edit",
-        "start": {
-          "column": 8,
-          "line": 73
-        }
-      }
-    ],
-    "path": "src/i18n/globalMessages.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Edit",
-        "end": {
-          "column": 3,
-          "line": 35
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit",
-        "start": {
-          "column": 8,
-          "line": 32
-        }
-      },
-      {
-        "defaultMessage": "!!!Undo",
-        "end": {
-          "column": 3,
-          "line": 39
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.undo",
-        "start": {
-          "column": 8,
-          "line": 36
-        }
-      },
-      {
-        "defaultMessage": "!!!Redo",
-        "end": {
-          "column": 3,
-          "line": 43
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.redo",
-        "start": {
-          "column": 8,
-          "line": 40
-        }
-      },
-      {
-        "defaultMessage": "!!!Cut",
-        "end": {
-          "column": 3,
-          "line": 47
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.cut",
-        "start": {
-          "column": 7,
-          "line": 44
-        }
-      },
-      {
-        "defaultMessage": "!!!Copy",
-        "end": {
-          "column": 3,
-          "line": 51
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.copy",
-        "start": {
-          "column": 8,
-          "line": 48
-        }
-      },
-      {
-        "defaultMessage": "!!!Paste",
-        "end": {
-          "column": 3,
-          "line": 55
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.paste",
-        "start": {
-          "column": 9,
-          "line": 52
-        }
-      },
-      {
-        "defaultMessage": "!!!Paste And Match Style",
-        "end": {
-          "column": 3,
-          "line": 59
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.pasteAndMatchStyle",
-        "start": {
-          "column": 22,
-          "line": 56
-        }
-      },
-      {
-        "defaultMessage": "!!!Delete",
-        "end": {
-          "column": 3,
-          "line": 63
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.delete",
-        "start": {
-          "column": 10,
-          "line": 60
-        }
-      },
-      {
-        "defaultMessage": "!!!Select All",
-        "end": {
-          "column": 3,
-          "line": 67
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.selectAll",
-        "start": {
-          "column": 13,
-          "line": 64
-        }
-      },
-      {
-        "defaultMessage": "!!!Find in Page",
-        "end": {
-          "column": 3,
-          "line": 71
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.findInPage",
-        "start": {
-          "column": 14,
-          "line": 68
-        }
-      },
-      {
-        "defaultMessage": "!!!Speech",
-        "end": {
-          "column": 3,
-          "line": 75
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.speech",
-        "start": {
-          "column": 10,
-          "line": 72
-        }
-      },
-      {
-        "defaultMessage": "!!!Start Speaking",
-        "end": {
-          "column": 3,
-          "line": 79
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.startSpeaking",
-        "start": {
-          "column": 17,
-          "line": 76
-        }
-      },
-      {
-        "defaultMessage": "!!!Stop Speaking",
-        "end": {
-          "column": 3,
-          "line": 83
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.stopSpeaking",
-        "start": {
-          "column": 16,
-          "line": 80
-        }
-      },
-      {
-        "defaultMessage": "!!!Start Dictation",
-        "end": {
-          "column": 3,
-          "line": 87
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.startDictation",
-        "start": {
-          "column": 18,
-          "line": 84
-        }
-      },
-      {
-        "defaultMessage": "!!!Emoji & Symbols",
-        "end": {
-          "column": 3,
-          "line": 91
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.edit.emojiSymbols",
-        "start": {
-          "column": 16,
-          "line": 88
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Quick Switch",
-        "end": {
-          "column": 3,
-          "line": 95
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.openQuickSwitch",
-        "start": {
-          "column": 19,
-          "line": 92
-        }
-      },
-      {
-        "defaultMessage": "!!!Back",
-        "end": {
-          "column": 3,
-          "line": 99
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.back",
-        "start": {
-          "column": 8,
-          "line": 96
-        }
-      },
-      {
-        "defaultMessage": "!!!Forward",
-        "end": {
-          "column": 3,
-          "line": 103
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.forward",
-        "start": {
-          "column": 11,
-          "line": 100
-        }
-      },
-      {
-        "defaultMessage": "!!!Actual Size",
-        "end": {
-          "column": 3,
-          "line": 107
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.resetZoom",
-        "start": {
-          "column": 13,
-          "line": 104
-        }
-      },
-      {
-        "defaultMessage": "!!!Zoom In",
-        "end": {
-          "column": 3,
-          "line": 111
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.zoomIn",
-        "start": {
-          "column": 10,
-          "line": 108
-        }
-      },
-      {
-        "defaultMessage": "!!!Zoom Out",
-        "end": {
-          "column": 3,
-          "line": 115
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.zoomOut",
-        "start": {
-          "column": 11,
-          "line": 112
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Full Screen",
-        "end": {
-          "column": 3,
-          "line": 119
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleFullScreen",
-        "start": {
-          "column": 20,
-          "line": 116
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Dark Mode",
-        "end": {
-          "column": 3,
-          "line": 123
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleDarkMode",
-        "start": {
-          "column": 18,
-          "line": 120
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Developer Tools",
-        "end": {
-          "column": 3,
-          "line": 127
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleDevTools",
-        "start": {
-          "column": 18,
-          "line": 124
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Todos Developer Tools",
-        "end": {
-          "column": 3,
-          "line": 131
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleTodosDevTools",
-        "start": {
-          "column": 23,
-          "line": 128
-        }
-      },
-      {
-        "defaultMessage": "!!!Toggle Service Developer Tools",
-        "end": {
-          "column": 3,
-          "line": 135
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.toggleServiceDevTools",
-        "start": {
-          "column": 25,
-          "line": 132
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Service",
-        "end": {
-          "column": 3,
-          "line": 139
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.reloadService",
-        "start": {
-          "column": 17,
-          "line": 136
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload Ferdi",
-        "end": {
-          "column": 3,
-          "line": 143
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.reloadFerdi",
-        "start": {
-          "column": 15,
-          "line": 140
-        }
-      },
-      {
-        "defaultMessage": "!!!Lock Ferdi",
-        "end": {
-          "column": 3,
-          "line": 147
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.lockFerdi",
-        "start": {
-          "column": 13,
-          "line": 144
-        }
-      },
-      {
-        "defaultMessage": "!!!Reload ToDos",
-        "end": {
-          "column": 3,
-          "line": 151
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view.reloadTodos",
-        "start": {
-          "column": 15,
-          "line": 148
-        }
-      },
-      {
-        "defaultMessage": "!!!Minimize",
-        "end": {
-          "column": 3,
-          "line": 155
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window.minimize",
-        "start": {
-          "column": 12,
-          "line": 152
-        }
-      },
-      {
-        "defaultMessage": "!!!Close",
-        "end": {
-          "column": 3,
-          "line": 159
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window.close",
-        "start": {
-          "column": 9,
-          "line": 156
-        }
-      },
-      {
-        "defaultMessage": "!!!Learn More",
-        "end": {
-          "column": 3,
-          "line": 163
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.learnMore",
-        "start": {
-          "column": 13,
-          "line": 160
-        }
-      },
-      {
-        "defaultMessage": "!!!Changelog",
-        "end": {
-          "column": 3,
-          "line": 167
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.changelog",
-        "start": {
-          "column": 13,
-          "line": 164
-        }
-      },
-      {
-        "defaultMessage": "!!!Import/Export Configuration Data",
-        "end": {
-          "column": 3,
-          "line": 171
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.importExportData",
-        "start": {
-          "column": 20,
-          "line": 168
-        }
-      },
-      {
-        "defaultMessage": "!!!Support",
-        "end": {
-          "column": 3,
-          "line": 175
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.support",
-        "start": {
-          "column": 11,
-          "line": 172
-        }
-      },
-      {
-        "defaultMessage": "!!!Copy Debug Information",
-        "end": {
-          "column": 3,
-          "line": 179
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.debugInfo",
-        "start": {
-          "column": 13,
-          "line": 176
-        }
-      },
-      {
-        "defaultMessage": "!!!Publish Debug Information",
-        "end": {
-          "column": 3,
-          "line": 183
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.publishDebugInfo",
-        "start": {
-          "column": 20,
-          "line": 180
-        }
-      },
-      {
-        "defaultMessage": "!!!Ferdi Debug Information",
-        "end": {
-          "column": 3,
-          "line": 187
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.debugInfoCopiedHeadline",
-        "start": {
-          "column": 27,
-          "line": 184
-        }
-      },
-      {
-        "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
-        "end": {
-          "column": 3,
-          "line": 192
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.debugInfoCopiedBody",
-        "start": {
-          "column": 23,
-          "line": 188
-        }
-      },
-      {
-        "defaultMessage": "!!!Unlock with Touch ID",
-        "end": {
-          "column": 3,
-          "line": 196
-        },
-        "file": "src/lib/Menu.js",
-        "id": "locked.touchId",
-        "start": {
-          "column": 11,
-          "line": 193
-        }
-      },
-      {
-        "defaultMessage": "!!!unlock via Touch ID",
-        "end": {
-          "column": 3,
-          "line": 200
-        },
-        "file": "src/lib/Menu.js",
-        "id": "locked.touchIdPrompt",
-        "start": {
-          "column": 17,
-          "line": 197
-        }
-      },
-      {
-        "defaultMessage": "!!!Terms of Service",
-        "end": {
-          "column": 3,
-          "line": 204
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.tos",
-        "start": {
-          "column": 7,
-          "line": 201
-        }
-      },
-      {
-        "defaultMessage": "!!!Privacy Statement",
-        "end": {
-          "column": 3,
-          "line": 208
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help.privacy",
-        "start": {
-          "column": 11,
-          "line": 205
-        }
-      },
-      {
-        "defaultMessage": "!!!File",
-        "end": {
-          "column": 3,
-          "line": 212
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.file",
-        "start": {
-          "column": 8,
-          "line": 209
-        }
-      },
-      {
-        "defaultMessage": "!!!View",
-        "end": {
-          "column": 3,
-          "line": 216
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.view",
-        "start": {
-          "column": 8,
-          "line": 213
-        }
-      },
-      {
-        "defaultMessage": "!!!Services",
-        "end": {
-          "column": 3,
-          "line": 220
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services",
-        "start": {
-          "column": 12,
-          "line": 217
-        }
-      },
-      {
-        "defaultMessage": "!!!Window",
-        "end": {
-          "column": 3,
-          "line": 224
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.window",
-        "start": {
-          "column": 10,
-          "line": 221
-        }
-      },
-      {
-        "defaultMessage": "!!!Help",
-        "end": {
-          "column": 3,
-          "line": 228
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.help",
-        "start": {
-          "column": 8,
-          "line": 225
-        }
-      },
-      {
-        "defaultMessage": "!!!About Ferdi",
-        "end": {
-          "column": 3,
-          "line": 232
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.about",
-        "start": {
-          "column": 9,
-          "line": 229
-        }
-      },
-      {
-        "defaultMessage": "!!!Check for updates",
-        "end": {
-          "column": 3,
-          "line": 236
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.checkForUpdates",
-        "start": {
-          "column": 19,
-          "line": 233
-        }
-      },
-      {
-        "defaultMessage": "!!!Hide",
-        "end": {
-          "column": 3,
-          "line": 240
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.hide",
-        "start": {
-          "column": 8,
-          "line": 237
-        }
-      },
-      {
-        "defaultMessage": "!!!Hide Others",
-        "end": {
-          "column": 3,
-          "line": 244
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.hideOthers",
-        "start": {
-          "column": 14,
-          "line": 241
-        }
-      },
-      {
-        "defaultMessage": "!!!Unhide",
-        "end": {
-          "column": 3,
-          "line": 248
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.unhide",
-        "start": {
-          "column": 10,
-          "line": 245
-        }
-      },
-      {
-        "defaultMessage": "!!!Auto-hide menu bar",
-        "end": {
-          "column": 3,
-          "line": 252
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.app.autohideMenuBar",
-        "start": {
-          "column": 19,
-          "line": 249
-        }
-      },
-      {
-        "defaultMessage": "!!!Add New Service...",
-        "end": {
-          "column": 3,
-          "line": 256
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.addNewService",
-        "start": {
-          "column": 17,
-          "line": 253
-        }
-      },
-      {
-        "defaultMessage": "!!!Add New Workspace...",
-        "end": {
-          "column": 3,
-          "line": 260
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.addNewWorkspace",
-        "start": {
-          "column": 19,
-          "line": 257
-        }
-      },
-      {
-        "defaultMessage": "!!!Open workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 264
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.openWorkspaceDrawer",
-        "start": {
-          "column": 23,
-          "line": 261
-        }
-      },
-      {
-        "defaultMessage": "!!!Close workspace drawer",
-        "end": {
-          "column": 3,
-          "line": 268
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.closeWorkspaceDrawer",
-        "start": {
-          "column": 24,
-          "line": 265
-        }
-      },
-      {
-        "defaultMessage": "!!!Activate next service...",
-        "end": {
-          "column": 3,
-          "line": 272
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.setNextServiceActive",
-        "start": {
-          "column": 23,
-          "line": 269
-        }
-      },
-      {
-        "defaultMessage": "!!!Activate previous service...",
-        "end": {
-          "column": 3,
-          "line": 276
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.activatePreviousService",
-        "start": {
-          "column": 27,
-          "line": 273
-        }
-      },
-      {
-        "defaultMessage": "!!!Disable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 280
-        },
-        "file": "src/lib/Menu.js",
-        "id": "sidebar.muteApp",
-        "start": {
-          "column": 11,
-          "line": 277
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable notifications & audio",
-        "end": {
-          "column": 3,
-          "line": 284
-        },
-        "file": "src/lib/Menu.js",
-        "id": "sidebar.unmuteApp",
-        "start": {
-          "column": 13,
-          "line": 281
-        }
-      },
-      {
-        "defaultMessage": "!!!Workspaces",
-        "end": {
-          "column": 3,
-          "line": 288
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces",
-        "start": {
-          "column": 14,
-          "line": 285
-        }
-      },
-      {
-        "defaultMessage": "!!!Default",
-        "end": {
-          "column": 3,
-          "line": 292
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.workspaces.defaultWorkspace",
-        "start": {
-          "column": 20,
-          "line": 289
-        }
-      },
-      {
-        "defaultMessage": "!!!Todos",
-        "end": {
-          "column": 3,
-          "line": 296
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.todos",
-        "start": {
-          "column": 9,
-          "line": 293
-        }
-      },
-      {
-        "defaultMessage": "!!!Open Todos drawer",
-        "end": {
-          "column": 3,
-          "line": 300
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.Todoss.openTodosDrawer",
-        "start": {
-          "column": 19,
-          "line": 297
-        }
-      },
-      {
-        "defaultMessage": "!!!Close Todos drawer",
-        "end": {
-          "column": 3,
-          "line": 304
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.Todoss.closeTodosDrawer",
-        "start": {
-          "column": 20,
-          "line": 301
-        }
-      },
-      {
-        "defaultMessage": "!!!Enable Todos",
-        "end": {
-          "column": 3,
-          "line": 308
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.todos.enableTodos",
-        "start": {
-          "column": 15,
-          "line": 305
-        }
-      },
-      {
-        "defaultMessage": "!!!Home",
-        "end": {
-          "column": 3,
-          "line": 312
-        },
-        "file": "src/lib/Menu.js",
-        "id": "menu.services.goHome",
-        "start": {
-          "column": 17,
-          "line": 309
-        }
-      }
-    ],
-    "path": "src/lib/Menu.json"
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 6964a93f1..4c658297e 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Επαναφόρτωση",
-  "app.errorHandler.headline": "Κάτι δεν λειτουργεί",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Προσαρμοσμένος διακομιστής",
  "changeserver.headline": "Change server",
  "changeserver.label": "Διακομιστής",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Τι συνέβη;",
  "connectionLostBanner.message": "Ωχ όχι! Ο Ferdi έχασε την επικοινωνία με το",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Εγγραφή πληροφοριών εντοπισμού σφαλμάτων",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "Search...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Δεν είναι δυνατή η σύνδεση με τις ζωντανές υπηρεσίες του Ferdi",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Ακύρωση",
+  "global.cancel": "Cancel",
  "global.edit": "Επεξεργασία",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Έχετε αποσυνδεθεί από το Διαδίκτυο",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Ρυθμίσεις",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Use System Default ({default})",
  "global.spellchecking.autodetect": "Detect language automatically",
  "global.spellchecking.autodetect.short": "Automatic",
  "global.spellchecking.language": "Spell checking language",
-  "global.submit": "Υποβολή",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Εισαγάγετε τις υπηρεσίες σας Ferdi 4",
  "import.notSupportedHeadline": "Υπηρεσίες που δεν υποστηρίζονται ακόμα στο Ferdi 5",
  "import.skip.label": "Θέλω να προσθέσω υπηρεσίες χειροκίνητα",
-  "import.submit.label": "Εισαγωγή υπηρεσιών",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Τι νέο υπάρχει;",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Επανεκκίνηση & εγκατάσταση ενημερώσεων",
  "infobar.buttonReloadServices": "Ανανέωση υπηρεσιών",
  "infobar.hide": "Απόκρυψη",
@@ -75,7 +74,7 @@
  "login.email.label": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
  "login.headline": "Σύνδεση",
  "login.invalidCredentials": "Το email ή ο κωδικός πρόσβασης δεν είναι έγκυρος",
-  "login.link.password": "Επαναφορά κωδικού πρόσβασης",
+  "login.link.password": "Reset password",
  "login.link.signup": "Δημιουργία δωρεάν λογαριασμού",
  "login.password.label": "Password",
  "login.serverLogout": "Η συνεδρία σας έληξε, συνδεθείτε ξανά.",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Όροι Χρήσης",
  "menu.services": "Υπηρεσίες",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Όλες οι υπηρεσίες",
  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
  "password.email.label": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
-  "password.headline": "Επαναφορά κωδικού πρόσβασης",
+  "password.headline": "Reset password",
  "password.link.login": "Σύνδεση στο λογαριασμό σας",
  "password.link.signup": "Δημιουργία δωρεάν λογαριασμού",
-  "password.noUser": "Δεν βρέθηκε χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Ελέγξτε το email σας",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Επαναφόρτωση {name}",
  "service.crashHandler.autoReload": "Γίνεται προσπάθεια αυτόματης ανάκτησης του {name} σε {seconds} δευτερόλεπτα",
  "service.crashHandler.headline": "Ω, όχι!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Καλώς ορίσατε στον Ferdi",
-  "settings.account.account.editButton": "Επεξεργασία λογαριασμού",
+  "settings.account.account.editButton": "Edit 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": "Ενημέρωση προφίλ",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "Έχετε λάβει ένα email με έναν σύνδεσμο για την επιβεβαίωση της διαγραφής του λογαριασμού σας. Ο λογαριασμός και τα δεδομένα σας δεν μπορούν να ανακτηθούν!",
  "settings.account.deleteInfo": "Εάν δεν χρειάζεστε πλέον το λογαριασμό σας στο Ferdi, μπορείτε να διαγράψετε το λογαριασμό σας και όλα τα δεδομένα που σχετίζονται με αυτόν εδώ.",
  "settings.account.headline": "Λογαριασμός",
-  "settings.account.headlineAccount": "Πληροφορίες λογαριασμού",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Επικίνδυνη Ζώνη",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Τιμολόγια",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Αλλαγή κωδικού πρόσβασης",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Ενημέρωση προφίλ",
  "settings.account.successInfo": "Οι αλλαγές σας έχουν αποθηκευτεί",
  "settings.account.tryReloadServices": "Δοκιμάστε ξανά",
  "settings.account.tryReloadUserInfoRequest": "Δοκιμάστε ξανά",
  "settings.account.userInfoRequestFailed": "Δεν ήταν δυνατή η φόρτωση πληροφοριών χρήστη",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Καθαρισμός λανθάνουσας μνήμης",
  "settings.app.buttonInstallUpdate": "Επανεκκίνηση & εγκατάσταση ενημερώσεων",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Ενεργοποιήση Ενίσχυσης GPU ",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Ενεργοποίηση ορθογραφικού ελέγχου",
-  "settings.app.form.enableSystemTray": "Εμφάνιση του Ferdi στη γραμμή ειδοποιήσεων",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Προβολή καρτελών των απενεργοποιημένων υπηρεσιών",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Προβολή του εικονιδίου μη αναγνωσμένου μηνύματος όταν οι ειδοποιήσεις είναι απενεργοποιημένες",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Διαγραφή υπηρεσίας",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Επεξεργασία {name}",
  "settings.service.form.enableAudio": "Ενεργοποίηση ήχου",
  "settings.service.form.enableBadge": "Εμφάνιση εικονιδίων μη αναγνωσμένου μηνύματος",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Όλοι οι ήχοι καθώς και η αναπαραγωγή ήχου θα απενεργοποιηθούν",
  "settings.service.form.name": "Όνομα",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Ανακαλύψτε υπηρεσίες",
  "settings.services.headline": "Οι υπηρεσίες σας",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Η υπηρεσία είναι απενεργοποιημένη",
  "settings.services.tooltip.isMuted": "Όλοι οι ήχοι είναι απενεργοποιημένοι",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Μη κερδοσκοπικός",
  "settings.user.form.currentPassword": "Τρέχων κωδικός πρόσβασης",
  "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Όνομα",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Επίθετο",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Νέος κωδικός πρόσβασης",
  "settings.workspace.add.form.name": "Όνομα",
  "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Ενεργοποίηση ειδοποιήσεων & ήχου",
  "signup.email.label": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
  "signup.emailDuplicate": "Ένας χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου υπάρχει ήδη",
-  "signup.firstname.label": "Όνομα",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Εγγραφή",
-  "signup.lastname.label": "Επίθετο",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Δημιουργώντας έναν λογαριασμό Ferdi αποδέχεστε τους",
  "signup.legal.privacy": "Δήλωση απορρήτου",
  "signup.legal.terms": "Όροι υπηρεσίας",
@@ -430,11 +421,11 @@
  "signup.password.label": "Password",
  "signup.submit.label": "Δημιουργία λογαριασμού",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Διαγραφή υπηρεσίας",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Απενεργοποίηση ήχου",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Απενεργοποίηση ειδοποιήσεων",
-  "tabs.item.disableService": "Απενεργοποίηση υπηρεσίας",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Ενεργοποίηση ήχου",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Ενεργοποίηση ειδοποιήσεων",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Επαναφόρτωση",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} δεν είναι έγκυρο",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} πρέπει να είναι τουλάχιστον {length} χαρακτήρες",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} είναι υποχρεωτικό",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} δεν είναι έγκυρος σύνδεσμος URL",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Back",
  "webControls.forward": "Forward",
  "webControls.goHome": "Home",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index be9bbb961..812ec8c4c 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Custom server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -45,7 +44,7 @@
  "import.headline": "Import your Ferdi 4 services",
  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
  "import.skip.label": "I want to add services manually",
-  "import.submit.label": "Import services",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Restart & install update",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Terms of Service",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -152,18 +151,7 @@
  "password.link.login": "Sign in to your account",
  "password.link.signup": "Create a free account",
  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Please check your email",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
  "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
  "settings.account.tryReloadServices": "Try again",
  "settings.account.tryReloadUserInfoRequest": "Try again",
  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Clear cache",
  "settings.app.buttonInstallUpdate": "Restart & install update",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 9a5c248a2..518e862ba 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Volver a cargar",
-  "app.errorHandler.headline": "Algo salió mal.",
+  "app.errorHandler.headline": "Algo ha fallado.",
  "changeserver.customServerLabel": "Servidor personalizado",
  "changeserver.headline": "Cambiar servidor",
  "changeserver.label": "Servidor",
@@ -9,13 +9,12 @@
  "connectionLostBanner.cta": "Recargar Servicio",
  "connectionLostBanner.informationLink": "¿Qué ocurrió?",
  "connectionLostBanner.message": "¡Oh no! Ferdi perdió la conexión con {name}.",
-  "feature.basicAuth.signIn": "Sign In",
+  "feature.basicAuth.signIn": "Iniciar Sesión",
-  "feature.debugger.title": "Publica la información de depuración",
  "feature.nightlyBuilds.activate": "Activar",
  "feature.nightlyBuilds.info": "Las \"Nightly builds\" son versiones altamente experimentales de Ferdi que pueden contener características sin pulir o sin completar. Estas versiones son utilizadas principalmente por los desarrolladores para probar sus nuevas características desarrolladas y cómo se comportarán en la versión final. Si no sabe lo que está haciendo, le sugerimos que no active las estas versiones.",
  "feature.nightlyBuilds.title": "Nightly Builds",
  "feature.publishDebugInfo.error": "Hubo un error al intentar publicar la información de depuración. Por favor, inténtalo de nuevo más tarde o revisa la consola para más información.",
-  "feature.publishDebugInfo.info": "Publicar tu información de depuración nos ayuda a encontrar problemas y errores en Ferdi. Al publicar tu información de depuración aceptas la política de privacidad y las condiciones de servicio de Ferdi Debuggger",
+  "feature.publishDebugInfo.info": "Publicar tu información de depuración nos ayuda a encontrar problemas y errores en Ferdi. Al publicar tu información de depuración aceptas la política de privacidad y las condiciones de servicio de depuración de Ferdi",
  "feature.publishDebugInfo.privacy": "Política de Privacidad",
  "feature.publishDebugInfo.publish": "Aceptar y publicar",
  "feature.publishDebugInfo.published": "Su registro de depuración fue publicado y ahora está disponible en",
@@ -23,29 +22,29 @@
  "feature.publishDebugInfo.title": "Publica la información de depuración",
  "feature.quickSwitch.info": "Puede seleccionar un servicio usando TAB, ↑ y ↓. Puede abrir servicio usando ENTER.",
  "feature.quickSwitch.search": "Buscar...",
-  "feature.quickSwitch.title": "Cambiar rápidamente",
+  "feature.quickSwitch.title": "Cambio rápido",
-  "global.api.unhealthy": "No es posible conectarse a los servicios en línea de Ferdi.",
+  "global.api.unhealthy": "No es posible conectarse a los servicios en línea de Ferdi",
  "global.cancel": "Cancelar",
  "global.edit": "Editar",
  "global.no": "No",
  "global.notConnectedToTheInternet": "No estás conectado a Internet",
-  "global.ok": "Ok",
+  "global.ok": "Aceptar",
-  "global.quit": "Quit",
+  "global.quit": "Salir",
-  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.quitConfirmation": "¿Estás seguro de que quieres salir de Ferdi?",
-  "global.save": "Save",
+  "global.save": "Guardar",
  "global.settings": "Configuración",
  "global.spellchecker.useDefault": "Utilizar estándar del sistema ({default})",
  "global.spellchecking.autodetect": "Detectar el idioma automáticamente",
  "global.spellchecking.autodetect.short": "Automático",
-  "global.spellchecking.language": "Corrector de ortograf��a",
+  "global.spellchecking.language": "Idioma de corrección ortogr��fica",
  "global.submit": "Enviar",
-  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
+  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (para descubrir) o 'https://developeropers.whatismybrowser.com/useragents/explore/' (para elegir) su agente de usuario deseado y copiarlo aquí.",
-  "global.userAgentPref": "Navegador",
+  "global.userAgentPref": "Agente de Usuario",
-  "global.yes": "Yes",
+  "global.yes": "Sí",
  "import.headline": "Importa tus servicios de Ferdi 4",
  "import.notSupportedHeadline": "Servicios aún no admitidos en Ferdi 5",
  "import.skip.label": "Quiero agregar servicios manualmente",
-  "import.submit.label": "Importar servicios",
+  "import.submit.label": "Importar {count} servicios",
  "infobar.authRequestFailed": "Error al intentar realizar la solicitud de autenticación. Por favor, cerrar la sesión y volver a entrar si este error persiste.",
  "infobar.buttonChangelog": "¿Qué hay de nuevo?",
  "infobar.buttonInstallUpdate": "Reiniciar e instalar actualización",
@@ -54,15 +53,15 @@
  "infobar.requiredRequestsFailed": "No se han podido cargar los servicios ni la información de usuario",
  "infobar.servicesUpdated": "Tus servicios han sido actualizados.",
  "infobar.updateAvailable": "Una nueva actualización de Ferdi está disponible",
-  "infobox.dismiss": "Descargar",
+  "infobox.dismiss": "Descartar",
  "invite.email.label": "Dirección de correo electrónico",
  "invite.headline.friends": "Invita a 3 de tus amigos o compañeros",
  "invite.name.label": "Nombre",
-  "invite.skip.label": "Lo haré más tarde",
+  "invite.skip.label": "Deseo continuar más tarde",
  "invite.submit.label": "Enviar invitaciones",
  "invite.successInfo": "Invitaciones enviadas correctamente",
  "locked.headline": "Bloqueado",
-  "locked.info": "Ferdi está bloqueado. Debe desbloquear Ferdi con su contraseña para ver mensajes.",
+  "locked.info": "Ferdi está actualmente bloqueado. Por favor, desbloquea Ferdi con tu contraseña para ver tus mensajes.",
  "locked.invalidCredentials": "Contraseña incorrecta",
  "locked.password.label": "Contraseña",
  "locked.submit.label": "Desbloquear",
@@ -70,8 +69,8 @@
  "locked.touchIdPrompt": "desbloquear con Touch ID",
  "locked.unlockWithPassword": "Desbloquear con contraseña",
  "login.changeServer": "Cambiar servidor",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
+  "login.customServerQuestion": "¿Utilizar una cuenta de Franz para iniciar sesión?",
-  "login.customServerSuggestion": "Try importing your Franz account",
+  "login.customServerSuggestion": "Intenta importar tu cuenta de Franz en Ferdi",
  "login.email.label": "Dirección de correo electrónico",
  "login.headline": "Iniciar sesión",
  "login.invalidCredentials": "Correo electrónico o contraseña no válidos ",
@@ -87,30 +86,30 @@
  "menu.app.autohideMenuBar": "Auto-ocultar barra de menú",
  "menu.app.checkForUpdates": "Comprobar actualizaciones",
  "menu.app.hide": "Ocultar",
-  "menu.app.hideOthers": "Hide Others",
+  "menu.app.hideOthers": "Ocultar otros",
-  "menu.app.unhide": "Unhide",
+  "menu.app.unhide": "Mostrar",
  "menu.edit": "Editar",
-  "menu.edit.copy": "Copy",
+  "menu.edit.copy": "Copiar",
-  "menu.edit.cut": "Cut",
+  "menu.edit.cut": "Cortar",
  "menu.edit.delete": "Borrar",
  "menu.edit.emojiSymbols": "Emoji y Símbolos",
  "menu.edit.findInPage": "Buscar en la página",
-  "menu.edit.paste": "Paste",
+  "menu.edit.paste": "Pegar",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.pasteAndMatchStyle": "Pegar y ajustar estilo",
-  "menu.edit.redo": "Redo",
+  "menu.edit.redo": "Rehacer",
-  "menu.edit.selectAll": "Select All",
+  "menu.edit.selectAll": "Seleccionar Todo",
  "menu.edit.speech": "Leer",
  "menu.edit.startDictation": "Empezar dictado",
  "menu.edit.startSpeaking": "Empezar lectura",
  "menu.edit.stopSpeaking": "Detener lectura",
-  "menu.edit.undo": "Undo",
+  "menu.edit.undo": "Deshacer",
  "menu.file": "Archivo",
-  "menu.help": "Help",
+  "menu.help": "Ayuda",
  "menu.help.changelog": "Registro de cambios",
  "menu.help.debugInfo": "Copiar información de depuración",
  "menu.help.debugInfoCopiedBody": "Tu información de depuración ha sido copiada a tu portapapeles",
  "menu.help.debugInfoCopiedHeadline": "Información de depurador de Ferdi",
-  "menu.help.importExportData": "Import/Export Configuration Data",
+  "menu.help.importExportData": "Importar/Exportar datos de configuración",
  "menu.help.learnMore": "Conocer más",
  "menu.help.privacy": "Declaración de privacidad",
  "menu.help.publishDebugInfo": "Escribir información de depuración",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Términos del Servicio",
  "menu.services": "Servicios",
  "menu.services.activatePreviousService": "Activa el servicio previo",
-  "menu.services.addNewService": "Añadir Nuevo Servicio",
+  "menu.services.addNewService": "Añadir Nuevo Servicio...",
  "menu.services.goHome": "Inicio",
  "menu.services.setNextServiceActive": "Activa el siguiente servicio",
  "menu.todos": "Tareas pendientes",
@@ -128,20 +127,20 @@
  "menu.view.forward": "Siguiente",
  "menu.view.lockFerdi": "Bloquear Ferdi",
  "menu.view.openQuickSwitch": "Abrir Cambio Rápido",
-  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Recargar Ferdi",
  "menu.view.reloadService": "Recargar Servicio",
  "menu.view.reloadTodos": "Recargar Pendientes",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "Tamaño Real",
  "menu.view.toggleDarkMode": "Cambiar a modo oscuro",
  "menu.view.toggleDevTools": "Activar las Herramientas para Desarrolladores",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "Cambiar a Pantalla Completa",
  "menu.view.toggleServiceDevTools": "Mostrar Herramientas de Servicios para Desarrolladores",
  "menu.view.toggleTodosDevTools": "Tareas pendientes: Herramientas para desarrolladores",
-  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomIn": "Ampliar",
-  "menu.view.zoomOut": "Zoom Out",
+  "menu.view.zoomOut": "Reducir",
-  "menu.window": "Window",
+  "menu.window": "Ventana",
-  "menu.window.close": "Close",
+  "menu.window.close": "Cerrar",
-  "menu.window.minimize": "Minimize",
+  "menu.window.minimize": "Minimizar",
  "menu.workspaces": "Espacios de trabajo",
  "menu.workspaces.addNewWorkspace": "Añadir nuevo espacio de trabajo...",
  "menu.workspaces.closeWorkspaceDrawer": "Cerrar cajón de espacio de trabajo",
@@ -152,18 +151,7 @@
  "password.link.login": "Inicia sesión en tu cuenta",
  "password.link.signup": "Crear una cuenta gratuita",
  "password.noUser": "No se encontró un usuario con esa dirección de correo electrónico",
-  "password.successInfo": "Por favor revisa tu correo electrónico",
+  "password.successInfo": "Tu nueva contraseña ha sido enviada a tu dirección de email",
-  "pricing.features.accountSync": "Sincronización de cuenta",
-  "pricing.features.customWebsites": "Agregue sitios personalizados",
-  "pricing.features.desktopNotifications": "Notificaciones de escritorio",
-  "pricing.features.onPremise": "En sitio y otros servicios alojados",
-  "pricing.features.recipes": "Elegir entre más de 70 servicios",
-  "pricing.features.serviceProxies": "Apoderados de Servicio",
-  "pricing.features.spellchecker": "Soporte de corrector ortográfico",
-  "pricing.features.teamManagement": "Administración de Equipo",
-  "pricing.features.thirdPartyServices": "Instalar servicios de terceros",
-  "pricing.features.unlimitedServices": "Agregar servicios ilimitados",
-  "pricing.features.workspaces": "Espacios de trabajo",
  "service.crashHandler.action": "Recargar {name}",
  "service.crashHandler.autoReload": "Intentando recuperar automáticamente {name} en {seconds} segundos",
  "service.crashHandler.headline": "¡Oh, no!",
@@ -174,11 +162,11 @@
  "service.errorHandler.editAction": "Editar {name}",
  "service.errorHandler.headline": "¡Oh, no!",
  "service.errorHandler.message": "Error",
-  "service.errorHandler.text": "{name} ha fallado la carga",
+  "service.errorHandler.text": "{name} no ha podido cargar.",
  "service.webviewLoader.loading": "Cargando {service}",
  "services.getStarted": "Primeros pasos",
  "services.login": "Iniciar sesión para usar Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
+  "services.serverInfo": "Opcionalmente, puede cambiar su servidor Ferdi haciendo clic en el engranaje en la esquina inferior izquierda. Si está cambiando (de uno de los servidores alojados) a usar Ferdi sin una cuenta, por favor tenga en cuenta que puede exportar sus datos desde ese servidor y posteriormente importarlos usando el menú Ayuda para restaurar todos sus espacios de trabajo y servicios configurados!",
  "services.serverless": "Usar Ferdi sin una cuenta",
  "services.welcome": "Bienvenido a Ferdi",
  "settings.account.account.editButton": "Editar cuenta",
@@ -198,12 +186,12 @@
  "settings.account.tryReloadServices": "Intentar de nuevo",
  "settings.account.tryReloadUserInfoRequest": "Intentar de nuevo",
  "settings.account.userInfoRequestFailed": "No se pudo cargar la información de usuario",
-  "settings.account.yourLicense": "Su Licencia Ferdi",
+  "settings.account.yourLicense": "Su Licencia Ferdi:",
  "settings.app.accentColorInfo": "Escribe tu color de acento en un formato compatible con CSS. (Predeterminado: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Limpiar caché",
  "settings.app.buttonInstallUpdate": "Reiniciar e instalar actualización",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Abrir Carpeta de Perfil",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Abrir carpeta de recetas de servicio",
  "settings.app.buttonSearchForUpdate": "Comprobar actualizaciones",
  "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.",
  "settings.app.cacheNotCleared": "No se ha podido eliminar el cache",
@@ -218,14 +206,14 @@
  "settings.app.form.beta": "Incluir versiones beta",
  "settings.app.form.clipboardNotifications": "Dejar de mostrar notificaciones acerca del portapapeles",
  "settings.app.form.closeToSystemTray": "Cerrar Ferdi a la barra de tareas",
-  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
+  "settings.app.form.confirmOnQuit": "Confirmar al salir de Ferdi",
-  "settings.app.form.customTodoServer": "Servidor de Todo personalizado",
+  "settings.app.form.customTodoServer": "Servidor de TODO personalizado",
-  "settings.app.form.darkMode": "Activar tema oscuro",
+  "settings.app.form.darkMode": "Habilitar modo oscuro",
  "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU",
  "settings.app.form.enableLock": "Activar bloqueo por contraseña",
  "settings.app.form.enableMenuBar": "Mostrar a Ferdi en la barra de menús",
  "settings.app.form.enableSpellchecking": "Activar corrección ortográfica",
-  "settings.app.form.enableSystemTray": "Mostrar Ferdi en la bandeja del sistema",
+  "settings.app.form.enableSystemTray": "Mostrar siempre icono de Ferdi en la bandeja del sistema",
  "settings.app.form.enableTodos": "Activar Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Mantener los servicios en hibernación al iniciar",
  "settings.app.form.hibernationStrategy": "Estrategia de hibernación",
@@ -237,7 +225,7 @@
  "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema",
  "settings.app.form.navigationBarBehaviour": "Comportamiento de la barra de navegación",
  "settings.app.form.notifyTaskBarOnMessage": "Notificar en la Barra de tareas / Dock los nuevos mensajes",
-  "settings.app.form.passwordToggle": "Password toggle",
+  "settings.app.form.passwordToggle": "Cambio de contraseña",
  "settings.app.form.predefinedTodoServer": "Servidor de tareas",
  "settings.app.form.privateNotifications": "No mostrar contenido de mensajes en notificaciones",
  "settings.app.form.reloadAfterResume": "Recargar Ferdi después de reanudar el sistema",
@@ -251,11 +239,12 @@
  "settings.app.form.showDisabledServices": "Mostrar pestañas de servicios desactivados",
  "settings.app.form.showDragArea": "Mostrar área arrastrable en la ventana",
  "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
+  "settings.app.form.splitMode": "Activar el modo de vista separada",
  "settings.app.form.startMinimized": "Iniciar minimizado",
  "settings.app.form.universalDarkMode": "Activar modo oscuro universal",
  "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.useVerticalStyle": "Usar estilo horizontal",
-  "settings.app.form.wakeUpStrategy": "Wake up strategy",
+  "settings.app.form.wakeUpStrategy": "Estrategia para despertar",
  "settings.app.headlineAdvanced": "Avanzado",
  "settings.app.headlineAppearance": "Apariencia",
  "settings.app.headlineGeneral": "General",
@@ -265,16 +254,16 @@
  "settings.app.hibernateInfo": "Por defecto, Ferdi mantendrá todos sus servicios abiertos y cargados en segundo plano para que estén listos cuando los necesite. La hibernación del servicio desactivará los mismos tras el tiempo especificado. Esto es útil para ahorrar RAM y evitar que los servicios ralentizen su sistema.",
  "settings.app.inactivityLockInfo": "Minutos de inactividad, tras los cuales Ferdi debe bloquear automáticamente. Utilice 0 para desactivar",
  "settings.app.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.",
-  "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 {lockShortcut}.",
+  "settings.app.lockInfo": "El bloqueo de contraseña le permite mantener los mensajes protegidos.\nSi activa el bloqueo de contraseña, se le pedirá introducirla cada vez que inicie o bloquee Ferdi usando el símbolo de la esquina inferior izquierda o bien el acceso directo {lockShortcut}.",
  "settings.app.lockedPassword": "Contraseña",
-  "settings.app.lockedPasswordInfo": "Por favor, asegúrese de recordar la contraseña que establezca.\nSi la perdiera u olvidara, tendría que reinstalar Ferdi.",
+  "settings.app.lockedPasswordInfo": "Por favor, asegúrese de establecer una contraseña que usted pueda recordar.\nSi pierde esta contraseña, tendrá que reinstalar Ferdi.",
  "settings.app.restartRequired": "Los cambios requieren reiniciar",
  "settings.app.scheduledDNDInfo": "El \"No molestar\" programado permite definir un período de tiempo en el que no recibir notificaciones de Ferdi.",
  "settings.app.scheduledDNDTimeInfo": "Horas en formato 24 horas. La hora de finalización puede ser anterior a la hora de inicio (por ejemplo, inicio 17:00, final 09:00) para habilitar No molestar la noche.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
+  "settings.app.sentryInfo": "El envío de datos de telemetría nos permite encontrar errores en Ferdi - ¡No enviaremos ninguna información personal como sus mensajes!",
  "settings.app.spellCheckerLanguageInfo": "Ferdi utiliza el corrector ortográfico incluido en su Mac. Si desea cambiar los lenguajes que el corrector ortográfico revisa, lo puede hacer en las Preferencias del Sistema de su Mac.",
  "settings.app.subheadlineCache": "Caché",
-  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
+  "settings.app.subheadlineFerdiProfile": "Perfil de Ferdi",
  "settings.app.todoServerInfo": "Este servidor se utilizará para la función \"Ferdi Todo\".",
  "settings.app.translationHelp": "Ayúdanos a traducir Ferdi a tu idioma.",
  "settings.app.universalDarkModeInfo": "El Modo Oscuro Universal intenta generar dinámicamente estilos de modo oscuro para servicios que de otro modo no están soportados actualmente.",
@@ -294,7 +283,7 @@
  "settings.recipes.customService.headline.communityRecipes": "Recetas de terceros comunitarios",
  "settings.recipes.customService.headline.customRecipes": "Recetas de terceros comunitarios",
  "settings.recipes.customService.headline.devRecipes": "Sus recetas de Servicio de Desarrollo",
-  "settings.recipes.customService.intro": "Para añadir un servicio personalizado, copia la receta de servicio a:",
+  "settings.recipes.customService.intro": "Para añadir un servicio personalizado, copie la receta de servicio a:",
  "settings.recipes.customService.openDevDocs": "Documentación para desarrolladores",
  "settings.recipes.customService.openFolder": "Abrir carpeta",
  "settings.recipes.headline": "Servicios disponibles",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "Cuando se activa, un servicio se apagará después de un período de tiempo para ahorrar recursos del sistema.",
  "settings.service.form.isMutedInfo": "Cuando estén desactivados, todos los sonidos de notificación y la reproducción de audio serán silenciados",
  "settings.service.form.name": "Nombre",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Solo mostrar Favoritos en el recuento de no leídos",
  "settings.service.form.openDarkmodeCss": "Abrir darkmode.css (modo oscuro)",
  "settings.service.form.openUserCss": "Abrir user.css",
  "settings.service.form.openUserJs": "Abrir user.js",
  "settings.service.form.proxy.headline": "Ajustes Proxy HTTP/HTTPS",
  "settings.service.form.proxy.host": "Servidor/IP Proxy",
-  "settings.service.form.proxy.info": "Las configuraciones de Proxy no se sincronizarán con los servidores de Ferdi.",
+  "settings.service.form.proxy.info": "Las configuraciones del Proxy no se sincronizarán con los servidores de Ferdi.",
  "settings.service.form.proxy.isEnabled": "Utilizar Proxy",
  "settings.service.form.proxy.password": "Contraseña (opcional)",
  "settings.service.form.proxy.port": "Puerto",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Descubrir servicios",
  "settings.services.headline": "Tus servicios",
  "settings.services.noServicesAdded": "Empieze añadiendo un servicio.",
+  "settings.services.nothingFound": "Lo sentimos, pero no pudimos encontrar ningún servicio similar a tu búsqueda, sin embargo: puedes agregarlo utilizando la opción de \"Sitio web personalizado\". \nRecuerda que pueden aparecer más servicios de los que has agregado a Ferdi desde la versión que estás utilizando. Para poder utilizar los nuevos servicios disponibles, considera actualizar a la versión más reciente.",
  "settings.services.servicesRequestFailed": "No pudo cargar tus servicios",
  "settings.services.tooltip.isDisabled": "El servicio está desactivado",
  "settings.services.tooltip.isMuted": "Todos los sonidos están silenciados",
@@ -377,7 +368,7 @@
  "settings.team.contentHeadline": "Administración de Equipo",
  "settings.team.copy": "La gestión de equipos de Franz's te permite administrar suscripciones de Franz para múltiples usuarios. Por favor, ten en cuenta que tener una suscripción a Franz Premium no te dará ninguna ventaja en el uso de Ferdi: la única razón por la que todavía tienes acceso a la Gestión de Equipos es para que puedas gestionar tus equipos de Franz y para que no pierdas ninguna funcionalidad en la gestión de tu cuenta.",
  "settings.team.headline": "Equipo",
-  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "Actualmente estás usando servidores Franz, por lo que tienes acceso a la Gestión de Equipos.",
  "settings.team.manageAction": "Administra tu equipo en meetfranz.com",
  "settings.team.teamsUnavailable": "Los equipos no están disponibles",
  "settings.team.teamsUnavailableInfo": "Los equipos están disponibles actualmente sólo cuando se utiliza el servidor Franz y después de pagar por Franz Professional. Por favor, cambie su servidor a https://api.franz)[video] .com para usar equipos.",
@@ -388,7 +379,7 @@
  "settings.user.form.currentPassword": "Contraseña actual",
  "settings.user.form.email": "Correo electrónico",
  "settings.user.form.firstname": "Nombre",
-  "settings.user.form.lastname": "Apellido",
+  "settings.user.form.lastname": "Apellidos",
  "settings.user.form.newPassword": "Nueva contraseña",
  "settings.workspace.add.form.name": "Nombre",
  "settings.workspace.add.form.submitButton": "Crear un sitio de trabajo",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Intentar de nuevo",
  "settings.workspaces.updatedInfo": "Tus cambios han sido guardados",
  "settings.workspaces.workspaceFeatureHeadline": "Menos es más: Presentación de Ferdi Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "Los espacios de trabajo Ferdi permiten centrarse en lo que es importante. Configure diferentes conjuntos de servicios y cambie fácilmente entre ellos en cualquier momento. Usted decide qué servicios necesita, cuándo y dónde, para que podamos ayudarte a mantenerte al tanto - o apartarte fácilmente del trabajo cuando asi lo desees.",
+  "settings.workspaces.workspaceFeatureInfo": "Los espacios de trabajo Ferdi permiten centrarse en lo que es importante. Configure diferentes conjuntos de servicios y cambie fácilmente entre ellos en cualquier momento. Usted decide qué servicios necesita, cuándo y dónde, para que podamos ayudarte a mantenerte al tanto - o apartarte fácilmente del trabajo cuando así lo desees.",
  "settings.workspaces.workspacesRequestFailed": "No se han podido cargar sus áreas de trabajo",
  "setupAssistant.headline": "Empecemos",
  "setupAssistant.subheadline": "Elige entre nuestros servicios más utilizados y vuelve a ponerte al tanto de tu mensajería ahora.",
@@ -422,7 +413,7 @@
  "signup.emailDuplicate": "Ya existe un usuario con esa dirección de correo electrónico",
  "signup.firstname.label": "Nombre",
  "signup.headline": "Registrarse",
-  "signup.lastname.label": "Apellido",
+  "signup.lastname.label": "Apellidos",
  "signup.legal.info": "Al crear una cuenta en Ferdi usted acepta",
  "signup.legal.privacy": "Declaración de privacidad",
  "signup.legal.terms": "Términos de servicio",
@@ -432,21 +423,21 @@
  "tabs.item.confirmDeleteService": "¿Estás seguro que quieres elimiar el servicio de {serviceName}?",
  "tabs.item.deleteService": "Eliminar servicio",
  "tabs.item.disableAudio": "Desactivar sonido",
-  "tabs.item.disableDarkMode": "Disable Dark mode",
+  "tabs.item.disableDarkMode": "Desactivar modo oscuro",
  "tabs.item.disableNotifications": "Desactivar notificaciones",
  "tabs.item.disableService": "Desactivar servicio",
  "tabs.item.enableAudio": "Habilitar audio",
-  "tabs.item.enableDarkMode": "Enable Dark mode",
+  "tabs.item.enableDarkMode": "Habilitar modo oscuro",
  "tabs.item.enableNotification": "Activar notificaciones",
  "tabs.item.enableService": "Activar servicio",
-  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.hibernateService": "Hibernar servicio",
  "tabs.item.reload": "Volver a cargar",
-  "tabs.item.wakeUpService": "Wake up service",
+  "tabs.item.wakeUpService": "Despertar servicio",
  "validation.email": "{field} no es válido",
  "validation.minLength": "{field} debería tener al menos {length} caracteres",
  "validation.oneRequired": "Al menos uno es requerido",
  "validation.required": "{field} es obligatorio",
-  "validation.url": "{field} no es una URL válida",
+  "validation.url": "{field} no es una dirección URL válida",
  "webControls.back": "Volver",
  "webControls.forward": "Siguiente",
  "webControls.goHome": "Inicio",
@@ -459,7 +450,7 @@
  "workspaceDrawer.headline": "Espacios de trabajo",
  "workspaceDrawer.item.contextMenuEdit": "editar",
  "workspaceDrawer.item.noServicesAddedYet": "Ningún servicio ha sido añadido",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Los espacios de trabajo Ferdi permiten centrarse en lo que es importante. Configure diferentes conjuntos de servicios y cambie fácilmente entre ellos en cualquier momento. </p><p>Usted decide qué servicios necesita, cuándo y dónde, para que podamos ayudarte a mantenerte al tanto - o apartarte fácilmente del trabajo cuando asi lo desees.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Los espacios de trabajo Ferdi permiten centrarse en lo que es importante. Configure diferentes conjuntos de servicios y cambie fácilmente entre ellos en cualquier momento. </p><p>Usted decide qué servicios necesita, cuándo y dónde, para que podamos ayudarte a mantenerte al tanto - o apartarte fácilmente del trabajo cuando así lo desees.</p>",
  "workspaceDrawer.workspacesSettingsTooltip": "Editar ajustes de áreas de trabajo",
  "workspaces.switchingIndicator.switchingTo": "Cambiando a"
 }
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index 5ccea37e5..e6c756935 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Lataa uudelleen",
-  "app.errorHandler.headline": "Jotain meni pieleen",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Mukautettu palvelin",
  "changeserver.headline": "Vaihda palvelinta",
  "changeserver.label": "Palvelin",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Mitä tapahtui?",
  "connectionLostBanner.message": "Voi ei! Ferdi menetti yhteyden {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Julkaise virheraportti",
  "feature.nightlyBuilds.activate": "Aktivoi",
  "feature.nightlyBuilds.info": "Uusimmat versiot ovat Ferdin kokeellisia versioita, jotka voivat sisältää viimeistelemättömiä tai keskeneräisiä ominaisuuksia. Näitä uusimpia versioita käyttävät pääasiassa kehittäjät testaamaan uusia ominaisuuksia ja miten ne toimivat lopullisessa versiossa. Jos et tiedä mitä olet tekemässä, suosittelemme ettet aktivoi uusimpia versioita.",
  "feature.nightlyBuilds.title": "Uusimmat versiot",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Valitse palvelu painamalla TAB, ↑ ja ↓. Avaa palvelu painamalla ENTER.",
  "feature.quickSwitch.search": "Etsi...",
  "feature.quickSwitch.title": "Pikavalitsin",
-  "global.api.unhealthy": "Ferdin verkkopalveluihin ei saada yhteyttä",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Peruuta",
+  "global.cancel": "Cancel",
  "global.edit": "Muokkaa",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Et ole yhteydessä internetiin.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Asetukset",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Käytä järjestelmän oletusasetusta ({default})",
  "global.spellchecking.autodetect": "Tunnista kieli automaattisesti",
  "global.spellchecking.autodetect.short": "Automaattinen",
  "global.spellchecking.language": "Oikeinkirjoituksen tarkistuskieli",
-  "global.submit": "Jatka",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Tuo Ferdin 4 palveluasi",
  "import.notSupportedHeadline": "Palvelut eivät vielä tue Ferdi 5-versiota",
  "import.skip.label": "Haluan lisätä palvelut manuaalisesti",
-  "import.submit.label": "Tuo palveluita",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "Todennuspyynnön suoritamisessa tapahtui virhe. Jos tämä virhe toistuu, ole hyvä ja yritä kirjautua ulos. Kirjaudu sen jälkeen uudestaan sisälle.",
-  "infobar.buttonChangelog": "Mitä uutta?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Käynnistä uudelleen ja asenna päivitys",
  "infobar.buttonReloadServices": "Lataa palvelut uudestaan",
  "infobar.hide": "Piilota",
@@ -75,7 +74,7 @@
  "login.email.label": "Sähköpostiosoite",
  "login.headline": "Kirjaudu sisään",
  "login.invalidCredentials": "Sähköpostiosoite tai salasana ei kelpaa",
-  "login.link.password": "Nollaa salasana",
+  "login.link.password": "Reset password",
  "login.link.signup": "Luo ilmainen tili",
  "login.password.label": "Salasana",
  "login.serverLogout": "Istuntosi on vanhentunut. Kirjaudu uudelleen sisään.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Tuki",
  "menu.help.tos": "Käyttöehdot",
  "menu.services": "Palvelut",
-  "menu.services.activatePreviousService": "Aktivoi edellinen palvelu",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Etusivu",
-  "menu.services.setNextServiceActive": "Aktivoi seuraava palvelu",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos-tehtävät",
  "menu.todos.enableTodos": "Ota Todos käyttöön",
  "menu.view": "Katso",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Kaikki palvelut",
  "menu.workspaces.openWorkspaceDrawer": "Avaa työtilan valikko",
  "password.email.label": "Sähköpostiosoite",
-  "password.headline": "Nollaa salasana",
+  "password.headline": "Reset password",
  "password.link.login": "Kirjaudu tilillesi",
  "password.link.signup": "Luo ilmainen tili",
-  "password.noUser": "Tälle sähköpostiosoiteelle ei löytynyt käyttäjää",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Ole hyvä ja tarkista sähköpostisi",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Tilin Synkronointi",
-  "pricing.features.customWebsites": "Lisää mukautettuja sivustoja",
-  "pricing.features.desktopNotifications": "Työpöytäilmoitukset",
-  "pricing.features.onPremise": "Toimitila ja muut Hosting-palvelut",
-  "pricing.features.recipes": "Valitse yli 70 Palvelusta",
-  "pricing.features.serviceProxies": "Palveluiden Välityspalvelimet",
-  "pricing.features.spellchecker": "Oikoluvun tuki",
-  "pricing.features.teamManagement": "Tiimin Hallinta",
-  "pricing.features.thirdPartyServices": "Asenna kolmannen osapuolen palveluita",
-  "pricing.features.unlimitedServices": "Lisää rajattomat palvelut",
-  "pricing.features.workspaces": "Työtilat",
  "service.crashHandler.action": "Lataa uudestaan {name}",
  "service.crashHandler.autoReload": "Yritetään palauttaa {name} automaattisesti {seconds} sekunnin kuluttua",
  "service.crashHandler.headline": "Voi ei!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Käytä Ferdia ilman tiliä",
  "services.welcome": "Tervetuloa Ferdiin",
-  "settings.account.account.editButton": "Muokkaa tiliä",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Tili ei ole käytettävissä",
  "settings.account.accountUnavailableInfo": "Käytät Ferdia ilman tiliä. Jos haluat käyttää Ferdia tilin kanssa ja pitää palvelusi synkronoituna kaikissa asennuksissa, valitse Asetukset-välilehdessä palvelin ja kirjaudu sisään.",
  "settings.account.buttonSave": "Päivitä profiili",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "Olet saanut sähköpostiviestissä linkin, jonka kautta voit vahvistaa tilisi poistamisen. Tiliäsi ja tietoja ei voi palauttaa!",
  "settings.account.deleteInfo": "Jos et enää tarvitse Ferdi-tiliäsi, voit poistaa tilisi ja kaikki siihen liittyvät tiedot täältä.",
  "settings.account.headline": "Tili",
-  "settings.account.headlineAccount": "Tilin tiedot",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Vaaravyöhyke",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Laskut",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Vaihda salasana",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Päivitä profiili",
  "settings.account.successInfo": "Tekemäsi muutokset on tallennettu",
  "settings.account.tryReloadServices": "Yritä uudelleen",
  "settings.account.tryReloadUserInfoRequest": "Yritä uudelleen",
  "settings.account.userInfoRequestFailed": "Käyttäjätietoja ei voitu ladata",
-  "settings.account.yourLicense": "Sinun Ferdi-lisenssi",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Tyhjennä välimuisti",
  "settings.app.buttonInstallUpdate": "Käynnistä uudelleen ja asenna päivitys",
@@ -219,13 +207,13 @@
  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "Mukautettu Todo-Palvelin",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
  "settings.app.form.darkMode": "Ota tumma tila käyttöön",
  "settings.app.form.enableGPUAcceleration": "Ota Gpu-kiihdytys käyttöön",
  "settings.app.form.enableLock": "Ota Salasanan lukitus käyttöön",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Ota oikoluku käyttöön",
-  "settings.app.form.enableSystemTray": "Näytä Ferdi ilmoitusalueella",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Ota Ferdi Todos käyttöön",
  "settings.app.form.hibernateOnStartup": "Pidä palvelut horrostilassa käynnistettäessä",
  "settings.app.form.hibernationStrategy": "Horrostila-suunnitelma",
@@ -251,9 +239,10 @@
  "settings.app.form.showDisabledServices": "Näytä Estetyt palvelut -välilehdet",
  "settings.app.form.showDragArea": "Näytä ikkunassa siirrettävä alue",
  "settings.app.form.showMessagesBadgesWhenMuted": "Näytä merkki lukemattomasta viestistä kun ilmoitukset on poistettu käytöstä",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Käynnistä pienennettynä",
  "settings.app.form.universalDarkMode": "Ota käyttöön yleinen tumma tila",
-  "settings.app.form.useTouchIdToUnlock": "Salli TouchID:n käyttö Ferdin avaamiseksi",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.form.useVerticalStyle": "Use horizontal style",
  "settings.app.form.wakeUpStrategy": "Wake up strategy",
  "settings.app.headlineAdvanced": "Lisäasetukset",
@@ -267,7 +256,7 @@
  "settings.app.languageDisclaimer": "Viralliset käännökset ovat englanti ja saksa. Kaikki muut kielet ovat yhteisön kääntämiä.",
  "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 {lockShortcut}.",
  "settings.app.lockedPassword": "Salasana",
-  "settings.app.lockedPasswordInfo": "Varmista, että luot salasanan, jonka muistat.\nJos hukkaat tämän salasanan, sinun täytyy asentaa Ferdi uudelleen.",
+  "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.restartRequired": "Muutokset vaativat uudelleenkäynnistyksen",
  "settings.app.scheduledDNDInfo": "Ajastetun Älä häiritse-tilan avulla voit määritellä ajanjakson, jonka aikana et halua saada ilmoituksia Ferdistä.",
  "settings.app.scheduledDNDTimeInfo": "Ajastin 24 tunnin järjestelmässä. Kun Älä häiritse-tila otetaan yöksi käyttöön, päättymisaika voi olla ennen alkamisaikaa (esim. alku 17:00, loppu 09:00).",
@@ -275,7 +264,7 @@
  "settings.app.spellCheckerLanguageInfo": "Ferdi käyttää Macin sisäänrakennettua oikolukua tarkastaessaan kirjoitusvirheitä. Jos haluat muuttaa tarkastettavaa kieltä, voit tehdä sen Macin järjestelmän asetuksissa.",
  "settings.app.subheadlineCache": "Välimuisti",
  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Tätä palvelinta käytetään \"Ferdi Todo\" -toiminnossa.",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
  "settings.app.translationHelp": "Auta meitä kääntämään Ferdi omalle kielellesi.",
  "settings.app.universalDarkModeInfo": "Yleinen Tumma-tila yrittää luoda palveluille tyylejä, joita ei tueta tällä hetkellä.",
  "settings.app.updateStatusAvailable": "Päivitys saatavilla, ladataan...",
@@ -294,9 +283,9 @@
  "settings.recipes.customService.headline.communityRecipes": "Yhteisön Kolmannen osapuolen Ohjeet",
  "settings.recipes.customService.headline.customRecipes": "Kolmannen osapuolen ohjeet",
  "settings.recipes.customService.headline.devRecipes": "Ohjeet palvelun kehittämiseen",
-  "settings.recipes.customService.intro": "Jos haluat lisätä mukautetun palvelun, kopioi palvelun ohje:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Ohjelmoijan dokumentaatio",
-  "settings.recipes.customService.openFolder": "Avaa kansio",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Käytettävissä olevat palvelut",
  "settings.recipes.missingService": "Palvelu puuttuu?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Tumman tilan kirkkaus",
  "settings.service.form.darkReaderContrast": "Tumman tilan kontrasti",
  "settings.service.form.darkReaderSepia": "Tumman tilan seepia",
-  "settings.service.form.deleteButton": "Poista palvelu",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Muokkaa {name}",
  "settings.service.form.enableAudio": "Ota ääni käyttöön",
  "settings.service.form.enableBadge": "Näytä lukemattomat viestit",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Kun poistettu käytöstä, kaikki ilmoitusäänet ja äänentoisto on mykistetty",
  "settings.service.form.name": "Nimi",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Avaa darkmode.css",
  "settings.service.form.openUserCss": "Avaa user.css",
  "settings.service.form.openUserJs": "Avaa user.js",
  "settings.service.form.proxy.headline": "Http/Https välityspalvelimen asetukset",
  "settings.service.form.proxy.host": "Välityspalvelimen Host/IP",
-  "settings.service.form.proxy.info": "Välityspalvelimen asetukset eivät synkronoidu Ferdin palvelimiin.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Käytä välityspalvelinta",
-  "settings.service.form.proxy.password": "Salasana (valinnainen)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Portti",
  "settings.service.form.proxy.restartInfo": "Käynnistä Ferdi välityspalvelimen asetusten vaihtamisen jälkeen.",
-  "settings.service.form.proxy.user": "Käyttäjä (valinnainen)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Käyttäjän tiedostot lisätään web-sivulle, jotta voit muokata palveluita millä tahansa tavalla. Käyttäjätiedostot tallennetaan vain paikallisesti eikä niitä siirretä muille tietokoneille käyttäen samaa tiliä.",
  "settings.service.form.saveButton": "Tallenna palvelu",
  "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Selaa palveluita",
  "settings.services.headline": "Sinun palvelusi",
  "settings.services.noServicesAdded": "Aloita lisäämällä palvelu.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Palveluita ei voitu ladata",
  "settings.services.tooltip.isDisabled": "Palvelu poistettu käytöstä",
  "settings.services.tooltip.isMuted": "Kaikki äänet on mykistetty",
@@ -362,12 +353,12 @@
  "settings.supportFerdi.aboutIntro": "<p>Ferdi on yhteisöjohtoinen ja avoimen lähdekoodin sovellus.</p><p>Kiitos henkilöille, jotka tekevät tämän mahdolliseksi:</p>",
  "settings.supportFerdi.bannerText": "Haluatko auttaa meitä kehittämään Ferdiä?",
  "settings.supportFerdi.headline": "Tietoja Ferdistä",
-  "settings.supportFerdi.openSurvey": "Avaa mielipidekysely",
+  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "Jos haluat tukea Ferdin kehitystä lahjoituksella, voit tehdä niin molemmilla tavoilla,",
  "settings.supportFerdi.textDonationAnd": "ja",
  "settings.supportFerdi.textExpenses": "Vaikka vapaaehtoiset tekevät suurimman osan työstä, meidän on silti maksettava palvelemista ja sertifikaateista. Olemme yhteisönä täysin läpinäkyviä keräämiämme ja käyttämiemme varojen suhteen",
  "settings.supportFerdi.textGitHubSponsors": "GitHub sponsorit",
-  "settings.supportFerdi.textListContributors": "Täydellinen luettelo tukijoista",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
  "settings.supportFerdi.textListContributorsHere": "tästä",
  "settings.supportFerdi.textOpenCollective": "Avoin Kollektiivi",
  "settings.supportFerdi.textSupportWelcome": "Tuki on aina tervetullutta. Voit saada listan tarvitsemastamme avusta",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Voittoa tavoittelematon",
  "settings.user.form.currentPassword": "Nykyinen salasana",
  "settings.user.form.email": "Sähköposti",
-  "settings.user.form.firstname": "Etunimi",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Sukunimi",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Uusi salasana",
  "settings.workspace.add.form.name": "Nimi",
  "settings.workspace.add.form.submitButton": "Luo työtila",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Yritä uudelleen",
  "settings.workspaces.updatedInfo": "Tekemäsi muutokset on tallennettu",
  "settings.workspaces.workspaceFeatureHeadline": "Vähemmän on enemmän: Esittelyssä Ferdi Työtilat",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi Työtilat antavat sinun keskittyä siihen, mikä on tärkeää juuri nyt. Määritä erilaisia palveluja ja vaihda helposti niiden välillä milloin tahansa. Sinä päätät mitä palveluita tarvitset milloin ja missä, jotta voimme auttaa sinua pysymään töissä - tai helposti pois töistä aina kun haluat.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Työtiloja ei voitu ladata",
  "setupAssistant.headline": "Let's get started",
  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Käytä ilmoituksia ja ääniä",
  "signup.email.label": "Sähköpostiosoite",
  "signup.emailDuplicate": "Käyttäjä, jolla on tämä sähköpostiosoite, on jo olemassa",
-  "signup.firstname.label": "Etunimi",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Kirjaudu",
-  "signup.lastname.label": "Sukunimi",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Luomalla Ferdi-tilin hyväksyt",
  "signup.legal.privacy": "Tietosuojalauseke",
  "signup.legal.terms": "Käyttöehdot",
@@ -430,11 +421,11 @@
  "signup.password.label": "Salasana",
  "signup.submit.label": "Luo tili",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Poista palvelu",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Poista ääni käytöstä",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Poista ilmoitukset käytöstä",
-  "tabs.item.disableService": "Poista palvelu",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Ota ääni käyttöön",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Ota ilmoitukset käyttöön",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Lataa uudelleen",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} ei ole kelvollinen",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} pitää olla vähintään {length} kirjainta",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Vähintään yksi kohde valittava",
-  "validation.required": "{field} on pakollinen",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} ei ole kelvollinen URL-osoite",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Takaisin",
  "webControls.forward": "Eteenpäin",
  "webControls.goHome": "Etusivu",
@@ -454,12 +445,12 @@
  "webControls.reload": "Lataa uudelleen",
  "welcome.loginButton": "Kirjaudu tilillesi",
  "welcome.signupButton": "Luo ilmainen tili",
-  "workspaceDrawer.addNewWorkspaceLabel": "Lisää uusi työtila",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Kaikki palvelut",
  "workspaceDrawer.headline": "Työtilat",
  "workspaceDrawer.item.contextMenuEdit": "muokkaa",
  "workspaceDrawer.item.noServicesAddedYet": "Palveluja ei ole vielä lisätty",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces auttaa sinun keskittymään mikä on tärkeää juuri nyt. Määritä erilaisia palvelukokonaisuuksia ja vaihda helposti niiden välillä milloin tahansa.</p><p>Sinä päätät mitä palveluita tarvitset milloin ja missä, jotta voimme auttaa sinua pysymään työsi äärellä - tai helpottamaan poistumista aina kun haluat.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Muokkaa työtilojen asetuksia",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Vaihdetaan"
 }
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index d81d23d79..80b32f495 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Actualiser",
-  "app.errorHandler.headline": "On dirait que quelque chose ne va pas",
+  "app.errorHandler.headline": "Quelque chose a mal tourné.",
  "changeserver.customServerLabel": "Serveur personnalisé",
  "changeserver.headline": "Changer de serveur",
  "changeserver.label": "Serveur",
@@ -9,8 +9,7 @@
  "connectionLostBanner.cta": "Redémarrer le service",
  "connectionLostBanner.informationLink": "Que s'est-il passé?",
  "connectionLostBanner.message": "Oh non ! Ferdi a perdu la connexion avec {name}.",
-  "feature.basicAuth.signIn": "Sign In",
+  "feature.basicAuth.signIn": "Connexion",
-  "feature.debugger.title": "Publier les informations de débogage",
  "feature.nightlyBuilds.activate": "Activer",
  "feature.nightlyBuilds.info": "Les versions de développement sont des versions expérimentales de Ferdi qui peuvent contenir des fonctionnalités non optimisées ou incomplètes. Ces versions de développement sont principalement utilisés par les développeurs pour tester leurs nouvelles fonctionnalités et leurs performances. Si vous ne savez pas ce que vous faites, nous vous suggérons de ne pas activer les versions de développement.",
  "feature.nightlyBuilds.title": "Versions de développement",
@@ -27,27 +26,27 @@
  "global.api.unhealthy": "Impossible de se connecter aux services en ligne de Ferdi",
  "global.cancel": "Annuler",
  "global.edit": "Éditer",
-  "global.no": "No",
+  "global.no": "Non",
  "global.notConnectedToTheInternet": "Vous n'êtes pas connecté à Internet.",
  "global.ok": "Ok",
-  "global.quit": "Quit",
+  "global.quit": "Quitter",
-  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.quitConfirmation": "Voulez-vous vraiment quitter Ferdi ?",
-  "global.save": "Save",
+  "global.save": "Sauver",
  "global.settings": "Paramètres",
  "global.spellchecker.useDefault": "Par défaut ({default})",
  "global.spellchecking.autodetect": "Détecter automatiquement la langue",
  "global.spellchecking.autodetect.short": "Automatiquement",
  "global.spellchecking.language": "Langue de la vérification orthographique",
-  "global.submit": "Soumettre",
+  "global.submit": "Envoyer",
-  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
+  "global.userAgentHelp": "Utilisez 'https://whatmyuseragent.com/' (pour découvrir) ou 'https://developers.whatismybrowser.com/useragents/explore/' (pour choisir) votre agent utilisateur désiré et copier-coller ici.",
  "global.userAgentPref": "User Agent",
-  "global.yes": "Yes",
+  "global.yes": "Oui",
  "import.headline": "Importez vos services depuis la version 4 de Ferdi",
  "import.notSupportedHeadline": "Ces services ne sont pas encore supportés par la version 5 de Ferdi",
  "import.skip.label": "Je veux ajouter des services manuellement",
-  "import.submit.label": "Importer des services",
+  "import.submit.label": "Importer {count} services",
  "infobar.authRequestFailed": "Il y a eu des erreurs pendant l'authentification demandée. Essayer de vous déconnecter et de vous reconnecter pour voir si cette erreur persiste.",
-  "infobar.buttonChangelog": "Nouveautés?",
+  "infobar.buttonChangelog": "Quoi de neuf ?",
  "infobar.buttonInstallUpdate": "Redémarrer et installer la mise à jour",
  "infobar.buttonReloadServices": "Recharger les services",
  "infobar.hide": "Masquer",
@@ -75,7 +74,7 @@
  "login.email.label": "Adresse Email",
  "login.headline": "S'identifier",
  "login.invalidCredentials": "Email ou mot de passe invalide",
-  "login.link.password": "Réinitialiser le mot de passe",
+  "login.link.password": "Reset password",
  "login.link.signup": "Créer un compte gratuit",
  "login.password.label": "Mot de passe",
  "login.serverLogout": "Votre session a expiré. Reconnectez-vous s'il vous plaît.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Assistance",
  "menu.help.tos": "Conditions d'utilisation",
  "menu.services": "Services",
-  "menu.services.activatePreviousService": "Activer le service précédent",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Ajouter un nouveau service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Accueil",
-  "menu.services.setNextServiceActive": "Activer le service suivant",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Activer Todos",
  "menu.view": "Aperçu",
@@ -131,39 +130,28 @@
  "menu.view.reloadFerdi": "Reload Ferdi",
  "menu.view.reloadService": "Redémarrer le service",
  "menu.view.reloadTodos": "Recharger les Todos",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "Taille actuelle",
  "menu.view.toggleDarkMode": "Activer le mode sombre",
  "menu.view.toggleDevTools": "Activer les outils de développeur",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "Activer/désactiver le mode plein écran",
  "menu.view.toggleServiceDevTools": "Activer les outils de développeur du service",
  "menu.view.toggleTodosDevTools": "Activer les outils de développeur Todos",
-  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomIn": "Zoom avant",
-  "menu.view.zoomOut": "Zoom Out",
+  "menu.view.zoomOut": "Zoom arrière",
-  "menu.window": "Window",
+  "menu.window": "Fenêtre",
-  "menu.window.close": "Close",
+  "menu.window.close": "Fermer",
-  "menu.window.minimize": "Minimize",
+  "menu.window.minimize": "Réduire",
  "menu.workspaces": "Espace de travail",
  "menu.workspaces.addNewWorkspace": "Ajouter un nouvel espace de travail...",
  "menu.workspaces.closeWorkspaceDrawer": "Fermer l'espace de travail",
  "menu.workspaces.defaultWorkspace": "Tous les services",
  "menu.workspaces.openWorkspaceDrawer": "Ouvrir l'espace de travail",
  "password.email.label": "Adresse Email",
-  "password.headline": "Réinitialiser le mot de passe",
+  "password.headline": "Reset password",
  "password.link.login": "Connectez-vous à votre compte",
  "password.link.signup": "Créer un compte gratuit",
  "password.noUser": "Aucun utilisateur n'a été trouvé avec cette adresse email",
-  "password.successInfo": "Merci de consulter vos emails",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Synchronisation de compte",
-  "pricing.features.customWebsites": "Ajouter des sites web modifiés",
-  "pricing.features.desktopNotifications": "Notifications de bureau",
-  "pricing.features.onPremise": "Services hébergés sur place et autres",
-  "pricing.features.recipes": "Choisissez parmi de plus de 70 services",
-  "pricing.features.serviceProxies": "Service Proxy",
-  "pricing.features.spellchecker": "Support du correcteur orthographique",
-  "pricing.features.teamManagement": "Gestion d'équipe",
-  "pricing.features.thirdPartyServices": "Installer des services tiers",
-  "pricing.features.unlimitedServices": "Ajouter des services illimités",
-  "pricing.features.workspaces": "Espace de travail",
  "service.crashHandler.action": "Recharger {name}",
  "service.crashHandler.autoReload": "Tentative de restauration automatique de {name} dans {seconds} secondes",
  "service.crashHandler.headline": "Oh non!",
@@ -190,7 +178,7 @@
  "settings.account.deleteInfo": "Si vous n'avez plus besoin de votre compte Ferdi, vous pouvez le supprimer avec toutes ses données associées.",
  "settings.account.headline": "Compte",
  "settings.account.headlineAccount": "Informations sur le compte",
-  "settings.account.headlineDangerZone": "Zone dangereuse",
+  "settings.account.headlineDangerZone": "Zone à risque",
  "settings.account.headlineInvoices": "Factures",
  "settings.account.headlinePassword": "Changer le mot de passe",
  "settings.account.headlineProfile": "Mettre à jour le profil",
@@ -198,16 +186,16 @@
  "settings.account.tryReloadServices": "Réessayer",
  "settings.account.tryReloadUserInfoRequest": "Réessayer",
  "settings.account.userInfoRequestFailed": "Impossible de charger les informations de l'utilisateur",
-  "settings.account.yourLicense": "Votre licence Ferdi",
+  "settings.account.yourLicense": "Votre licence Ferdi :",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Vider le cache",
  "settings.app.buttonInstallUpdate": "Redémarrer et installer la mise à jour",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Afficher le dossier du profil",
  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
  "settings.app.buttonSearchForUpdate": "Vérifier les mises à jour",
  "settings.app.cacheInfo": "Le cache de Ferdi occupe actuellement {size} en espace disque.",
  "settings.app.cacheNotCleared": "Impossible de vider toute la cache",
-  "settings.app.closeSettings": "Close settings",
+  "settings.app.closeSettings": "Fermer les paramètres",
  "settings.app.currentVersion": "Version actuelle :",
  "settings.app.form.accentColor": "Couleur d'accentuation",
  "settings.app.form.adaptableDarkMode": "Synchroniser le mode sombre avec l'option mode sombre du système",
@@ -219,13 +207,13 @@
  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
  "settings.app.form.closeToSystemTray": "Afficher Ferdi dans la barre d'état système",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "Serveur Todo personnalisé",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
  "settings.app.form.darkMode": "Activer le mode sombre",
  "settings.app.form.enableGPUAcceleration": "Activer l'accélération GPU",
  "settings.app.form.enableLock": "Activer le verrouillage par mot de passe",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Activer la vérification orthographique",
-  "settings.app.form.enableSystemTray": "Afficher Ferdi dans la barre d'état système",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Activer Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Garder les services en veille prolongée au démarrage",
  "settings.app.form.hibernationStrategy": "Stratégie d'hibernation",
@@ -251,9 +239,10 @@
  "settings.app.form.showDisabledServices": "Afficher les onglets des services désactivés",
  "settings.app.form.showDragArea": "Afficher les zones de glisser-déposer dans la fenêtre",
  "settings.app.form.showMessagesBadgesWhenMuted": "Afficher les badges de messages non lus quand les notifications sont désactivées",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Démarrage minimisé",
  "settings.app.form.universalDarkMode": "Activer le mode sombre universel",
-  "settings.app.form.useTouchIdToUnlock": "Autoriser l'utilisation de TouchID pour déverrouiller Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.form.useVerticalStyle": "Use horizontal style",
  "settings.app.form.wakeUpStrategy": "Wake up strategy",
  "settings.app.headlineAdvanced": "Paramètres avancés",
@@ -267,7 +256,7 @@
  "settings.app.languageDisclaimer": "Les traductions officielles sont l'anglais et l'allemand. Toutes les autres langues sont des traductions faites par la communauté.",
  "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 {lockShortcut}.",
  "settings.app.lockedPassword": "Mot de passe",
-  "settings.app.lockedPasswordInfo": "S'il vous plaît soyez sûre de mettre un mot de passe que vous allez vous rappelez.\nSi vous perdez ce mot de passe vous allez devoir réinstaller Ferdi.",
+  "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.restartRequired": "Les modifications nécessitent un redémarrage",
  "settings.app.scheduledDNDInfo": "Planifier le Ne-pas-Déranger vous permet de définir une période de temps dans lequel vous ne voulez pas de notifications de Ferdi.",
  "settings.app.scheduledDNDTimeInfo": "Le temps est en format 24 heures. La fin du temps peut être avant le début du temps (ex: début 17:00, fin 09:00) pour activer le Ne-pas-Déranger durant la nuit.",
@@ -275,7 +264,7 @@
  "settings.app.spellCheckerLanguageInfo": "Ferdi utilise le correcteur orthographique intégré de votre Mac pour vérifier les fautes de frappe. Si vous voulez changer les langues pour lesquelles le correcteur vérifie l'orthographe, vous pouvez le faire dans les préférences système de votre Mac.",
  "settings.app.subheadlineCache": "Cache",
  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Ce serveur sera utilisé pour la fonctionnalité \"Ferdi Todo\".",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
  "settings.app.translationHelp": "Aidez-nous à traduire Ferdi dans votre langue.",
  "settings.app.universalDarkModeInfo": "Le mode sombre universel tente de générer dynamiquement des styles de mode sombre pour les services qui ne sont pas encore supportés.",
  "settings.app.updateStatusAvailable": "Mise à jour disponible, téléchargement en cours...",
@@ -294,9 +283,9 @@
  "settings.recipes.customService.headline.communityRecipes": "Recettes tiers communautaire",
  "settings.recipes.customService.headline.customRecipes": "Recettes tiers modifiées",
  "settings.recipes.customService.headline.devRecipes": "Vos recettes de service de développement",
-  "settings.recipes.customService.intro": "Pour ajouter un service modifié, copié la recette à:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Documentation de Développeur",
-  "settings.recipes.customService.openFolder": "Ouvrir le dossier",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Services disponibles",
  "settings.recipes.missingService": "Un service est manquant?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Luminosité de Dark Reader",
  "settings.service.form.darkReaderContrast": "Contraste de Dark Reader",
  "settings.service.form.darkReaderSepia": "Sepia de Dark Reader",
-  "settings.service.form.deleteButton": "Supprimer le service",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Modifier {name}",
  "settings.service.form.enableAudio": "Activer l'audio",
  "settings.service.form.enableBadge": "Afficher le badge des messages non lus",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "Quand activé, les services seront éteints après un moment pour économiser les ressources systèmes.",
  "settings.service.form.isMutedInfo": "Lorsque désactivé, tous les sons de notifications ainsi que l'audio sont coupés",
  "settings.service.form.name": "Nom",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Ouvrir darkmode.css",
  "settings.service.form.openUserCss": "Ouvrir user.css",
  "settings.service.form.openUserJs": "Ouvrir user.js",
  "settings.service.form.proxy.headline": "Paramètres proxy HTTP/HTTPS",
  "settings.service.form.proxy.host": "Hôte/IP du proxy",
-  "settings.service.form.proxy.info": "Les paramètres de proxy ne seront pas synchronisés avec les serveurs de Ferdi.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Utiliser un proxy",
-  "settings.service.form.proxy.password": "Mot de passe (facultatif)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Veuillez redémarrer Ferdi après avoir modifié les paramètres proxy.",
-  "settings.service.form.proxy.user": "Utilisateur (facultatif)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Vos fichiers utilisateur seront insérés dans la page Web afin que vous puissiez personnaliser les services comme vous le souhaitez. Les fichiers utilisateurs sont stockés localement et ne sont pas transférés à d'autres ordinateurs en utilisant le même compte.",
  "settings.service.form.saveButton": "Enregistrer le service",
  "settings.service.form.tabHosted": "Hébergé",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Découvrir les services",
  "settings.services.headline": "Vos services",
  "settings.services.noServicesAdded": "Commencez par ajouter un service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Impossible de charger vos services",
  "settings.services.tooltip.isDisabled": "Ce service est désactivé",
  "settings.services.tooltip.isMuted": "Tous les sons sont coupés",
@@ -362,12 +353,12 @@
  "settings.supportFerdi.aboutIntro": "<p>Ferdi est une application open-source et dirigée par la communauté.</p><p>Merci à toutes les personnes qui rendent cela possible :</p>",
  "settings.supportFerdi.bannerText": "Voulez-vous nous aider à améliorer Ferdi ?",
  "settings.supportFerdi.headline": "À propos de Ferdi",
-  "settings.supportFerdi.openSurvey": "Ouvrir l'enquête",
+  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "Si vous avez envie de soutenir le développement de Ferdi par un don, vous pouvez le faire via",
  "settings.supportFerdi.textDonationAnd": "et",
  "settings.supportFerdi.textExpenses": "Bien que les bénévoles fassent la majeure partie du travail, nous avons besoin de payer pour les serveurs et les certificats. En tant que communauté, nous sommes totalement transparents sur les fonds que nous collectons et dépensons - voir nos",
  "settings.supportFerdi.textGitHubSponsors": "Sponsors sur GitHub",
-  "settings.supportFerdi.textListContributors": "Liste complète des contributeurs",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
  "settings.supportFerdi.textListContributorsHere": "ici",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
  "settings.supportFerdi.textSupportWelcome": "Toute aide est toujours la bienvenue. Vous pouvez trouver une liste de l'aide dont nous avons besoin",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Non-lucratif",
  "settings.user.form.currentPassword": "Mot de passe actuel",
  "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Prénom",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Nom",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Nouveau mot de passe",
  "settings.workspace.add.form.name": "Nom",
  "settings.workspace.add.form.submitButton": "Créer l'espace de travail",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Réessayer",
  "settings.workspaces.updatedInfo": "Vos modifications ont été enregistrées",
  "settings.workspaces.workspaceFeatureHeadline": "Présentation des Espaces de travail de Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "Les Espaces de travail de Ferdi vous permettant de rester concentré sur ce qui est important. Créez différents groupes de services et naviguez facilement entre eux à n'importe quel moment. Vous décidez de quels services vous avez besoin, où et quand, ainsi nous pouvons vous aider à rester concentré sur votre travail - ou à le quitter dès que vous le souhaitez.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Impossible de charger vos espaces de travail",
  "setupAssistant.headline": "Commençons",
  "setupAssistant.subheadline": "Choisissez parmi nos services les plus utilisés et revenez maintenant sur votre messagerie.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Activer les notifications et les sons",
  "signup.email.label": "Adresse Email",
  "signup.emailDuplicate": "Cette adresse email est déjà utilisée",
-  "signup.firstname.label": "Prénom",
+  "signup.firstname.label": "First Name",
  "signup.headline": "S'inscrire",
-  "signup.lastname.label": "Nom",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "En créant un compte Ferdi, vous acceptez la",
  "signup.legal.privacy": "Déclaration de confidentialité",
  "signup.legal.terms": "Conditions d'utilisation",
@@ -430,11 +421,11 @@
  "signup.password.label": "Mot de passe",
  "signup.submit.label": "Créer un compte",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Supprimer le service",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Désactiver l'audio",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Désactiver les notifications",
-  "tabs.item.disableService": "Désactiver le service",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Activer l'audio",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Activer les notifications",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Actualiser",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} n'est pas valide",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} doit contenir au moins {length} caractère(s)",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Au moins un de ces champs est requis",
-  "validation.required": "{field} est requis",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} n'est pas une URL valide",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Revenir",
  "webControls.forward": "Avancer",
  "webControls.goHome": "Accueil",
@@ -454,12 +445,12 @@
  "webControls.reload": "Actualiser",
  "welcome.loginButton": "Se connecter sur son compte",
  "welcome.signupButton": "Créer un compte gratuit",
-  "workspaceDrawer.addNewWorkspaceLabel": "Ajouter un nouvel espace de travail",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Tous les services",
  "workspaceDrawer.headline": "Espace de travail",
  "workspaceDrawer.item.contextMenuEdit": "Modifier",
  "workspaceDrawer.item.noServicesAddedYet": "Aucun services ajoutés pour l'instant",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Les Espaces de travail de Ferdi vous permettant de rester concentré sur ce qui est important. Créez différents groupes de services et naviguez facilement entre eux à n'importe quel moment.</p><p>Vous décidez de quels services vous avez besoin, où et quand, ainsi nous pouvons vous aider à rester concentré sur votre travail - ou à le quitter dès que vous le souhaitez.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Éditer les paramètres de l'espace de travail",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Changement vers"
 }
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index a78c90771..46dc1acc4 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Athlódáil",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Freastalaí saincheaptha",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "Search...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Ní féidir nascadh le seirbhísí Ferdi ar líne",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Cealaigh",
+  "global.cancel": "Cancel",
  "global.edit": "Cuir in eagar",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Níl tú nasctha leis an Idirlíon.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Socruithe",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Use System Default ({default})",
  "global.spellchecking.autodetect": "Detect language automatically",
  "global.spellchecking.autodetect.short": "Automatic",
  "global.spellchecking.language": "Spell checking language",
-  "global.submit": "Cuir isteach",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Iompórtáil do sheirbhísí Ferdi 4",
  "import.notSupportedHeadline": "Níl na seirbhísí seo taca ag Ferdi 5 go fóill",
  "import.skip.label": "Ba mhaith liom seirbhísí a chur de láimh",
-  "import.submit.label": "Iompórtáil seirbhísí",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Cad atá nua?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Atosaigh ⁊ suiteáil nuashonrú",
  "infobar.buttonReloadServices": "Athlódáil seirbhísí",
  "infobar.hide": "Cuir Ferdi i bhfolach",
@@ -75,7 +74,7 @@
  "login.email.label": "Seoladh ríomhphoist",
  "login.headline": "Logáil isteach",
  "login.invalidCredentials": "Seoladh ríomhphoist nó pasfhocal neamhbhailí",
-  "login.link.password": "Athshocraigh pasfhocal",
+  "login.link.password": "Reset password",
  "login.link.signup": "Cruthaigh cuntas saor in aisce",
  "login.password.label": "Password",
  "login.serverLogout": "D'éag do sheisiún, logáil isteach arís le do thoil.",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Téarmaí tagartha",
  "menu.services": "Seirbhísí",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Gach seirbhís",
  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
  "password.email.label": "Seoladh ríomhphoist",
-  "password.headline": "Athshocraigh pasfhocal",
+  "password.headline": "Reset password",
  "password.link.login": "Logáil isteach i do chuntas",
  "password.link.signup": "Cruthaigh cuntas saor in aisce",
-  "password.noUser": "Níor aimsíodh úsáideoir leis an seoladh ríomhphoist seo",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Seiceáil do chuid ríomhphoist le do thoil",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Athlódáil {name}",
  "service.crashHandler.autoReload": "Ag iarraidh {name} a thabhairt ar ais go huathoibríoch i gceann {seconds} shoicind",
  "service.crashHandler.headline": "Oró, ní hea!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Fáilte go Ferdi",
-  "settings.account.account.editButton": "Cuir cuntas in eagar",
+  "settings.account.account.editButton": "Edit 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": "Nuashonraigh próifíl",
@@ -189,16 +177,16 @@
  "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!",
  "settings.account.deleteInfo": "Más rud é nár ghá cuntas Ferdi a bheith agat a thuilleadh, is féidir do chuntas agus gach sonraí riachtanach a scriosadh anseo.",
  "settings.account.headline": "Cuntas",
-  "settings.account.headlineAccount": "Eolas faoin gcuntas",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Scrios cuntas",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Sonraisc",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Athraigh pasfhocal",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Nuashonraigh próifíl",
  "settings.account.successInfo": "Sábháladh do chuid athruithe",
  "settings.account.tryReloadServices": "Atriail",
  "settings.account.tryReloadUserInfoRequest": "Atriail",
  "settings.account.userInfoRequestFailed": "Ní féidir eolas úsáideora a lódáil",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Glan taisce",
  "settings.app.buttonInstallUpdate": "Atosaigh ⁊ suiteáil nuashonrú",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Cumasaigh luasghéarú APG",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Cumasaigh seiceáil litrithe",
-  "settings.app.form.enableSystemTray": "Taispeáin Ferdi i dtráidire an chórais",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Taispeáin tabanna do sheirbhísí dhíchumasaithe",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Taispeáin teachtaireachtaí neamhléite, nuair a dhíchumasaítear fógraí",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Scrios seirbhís",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Cuir {name} in eagar",
  "settings.service.form.enableAudio": "Cumasaigh fuaim",
  "settings.service.form.enableBadge": "Taispeáin comhartha do theachtaireachtaí neamhléite",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Tachtar gach fuaim fógraí agus athchasadh fuaime",
  "settings.service.form.name": "Ainm",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Aimsigh seirbhísí",
  "settings.services.headline": "Do sheirbhísí",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Seirbhís díchumasaithe",
  "settings.services.tooltip.isMuted": "Tachtar gach fuaim",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Neamhbhrabúis",
  "settings.user.form.currentPassword": "Pasfhocal reatha",
  "settings.user.form.email": "Ríomhphost",
-  "settings.user.form.firstname": "Céadainm",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Sloinne",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Pasfhocal nua",
  "settings.workspace.add.form.name": "Ainm",
  "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Cumasaigh fógraí ⁊ fuaim",
  "signup.email.label": "Seoladh ríomhphoist",
  "signup.emailDuplicate": "Tá úsáideoir leis an seoladh ríomhphoist sin cheana féin",
-  "signup.firstname.label": "Céadainm",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Cláraigh",
-  "signup.lastname.label": "Sloinne",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Agus tú ag cruthú cuntas Ferdi glacann tú le",
  "signup.legal.privacy": "Ráiteas phríobháideachais",
  "signup.legal.terms": "Tearmaí seirbhíse",
@@ -430,11 +421,11 @@
  "signup.password.label": "Password",
  "signup.submit.label": "Cruthaigh cuntas",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Scrios seirbhís",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Díchumasaigh fuaim",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Díchumasaigh fógraí",
-  "tabs.item.disableService": "Díchumasaigh seirbhís",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Cumasaigh fuaim",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Cumasaigh fógraí",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Athlódáil",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "Níl {field} neamhbhailí",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "Ba cheart go mbeadh {field} ar a laghad {length} charactar fada",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "At least one is required",
-  "validation.required": "Tá {field} de dhíth",
+  "validation.required": "{field} is required",
-  "validation.url": "Ní AAA bhailí é {field}",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Back",
  "webControls.forward": "Forward",
  "webControls.goHome": "Home",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 79e1532b5..5bec0bf13 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "רענן",
-  "app.errorHandler.headline": "משהו השתבש",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "שרת מותאם אישית",
  "changeserver.headline": "החלף שרת",
  "changeserver.label": "שרת",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "מה קרה?",
  "connectionLostBanner.message": "הו לא! פרדי איבד את החיבור ל {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "פרסם את פרטי ניפוי השגיאות",
  "feature.nightlyBuilds.activate": "הפעל",
  "feature.nightlyBuilds.info": "גרסאות נייטלי הם גרסאות נסיוניות ביותר של פרדי, העשויות להכיל פיצ'רים בלתי גמורים. גרסאות אלה מיועדות בעיקר לשימוש מפתחים על מנת לנסות את הפיצ'רים החדשים הנמצאים בפיתוח - לפני הכנסתם לגרסה הסופית. אם אתה לא יודע מה אתה עושה, אנו ממליצים שלא תפעיל את האופציה הזאת.",
  "feature.nightlyBuilds.title": "גרסאות נייטלי",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "בחר שירות עם מקש ה TAB, ↑ ו ↓. פתח שירות באמצעות מקש ה ENTER.",
  "feature.quickSwitch.search": "חיפוש...",
  "feature.quickSwitch.title": "החלפה מהירה",
-  "global.api.unhealthy": "לא ניתן להתחבר לשרותי האינטרנת של Ferdi",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "בטל",
+  "global.cancel": "Cancel",
  "global.edit": "ערוך",
  "global.no": "No",
  "global.notConnectedToTheInternet": "נראה שאתה לא מחובר לאינטרנט.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "הגדרות",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "השתמש בברירת המחדל של המערכת ({default})",
  "global.spellchecking.autodetect": "זהה שפה באופן אוטומטי",
  "global.spellchecking.autodetect.short": "אוטומטי",
  "global.spellchecking.language": "שפה לבדיקת איות",
-  "global.submit": "שלח",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "סוכן משתמש",
  "global.yes": "Yes",
  "import.headline": "ייבא את השירותים שלך מפרדי גרסה 4",
  "import.notSupportedHeadline": "השירות עדיין אינו נתמך בפרדי גרסה 5",
  "import.skip.label": "אני רוצה להוסיף שירותים באופן ידני",
-  "import.submit.label": "ייבא שירותים",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "אירעה שגיאה בניסיון ההתחברות. נסה להתנתק ולהתחבר מחדש.",
-  "infobar.buttonChangelog": "מה חדש?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "הפעל מחדש והתקן עדכונים",
  "infobar.buttonReloadServices": "טען מחדש את השירותים",
  "infobar.hide": "הסתר",
@@ -75,7 +74,7 @@
  "login.email.label": "כתובת דוא\"ל",
  "login.headline": "התחבר",
  "login.invalidCredentials": "כתובת הדוא\"ל או הסיסמא אינם תקינים",
-  "login.link.password": "איפוס סיסמה",
+  "login.link.password": "Reset password",
  "login.link.signup": "צור חשבון חדש בחינם",
  "login.password.label": "סיסמא",
  "login.serverLogout": "פג תוקף ההתחברות, אנא התחבר שוב.",
@@ -117,10 +116,10 @@
  "menu.help.support": "תמיכה",
  "menu.help.tos": "תנאי שימוש",
  "menu.services": "שירותים",
-  "menu.services.activatePreviousService": "הפעל את השירות הקודם",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "הוסף שירות חדש",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "בית",
-  "menu.services.setNextServiceActive": "הפעל את השירות הבא",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "משימות",
  "menu.todos.enableTodos": "אפשר משימות",
  "menu.view": "הצג",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "כל השירותים",
  "menu.workspaces.openWorkspaceDrawer": "פתח את סרגל סביבות העבודה",
  "password.email.label": "כתובת דוא\"ל",
-  "password.headline": "איפוס סיסמה",
+  "password.headline": "Reset password",
  "password.link.login": "היכנס לחשבונך",
  "password.link.signup": "צור חשבון חדש בחינם",
-  "password.noUser": "לא נמצא משתמש עם כתובת הדוא\"ל הזאת",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "אנא בדוק את הדוא\"ל שלך",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "סנכון החשבון",
-  "pricing.features.customWebsites": "הוסף אתרים מותאמים אישית",
-  "pricing.features.desktopNotifications": "התראות שולחן העבודה",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "בחר מתוך יותר מ 70 שירותים",
-  "pricing.features.serviceProxies": "פרוקסי לשירותים",
-  "pricing.features.spellchecker": "תמיכה בבדיקת איות",
-  "pricing.features.teamManagement": "ניהול צוות",
-  "pricing.features.thirdPartyServices": "התקן שירותי צד שלישי",
-  "pricing.features.unlimitedServices": "הוסף שירותים בלי הגבלה",
-  "pricing.features.workspaces": "סביבות עבודה",
  "service.crashHandler.action": "טען מחדש {name}",
  "service.crashHandler.autoReload": "מנסה לשחזר את {name} באופן אוטומטי בעוד {seconds} שניות",
  "service.crashHandler.headline": "הו, לא!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "השתמש בפרדי ללא חשבון",
  "services.welcome": "ברוך הבא לפרדי",
-  "settings.account.account.editButton": "ערוך את החשבון",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "החשבון אינו זמין",
  "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": "עדכן פרופיל",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
  "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
  "settings.account.headline": "חשבון",
-  "settings.account.headlineAccount": "פרטי חשבון",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "אזור מסוכן",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "חשבוניות",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "שנה סיסמה",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "עדכן פרופיל",
  "settings.account.successInfo": "השינויים שלך נשמרו",
  "settings.account.tryReloadServices": "נסה שוב",
  "settings.account.tryReloadUserInfoRequest": "נסה שוב",
  "settings.account.userInfoRequestFailed": "אי אפשר לטעון את פרטי המשתמש",
-  "settings.account.yourLicense": "רישיון הפרדי שלך",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "ניקוי המטמון",
  "settings.app.buttonInstallUpdate": "הפעל מחדש והתקן עדכונים",
@@ -219,13 +207,13 @@
  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "שרת מותאם אישית לרשימת המשימות",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
  "settings.app.form.darkMode": "אפשר מצב לילה",
  "settings.app.form.enableGPUAcceleration": "אפשר האצת חומרה (GPU)",
  "settings.app.form.enableLock": "אפשר נעילה באמצעות סיסמא",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "הפעל בדיקת איות",
-  "settings.app.form.enableSystemTray": "הצג את פרדי בסרגל הכלים",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "אפשר את רשימת המשימות של Ferdi",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "התחלה במצב ממוזער",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -296,7 +285,7 @@
  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "תיעוד למפתחים",
-  "settings.recipes.customService.openFolder": "פתח תיקיה",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "שירותים זמינים",
  "settings.recipes.missingService": "לא מוצא את השירות שלך?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "מחק שירות",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "ערוך {name}",
  "settings.service.form.enableAudio": "אפשר אודיו",
  "settings.service.form.enableBadge": "הצג חיווי על הודעות שלא נקראו",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "שם",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "פתח את darkmode.css",
  "settings.service.form.openUserCss": "פתח את user.css",
  "settings.service.form.openUserJs": "פתח את user.js",
  "settings.service.form.proxy.headline": "הגדרות פרוקסי ל HTTP/HTTPS",
  "settings.service.form.proxy.host": "מארח\\IP פרוקסי",
-  "settings.service.form.proxy.info": "הגדרות הפרוקסי לא יסונכרנו עם שרתי פרדי.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "השתמש בפרוקסי",
-  "settings.service.form.proxy.password": "סיסמה (אופציונלית)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "פורט",
  "settings.service.form.proxy.restartInfo": "אנא הפעל מחדש את פרדי אחרי שינוי הגדרות פרוקסי.",
-  "settings.service.form.proxy.user": "משתמש (אופציונלי)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "קבצי המשתמש שלך יוכנסו לתוך דף האינטרנט על מנת שתוכל להתאים את השירותים שלך כפי שתרצה. קבצי משתמש מאוחסנים לוקאלית ואינם מועברים למחשבים אחרים המשתמשים באותו חשבון.",
  "settings.service.form.saveButton": "שמור שירות",
  "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "גלה שירותים חדשים",
  "settings.services.headline": "השירותים שלך",
  "settings.services.noServicesAdded": "התחל להוסיף שירותים.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "לא נית לטעון את השירותים שלך",
  "settings.services.tooltip.isDisabled": "השירות מושבת",
  "settings.services.tooltip.isMuted": "כל הצלילים מושתקים",
@@ -362,12 +353,12 @@
  "settings.supportFerdi.aboutIntro": "<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
  "settings.supportFerdi.bannerText": "האם תרצה לעזור לנו לשפר את פרדי?",
  "settings.supportFerdi.headline": "אודות פרדי",
-  "settings.supportFerdi.openSurvey": "פתח סקר",
+  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "אם תרצה לתמוך בפרדי באמצעות תרומה, אתה יכול לעשות זאת גם,",
  "settings.supportFerdi.textDonationAnd": "וגם",
  "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
  "settings.supportFerdi.textGitHubSponsors": "תומכים בגיטהאב",
-  "settings.supportFerdi.textListContributors": "רשימת התומכים המלאה",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
  "settings.supportFerdi.textListContributorsHere": "כאן",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "ללא כוונת רווח",
  "settings.user.form.currentPassword": "הסיסמא הנוכחית",
  "settings.user.form.email": "דוא\"ל",
-  "settings.user.form.firstname": "שם פרטי",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "שם משפחה",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "סיסמא חדשה",
  "settings.workspace.add.form.name": "שם",
  "settings.workspace.add.form.submitButton": "צור סביבת עבודה",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "אפשר התראות ואודיו",
  "signup.email.label": "כתובת דוא\"ל",
  "signup.emailDuplicate": "כבר קיים חשבון עם כתובת דוא\"ל זו",
-  "signup.firstname.label": "שם פרטי",
+  "signup.firstname.label": "First Name",
  "signup.headline": "הרשם",
-  "signup.lastname.label": "שם משפחה",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "ביצירת חשבון פרדי אתה מסכים ל",
  "signup.legal.privacy": "הצהרת פרטיות",
  "signup.legal.terms": "תנאי שימוש",
@@ -430,11 +421,11 @@
  "signup.password.label": "סיסמא",
  "signup.submit.label": "צור חשבון",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "מחק שירות",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "כבה אודיו",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "כבה התראות",
-  "tabs.item.disableService": "כבה שירות",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "אפשר אודיו",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "אפשר התראות",
@@ -454,12 +445,12 @@
  "webControls.reload": "רענן",
  "welcome.loginButton": "התחבר לחשבון שלך",
  "welcome.signupButton": "צור חשבון חדש בחינם",
-  "workspaceDrawer.addNewWorkspaceLabel": "הוסף סביבת עבודה חדשה",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "כל השירותים",
  "workspaceDrawer.headline": "סביבות עבודה",
  "workspaceDrawer.item.contextMenuEdit": "ערוך",
  "workspaceDrawer.item.noServicesAddedYet": "לא נוספו שירותים…",
  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "הגדרות סביבת עבודה",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "מעבר ל"
 }
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index be9bbb961..812ec8c4c 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Custom server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -45,7 +44,7 @@
  "import.headline": "Import your Ferdi 4 services",
  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
  "import.skip.label": "I want to add services manually",
-  "import.submit.label": "Import services",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Restart & install update",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Terms of Service",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -152,18 +151,7 @@
  "password.link.login": "Sign in to your account",
  "password.link.signup": "Create a free account",
  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Please check your email",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
  "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
  "settings.account.tryReloadServices": "Try again",
  "settings.account.tryReloadUserInfoRequest": "Try again",
  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Clear cache",
  "settings.app.buttonInstallUpdate": "Restart & install update",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index f7e046ed9..6dcd65032 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Ponovno učitavanje",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Prilagođen server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "Search...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Nije se moguće povezati na Francove on-line servise. ",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Odustani",
+  "global.cancel": "Cancel",
  "global.edit": "Uredi",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Sada ste povezani s internetom. ",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Postavke",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Use System Default ({default})",
  "global.spellchecking.autodetect": "Detect language automatically",
  "global.spellchecking.autodetect.short": "Automatic",
  "global.spellchecking.language": "Spell checking language",
-  "global.submit": "Pošalji",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Uvezite svoje Franc 4 servise. ",
  "import.notSupportedHeadline": "Franc 5 trenutno ne podržava taj servis",
  "import.skip.label": "Želim ručno dodati ove usluge",
-  "import.submit.label": "Uvezi servise",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Šta je novo?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Ponovo pokreni i instaliraj ažuriranje",
  "infobar.buttonReloadServices": "Ponovo učitaj servise",
  "infobar.hide": "Hide",
@@ -75,7 +74,7 @@
  "login.email.label": "Vaša e-adresa:",
  "login.headline": "Prijavite se",
  "login.invalidCredentials": "E-mail ili lozinka nisu točni",
-  "login.link.password": "Stvaranje nove lozinke",
+  "login.link.password": "Reset password",
  "login.link.signup": "Stvorite besplatan račun",
  "login.password.label": "Password",
  "login.serverLogout": "Vaša sesija je istekla, prijavite se ponovo.",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Terms of Service",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Sve usluge",
  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
  "password.email.label": "Vaša e-adresa:",
-  "password.headline": "Stvaranje nove lozinke",
+  "password.headline": "Reset password",
  "password.link.login": "Prijavite se na Vaš račun",
  "password.link.signup": "Stvorite besplatan račun",
-  "password.noUser": "Ne postoji ni jedan korisnik s tom e-mail adresom",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Molimo Vas da provjerite svoju e-mail adresu",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Osvježi okvir",
  "service.crashHandler.autoReload": "Pokušati ću automatski povratiti {name} u {seconds} sekundi",
  "service.crashHandler.headline": "O, ne! ",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Dobrodošli u Ferdi",
-  "settings.account.account.editButton": "Uredi račun",
+  "settings.account.account.editButton": "Edit 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": "Ažuriraj profil",
@@ -189,16 +177,16 @@
  "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. ",
  "settings.account.deleteInfo": "Ako više ne trebate Ferdi račun, ovdje možete obrisati sve vezane podatke kao i račun.",
  "settings.account.headline": "Korisnički račun",
-  "settings.account.headlineAccount": "Informacije o računu",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Opasnost",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Fakture",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Promijenite lozinku",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Ažuriraj profil",
  "settings.account.successInfo": "Vaše promjene su spremljene",
  "settings.account.tryReloadServices": "Pokušajte ponovno",
  "settings.account.tryReloadUserInfoRequest": "Pokušajte ponovno",
  "settings.account.userInfoRequestFailed": "Nije moguće učitati informacije o korisniku",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Očisti memoriju",
  "settings.app.buttonInstallUpdate": "Ponovo pokreni i instaliraj ažuriranje",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa",
-  "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Prikaži ploče s onemogućenim servisima",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Pokaži nepročitane značke poruka kad se obavještenja onemoguće",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Izbriši uslugu",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Uredite {name}",
  "settings.service.form.enableAudio": "Omogućite zvuk",
  "settings.service.form.enableBadge": "Show unread message badges",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti nečujna. ",
  "settings.service.form.name": "Ime",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Pronađite usluge",
  "settings.services.headline": "Vaše usluge",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Usluga je onemogućena. ",
  "settings.services.tooltip.isMuted": "Svi zvukovi su onemogućeni. ",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Neprofitno ",
  "settings.user.form.currentPassword": "Trenutna lozinka:",
  "settings.user.form.email": "E-pošta",
-  "settings.user.form.firstname": "Ime",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Prezime",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Nova lozinka",
  "settings.workspace.add.form.name": "Ime",
  "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Omogući obavijesti i zvuk",
  "signup.email.label": "Vaša e-adresa:",
  "signup.emailDuplicate": "Već postoji korisnik s tom e-mail adresom",
-  "signup.firstname.label": "Ime",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Prijava",
-  "signup.lastname.label": "Prezime",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Prilikom stvaranja Ferdi računa, slažete se sa sljedećim stavkama:",
  "signup.legal.privacy": "Izjava o privatnosti ",
  "signup.legal.terms": "Uvjeti korištenja",
@@ -430,11 +421,11 @@
  "signup.password.label": "Password",
  "signup.submit.label": "Napravite novi račun",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Izbriši uslugu",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Onemogući zvuk",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Onemogući obavijesti",
-  "tabs.item.disableService": "Onemogući servis",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Omogućite zvuk",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Omogućite obavijesti",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 84c8496b8..8d83fea42 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Újratöltés",
-  "app.errorHandler.headline": "Valami nem jött össze",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Egyéni szerver",
  "changeserver.headline": "Szerver megváltoztatása",
  "changeserver.label": "Szerver",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Mi történt?",
  "connectionLostBanner.message": "Ja ne! Ferdi nem tud kapcsolodni {name}-hez.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Hibakeresési napló publikálása",
  "feature.nightlyBuilds.activate": "Aktiválás",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly verziók",
@@ -24,30 +23,30 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "Keresés...",
  "feature.quickSwitch.title": "Gyorsváltó",
-  "global.api.unhealthy": "Nem lehet csatlakozni a Ferdi online szolgáltatáshoz",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Mégsem",
+  "global.cancel": "Cancel",
  "global.edit": "Szerkesztés",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Nincs hálózati kapcsolat.",
  "global.ok": "Ok",
-  "global.quit": "Kilépés",
+  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Beállítások",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Rendszer alapbeállítás használata ({default})",
  "global.spellchecking.autodetect": "Automatikus nyelvdetektálás",
  "global.spellchecking.autodetect.short": "Automatikus",
  "global.spellchecking.language": "Helyesírás-ellenőrző nyelve",
-  "global.submit": "Küldés",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Importáld szolgáltatásaidat a Ferdi 4-ből",
  "import.notSupportedHeadline": "Még nem támogatott szolgáltatások a Ferdi 5-ben",
  "import.skip.label": "Manuálisan szeretném hozzáadni a szolgáltatásokat",
-  "import.submit.label": "Szolgáltatások importálása",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Mi változott?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Újraindítás és frissítés telepítése",
  "infobar.buttonReloadServices": "Szolgáltatások újratöltése",
  "infobar.hide": "Elrejt",
@@ -75,7 +74,7 @@
  "login.email.label": "Email cím",
  "login.headline": "Bejelentkezés",
  "login.invalidCredentials": "Hibás email cím vagy jelszó",
-  "login.link.password": "Jelszó visszaállítás",
+  "login.link.password": "Reset password",
  "login.link.signup": "Új fiók létrehozása",
  "login.password.label": "Jelszó",
  "login.serverLogout": "A munkamenet lejárt, kérlek lépj be újra.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Támogatás",
  "menu.help.tos": "Felhasználói feltételek",
  "menu.services": "Szolgáltatások",
-  "menu.services.activatePreviousService": "Előző szolgáltatás",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Kezdőlap",
-  "menu.services.setNextServiceActive": "Következő szolgáltatás",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Tennivalók",
  "menu.todos.enableTodos": "Enable Todos",
  "menu.view": "Nézet",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Összes szolgáltatás",
  "menu.workspaces.openWorkspaceDrawer": "Munkaterület panel kinyitása",
  "password.email.label": "Email cím",
-  "password.headline": "Jelszó visszaállítás",
+  "password.headline": "Reset password",
  "password.link.login": "Jelentkezz be a fiókodba",
  "password.link.signup": "Új fiók létrehozása",
-  "password.noUser": "Nem található felhasználó a megadott email címmel",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Ellenőrizd az email fiókodat",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Fiók szinkronizálás",
-  "pricing.features.customWebsites": "Egyéni weboldalak megadása",
-  "pricing.features.desktopNotifications": "Asztali értesítések",
-  "pricing.features.onPremise": "Helyi és egyéb távoli szolgáltatások",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Szolgáltatás Proxy-k",
-  "pricing.features.spellchecker": "Helyesírás-ellenőrzés támogatás",
-  "pricing.features.teamManagement": "Csapatkezelés",
-  "pricing.features.thirdPartyServices": "Harmadik féltől származó szolgáltatások használata",
-  "pricing.features.unlimitedServices": "Korlátlan szolgáltatások felvitele",
-  "pricing.features.workspaces": "Munkaterületek",
  "service.crashHandler.action": "{name} újratöltése",
  "service.crashHandler.autoReload": "{name} automatikusan helyreállítása {seconds} másodpercen belül",
  "service.crashHandler.headline": "Jajj ne!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Üdvözöl a Ferdi",
-  "settings.account.account.editButton": "Fiók szerkesztése",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "A Fiók nem érhető el",
  "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",
@@ -189,16 +177,16 @@
  "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é!",
  "settings.account.deleteInfo": "Ha még nem szeretnéd fenntartani a Ferdi-fiókodat, akkor itt törölheted minden hozzá kapcsolódó adattal együtt.",
  "settings.account.headline": "Fiók",
-  "settings.account.headlineAccount": "Fiókinformációk",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Veszélyes terület",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Számlák",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Jelszócsere",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Profil frissítése",
  "settings.account.successInfo": "A módosításokat elmentettük",
  "settings.account.tryReloadServices": "Próbáld újra",
  "settings.account.tryReloadUserInfoRequest": "Próbáld újra",
  "settings.account.userInfoRequestFailed": "A felhasználói adatok betöltése sikertelen",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Gyorsítótár törlése",
  "settings.app.buttonInstallUpdate": "Újraindítás és frissítés telepítése",
@@ -225,7 +213,7 @@
  "settings.app.form.enableLock": "Jelszavas zár engedélyezése",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Helyesírás-ellenőrzés engedélyezése",
-  "settings.app.form.enableSystemTray": "Ferdi mutatása a tálcán",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Ferdi Tennivalók bekapcsolása",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Letiltott szolgáltatások megjelenítése",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Mutassa az 'olvasatlan üzenet' jelzést, amikor az értesítések le vannak tiltva",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Indítás minimalizálva",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -294,9 +283,9 @@
  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
  "settings.recipes.customService.headline.customRecipes": "Egyéni, harmadik féltől származó receptek",
  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "Az egyéni szolgáltatás hozzáadásához, másoljuk be annak receptjét:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Fejlesztői dokumentáció",
-  "settings.recipes.customService.openFolder": "Könyvtár megnyitása",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Elérhető szolgáltatások",
  "settings.recipes.missingService": "Hiányzik egy szolgáltatás?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Szolgáltatás törlése",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "{name} szerkesztése",
  "settings.service.form.enableAudio": "Hang engedélyezése",
  "settings.service.form.enableBadge": "Mutasd az olvasatlan jelzéseket",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Ha kikapcsolod, minden értesítési és lejátszott hang némításra kerül",
  "settings.service.form.name": "Név",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "User.css megnyitása",
  "settings.service.form.openUserJs": "User.js megnyitása",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy beállítások",
  "settings.service.form.proxy.host": "Proxy hoszt/IP",
-  "settings.service.form.proxy.info": "Proxy beállítások nem szinkronizálódnak a Ferdi kiszolgálókkal.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Proxy használata",
-  "settings.service.form.proxy.password": "Jelszó (opcionális)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Kérjük indítsd újra a Ferdi-ot a proxy beállítások megváltoztatása után.",
-  "settings.service.form.proxy.user": "Felhasználó (opcionális)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "Szolgáltatás mentése",
  "settings.service.form.tabHosted": "Üzemeltetett",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Szolgáltatások felfedezése",
  "settings.services.headline": "Szolgáltatásaid",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Szolgáltatásaid betöltése sikertelen",
  "settings.services.tooltip.isDisabled": "A szolgáltatás le van tiltva",
  "settings.services.tooltip.isMuted": "Minden hang lenémítva",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Nonprofit",
  "settings.user.form.currentPassword": "Jelenlegi jelszó",
  "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Keresztnév",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Vezetéknév",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Új jelszó",
  "settings.workspace.add.form.name": "Név",
  "settings.workspace.add.form.submitButton": "Új munkaterület",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Próbáld újra",
  "settings.workspaces.updatedInfo": "A módosításokat elmentettük",
  "settings.workspaces.workspaceFeatureHeadline": "A kevesebb több: Bemutatjuk a Ferdi Munkaterületeket",
-  "settings.workspaces.workspaceFeatureInfo": "A Ferdi Munkaterületek lehetővé teszik, hogy összpontosíts a jelenleg fontos dolgokra. Állítsd be a különböző szolgáltatáskészleteket és könnyedén válthatsz közöttük bármikor. Te döntöd el, hogy mely szolgáltatásokra van szükséged, mikor és hol, így segíthetünk abban, hogy a teljesítményed csúcsán maradhass, vagy ha csak akarod, egyszerűen kikapcsold a munkával kapcsolatos dolgokat.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Nem sikerült betölteni a munkaterületeket",
  "setupAssistant.headline": "Let's get started",
  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Értesítések és hangok engedélyezése",
  "signup.email.label": "Email cím",
  "signup.emailDuplicate": "Ezzel az e-mail címmel már létezik felhasználó",
-  "signup.firstname.label": "Keresztnév",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Regisztráció",
-  "signup.lastname.label": "Vezetéknév",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "A Ferdi fiók létrehozásával elfogadod az",
  "signup.legal.privacy": "Adatvédelmi Nyilatkozatot",
  "signup.legal.terms": "Felhasználási Feltételeket",
@@ -430,23 +421,23 @@
  "signup.password.label": "Jelszó",
  "signup.submit.label": "Fiók létrehozása",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Szolgáltatás törlése",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Hang letiltása",
  "tabs.item.disableDarkMode": "Sötét mód kikapcsolása",
  "tabs.item.disableNotifications": "Értesítések letiltása",
-  "tabs.item.disableService": "Szolgáltatás letiltása",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Hang engedélyezése",
  "tabs.item.enableDarkMode": "Sötét mód bekapcsolása",
  "tabs.item.enableNotification": "Értesítések engedélyezése",
  "tabs.item.enableService": "Szolgáltatás engedélyezése",
-  "tabs.item.hibernateService": "Szlgáltatás hibernálása",
+  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Újratöltés",
-  "tabs.item.wakeUpService": "Szolgáltatás felébresztése",
+  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} nem érvényes",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} mezőnek legalább {length} karakter hosszúnak kell lennie",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Legalább egy kitöltése szükséges",
-  "validation.required": "{field} kitöltése kötelező",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} nem érvényes URL",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Vissza",
  "webControls.forward": "Előre",
  "webControls.goHome": "Kezdőlap",
@@ -454,12 +445,12 @@
  "webControls.reload": "Újratöltés",
  "welcome.loginButton": "Jelentkezz be a fiókodba",
  "welcome.signupButton": "Új fiók létrehozása",
-  "workspaceDrawer.addNewWorkspaceLabel": "Munkaterület hozzáadása",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Összes szolgáltatás",
  "workspaceDrawer.headline": "Munkaterületek",
  "workspaceDrawer.item.contextMenuEdit": "szerkeszt",
  "workspaceDrawer.item.noServicesAddedYet": "Még nincsenek hozzáadott szolgáltatások",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>A Ferdi Munkaterületek lehetővé teszik, hogy összpontosíts a jelenleg fontos dolgokra. Állítsd be a különböző szolgáltatáskészleteket és könnyedén válthatsz közöttük bármikor.</p><p>Te döntöd el, hogy mely szolgáltatásokra van szükséged, mikor és hol, így segíthetünk abban, hogy a teljesítményed csúcsán maradhass, vagy ha csak akarod, egyszerűen kikapcsold a munkával kapcsolatos dolgokat.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Munkaterület beállítások szerkesztése",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Váltás"
 }
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 7a716a00c..5a2aa1ea7 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Muat Ulang",
-  "app.errorHandler.headline": "Terjadi kesalahan",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Server khusus",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Ada apa ini?",
  "connectionLostBanner.message": "Yah! Ferdi terputus dari {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Terbitkan informasi debug",
  "feature.nightlyBuilds.activate": "Mengaktifkan",
  "feature.nightlyBuilds.info": "Nightly builds adalah versi eksperimen dari Ferdi yang mungkin berisi fitur-fitur yang masih kasar dan tidak lengkap. Nightly builds ini biasa digunakan untuk para developer untuk mengetes fitur-fitur terbaru mereka dan bagaimana fitur-fitur itu berjalan di versi terakhir. Jika anda tidak tahu apa yang anda lakukan, kami sarankan untuk tidak mengaktivasi nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "Search...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Tidak dapat tersambung ke layanan Ferdi",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Batalkan",
+  "global.cancel": "Cancel",
  "global.edit": "Edit",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Anda tidak tersambung ke internet.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Pengaturan",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Gunakan Bawaan Sistem ({default})",
  "global.spellchecking.autodetect": "Deteksi bahasa secara otomatis",
  "global.spellchecking.autodetect.short": "Otomatis",
  "global.spellchecking.language": "Periksa ejaan",
-  "global.submit": "Kirim",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Impor layanan Ferdi 4 Anda",
  "import.notSupportedHeadline": "Layanan belum didukung di Ferdi 5",
  "import.skip.label": "Saya ingin menambahkan layanan secara manual",
-  "import.submit.label": "Impor layanan",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Yang baru",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Mulai ulang & instal pembaruan",
  "infobar.buttonReloadServices": "Muat ulang layanan",
  "infobar.hide": "Sembunyikan",
@@ -75,7 +74,7 @@
  "login.email.label": "Alamat email",
  "login.headline": "Masuk",
  "login.invalidCredentials": "Email atau kata sandi tidak valid",
-  "login.link.password": "Setel ulang sandi",
+  "login.link.password": "Reset password",
  "login.link.signup": "Buat akun gratis",
  "login.password.label": "Password",
  "login.serverLogout": "Sesi Anda telah berakhir, silakan masuk kembali.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Dukungan",
  "menu.help.tos": "Ketentuan Layanan",
  "menu.services": "Layanan",
-  "menu.services.activatePreviousService": "Aktifkan layanan sebelumnya",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Aktifkan layanan berikutnya",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Enable Todos",
  "menu.view": "Tampilan",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Semua layanan",
  "menu.workspaces.openWorkspaceDrawer": "Buka laci ruang kerja",
  "password.email.label": "Alamat email",
-  "password.headline": "Setel ulang sandi",
+  "password.headline": "Reset password",
  "password.link.login": "Masuk ke akun Anda",
  "password.link.signup": "Buat akun gratis",
-  "password.noUser": "Tidak ditemukan pengguna dengan email tersebut",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Periksa email Anda",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Ruang kerja",
  "service.crashHandler.action": "Muat Ulang {name}",
  "service.crashHandler.autoReload": "Mencoba memulihkan {name} secara otomatis dalam {seconds} detik",
  "service.crashHandler.headline": "Ya Ampun!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Selamat datang di Ferdi",
-  "settings.account.account.editButton": "Edit akun",
+  "settings.account.account.editButton": "Edit 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": "Perbarui profil",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "Anda menerima email dengan tautan untuk mengonfirmasi penghapusan akun. Akun dan data Anda tidak bisa dipulihkan!",
  "settings.account.deleteInfo": "Jika Anda tidak membutuhkan akun Ferdi lagi, Anda bisa menghapus akun dan semua data terkait di sini.",
  "settings.account.headline": "Akun",
-  "settings.account.headlineAccount": "Informasi akun",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Wilayah Berbahaya",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Tagihan",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Ubah sandi",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Perbarui profil",
  "settings.account.successInfo": "Perubahan Anda telah disimpan",
  "settings.account.tryReloadServices": "Coba lagi",
  "settings.account.tryReloadUserInfoRequest": "Coba lagi",
  "settings.account.userInfoRequestFailed": "Gagal memuat informasi pengguna",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Bersihkan singgahan",
  "settings.app.buttonInstallUpdate": "Mulai ulang & instal pembaruan",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Aktifkan Mode Gelap",
  "settings.app.form.enableGPUAcceleration": "Aktifkan Akselerasi GPU",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Aktifkan pemeriksaan ejaan",
-  "settings.app.form.enableSystemTray": "Tampilkan Ferdi di baki sistem",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Tampilkan tab layanan yang dinonaktifkan",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Tampilkan lencana pesan belum dibaca saat pemberitahuan dinonaktifkan",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Hapus layanan",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Edit {name}",
  "settings.service.form.enableAudio": "Aktifkan audio",
  "settings.service.form.enableBadge": "Tampilkan lencana pesan belum dibaca",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Saat dinonaktifkan, semua suara pemberitahuan dan pemutaran audio akan dibisukan",
  "settings.service.form.name": "Nama",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "Pengaturan Proxy HTTP/HTTPS",
  "settings.service.form.proxy.host": "Host/IP Proksi",
-  "settings.service.form.proxy.info": "Pengaturan proksi tidak akan disinkronkan dengan server Ferdi.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Gunakan Proksi",
-  "settings.service.form.proxy.password": "Sandi (opsional)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Silahkan mulai ulang Ferdi setelah mengubah Setelan proxy",
-  "settings.service.form.proxy.user": "Pengguna (opsional)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "Simpan layanan",
  "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Temukan layanan",
  "settings.services.headline": "Layanan Anda",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Tidak dapat memuat layanan Anda",
  "settings.services.tooltip.isDisabled": "Layanan dinonaktifkan",
  "settings.services.tooltip.isMuted": "Semua suara dibisukan",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Nirlaba",
  "settings.user.form.currentPassword": "Sandi saat ini",
  "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Nama Depan",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Nama Belakang",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Sandi baru",
  "settings.workspace.add.form.name": "Nama",
  "settings.workspace.add.form.submitButton": "Buat ruang kerja",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Coba lagi",
  "settings.workspaces.updatedInfo": "Perubahan Anda telah disimpan",
  "settings.workspaces.workspaceFeatureHeadline": "Sedikit Namun Banyak: Memperkenalkan Ruang Kerja Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "Ruang Kerja Ferdi dapat digunakan untuk tetap fokus pada hal penting saat ini. Siapkan sekelompok layanan yang berbeda dan dengan mudah beralih ke yang lain. Anda yang memutuskan layanan mana yang Anda perlukan dan kapan, agar kami bisa membantu Anda tetap berada di garis depan - atau dengan mudah mengakhiri hari kerja kapan saja Anda inginkan.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Tidak dapat memuat ruang kerja Anda",
  "setupAssistant.headline": "Let's get started",
  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Aktifkan pemberitahuan",
  "signup.email.label": "Alamat email",
  "signup.emailDuplicate": "Pengguna dengan alamat email ini sudah ada",
-  "signup.firstname.label": "Nama Depan",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Daftar",
-  "signup.lastname.label": "Nama Belakang",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Dengan membuat akun Ferdi, Anda menyetujui",
  "signup.legal.privacy": "Pernyataan Privasi",
  "signup.legal.terms": "Ketentuan layanan",
@@ -430,11 +421,11 @@
  "signup.password.label": "Password",
  "signup.submit.label": "Buat akun",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Hapus layanan",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Nonaktifkan audio",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Nonaktifkan pemberitahuan",
-  "tabs.item.disableService": "Nonaktifkan layanan",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Aktifkan audio",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Aktifkan pemberitahuan",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Muat Ulang",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} tidak benar",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} setidaknya harus {length} karakter",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Setidaknya diperlukan satu",
-  "validation.required": "{field} wajib diisi",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} bukan URL yang benar",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Back",
  "webControls.forward": "Forward",
  "webControls.goHome": "Home",
@@ -454,12 +445,12 @@
  "webControls.reload": "Muat Ulang",
  "welcome.loginButton": "Masuk ke akun Anda",
  "welcome.signupButton": "Buat akun gratis",
-  "workspaceDrawer.addNewWorkspaceLabel": "Tambah ruang kerja baru",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Semua layanan",
  "workspaceDrawer.headline": "Ruang kerja",
  "workspaceDrawer.item.contextMenuEdit": "edit",
  "workspaceDrawer.item.noServicesAddedYet": "Belum ada layanan yang ditambahkan",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ruang Kerja Ferdi dapat digunakan untuk tetap fokus pada hal penting saat ini. Siapkan sekelompok layanan yang berbeda dan dengan mudah beralih ke yang lain.</p><p>Anda yang memutuskan layanan mana yang Anda perlukan dan kapan, agar kami bisa membantu Anda tetap berada di garis depan - atau dengan mudah mengakhiri hari kerja kapan saja Anda inginkan.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edit setelan ruang kerja",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Beralih ke"
 }
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index d5539aa30..004bd2d26 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Ricarica",
-  "app.errorHandler.headline": "Qualcosa è andato storto",
+  "app.errorHandler.headline": "Qualcosa è andato storto.",
  "changeserver.customServerLabel": "Server personalizzato",
  "changeserver.headline": "Cambia Server",
  "changeserver.label": "Server",
@@ -9,8 +9,7 @@
  "connectionLostBanner.cta": "Ricarica Servizio",
  "connectionLostBanner.informationLink": "Cos'è successo?",
  "connectionLostBanner.message": "Oh no! Ferdi ha perso la connessione con {name}.",
-  "feature.basicAuth.signIn": "Sign In",
+  "feature.basicAuth.signIn": "Accedi",
-  "feature.debugger.title": "Pubblica informazioni di debug",
  "feature.nightlyBuilds.activate": "Attivato",
  "feature.nightlyBuilds.info": "Le 'Nightly Builds' sono versioni sperimentali di Ferdi che possono contenere funzionalità incomplete o non perfettamente funzionanti. Queste versioni sono principalmente usate dagli sviluppatori per effettuare dei test sulle nuove caratteristiche e verificare come si integrano nella versione finale di Ferdi. Se non sei sicuro di quello che stai facendo, ti consigliamo di non attivare le 'Nightly Builds'.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -30,9 +29,9 @@
  "global.no": "No",
  "global.notConnectedToTheInternet": "Non sei connesso a Internet.",
  "global.ok": "Ok",
-  "global.quit": "Quit",
+  "global.quit": "Esci",
-  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.quitConfirmation": "Sei sicuro di voler uscire da Ferdi?",
-  "global.save": "Save",
+  "global.save": "Salva",
  "global.settings": "Impostazioni",
  "global.spellchecker.useDefault": "Usa le impostazioni predefinite di sistema ({default})",
  "global.spellchecking.autodetect": "Rileva automaticamente la lingua",
@@ -41,11 +40,11 @@
  "global.submit": "Invia",
  "global.userAgentHelp": "Usa 'https://whatmyuseragent.com/' (per scoprire) o 'https://developers.whatismybrowser.com/useragents/explore/' (per scegliere) il tuo user agent desiderato e copialo qui.",
  "global.userAgentPref": "User Agent",
-  "global.yes": "Yes",
+  "global.yes": "Si",
  "import.headline": "Importa i servizi di Ferdi 4",
  "import.notSupportedHeadline": "Servizi non ancora supportati in Ferdi 5",
  "import.skip.label": "Voglio aggiungere i servizi manualmente",
-  "import.submit.label": "Importa servizi",
+  "import.submit.label": "Importa {count} servizi",
  "infobar.authRequestFailed": "Si sono verificati errori durante il tentativo di eseguire una richiesta autenticata. Si prega di provare a disconnettersi e tornare indietro se questo errore persiste.",
  "infobar.buttonChangelog": "Cosa c'è di nuovo?",
  "infobar.buttonInstallUpdate": "Riavvia e installa l'aggiornamento",
@@ -87,30 +86,30 @@
  "menu.app.autohideMenuBar": "Nascondi automaticamente la barra del menù",
  "menu.app.checkForUpdates": "Controlla aggiornamenti",
  "menu.app.hide": "Nascondi",
-  "menu.app.hideOthers": "Hide Others",
+  "menu.app.hideOthers": "Nascondi altri",
-  "menu.app.unhide": "Unhide",
+  "menu.app.unhide": "Mostra",
  "menu.edit": "Modifica",
-  "menu.edit.copy": "Copy",
+  "menu.edit.copy": "Copia",
-  "menu.edit.cut": "Cut",
+  "menu.edit.cut": "Taglia",
  "menu.edit.delete": "Elimina",
  "menu.edit.emojiSymbols": "Emoji e simboli",
  "menu.edit.findInPage": "Trova nella pagina",
-  "menu.edit.paste": "Paste",
+  "menu.edit.paste": "Incolla",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.pasteAndMatchStyle": "Incolla e abbina stile",
-  "menu.edit.redo": "Redo",
+  "menu.edit.redo": "Ripeti",
-  "menu.edit.selectAll": "Select All",
+  "menu.edit.selectAll": "Seleziona Tutto",
  "menu.edit.speech": "Sintesi Vocale",
  "menu.edit.startDictation": "Avvia Dettatura",
  "menu.edit.startSpeaking": "Avvia Pronuncia",
  "menu.edit.stopSpeaking": "Interrompi Pronuncia",
-  "menu.edit.undo": "Undo",
+  "menu.edit.undo": "Annulla",
  "menu.file": "File",
-  "menu.help": "Help",
+  "menu.help": "Aiuto",
  "menu.help.changelog": "Changelog",
  "menu.help.debugInfo": "Copia informazioni di debug",
  "menu.help.debugInfoCopiedBody": "Le tue informazioni di debug sono state copiate nella tua clipboard.",
  "menu.help.debugInfoCopiedHeadline": "Informazioni di debug di Ferdi",
-  "menu.help.importExportData": "Import/Export Configuration Data",
+  "menu.help.importExportData": "Importa/Esporta Dati Di Configurazione",
  "menu.help.learnMore": "Maggiori Informazioni",
  "menu.help.privacy": "Dichiarazione della Privacy",
  "menu.help.publishDebugInfo": "Pubblica le informazioni di debug",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Termini di Servizio",
  "menu.services": "Servizi",
  "menu.services.activatePreviousService": "Attiva servizio precedente",
-  "menu.services.addNewService": "Aggiungi un Nuovo Servizio",
+  "menu.services.addNewService": "Aggiungi nuovo servizio...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Attiva servizio seguente",
  "menu.todos": "Todo",
@@ -128,20 +127,20 @@
  "menu.view.forward": "Avanti",
  "menu.view.lockFerdi": "Blocca Ferdi",
  "menu.view.openQuickSwitch": "Apri Cambio Rapido",
-  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Ricarica Ferdi",
  "menu.view.reloadService": "Ricarica Servizio",
  "menu.view.reloadTodos": "Ricarica ToDos",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "Dimensione attuale",
  "menu.view.toggleDarkMode": "Attiva la modalità scura",
  "menu.view.toggleDevTools": "Attiva/Disattiva Strumenti Sviluppo",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "Attiva/Disattiva Schermo Intero",
  "menu.view.toggleServiceDevTools": "Attiva/Disattiva Strumenti per Sviluppatori di Servizi",
  "menu.view.toggleTodosDevTools": "Attiva/Disattiva gli strumenti di sviluppo delle Attività",
-  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomIn": "Aumenta zoom",
-  "menu.view.zoomOut": "Zoom Out",
+  "menu.view.zoomOut": "Diminuisci Zoom",
-  "menu.window": "Window",
+  "menu.window": "Finestra",
-  "menu.window.close": "Close",
+  "menu.window.close": "Chiudi",
-  "menu.window.minimize": "Minimize",
+  "menu.window.minimize": "Riduzione a icona",
  "menu.workspaces": "Aree di lavoro",
  "menu.workspaces.addNewWorkspace": "Aggiungi un'area di lavoro...",
  "menu.workspaces.closeWorkspaceDrawer": "Chiudi il menu dei workspace",
@@ -152,18 +151,7 @@
  "password.link.login": "Accedi al tuo account",
  "password.link.signup": "Crea un account gratuito",
  "password.noUser": "Non è stato trovato nessun utente con questo indirizzo email",
-  "password.successInfo": "Per favore controlla la tua email",
+  "password.successInfo": "Una nuova password è stata inviata al tuo indirizzo email",
-  "pricing.features.accountSync": "Sincronizzazione account",
-  "pricing.features.customWebsites": "Aggiungi siti web personalizzati",
-  "pricing.features.desktopNotifications": "Notifiche desktop",
-  "pricing.features.onPremise": "Servizi ospitati & on-premise",
-  "pricing.features.recipes": "Scegli tra più di 70 Servizi",
-  "pricing.features.serviceProxies": "Proxy di servizio",
-  "pricing.features.spellchecker": "Supporto per il correttore ortografico",
-  "pricing.features.teamManagement": "Gestione del team",
-  "pricing.features.thirdPartyServices": "Installa servizi di terze parti",
-  "pricing.features.unlimitedServices": "Aggiungi servizi illimitati",
-  "pricing.features.workspaces": "Aree di lavoro",
  "service.crashHandler.action": "Ricarica {name}",
  "service.crashHandler.autoReload": "Tentativo di ripristino automatico di {name} in {seconds} secondi",
  "service.crashHandler.headline": "Oh no!",
@@ -178,7 +166,7 @@
  "service.webviewLoader.loading": "Caricamento {service}",
  "services.getStarted": "Iniziamo",
  "services.login": "Effettua il login per utlizzare Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
+  "services.serverInfo": "Facoltativamente, puoi cambiare il tuo server Ferdi cliccando l'ingranaggio nell'angolo in basso a sinistra. Se stai passando (da uno dei server ospitati) ad usare Ferdi senza un account, sappi che puoi esportare i tuoi dati da quel server e successivamente importarli usando il menu Aiuto per ripristinare tutti i tuoi spazi di lavoro e servizi configurati!",
  "services.serverless": "Usa Ferdi senza account",
  "services.welcome": "Benvenuto su Ferdi",
  "settings.account.account.editButton": "Modifica account",
@@ -198,12 +186,12 @@
  "settings.account.tryReloadServices": "Riprova",
  "settings.account.tryReloadUserInfoRequest": "Riprova",
  "settings.account.userInfoRequestFailed": "Impossibile caricare le informazioni dell'utente.",
-  "settings.account.yourLicense": "La tua licenza Ferdi",
+  "settings.account.yourLicense": "La tua licenza Ferdi:",
  "settings.app.accentColorInfo": "Inserisci il tuo colore in risalto in un formato compatibile con CSS. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Svuota la cache",
  "settings.app.buttonInstallUpdate": "Riavvia e installa l'aggiornamento",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Apri cartella del profilo utente",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Apri cartella ricette dei servizi",
  "settings.app.buttonSearchForUpdate": "Controlla aggiornamenti",
  "settings.app.cacheInfo": "Ferdi sta utilizzando {size} di spazio su disco.",
  "settings.app.cacheNotCleared": "Impossibile eliminare tutta la cache",
@@ -218,14 +206,14 @@
  "settings.app.form.beta": "Includi versioni beta",
  "settings.app.form.clipboardNotifications": "Non mostrare notifiche per eventi dagli appunti",
  "settings.app.form.closeToSystemTray": "Chiudi Ferdi nell'area di notifica",
-  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
+  "settings.app.form.confirmOnQuit": "Conferma quando esci da Ferdi",
  "settings.app.form.customTodoServer": "Server Todo personalizzato",
-  "settings.app.form.darkMode": "Attiva modalità scura",
+  "settings.app.form.darkMode": "Attiva la modalità scura.",
  "settings.app.form.enableGPUAcceleration": "Attiva Accelerazione GPU",
  "settings.app.form.enableLock": "Abilita blocco con password",
  "settings.app.form.enableMenuBar": "Mostra sempre Ferdi nella barra dei menù",
  "settings.app.form.enableSpellchecking": "Attiva controllo ortografico",
-  "settings.app.form.enableSystemTray": "Mostra Ferdi nell'area di notifica",
+  "settings.app.form.enableSystemTray": "Mostra sempre icona Ferdi in area di notifica",
  "settings.app.form.enableTodos": "Abilità le Attività Ferdi",
  "settings.app.form.hibernateOnStartup": "Mantieni i servizi in ibernazione all'avvio",
  "settings.app.form.hibernationStrategy": "Strategia di ibernazione",
@@ -251,11 +239,12 @@
  "settings.app.form.showDisabledServices": "Mostra schede servizi disattivati",
  "settings.app.form.showDragArea": "Mostra area trascinabile nella finestra",
  "settings.app.form.showMessagesBadgesWhenMuted": "Mostra l'etichetta dei messaggi non letti quando le notifiche sono disattivate",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Avvio ridotto a icona",
  "settings.app.form.universalDarkMode": "Abilita la modalità scura universale",
  "settings.app.form.useTouchIdToUnlock": "Consenti l'utilizzo di TouchID per sbloccare Ferdi",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.useVerticalStyle": "Usa stile orizzontale",
-  "settings.app.form.wakeUpStrategy": "Wake up strategy",
+  "settings.app.form.wakeUpStrategy": "Strategia di risveglio",
  "settings.app.headlineAdvanced": "Avanzate",
  "settings.app.headlineAppearance": "Aspetto",
  "settings.app.headlineGeneral": "Generale",
@@ -265,17 +254,17 @@
  "settings.app.hibernateInfo": "Per impostazione predefinita, Ferdi manterrà tutti i servizi aperti e caricati in background in modo che siano pronti quando si desidera utilizzarli. Il servizio Hibernation sospenderà i servizi dopo un tempo specificato. Questo è utile per risparmiare RAM o per evitare che i servizi rallentino il computer.",
  "settings.app.inactivityLockInfo": "Minuti di inattività oltre i quali Ferdi si bloccherà automaticamente, 0 per disabilitare",
  "settings.app.languageDisclaimer": "Le traduzioni ufficiali sono in Inglese e Tedesco. Tutte le altre lingue sono tradotte dalla 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 {lockShortcut}.",
+  "settings.app.lockInfo": "Password Lock ti permette di mantenere i tuoi messaggi protetti. Usando Password Lock, ti verrà richiesto di inserire la tua password ogni volta che avvii Ferdi o di bloccare Ferdi stesso usando il simbolo del lucchetto nell'angolo in basso a sinistra o la scorciatoia {lockShortcut}.",
  "settings.app.lockedPassword": "Password",
  "settings.app.lockedPasswordInfo": "Assicurati di impostare una password che ricordi.\nSe perdi questa password, dovrai reinstallare Ferdi.",
  "settings.app.restartRequired": "Le modifiche richiedono un riavvio",
  "settings.app.scheduledDNDInfo": "I Do-not-Disturb pianificati consentono di definire un periodo di tempo nel quale le notifiche da Ferdi saranno disabilitate.",
  "settings.app.scheduledDNDTimeInfo": "Ora in formato 24 ore. L'ora di fine può essere prima dell'ora di inizio (ad esempio inizio 17:00, fine 09:00) per abilitare Do-not-Disturb durante la notte.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
+  "settings.app.sentryInfo": "L'invio dei dati di telemetria ci permette di trovare errori in Ferdi - non invieremo nessuna informazione personale come i dati del tuo messaggio!",
  "settings.app.spellCheckerLanguageInfo": "Ferdi utilizza il controllo ortografico del tuo Mac per verificare la presenza di errori. Se si desidera modificare le lingue del controllo ortografico, è possibile farlo nelle preferenze di sistema del vostro Mac.",
  "settings.app.subheadlineCache": "Cache",
-  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
+  "settings.app.subheadlineFerdiProfile": "Profilo Ferdi",
-  "settings.app.todoServerInfo": "Questo server verrà usato per le funzionalità 'Ferdi Todo'.",
+  "settings.app.todoServerInfo": "Questo server sarà utilizzato per la funzione \"Ferdi Todo\".",
  "settings.app.translationHelp": "Aiutaci a tradurre Ferdi nella tua lingua.",
  "settings.app.universalDarkModeInfo": "La modalità 'Dark Mode' universale cerca di generare dinamicamente uno stile di visualizzazione a sfondo scuro per quei servizi che non lo supportano nativamente.",
  "settings.app.updateStatusAvailable": "Aggiornamento disponibile, download in corso...",
@@ -294,12 +283,12 @@
  "settings.recipes.customService.headline.communityRecipes": "'Recipe' (istruzioni) per applicazioni di terze parti della community",
  "settings.recipes.customService.headline.customRecipes": "'Recipe' (istruzioni) per applicazioni di terze parti personalizzate",
  "settings.recipes.customService.headline.devRecipes": "Le tue 'Recipe' (istruzioni) per applicazioni",
-  "settings.recipes.customService.intro": "Per aggiungere un servizio personalizzato copia la sua 'recipe' (istruzioni) in:",
+  "settings.recipes.customService.intro": "Per aggiungere un servizio personalizzato copia la sua 'recipe' in:",
  "settings.recipes.customService.openDevDocs": "Documentazione per sviluppatori",
  "settings.recipes.customService.openFolder": "Apri cartella",
  "settings.recipes.headline": "Servizi disponibili",
  "settings.recipes.missingService": "Manca un servizio?",
-  "settings.recipes.nothingFound": "Ci scusiamo, ma nessun servizio corrisponde ai tuoi termini di ricerca - tuttavia è probabile che tu possa aggiungerlo in ogni caso utilizzando l'opzione \"Sito Web Personalizzato\". Ti informiamo che il sito web ufficiale potrebbe mostrare un numero maggiore di servizi rispetto alla versione attualmente in uso. Per ottenere tali servizi, è consigliato l'aggiornamento a una versione più recente di Ferdi.",
+  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.recipes.servicesSuccessfulAddedInfo": "Servizio aggiunto con successo",
  "settings.searchService": "Cerca servizio",
  "settings.service.error.goBack": "Torna ai servizi",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "Quando abilitato, un servizio verrà disattivato dopo un lasso di tempo per preservare le risorse del sistema.",
  "settings.service.form.isMutedInfo": "Se disattivato, tutte le notifiche sonore e le riproduzioni audio saranno mutate",
  "settings.service.form.name": "Nome",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Apri 'darkmode.css'",
  "settings.service.form.openUserCss": "Apri user.css",
  "settings.service.form.openUserJs": "Apri il file 'user.js'",
  "settings.service.form.proxy.headline": "Impostazioni Proxy HTTP/HTTPS",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Le impostazioni proxy non verranno sincronizzate con i server Ferdi.",
+  "settings.service.form.proxy.info": "Le impostazioni proxy non saranno sincronizzate con i server Ferdi.",
  "settings.service.form.proxy.isEnabled": "Usa un Proxy",
  "settings.service.form.proxy.password": "Password (opzionale)",
  "settings.service.form.proxy.port": "Porta",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Scopri servizi",
  "settings.services.headline": "I tuoi servizi",
  "settings.services.noServicesAdded": "Inizia aggiungendo un servizio.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Impossibile caricare il servizio",
  "settings.services.tooltip.isDisabled": "Il servizio è disattivato",
  "settings.services.tooltip.isMuted": "Tutti i suoni sono disattivati",
@@ -362,12 +353,12 @@
  "settings.supportFerdi.aboutIntro": "<p>Ferdi è un'applicazione open source sviluppata dalla community.</p><p>Un ringraziamento a tutti coloro che hanno reso questo possibile:</p>",
  "settings.supportFerdi.bannerText": "Vuoi aiutarci a migliorare Ferdi?",
  "settings.supportFerdi.headline": "Info su Ferdi",
-  "settings.supportFerdi.openSurvey": "Sondaggio aperto",
+  "settings.supportFerdi.openSurvey": "Apri sondaggio",
  "settings.supportFerdi.textDonation": "Se vuoi aiutare lo sviluppo di Ferdi con una donazione, puoi farlo",
  "settings.supportFerdi.textDonationAnd": "e",
  "settings.supportFerdi.textExpenses": "Nonostante la maggior parte del lavoro sia svolto da volontari è comunque necessario pagare per la gestione di server e certificati. Essendo una comunità vogliamo essere completamente trasparenti rispetto a come raccogliamo e spendiamo fondi",
  "settings.supportFerdi.textGitHubSponsors": "Sponsor GitHub",
-  "settings.supportFerdi.textListContributors": "Elenco dei contributori",
+  "settings.supportFerdi.textListContributors": "Elenco completo dei contributori",
  "settings.supportFerdi.textListContributorsHere": "qui",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
  "settings.supportFerdi.textSupportWelcome": "Il tuo supporto è il benvenuto. Puoi trovare un elenco degli aiuti che ci servono",
@@ -377,7 +368,7 @@
  "settings.team.contentHeadline": "Franz Team Management",
  "settings.team.copy": "Il gestore di Team di Franz (Franz's Team Management) ti consente di gestire gli abbonamenti Franz (Franz Subscriptions) per più utenti. È importante ricordare che possedere un abbonamento Premium Franz non dà alcun beneficio nell'usare Ferdi. L'unico motivo per cui hai accesso al gestore di Team è perchè tu posa gestire i tuoi Team di Franz creati in precedenza così da non perdere alcuna funzionalità nella gestione del tuo account.",
  "settings.team.headline": "Gruppo",
-  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
+  "settings.team.intro": "Attualmente stai usando server di Franz, ed è per questo che hai accesso al Team Management.",
  "settings.team.manageAction": "Gestisci i tuoi Team su meetfranz.com",
  "settings.team.teamsUnavailable": "I Teams non sono disponibili",
  "settings.team.teamsUnavailableInfo": "I Team sono disponibili esclusivamente usando Franz Server e dopo aver attivato Franz Professional (a pagamento). Per poter utilizzare i Team è necessario modificare il server in https://api.franzinfra.com.",
@@ -432,20 +423,20 @@
  "tabs.item.confirmDeleteService": "Vuoi davvero eliminare il servizio {serviceName}?",
  "tabs.item.deleteService": "Elimina servizio",
  "tabs.item.disableAudio": "Disattiva audio",
-  "tabs.item.disableDarkMode": "Disable Dark mode",
+  "tabs.item.disableDarkMode": "Disattiva modalità scura",
  "tabs.item.disableNotifications": "Disattiva notifiche",
  "tabs.item.disableService": "Disattiva servizio",
  "tabs.item.enableAudio": "Attiva audio",
-  "tabs.item.enableDarkMode": "Enable Dark mode",
+  "tabs.item.enableDarkMode": "Attiva modalità scura",
  "tabs.item.enableNotification": "Attiva le notifiche",
  "tabs.item.enableService": "Attiva il servizio",
-  "tabs.item.hibernateService": "Hibernate service",
+  "tabs.item.hibernateService": "Iberna servizio",
  "tabs.item.reload": "Ricarica",
-  "tabs.item.wakeUpService": "Wake up service",
+  "tabs.item.wakeUpService": "Risveglia servizio",
  "validation.email": "{field} non valido",
  "validation.minLength": "{field} dovrebbe contenere almeno {length} caratteri",
  "validation.oneRequired": "Almeno un campo è richiesto",
-  "validation.required": "{field} è necessario",
+  "validation.required": "{field} è obbligatorio",
  "validation.url": "{field} non è un URL valido",
  "webControls.back": "Indietro",
  "webControls.forward": "Avanti",
@@ -459,7 +450,7 @@
  "workspaceDrawer.headline": "Aree di lavoro",
  "workspaceDrawer.item.contextMenuEdit": "Modifica",
  "workspaceDrawer.item.noServicesAddedYet": "Nessun servizio aggiunto",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>I workspace di Ferdi ti permettono di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi.</p><p>Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Le aree di lavoro di Ferdi ti permettono di concentrarti su ciò che è importante. Configura diversi insiemi di servizi e passa facilmente da uno all’altro quando vuoi.</p><p> Decidi di quali servizi hai bisogno quando e dove, così che ti possiamo aiutare a dare sempre il massimo - o semplicemente staccare dal lavoro quando ne hai bisogno.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Modifica le impostazioni dei workspace",
+  "workspaceDrawer.workspacesSettingsTooltip": "Modifica le impostazioni dell'area di lavoro",
  "workspaces.switchingIndicator.switchingTo": "Passa a "
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 118a2fb8e..d07ed53af 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "再読み込み",
-  "app.errorHandler.headline": "間�����������部分�������ます",
+  "app.errorHandler.headline": "���題��発生�����������",
  "changeserver.customServerLabel": "独自サーバー",
  "changeserver.headline": "サーバーの変更",
  "changeserver.label": "サーバー",
@@ -9,8 +9,7 @@
  "connectionLostBanner.cta": "サービスをリロードする",
  "connectionLostBanner.informationLink": "何が起きましたか？",
  "connectionLostBanner.message": "{name}への接続が切断されました。",
-  "feature.basicAuth.signIn": "Sign In",
+  "feature.basicAuth.signIn": "サインイン",
-  "feature.debugger.title": "デバッグ情報の記録",
  "feature.nightlyBuilds.activate": "有効化",
  "feature.nightlyBuilds.info": "Nightlyビルドは未検証や未完成の機能が含まれる非常に実験的なバージョンです。このバージョンは、主に新機能のテストや最新ビルドでの検証を行う開発者が使用するものです。これを理解していない方は、Nightlyビルドを有効化しないことをおすすめします。",
  "feature.nightlyBuilds.title": "Nightlyビルド",
@@ -27,12 +26,12 @@
  "global.api.unhealthy": "Ferdiのオンラインサービスに接続できません。",
  "global.cancel": "キャンセル",
  "global.edit": "編集",
-  "global.no": "No",
+  "global.no": "いいえ",
  "global.notConnectedToTheInternet": "インターネットに接続されていません。",
-  "global.ok": "Ok",
+  "global.ok": "はい",
  "global.quit": "終了",
-  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.quitConfirmation": "Ferdiを本当に終了しますか？",
-  "global.save": "Save",
+  "global.save": "保存",
  "global.settings": "設定",
  "global.spellchecker.useDefault": "システムデフォルトを使用する({default})",
  "global.spellchecking.autodetect": "言語を自動的に検出する",
@@ -41,13 +40,13 @@
  "global.submit": "送信",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "ユーザーエージェント",
-  "global.yes": "Yes",
+  "global.yes": "はい",
  "import.headline": "Ferdi 4のサービスをインポートして下さい",
  "import.notSupportedHeadline": "Ferdi 5ではこのサービスにまだ対応していません",
  "import.skip.label": "手動でサービスを追加する",
-  "import.submit.label": "サービスをインポート�������さい",
+  "import.submit.label": "{count}個������ービスをインポート�����",
  "infobar.authRequestFailed": "認証済みリクエストの実行中にエラーが発生しました。このエラーが何度も発生する場合は、ログアウトして再度お試しください。",
-  "infobar.buttonChangelog": "��������歴を見る",
+  "infobar.buttonChangelog": "新着情���",
  "infobar.buttonInstallUpdate": "再起動して更新をインストールする",
  "infobar.buttonReloadServices": "サービスの再読み込み",
  "infobar.hide": "隠す",
@@ -57,7 +56,7 @@
  "infobox.dismiss": "閉じる",
  "invite.email.label": "メールアドレス",
  "invite.headline.friends": "あなたの友人や同僚の方を3名までFerdiに招待できます",
-  "invite.name.label": "氏名",
+  "invite.name.label": "名前",
  "invite.skip.label": "後で",
  "invite.submit.label": "招待を送る",
  "invite.successInfo": "招待は無事に送信されました",
@@ -118,7 +117,7 @@
  "menu.help.tos": "サービス利用規約",
  "menu.services": "サービス",
  "menu.services.activatePreviousService": "前のサービスを有効にする",
-  "menu.services.addNewService": "サービスを追加",
+  "menu.services.addNewService": "サービスを追加...",
  "menu.services.goHome": "ホーム",
  "menu.services.setNextServiceActive": "次のサービスを有効にする",
  "menu.todos": "ToDo",
@@ -151,19 +150,8 @@
  "password.headline": "パスワードをリセット",
  "password.link.login": "サインイン",
  "password.link.signup": "無料アカウントを作成",
-  "password.noUser": "このメールアドレスはまだ登録されていません",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "メールを確認して下さい",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "アカウントの同期",
-  "pricing.features.customWebsites": "カスタムサイトを追加",
-  "pricing.features.desktopNotifications": "デスクトップ通知",
-  "pricing.features.onPremise": "オンプレミスおよびその他のホスティングサービス",
-  "pricing.features.recipes": "70以上のサービスから選択",
-  "pricing.features.serviceProxies": "サービスプロキシ",
-  "pricing.features.spellchecker": "スペルチェックのサポート",
-  "pricing.features.teamManagement": "チーム管理",
-  "pricing.features.thirdPartyServices": "サードパーティ製サービスをインストール",
-  "pricing.features.unlimitedServices": "無制限にサービスを追加",
-  "pricing.features.workspaces": "ワークスペース",
  "service.crashHandler.action": "{name}を再読み込み",
  "service.crashHandler.autoReload": "{seconds}秒後、自動的に{name}の復旧を試みます",
  "service.crashHandler.headline": "しまった！",
@@ -181,7 +169,7 @@
  "services.serverInfo": "オプションとして、左下の歯車をクリックしてFerdiサーバーを変更することができます。他のホストされたサーバからアカウントなしでFerdiを使うように変更する場合は、そのサーバからデータをエクスポートし、その後ヘルプメニューを使ってインポートすることですべてのワークスペースと設定したサービスを復元させることができます。",
  "services.serverless": "アカウントなしでFerdiを使用する",
  "services.welcome": "Ferdiにようこそ",
-  "settings.account.account.editButton": "アカウント���編集",
+  "settings.account.account.editButton": "アカウント���編集",
  "settings.account.accountUnavailable": "アカウントが利用できません",
  "settings.account.accountUnavailableInfo": "アカウントなしでFerdiを使用しています。 Ferdiのアカウントを使用してコンピューター間でサービスを同期させる場合、 設定タブでサーバーを選択してログインしてください。",
  "settings.account.buttonSave": "プロフィールの更新",
@@ -190,7 +178,7 @@
  "settings.account.deleteInfo": "今後Ferdiのアカウントが必要なければ、こちらでアカウントと関連する情報を削除できます。",
  "settings.account.headline": "アカウント",
  "settings.account.headlineAccount": "アカウント情報",
-  "settings.account.headlineDangerZone": "注意��",
+  "settings.account.headlineDangerZone": "危険���操作",
  "settings.account.headlineInvoices": "請求書",
  "settings.account.headlinePassword": "パスワードの変更",
  "settings.account.headlineProfile": "プロフィールの更新",
@@ -198,7 +186,7 @@
  "settings.account.tryReloadServices": "もう一度試す",
  "settings.account.tryReloadUserInfoRequest": "もう一度試す",
  "settings.account.userInfoRequestFailed": "ユーザ情報を読み込めませんでした",
-  "settings.account.yourLicense": "ご利用中のFerdiライセンス",
+  "settings.account.yourLicense": "ご利用中のFerdiライセンス:",
  "settings.app.accentColorInfo": "CSSフォーマットでアクセントカラーを記述してください。(デフォルト: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "キャッシュを消去する",
  "settings.app.buttonInstallUpdate": "再起動して更新をインストールする",
@@ -218,14 +206,14 @@
  "settings.app.form.beta": "Betaバージョンを含める",
  "settings.app.form.clipboardNotifications": "クリップボードイベントの通知を表示しない",
  "settings.app.form.closeToSystemTray": "Ferdiをシステムトレイに閉じる",
-  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
+  "settings.app.form.confirmOnQuit": "Ferdiの終了時に確認する",
  "settings.app.form.customTodoServer": "カスタムToDoサーバー",
  "settings.app.form.darkMode": "ダークモードを有効にする",
  "settings.app.form.enableGPUAcceleration": "GPUアクセラレーションを有効にする",
  "settings.app.form.enableLock": "パスワードロックを有効にする",
  "settings.app.form.enableMenuBar": "Ferdi内にメニューバーを常時表示する",
  "settings.app.form.enableSpellchecking": "スペルチェックを有効にする",
-  "settings.app.form.enableSystemTray": "Ferdiをシステムトレイに表示する",
+  "settings.app.form.enableSystemTray": "Ferdiを常時システムトレイに表示する",
  "settings.app.form.enableTodos": "Ferdi ToDoを有効にする",
  "settings.app.form.hibernateOnStartup": "起動時にサービスを休止状態にする",
  "settings.app.form.hibernationStrategy": "休止状態の方法",
@@ -251,10 +239,11 @@
  "settings.app.form.showDisabledServices": "無効化されたサービスのタブを表示する",
  "settings.app.form.showDragArea": "ドラッグ可能な領域をウィンドウに表示",
  "settings.app.form.showMessagesBadgesWhenMuted": "通知の無効時に未読メッセージ件数を表示する",
+  "settings.app.form.splitMode": "分割表示モードを有効にする",
  "settings.app.form.startMinimized": "最小化して起動",
  "settings.app.form.universalDarkMode": "ユニバーサルダークモードを有効にする",
-  "settings.app.form.useTouchIdToUnlock": "Touch IDを使用してFerdiのロックを解除する",
+  "settings.app.form.useTouchIdToUnlock": "Ferdiのロックを解除��Touch IDを使用できるように��る",
-  "settings.app.form.useVerticalStyle": "Use horizontal style",
+  "settings.app.form.useVerticalStyle": "水平レイアウトを使用する",
  "settings.app.form.wakeUpStrategy": "起動方法",
  "settings.app.headlineAdvanced": "詳細",
  "settings.app.headlineAppearance": "表示スタイル",
@@ -265,9 +254,9 @@
  "settings.app.hibernateInfo": "デフォルトでは、Ferdiはすべてのサービスをバックグラウンドで開いて読み込んでおくので、使いたいときにすぐに使えます。 サービス休止機能は設定した時間が経過したら読み込んだサービスを解放します。これはRAMを節約したり、サービスでコンピューターの動作が重くなるのを防ぐのに役立ちます。",
  "settings.app.inactivityLockInfo": "休止状態までの時間(分)、この時間が経過後Ferdiは自動でロックします。0で無効化",
  "settings.app.languageDisclaimer": "公式の言語は英語とドイツ語です。他の言語はコミュニティによる翻訳です。",
-  "settings.app.lockInfo": "パスワードロックはメッセージを保護できます。\nパスワードロックを使用すると、Ferdiの起動時、または自分で左下のロックボタンを押すかショートカット{lockShortcut}でFerdiをロックしたときに、その都度パスワードの入力が求められます。",
+  "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 {lockShortcut}.",
  "settings.app.lockedPassword": "パスワード",
-  "settings.app.lockedPasswordInfo": "覚えられるパスワードを設定するようにしてください。\nパスワードを紛失すると、Ferdiの再インストールが必要になります。",
+  "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.restartRequired": "変更には再起動が必要です",
  "settings.app.scheduledDNDInfo": "集中モードのスケジュールを有効にすると、Ferdiからの通知を受け取らない時間帯を設定することができます。",
  "settings.app.scheduledDNDTimeInfo": "24時間形式で入力してください。終了時刻を開始時刻よりも早く設定すると(例: 17:00開始、9:00終了)、集中モードを一晩中有効にできます。",
@@ -275,7 +264,7 @@
  "settings.app.spellCheckerLanguageInfo": "FerdiはスペルチェックにmacOSシステムのスペルチェッカーを使用しています。スペルチェッカーでチェックする言語を変更するには、macOSのシステム環境設定から行ってください。",
  "settings.app.subheadlineCache": "キャッシュ",
  "settings.app.subheadlineFerdiProfile": "Ferdiプロフィール",
-  "settings.app.todoServerInfo": "このサーバーは「Ferdi ToDo」の機能に使用されます。",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
  "settings.app.translationHelp": "Ferdiの翻訳作業にご協力をお願いします。",
  "settings.app.universalDarkModeInfo": "ユニバーサルダークモードは、現在ダークモードがサポートされていないサービス向けにダークモードを動的に生成します。",
  "settings.app.updateStatusAvailable": "更新が見つかりました。ダウンロードしています...",
@@ -294,12 +283,12 @@
  "settings.recipes.customService.headline.communityRecipes": "コミュニティのサードパーティレシピ",
  "settings.recipes.customService.headline.customRecipes": "カスタムサードパーティレシピ",
  "settings.recipes.customService.headline.devRecipes": "開発サービスのレシピ",
-  "settings.recipes.customService.intro": "カスタムサービスを追加するには、サービスレシピを以下にコピーします:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "開発者ドキュメント",
  "settings.recipes.customService.openFolder": "フォルダーを開く",
  "settings.recipes.headline": "利用可能なサービス",
  "settings.recipes.missingService": "使いたいサービスが一覧にありませんか?",
-  "settings.recipes.nothingFound": "残念ながら、検索語に一致するサービスはありませんでした。しかし、「カスタムウェブサイト」のオプションを使用して追加することができます。新しいバージョンのFerdiではウェブサイトで紹介されているような、より多くのサービスが追加されていることがあります。それらの新しいサービスを追加するには、Ferdiのアップデートをご検討ください。",
+  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.recipes.servicesSuccessfulAddedInfo": "サービスが追加されました",
  "settings.searchService": "サービスを検索",
  "settings.service.error.goBack": "サービスに戻る",
@@ -331,18 +320,19 @@
  "settings.service.form.indirectMessages": "すべての新規メッセージについてバッジを表示する",
  "settings.service.form.isHibernatedEnabledInfo": "有効にすると、システムリソースを節約するために一定時間後にサービスが閉じられます。",
  "settings.service.form.isMutedInfo": "無効化されている場合、全ての通知音やオーディオ再生は無音になります",
-  "settings.service.form.name": "氏名",
+  "settings.service.form.name": "名前",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "darkmode.cssを開く",
  "settings.service.form.openUserCss": "user.cssを開く",
  "settings.service.form.openUserJs": "user.jsを開く",
  "settings.service.form.proxy.headline": "HTTP/HTTPSのプロキシ設定",
  "settings.service.form.proxy.host": "プロキシサーバー/IP",
-  "settings.service.form.proxy.info": "プロキシ設定はFerdi アカウントで同期されません。",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "プロキシ設定を有効にする",
-  "settings.service.form.proxy.password": "パスワード（任意）",
+  "settings.service.form.proxy.password": "パスワード(オプション)",
  "settings.service.form.proxy.port": "ポート",
  "settings.service.form.proxy.restartInfo": "プロキシ設定を変更してから、Ferdiを再起動してください",
-  "settings.service.form.proxy.user": "ユーザー名（任意）",
+  "settings.service.form.proxy.user": "ユーザー(オプション)",
  "settings.service.form.recipeFileInfo": "ユーザーファイルがウェブページに挿入されるので、任意の方法でサービスをカスタマイズできます。 ユーザーファイルはローカルにのみ保存され、同じアカウントを使用する他のコンピューターには転送されません。",
  "settings.service.form.saveButton": "サービスの保存",
  "settings.service.form.tabHosted": "ホスト",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "サービスを探す",
  "settings.services.headline": "利用中のサービス",
  "settings.services.noServicesAdded": "まずはサービスを追加します。",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "サービスを読み込むことができませんでした",
  "settings.services.tooltip.isDisabled": "サービスが無効です",
  "settings.services.tooltip.isMuted": "無音となっています",
@@ -367,7 +358,7 @@
  "settings.supportFerdi.textDonationAnd": "と",
  "settings.supportFerdi.textExpenses": "ボランティアがかなりの部分の作業を行っていますが、私たちもサーバー代と証明書を支払わなくてはなりません。コミュニティと同様に、私たちの収支は全て公開されています。以下を参照してください。",
  "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsors",
-  "settings.supportFerdi.textListContributors": "全ての貢献者������スト",
+  "settings.supportFerdi.textListContributors": "全ての貢献者リスト",
  "settings.supportFerdi.textListContributorsHere": "ここ",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
  "settings.supportFerdi.textSupportWelcome": "支援はいつでも歓迎です。私たちが必要としている支援のリストがあります",
@@ -390,13 +381,13 @@
  "settings.user.form.firstname": "名",
  "settings.user.form.lastname": "姓",
  "settings.user.form.newPassword": "新しいパスワード",
-  "settings.workspace.add.form.name": "氏名",
+  "settings.workspace.add.form.name": "名前",
  "settings.workspace.add.form.submitButton": "ワークスペースを作成",
  "settings.workspace.form.buttonDelete": "ワークスペースを削除",
  "settings.workspace.form.buttonSave": "ワークスペースを保存",
  "settings.workspace.form.keepLoaded": "このワークスペースを読み込んだままにしておく*",
  "settings.workspace.form.keepLoadedInfo": "*このオプションはグローバルの「すべてのワークスペースをロードしたままにする」オプションによって上書きされます。",
-  "settings.workspace.form.name": "氏名",
+  "settings.workspace.form.name": "名前",
  "settings.workspace.form.servicesInWorkspaceHeadline": "このワークスペースのサービス",
  "settings.workspace.form.yourWorkspaces": "利用中のワークスペース",
  "settings.workspaces.deletedInfo": "ワークスペースを削除しました",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "もう一度試す",
  "settings.workspaces.updatedInfo": "変更内容が保存されました",
  "settings.workspaces.workspaceFeatureHeadline": "ヒント: Ferdiワークスペースの紹介",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdiワークスペースを使用すると、すぐに重要なことに集中できます。異なるサービス群を設定し、いつでも簡単に切り替えることができます。 必要なサービスを、必要な時に、必要な場所でご利用いただけますので、仕事に集中することも、好きな時に仕事から離れることも可能です。",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdiワークスペースを使用すると、すぐに重要なことに集中できます。様々なサービスのセットを設定し、いつでも簡単に切り替えることができます。 必要なサービスを、必要な時に、必要な場所でご利用いただけますので、仕事に集中することも、好きな時に仕事から離れることも可能です。",
  "settings.workspaces.workspacesRequestFailed": "ワークスペースを読み込めませんでした",
  "setupAssistant.headline": "始めましょう",
  "setupAssistant.subheadline": "最も使用されているサービスの中から選択し、すぐにメッセージングの最新のやりとりに戻ってください。",
@@ -434,7 +425,7 @@
  "tabs.item.disableAudio": "オーディオの無効化",
  "tabs.item.disableDarkMode": "ダークモードを無効にする",
  "tabs.item.disableNotifications": "通知を無効にする",
-  "tabs.item.disableService": "サービス���無効にする",
+  "tabs.item.disableService": "サービス���無効化",
  "tabs.item.enableAudio": "オーディオを有効にする",
  "tabs.item.enableDarkMode": "ダークモードを有効にする",
  "tabs.item.enableNotification": "通知を有効にする",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "サービスの休止",
  "tabs.item.reload": "再読み込み",
  "tabs.item.wakeUpService": "サービスの起動",
-  "validation.email": "{field}は正しくありません",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field}は少なくとも{length}文字以上でなければなりません",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "少なくとも1つは必要です",
-  "validation.required": "{field}は必須です",
+  "validation.required": "{field} is required",
-  "validation.url": "{field}は正しいURLではありません",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "戻る",
  "webControls.forward": "次へ",
  "webControls.goHome": "ホーム",
@@ -459,7 +450,7 @@
  "workspaceDrawer.headline": "ワークスペース",
  "workspaceDrawer.item.contextMenuEdit": "編集",
  "workspaceDrawer.item.noServicesAddedYet": "まだサービスが追加されていません",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdiワークスペースを使用すると、すぐに重要なことに集中できます。異なるサービス群を設定し、いつでも簡単に切り替えることができます。</p><p> 必要なサービスを、必要な時に、必要な場所でご利用いただけますので、仕事に集中することも、好きな時に仕事から離れることも可能です。</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
  "workspaceDrawer.workspacesSettingsTooltip": "ワークスペースの設定を編集する",
  "workspaces.switchingIndicator.switchingTo": "切り替え先:"
 }
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index cc5a04aff..f327c1e51 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "ჩატვირთვა",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "კერძო სერვერი",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "Search...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Ferdi-ის ონლაინ სერვისთან დაკავშირება ვერ მოხერხდა",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "გაუქმება",
+  "global.cancel": "Cancel",
  "global.edit": "რედაქტირება",
  "global.no": "No",
  "global.notConnectedToTheInternet": "თქვენ არ ხართ ინტერნეტთან დაკავშირებული.",
@@ -33,19 +32,19 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "პარამეტრები",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Use System Default ({default})",
  "global.spellchecking.autodetect": "Detect language automatically",
  "global.spellchecking.autodetect.short": "Automatic",
  "global.spellchecking.language": "Spell checking language",
-  "global.submit": "დადასტურება",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "შემოიტანე Ferdi 4-ის სერვისები",
  "import.notSupportedHeadline": "სერვისები ჯერ არ არის მხარდაჭერილი Ferdi 5-ში",
  "import.skip.label": "I want to add services manually",
-  "import.submit.label": "მოწვევის გაგზავნა",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "გადატვირთეთ და დააყენეთ განახლება",
@@ -75,7 +74,7 @@
  "login.email.label": "მეილი",
  "login.headline": "შესვლა",
  "login.invalidCredentials": "მეილი ან პაროლი არასწორია",
-  "login.link.password": "პაროლის აღდგენა",
+  "login.link.password": "Reset password",
  "login.link.signup": "ანგარიშის შექმნა",
  "login.password.label": "Password",
  "login.serverLogout": "თქვენს სესიას ვადა გაუვიდა, შედით ანგარიშში ხელახლა.",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Terms of Service",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "ყველა სერვისი",
  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
  "password.email.label": "მეილი",
-  "password.headline": "პაროლის აღდგენა",
+  "password.headline": "Reset password",
  "password.link.login": "შედით თქვენს ანგარიშში",
  "password.link.signup": "ანგარიშის შექმნა",
-  "password.noUser": "მომხმარებელი მითითებული მეილით ვერ მოიძებნა",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "გთხოვთ შეამოწმეთ მეილი",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
  "service.crashHandler.headline": "Oh no!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "მოგესალმებით Ferdi-ზე",
-  "settings.account.account.editButton": "ანგარიშის მართვა",
+  "settings.account.account.editButton": "Edit 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": "პროფილის განახლება",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
  "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
  "settings.account.headline": "ანგარიში",
-  "settings.account.headlineAccount": "ანგარიშის ინფორმაცია",
+  "settings.account.headlineAccount": "Account information",
  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "ინვოისები",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "პაროლის შეცვლა",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "პროფილის განახლება",
  "settings.account.successInfo": "თქვენი ცვლილებები შენახულია",
  "settings.account.tryReloadServices": "სცადეთ ხელახლა",
  "settings.account.tryReloadUserInfoRequest": "სცადეთ ხელახლა",
  "settings.account.userInfoRequestFailed": "მომხმარებლის ინფორმაციის ჩატვირთვა ვერ მოხერხდა",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Clear cache",
  "settings.app.buttonInstallUpdate": "გადატვირთეთ და დააყენეთ განახლება",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "აჩვენეთ Ferdi სისტემის უჯრაში",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "სერვისის წაშლა",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "შეასწორე {name}",
  "settings.service.form.enableAudio": "Enable audio",
  "settings.service.form.enableBadge": "Show unread message badges",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "სახელი ",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "აღმოაჩინეთ სერვისები",
  "settings.services.headline": "თქვენი სერვისები",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "სერვისი გათიშულია",
  "settings.services.tooltip.isMuted": "All sounds are muted",
@@ -430,11 +421,11 @@
  "signup.password.label": "Password",
  "signup.submit.label": "ანგარიშის შექმნა",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "სერვისის წაშლა",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Disable audio",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "შეტყობინებების გამორთვა",
-  "tabs.item.disableService": "სერვისის გაუქმება",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Enable audio",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "შეტყობინებების ჩართვა",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index dfbfd63a3..3be2b27ff 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "새로고침",
-  "app.errorHandler.headline": "문제가 발생했습니다",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "사용자 정의 서버",
  "changeserver.headline": "서버 번경",
  "changeserver.label": "서버",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "무슨 일인가요?",
  "connectionLostBanner.message": "오 저런! Ferdi가 {name} 과 연결이 끊겼습니다.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "디버깅 정보 공개",
  "feature.nightlyBuilds.activate": "활성화",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "나이틀리 빌드",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "서비스를 TAB, ↑, ↓을 이용해 선택할 수 있습니다. ENTER를 이용하여 서비스를 열 수 있습니다.",
  "feature.quickSwitch.search": "검색...",
  "feature.quickSwitch.title": "빠른 검색",
-  "global.api.unhealthy": "Ferdi 온라인 서비스에 연결할 수 없습니다.",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "취소",
+  "global.cancel": "Cancel",
  "global.edit": "편집",
  "global.no": "No",
  "global.notConnectedToTheInternet": "인터넷에 연결할 수 없습니다.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "설정",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "시스템 기본 사용 ({default})",
  "global.spellchecking.autodetect": "언어 자동 탐색",
  "global.spellchecking.autodetect.short": "자동",
  "global.spellchecking.language": "철자 검사",
-  "global.submit": "제출",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Import your Ferdi 4 services",
  "import.notSupportedHeadline": "Ferdi 5에서 아직 지원되지 않는 서비스입니다.",
  "import.skip.label": "수동으로 서비스 추가",
-  "import.submit.label": "서비스 가져오기",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "새로운 기능",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "재시작 후 업데이트 설치",
  "infobar.buttonReloadServices": "서비스 재시작",
  "infobar.hide": "숨기기",
@@ -75,7 +74,7 @@
  "login.email.label": "이메일 주소",
  "login.headline": "로그인",
  "login.invalidCredentials": "이메일 또는 비밀번호가 일치하지 않습니다",
-  "login.link.password": "비밀번호 초기화",
+  "login.link.password": "Reset password",
  "login.link.signup": "무료 계정 생성",
  "login.password.label": "비밀번호",
  "login.serverLogout": "세션이 만료되었습니다. 다시 로그인 하세요.",
@@ -117,10 +116,10 @@
  "menu.help.support": "지원",
  "menu.help.tos": "이용 약관",
  "menu.services": "서비스",
-  "menu.services.activatePreviousService": "이전 서비스 활성화",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "새로운 서비스 추가",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "홈",
-  "menu.services.setNextServiceActive": "다음 서비스 활성화",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Todos 허용",
  "menu.view": "View",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "모든 서비스",
  "menu.workspaces.openWorkspaceDrawer": "작업영역 서랍 열기",
  "password.email.label": "이메일 주소",
-  "password.headline": "비밀번호 초기화",
+  "password.headline": "Reset password",
  "password.link.login": "계정에 로그인하세요.",
  "password.link.signup": "무료 계정 생성",
-  "password.noUser": "해당 이메일을 사용하는 유저를 찾을 수 없습니다.",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "이메일을 확인해 주세요.",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "계정 동기화",
-  "pricing.features.customWebsites": "사용자 지정 웹사이트 추가",
-  "pricing.features.desktopNotifications": "데스크탑 알림",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "서비스 프록시",
-  "pricing.features.spellchecker": "철자 검사 지원",
-  "pricing.features.teamManagement": "팀 관리",
-  "pricing.features.thirdPartyServices": "써드파티 서비스 설치",
-  "pricing.features.unlimitedServices": "무제한 서비스 추가",
-  "pricing.features.workspaces": "작업 공간",
  "service.crashHandler.action": "재시작 {name}",
  "service.crashHandler.autoReload": "{seconds} 초내에 자동으로 {name} 을 복원합니다.",
  "service.crashHandler.headline": "이런!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "계정없이 Ferdi 사용하기",
  "services.welcome": "Ferdi에 오신 것을 환영합니다.",
-  "settings.account.account.editButton": "계정 편집",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "계정을 사용할 수 없습니다.",
  "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": "프로필 수정",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "받은 이메일에 있는 링크를 통해 계정 삭제를 확인했다면 계정과 데이터는 복구되지 않습니다.",
  "settings.account.deleteInfo": "더 이상 Ferdi 계정이 필요하지 않다면 여기서 모든 관련한 데이터와 계정을 삭제할 수 있습니다.",
  "settings.account.headline": "계정",
-  "settings.account.headlineAccount": "계정 정보",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "위험 설정",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "청구서",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "비밀번호 변경",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "프로필 수정",
  "settings.account.successInfo": "변경사항이 저장되었습니다.",
  "settings.account.tryReloadServices": "다시 시도하세요.",
  "settings.account.tryReloadUserInfoRequest": "다시 시도하세요.",
  "settings.account.userInfoRequestFailed": "사용자 정보를 불러올 수 없습니다.",
-  "settings.account.yourLicense": "Ferdi 라이센스",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "캐시 지우기",
  "settings.app.buttonInstallUpdate": "재시작 후 업데이트 설치",
@@ -225,7 +213,7 @@
  "settings.app.form.enableLock": "암호 잠금 활성화",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "맞춤법 검사 활성화",
-  "settings.app.form.enableSystemTray": "Ferdi 시스템 트레이에 표시",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "하이버네이션 전략",
@@ -251,9 +239,10 @@
  "settings.app.form.showDisabledServices": "사용하지 않는 서비스 출력",
  "settings.app.form.showDragArea": "드래그 가능 영역 보기",
  "settings.app.form.showMessagesBadgesWhenMuted": "알림이 비활성화잉ㄹ 때 읽지 않은 메세지 배지 표시",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "최소화 된 상태로 시작",
  "settings.app.form.universalDarkMode": "전체 다크 모드 활성화",
-  "settings.app.form.useTouchIdToUnlock": "TouchID로 Ferdi 여는 것을 허용",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.form.useVerticalStyle": "Use horizontal style",
  "settings.app.form.wakeUpStrategy": "Wake up strategy",
  "settings.app.headlineAdvanced": "고급",
@@ -267,7 +256,7 @@
  "settings.app.languageDisclaimer": "공식 지우너 언어는 영어와 독일어이며 이외 언어들은 커뮤니티에 의해 번역되고 있습니다.",
  "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 {lockShortcut}.",
  "settings.app.lockedPassword": "비밀번호",
-  "settings.app.lockedPasswordInfo": "기억할 수 있는 비밀번호로 설정해주세요.\n만약 비밀번호를 잃어버리면 Ferdi 재설치를 해야합니다.",
+  "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.restartRequired": "변경사항을 적용하기 위해 재시작",
  "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.",
@@ -296,7 +285,7 @@
  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "개발 문서",
-  "settings.recipes.customService.openFolder": "폴더 열기",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "사용가능 한 서비스",
  "settings.recipes.missingService": "서비스가 보이지 않습니까?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "서비스 삭제",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "편집 {name}",
  "settings.service.form.enableAudio": "오디오 활성화",
  "settings.service.form.enableBadge": "읽지 않은 메세지 배지 표시",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "비활성화 시 모든 알림 소리도 꺼집니다.",
  "settings.service.form.name": "이름",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "darkmode.css 열기",
  "settings.service.form.openUserCss": "user.css 열기",
  "settings.service.form.openUserJs": "user.js 열기",
  "settings.service.form.proxy.headline": "HTTP/HTTPS 프록시 설정",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "프록시 설정이 Ferdi 서버와 동기화되지 않았습니다.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "프록시 사용하기",
-  "settings.service.form.proxy.password": "비밀번호 (선택)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "포트",
  "settings.service.form.proxy.restartInfo": "프록시 설정 변경 후 Ferdi를 재시작 해주세요.",
-  "settings.service.form.proxy.user": "사용자 옵션",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "서비스 저장",
  "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "서비스 발견",
  "settings.services.headline": "서비스",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "서비스를 불러올 수 없습니다.",
  "settings.services.tooltip.isDisabled": "서비스를 사용할 수 없습니다.",
  "settings.services.tooltip.isMuted": "모든 소리가 꺼져있습니다.",
@@ -362,12 +353,12 @@
  "settings.supportFerdi.aboutIntro": "<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
  "settings.supportFerdi.bannerText": "Ferdi 서비스 향상에 도움을 주기를 원하십니까?",
  "settings.supportFerdi.headline": "Ferdi에 대해",
-  "settings.supportFerdi.openSurvey": "설문조사 열기",
+  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
  "settings.supportFerdi.textDonationAnd": "그리고",
  "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
  "settings.supportFerdi.textGitHubSponsors": "깃허브 후원자",
-  "settings.supportFerdi.textListContributors": "기여자 전체 목록",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
  "settings.supportFerdi.textListContributorsHere": "here",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "비영리",
  "settings.user.form.currentPassword": "현재 비밀번호",
  "settings.user.form.email": "이메일",
-  "settings.user.form.firstname": "이름(성 제외)",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "성",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "새로운 비밀번호",
  "settings.workspace.add.form.name": "이름",
  "settings.workspace.add.form.submitButton": "새로운 작업영역 생성하기",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "알림과 오디오 활성화",
  "signup.email.label": "이메일 주소",
  "signup.emailDuplicate": "해당 이메일을 가진 사용자가 이미 존재합니다",
-  "signup.firstname.label": "이름(성 제외)",
+  "signup.firstname.label": "First Name",
  "signup.headline": "회원 가입",
-  "signup.lastname.label": "성",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "By creating a Ferdi account you accept the",
  "signup.legal.privacy": "개인정보보호정책",
  "signup.legal.terms": "이용 약관",
@@ -430,11 +421,11 @@
  "signup.password.label": "비밀번호",
  "signup.submit.label": "계정 만들기",
  "tabs.item.confirmDeleteService": "{serviceName} 서비스를 정말로 삭제하시겠습니까?",
-  "tabs.item.deleteService": "서비스 삭제",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "오디오 비활성화",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "알림 비활성화",
-  "tabs.item.disableService": "서비스 비활성화",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "오디오 활성화",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "알림 허용",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "새로고침",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} 는 유효하지 않습니다.",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} 는 최소한 {length} 보다 길어야 합니다.",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "적어도 하나는 필요 합니다.",
-  "validation.required": "{field} 는 필수입니다.",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} 는 유효하지 않은 URL입니다.",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "뒤로가기",
  "webControls.forward": "앞으로 가기",
  "webControls.goHome": "홈",
@@ -454,12 +445,12 @@
  "webControls.reload": "새로고침",
  "welcome.loginButton": "계정에 로그인하세요.",
  "welcome.signupButton": "무료 계정 생성",
-  "workspaceDrawer.addNewWorkspaceLabel": "새 작업영역을 만듭니다.",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "모든 서비스",
  "workspaceDrawer.headline": "작업 공간",
  "workspaceDrawer.item.contextMenuEdit": "편집",
  "workspaceDrawer.item.noServicesAddedYet": "추가된 서비스가 없습니다.",
  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "작업공간 설정 편집",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Switching to"
 }
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index b9ca228ba..5104d1bc2 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Herladen",
-  "app.errorHandler.headline": "Er ging iets mis",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Aangepaste server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "Search...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi services",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Annuleren",
+  "global.cancel": "Cancel",
  "global.edit": "Bewerken",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Je hebt geen internet verbinding.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Instellingen",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Gebruik Systeemstandaard ({default})",
  "global.spellchecking.autodetect": "Taal automatisch herkennen",
  "global.spellchecking.autodetect.short": "Automatisch",
  "global.spellchecking.language": "Taal spellingscontrole",
-  "global.submit": "Verzenden",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Importeer je Ferdi 4 services",
  "import.notSupportedHeadline": "De volgende services worden nog niet ondersteund in Ferdi 5",
  "import.skip.label": "Ik wil services handmatig toevoegen",
-  "import.submit.label": "Importeer services",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Wat is er nieuw?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
  "infobar.buttonReloadServices": "Services opnieuw laden",
  "infobar.hide": "Verbergen",
@@ -75,7 +74,7 @@
  "login.email.label": "E-mailadres",
  "login.headline": "Inloggen",
  "login.invalidCredentials": "E-mailadres of wachtwoord ongeldig",
-  "login.link.password": "Wachtwoord resetten",
+  "login.link.password": "Reset password",
  "login.link.signup": "Maak een gratis account aan",
  "login.password.label": "Password",
  "login.serverLogout": "De sessie is verlopen, log opnieuw in alsjeblieft.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Ondersteuning",
  "menu.help.tos": "Servicevoorwaarden",
  "menu.services": "Services",
-  "menu.services.activatePreviousService": "Vorige dienst activeren",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Volgende dienst activeren",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Enable Todos",
  "menu.view": "Weergave",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Alle services",
  "menu.workspaces.openWorkspaceDrawer": "Werkruimtepagina openen",
  "password.email.label": "E-mailadres",
-  "password.headline": "Wachtwoord resetten",
+  "password.headline": "Reset password",
  "password.link.login": "Log in op je account",
  "password.link.signup": "Maak een gratis account aan",
-  "password.noUser": "Geen gebruiker gevonden met dat e-mailadres",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Controleer alsjeblieft je e-mail",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Werkruimten",
  "service.crashHandler.action": "{naam} herladen",
  "service.crashHandler.autoReload": "Ga proberen om {name} te herstellen over {seconds} seconden",
  "service.crashHandler.headline": "Oh nee!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Welkom bij Ferdi",
-  "settings.account.account.editButton": "Account bewerken",
+  "settings.account.account.editButton": "Edit 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",
@@ -189,16 +177,16 @@
  "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!",
  "settings.account.deleteInfo": "Indien u uw Ferdi account niet meer nodig heeft, kan u hier uw account en alle gerelateerde gegevens verwijderen.",
  "settings.account.headline": "Account",
-  "settings.account.headlineAccount": "Account informatie",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Gevarenzone",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Facturen",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Wijzig wachtwoord",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Profiel bijwerken",
  "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
  "settings.account.tryReloadServices": "Probeer opnieuw",
  "settings.account.tryReloadUserInfoRequest": "Probeer opnieuw",
  "settings.account.userInfoRequestFailed": "Kon gebruikersinformatie niet laden",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Cache wissen",
  "settings.app.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Dark Mode aanzetten",
  "settings.app.form.enableGPUAcceleration": "GPU Acceleratie Activeren",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Spellingcontrole inschakelen",
-  "settings.app.form.enableSystemTray": "Toon Ferdi in de systeembalk",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Toon uitgeschakelde services",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Service verwijderen",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Bewerk {name}",
  "settings.service.form.enableAudio": "Audio inschakelen",
  "settings.service.form.enableBadge": "Toon badges met ongelezen berichten",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Indien uitgeschakeld zullen alle meldingsgeluiden en afgespeelde audio uitgeschakeld zijn",
  "settings.service.form.name": "Naam",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Instellingen",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy instellingen worden niet gesynchroniseerd met de Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Proxy gebruiken",
-  "settings.service.form.proxy.password": "Wachtwoord (optioneel)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Poort",
  "settings.service.form.proxy.restartInfo": "Start Ferdi opnieuw op na het aanpassen van proxy Instellingen.",
-  "settings.service.form.proxy.user": "Gebruiker (optioneel)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "Service opslaan",
  "settings.service.form.tabHosted": "Gehost",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Services ontdekken",
  "settings.services.headline": "Jouw services",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Kan je diensten niet laden",
  "settings.services.tooltip.isDisabled": "Service is uitgeschakeld",
  "settings.services.tooltip.isMuted": "Alle geluiden zijn uitgeschakeld",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Non-Profit",
  "settings.user.form.currentPassword": "Huidig wachtwoord",
  "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Voornaam",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Achternaam",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Nieuw wachtwoord",
  "settings.workspace.add.form.name": "Naam",
  "settings.workspace.add.form.submitButton": "Maak werkruimte aan",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Berichten & geluid inschakelen",
  "signup.email.label": "E-mailadres",
  "signup.emailDuplicate": "Er bestaat al een gebruiker met dat e-mailadres",
-  "signup.firstname.label": "Voornaam",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Registreren",
-  "signup.lastname.label": "Achternaam",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Door een account aan te maken aanvaard je de",
  "signup.legal.privacy": "Privacyverklaring",
  "signup.legal.terms": "Servicevoorwaarden",
@@ -430,11 +421,11 @@
  "signup.password.label": "Password",
  "signup.submit.label": "Account aanmaken",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Service verwijderen",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Audio uitschakelen",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Notificaties uitschakelen",
-  "tabs.item.disableService": "Service uitschakelen",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Audio inschakelen",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Notificaties aanzetten",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Herladen",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} is niet geldig",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} moet minimaal {length} karakters lang zijn",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Ten minste één is vereist",
-  "validation.required": "{field} is vereist",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} is niet een geldige URL",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Back",
  "webControls.forward": "Forward",
  "webControls.goHome": "Home",
@@ -454,12 +445,12 @@
  "webControls.reload": "Herladen",
  "welcome.loginButton": "Inloggen op je account",
  "welcome.signupButton": "Maak een gratis account aan",
-  "workspaceDrawer.addNewWorkspaceLabel": "Voeg een nieuwe werkruimte toe",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Alle services",
  "workspaceDrawer.headline": "Werkruimten",
  "workspaceDrawer.item.contextMenuEdit": "bewerken",
  "workspaceDrawer.item.noServicesAddedYet": "Nog geen diensten toegevoegd",
  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Pas werkruimte instellingen aan",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Overschakelen naar"
 }
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index eac72627f..6899e02ee 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Herladen",
-  "app.errorHandler.headline": "Er is iets mis gegaan",
+  "app.errorHandler.headline": "Er is iets mis gegaan.",
  "changeserver.customServerLabel": "Aangepaste server",
  "changeserver.headline": "Server wijzigen",
  "changeserver.label": "Server",
@@ -9,13 +9,12 @@
  "connectionLostBanner.cta": "Een service opnieuw laden",
  "connectionLostBanner.informationLink": "Wat gebeurde er?",
  "connectionLostBanner.message": "Oh nee! Ferdi heeft de verbinding met {name} verloren.",
-  "feature.basicAuth.signIn": "Sign In",
+  "feature.basicAuth.signIn": "Log in",
-  "feature.debugger.title": "Foutopsporingsinformatie publiceren",
  "feature.nightlyBuilds.activate": "Activeren",
-  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
+  "feature.nightlyBuilds.info": "Nachtelijke builds zijn zeer experimentele versies van Ferdi die ongepolijste of onvoltooide functies kunnen bevatten. Deze nightly builds worden voornamelijk gebruikt door ontwikkelaars om hun nieuwe functies te testen en hoe ze zullen presteren in de finale build. Als je niet weet wat je aan het doen bent, raden we aan om nachtelijke versies niet te activeren.",
  "feature.nightlyBuilds.title": "Nachtelijke builds",
  "feature.publishDebugInfo.error": "Er is een fout opgetreden tijdens het publiceren van de debug informatie. Probeer het later opnieuw of bekijk de console voor meer informatie.",
-  "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
+  "feature.publishDebugInfo.info": "Publiceren van uw debug informatie helpt ons problemen en fouten te vinden in Ferdi. Door uw debug informatie te publiceren, accepteert u het privacybeleid en de gebruiksvoorwaarden van Ferdi Debugger",
  "feature.publishDebugInfo.privacy": "Privacybeleid",
  "feature.publishDebugInfo.publish": "Accepteren en publiceren",
  "feature.publishDebugInfo.published": "Je foutopsporingslogboek is gepubliceerd en is nu beschikbaar op",
@@ -23,30 +22,30 @@
  "feature.publishDebugInfo.title": "Foutopsporingsinformatie publiceren",
  "feature.quickSwitch.info": "Selecteer een service met TAB, ↑ en ↓. Open een service met ENTER.",
  "feature.quickSwitch.search": "Zoeken...",
-  "feature.quickSwitch.title": "QuickSwitch",
+  "feature.quickSwitch.title": "Quickswitch",
-  "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi-services.",
+  "global.api.unhealthy": "Kan geen verbinding maken met de Ferdi-services",
  "global.cancel": "Annuleer",
  "global.edit": "Bewerk",
-  "global.no": "No",
+  "global.no": "Nee",
  "global.notConnectedToTheInternet": "U bent niet verbonden met het internet.",
-  "global.ok": "Ok",
+  "global.ok": "Oké",
-  "global.quit": "Quit",
+  "global.quit": "Afsluiten",
-  "global.quitConfirmation": "Do you really want to quit Ferdi?",
+  "global.quitConfirmation": "Wil je echt stoppen?",
-  "global.save": "Save",
+  "global.save": "Opslaan",
  "global.settings": "Instellingen",
  "global.spellchecker.useDefault": "Gebruik systeemstandaard ({default})",
  "global.spellchecking.autodetect": "Taal automatisch herkennen",
  "global.spellchecking.autodetect.short": "Automatisch",
  "global.spellchecking.language": "Taal voor spellingcontrole",
  "global.submit": "Verzenden",
-  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
+  "global.userAgentHelp": "Gebruik 'https://whatmyuseragent.com/' om te ontdekken of 'https://developers.whatismybrowser.com/useragents/explore/' om je gewenste user-agent te kiezen en het hier te kopiëren en plakken.",
  "global.userAgentPref": "User Agent",
-  "global.yes": "Yes",
+  "global.yes": "Ja",
  "import.headline": "Importeer uw Ferdi 4-services",
  "import.notSupportedHeadline": "Services die (nog) niet ondersteund worden in Ferdi 5",
  "import.skip.label": "Ik wil diensten handmatig toevoegen",
-  "import.submit.label": "Importeer services",
+  "import.submit.label": "Importeer {count} diensten",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+  "infobar.authRequestFailed": "Er zijn fouten opgetreden tijdens het uitvoeren van een geverifieerd verzoek. Probeer opnieuw in te loggen als deze fout zich blijft voordoen.",
  "infobar.buttonChangelog": "Wat is er nieuw?",
  "infobar.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
  "infobar.buttonReloadServices": "Services opnieuw laden",
@@ -54,7 +53,7 @@
  "infobar.requiredRequestsFailed": "Kan de services en gebruikersinformatie niet laden",
  "infobar.servicesUpdated": "Je services zijn bijgewerkt.",
  "infobar.updateAvailable": "Een nieuwe update voor Ferdi is beschikbaar.",
-  "infobox.dismiss": "Dismiss",
+  "infobox.dismiss": "Negeren",
  "invite.email.label": "E-mailadres",
  "invite.headline.friends": "Nodig 3 vrienden of collega's uit",
  "invite.name.label": "Naam",
@@ -75,95 +74,84 @@
  "login.email.label": "E-mailadres",
  "login.headline": "Inloggen",
  "login.invalidCredentials": "E-mailadres of wachtwoord ongeldig",
-  "login.link.password": "Wachtwoord vergeten",
+  "login.link.password": "Wachtwoord opnieuw instellen",
  "login.link.signup": "Maak een gratis account aan",
  "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.",
-  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
+  "menu.Todoss.closeTodosDrawer": "Sluit Todos overzicht",
-  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
+  "menu.Todoss.openTodosDrawer": "Open Todos overzicht",
  "menu.app.about": "Over Ferdi",
  "menu.app.autohideMenuBar": "Menubalk automatisch verbergen",
  "menu.app.checkForUpdates": "Controleer op updates",
  "menu.app.hide": "Verbergen",
-  "menu.app.hideOthers": "Hide Others",
+  "menu.app.hideOthers": "Verberg overigen",
-  "menu.app.unhide": "Unhide",
+  "menu.app.unhide": "Weergeven",
  "menu.edit": "Bewerk",
-  "menu.edit.copy": "Copy",
+  "menu.edit.copy": "Kopiëren",
-  "menu.edit.cut": "Cut",
+  "menu.edit.cut": "Knippen",
  "menu.edit.delete": "Verwijderen",
  "menu.edit.emojiSymbols": "Emoji's en symbolen",
  "menu.edit.findInPage": "Zoeken op pagina",
-  "menu.edit.paste": "Paste",
+  "menu.edit.paste": "Plakken",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.pasteAndMatchStyle": "Plakken en opmaak behouden",
-  "menu.edit.redo": "Redo",
+  "menu.edit.redo": "Opnieuw",
-  "menu.edit.selectAll": "Select All",
+  "menu.edit.selectAll": "Alles selecteren",
  "menu.edit.speech": "Spraak",
  "menu.edit.startDictation": "Beginnen met dicteren",
  "menu.edit.startSpeaking": "Begin met spreken",
  "menu.edit.stopSpeaking": "Stop met spreken",
-  "menu.edit.undo": "Undo",
+  "menu.edit.undo": "Ongedaan maken",
  "menu.file": "Bestand",
  "menu.help": "Help",
  "menu.help.changelog": "Wijzigingenlogboek",
-  "menu.help.debugInfo": "Copy Debug Information",
+  "menu.help.debugInfo": "Debug informatie kopiëren",
-  "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
+  "menu.help.debugInfoCopiedBody": "Uw debug informatie is gekopieerd naar uw klembord.",
-  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
+  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Informatie",
-  "menu.help.importExportData": "Import/Export Configuration Data",
+  "menu.help.importExportData": "Import/Export Configuratie Data",
  "menu.help.learnMore": "Meer informatie",
  "menu.help.privacy": "Privacyvoorwaarden",
-  "menu.help.publishDebugInfo": "Publish Debug Information",
+  "menu.help.publishDebugInfo": "Publiceer Debug Informatie",
  "menu.help.support": "Ondersteuning",
  "menu.help.tos": "Servicevoorwaarden",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activeer vorige service",
-  "menu.services.addNewService": "Nieuwe service toevoegen",
+  "menu.services.addNewService": "Nieuwe service toevoegen...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activeer volgende service",
  "menu.todos": "Taken",
-  "menu.todos.enableTodos": "Enable Todos",
+  "menu.todos.enableTodos": "Todos inschakelen",
  "menu.view": "Weergave",
  "menu.view.back": "Terug",
-  "menu.view.forward": "Forward",
+  "menu.view.forward": "Doorsturen",
  "menu.view.lockFerdi": "Ferdi vergrendelen",
  "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFerdi": "Reload Ferdi",
+  "menu.view.reloadFerdi": "Ferdi opnieuw laden",
  "menu.view.reloadService": "Een service opnieuw laden",
-  "menu.view.reloadTodos": "Reload ToDos",
+  "menu.view.reloadTodos": "ToDos opnieuw laden",
-  "menu.view.resetZoom": "Actual Size",
+  "menu.view.resetZoom": "Werkelijke grootte",
  "menu.view.toggleDarkMode": "Donkere modus aan/uit",
  "menu.view.toggleDevTools": "Ontwikkelaarstools aan/uit",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleFullScreen": "Volledig scherm in-/uitschakelen",
  "menu.view.toggleServiceDevTools": "Service ontwikkelaarstools aan/uit",
-  "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
+  "menu.view.toggleTodosDevTools": "Todos Developer Tools in-/uitschakelen",
-  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomIn": "Inzoomen",
-  "menu.view.zoomOut": "Zoom Out",
+  "menu.view.zoomOut": "Uitzoomen",
-  "menu.window": "Window",
+  "menu.window": "Venster",
-  "menu.window.close": "Close",
+  "menu.window.close": "Sluiten",
-  "menu.window.minimize": "Minimize",
+  "menu.window.minimize": "Minimaliseren",
  "menu.workspaces": "Werkruimtes",
  "menu.workspaces.addNewWorkspace": "Voeg nieuwe werkruimte toe...",
  "menu.workspaces.closeWorkspaceDrawer": "Werkruimtepagina sluiten",
  "menu.workspaces.defaultWorkspace": "Alle services",
  "menu.workspaces.openWorkspaceDrawer": "Werkruimtepagina openen",
  "password.email.label": "E-mailadres",
-  "password.headline": "Wachtwoord vergeten",
+  "password.headline": "Wachtwoord opnieuw instellen",
  "password.link.login": "Log in op je account",
  "password.link.signup": "Maak een gratis account aan",
-  "password.noUser": "Geen gebruiker bekend met dat e-mailadres",
+  "password.noUser": "Er is geen gebruiker met dit e-mailadres gevonden",
-  "password.successInfo": "Controleer je e-mail",
+  "password.successInfo": "Uw nieuwe wachtwoord is verzonden naar uw e-mailadres",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker ondersteuning",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Installeer diensten van derden",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Werkruimtes",
  "service.crashHandler.action": "Laad {name} opnieuw",
  "service.crashHandler.autoReload": "Bezig om {name} te herstellen over {seconds} seconden",
  "service.crashHandler.headline": "Oh nee!",
@@ -177,80 +165,81 @@
  "service.errorHandler.text": "{name} kon niet geladen worden.",
  "service.webviewLoader.loading": "{service} wordt geladen",
  "services.getStarted": "Begin",
-  "services.login": "Please login to use Ferdi.",
+  "services.login": "Log alstublieft in om Ferdi te gebruiken.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
+  "services.serverInfo": "U kunt ook uw Ferdi server veranderen door op het tandwieltje in de linker onderhoek te klikken. Als u overschakelt (van een van de gehoste servers) naar Ferdi zonder account wees u ervan bewust dat u uw gegevens van de server kunt exporteren en deze vervolgens kunt importeren via het Help-menu om al uw werkruimtes en geconfigureerde diensten weer te genereren!",
-  "services.serverless": "Use Ferdi without an Account",
+  "services.serverless": "Gebruik Ferdi zonder account",
  "services.welcome": "Welkom bij Ferdi",
-  "settings.account.account.editButton": "Bewerk account",
+  "settings.account.account.editButton": "Account bewerken",
-  "settings.account.accountUnavailable": "Account is unavailable",
+  "settings.account.accountUnavailable": "Account is niet beschikbaar",
-  "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.accountUnavailableInfo": "U gebruikt Ferdi zonder account. Als u Ferdi wilt gebruiken met een account en uw services gesynchroniseerd wilt houden tussen installaties, selecteer een server in het tabblad Instellingen en log in.",
  "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!",
  "settings.account.deleteInfo": "Wanneer je je Ferdi-account niet langer wilt gebruiken, kun je je account en alle gerelateerde data verwijderen.",
  "settings.account.headline": "Account",
-  "settings.account.headlineAccount": "Accountinformatie",
+  "settings.account.headlineAccount": "Account informatie",
  "settings.account.headlineDangerZone": "Gevarenzone",
  "settings.account.headlineInvoices": "Facturen",
-  "settings.account.headlinePassword": "Wijzig wachtwoord",
+  "settings.account.headlinePassword": "Wachtwoord wijzigen",
  "settings.account.headlineProfile": "Update profiel",
  "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
  "settings.account.tryReloadServices": "Probeer opnieuw",
  "settings.account.tryReloadUserInfoRequest": "Probeer opnieuw",
  "settings.account.userInfoRequestFailed": "Kon gebruikersinformatie niet laden",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Uw Ferdi licentie:",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
+  "settings.app.accentColorInfo": "Schrijf uw accentkleur in een CSS-compatibel formaat (standaard: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Cache legen",
  "settings.app.buttonInstallUpdate": "Opnieuw opstarten & update installeren",
-  "settings.app.buttonOpenFerdiProfileFolder": "Open Profile folder",
+  "settings.app.buttonOpenFerdiProfileFolder": "Profielmap openen",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open de map servicerecepten",
  "settings.app.buttonSearchForUpdate": "Controleer op updates",
  "settings.app.cacheInfo": "Ferdi gebruikt op dit moment {size} schijfruimte aan tijdelijke bestanden.",
-  "settings.app.cacheNotCleared": "Couldn't clear all cache",
+  "settings.app.cacheNotCleared": "Kon alle cache niet legen",
-  "settings.app.closeSettings": "Close settings",
+  "settings.app.closeSettings": "Instellingen sluiten",
  "settings.app.currentVersion": "Huidige versie:",
-  "settings.app.form.accentColor": "Accent color",
+  "settings.app.form.accentColor": "Accent kleur",
-  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
+  "settings.app.form.adaptableDarkMode": "Donkere modus synchroniseren met de instelling van mijn OS",
-  "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer",
+  "settings.app.form.alwaysShowWorkspaces": "Werkruimte lade altijd weergeven",
  "settings.app.form.autoLaunchInBackground": "Open op de achtergrond",
  "settings.app.form.autoLaunchOnStart": "Open Ferdi bij opstarten",
-  "settings.app.form.automaticUpdates": "Enable updates",
+  "settings.app.form.automaticUpdates": "Updates inschakelen",
  "settings.app.form.beta": "Inclusief bètaversies",
-  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
+  "settings.app.form.clipboardNotifications": "Meldingen voor klembord niet weergeven",
-  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "Minimaliseer Ferdi naar systeemvak",
-  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
+  "settings.app.form.confirmOnQuit": "Bevestigen bij het sluiten van Ferdi",
-  "settings.app.form.customTodoServer": "Custom Todo Server",
+  "settings.app.form.customTodoServer": "Aangepaste Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Dark mode aanzetten",
  "settings.app.form.enableGPUAcceleration": "Schakel videokaart-acceleratie in ",
-  "settings.app.form.enableLock": "Enable Password Lock",
+  "settings.app.form.enableLock": "Wachtwoordvergrendeling inschakelen",
-  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
+  "settings.app.form.enableMenuBar": "Altijd Ferdi weergeven in de menubalk",
  "settings.app.form.enableSpellchecking": "Zet spellingcontrole aan",
-  "settings.app.form.enableSystemTray": "Pictogram voor Ferdi in systeemvak tonen",
+  "settings.app.form.enableSystemTray": "Laat Ferdi altijd in systeembalk zien",
-  "settings.app.form.enableTodos": "Enable Ferdi Todos",
+  "settings.app.form.enableTodos": "Ferdi Todos inschakelen",
-  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
+  "settings.app.form.hibernateOnStartup": "Diensten in slaapstand houden bij opstarten",
-  "settings.app.form.hibernationStrategy": "Hibernation strategy",
+  "settings.app.form.hibernationStrategy": "Slaapstand strategie",
-  "settings.app.form.iconSize": "Service icon size",
+  "settings.app.form.iconSize": "Service icoongrootte",
-  "settings.app.form.inactivityLock": "Lock after inactivity",
+  "settings.app.form.inactivityLock": "Vergrendel na inactiviteit",
-  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
+  "settings.app.form.keepAllWorkspacesLoaded": "Houd alle werkruimtes geladen",
  "settings.app.form.language": "Taal",
  "settings.app.form.lockPassword": "Wachtwoord",
  "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar systeemvak",
-  "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
+  "settings.app.form.navigationBarBehaviour": "Navigatiebalk gedrag",
-  "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
+  "settings.app.form.notifyTaskBarOnMessage": "Informeer TakenBalk / Dock op een nieuw bericht",
-  "settings.app.form.passwordToggle": "Password toggle",
+  "settings.app.form.passwordToggle": "Wachtwoord wijzigen",
-  "settings.app.form.predefinedTodoServer": "Todo Server",
+  "settings.app.form.predefinedTodoServer": "Taak Server",
  "settings.app.form.privateNotifications": "Toon geen bericht-inhoud in meldingen",
-  "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
+  "settings.app.form.reloadAfterResume": "Herlaad Ferdi na systeem hervatten",
  "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.scheduledDNDEnabled": "Activeer geplande niet-storen modus",
  "settings.app.form.scheduledDNDEnd": "To",
-  "settings.app.form.scheduledDNDStart": "From",
+  "settings.app.form.scheduledDNDStart": "Van",
-  "settings.app.form.searchEngine": "Search engine",
+  "settings.app.form.searchEngine": "Zoekmachine",
-  "settings.app.form.sentry": "Send telemetry data",
+  "settings.app.form.sentry": "Verzend telemetrie gegevens",
  "settings.app.form.serviceRibbonWidth": "Sidebar width",
  "settings.app.form.showDisabledServices": "Toon uitgeschakelde services",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Toon badge met ongelezen berichten wanneer meldingen zijn uitgeschakeld",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -267,7 +256,7 @@
  "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 {lockShortcut}.",
  "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.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
  "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.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Verwijder service",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Bewerk {name}",
  "settings.service.form.enableAudio": "Audio inschakelen",
  "settings.service.form.enableBadge": "Toon badges met ongelezen berichten",
@@ -332,18 +321,19 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Indien uitgeschakeld, worden meldingen en audio niet afgespeeld",
  "settings.service.form.name": "Naam",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy instellingen",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy instellingen worden niet gesynchroniseerd met de Ferdi servers",
+  "settings.service.form.proxy.info": "Proxy instellingen worden niet gesynchroniseerd met de Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Proxy gebruiken",
  "settings.service.form.proxy.password": "Wachtwoord (optioneel)",
  "settings.service.form.proxy.port": "Poort",
  "settings.service.form.proxy.restartInfo": "Start Ferdi opnieuw na het aanpassen van proxy instellingen.",
  "settings.service.form.proxy.user": "Gebruiker (optioneel)",
-  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
+  "settings.service.form.recipeFileInfo": "Je gebruikersbestanden worden op de webpagina ingevoegd zodat je diensten op elke manier kunt aanpassen. Gebruikersbestanden worden alleen lokaal opgeslagen en worden niet overgebracht naar andere computers met hetzelfde account.",
  "settings.service.form.saveButton": "Service opslaan",
  "settings.service.form.tabHosted": "Gehost",
  "settings.service.form.tabOnPremise": "Zelf-gehost ⭐️",
@@ -353,7 +343,8 @@
  "settings.services.deletedInfo": "Service is verwijderd",
  "settings.services.discoverServices": "Ontdek services",
  "settings.services.headline": "Jouw services",
-  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.noServicesAdded": "Start met een service toe te voegen.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Kan jouw services niet laden",
  "settings.services.tooltip.isDisabled": "Service is uitgeschakeld",
  "settings.services.tooltip.isMuted": "Geluid is uitgeschakeld",
@@ -384,7 +375,7 @@
  "settings.user.form.accountType.company": "Bedrijf",
  "settings.user.form.accountType.individual": "Individueel",
  "settings.user.form.accountType.label": "Accounttype",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
+  "settings.user.form.accountType.non-profit": "Non-profit",
  "settings.user.form.currentPassword": "Huidige wachtwoord",
  "settings.user.form.email": "E-mailadres",
  "settings.user.form.firstname": "Voornaam",
@@ -405,13 +396,13 @@
  "settings.workspaces.tryReloadWorkspaces": "Probeer opnieuw",
  "settings.workspaces.updatedInfo": "Je wijzigingen zijn opgeslagen",
  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Zie hier Ferdi Werkruimtes",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van services aan en schakel wanneer je wilt tussen de verschillende sets. Jij beslist welke services je wanneer en waar nodig hebt. Zo helpen wij jou je focus te behouden - of net zo gemakkelijk te switchen van werk naar ontspanning.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Kan jouw werkruimtes niet laden",
-  "setupAssistant.headline": "Let's get started",
+  "setupAssistant.headline": "Laten we beginnen",
  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
  "setupAssistant.submit.label": "Let's go",
  "sidebar.addNewService": "Voeg service toe",
-  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
+  "sidebar.closeTodosDrawer": "Sluit Ferdi Todos",
  "sidebar.closeWorkspaceDrawer": "Werkruimtepagina sluiten",
  "sidebar.lockFerdi": "Ferdi vergrendelen",
  "sidebar.muteApp": "Berichten & geluid uitschakelen",
@@ -430,36 +421,36 @@
  "signup.password.label": "Wachtwoord",
  "signup.submit.label": "Account aanmaken",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Verwijder service",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Audio uitschakelen",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Meldingen uitschakelen",
  "tabs.item.disableService": "Service uitschakelen",
  "tabs.item.enableAudio": "Audio inschakelen",
-  "tabs.item.enableDarkMode": "Enable Dark mode",
+  "tabs.item.enableDarkMode": "Donkere modus inschakelen",
  "tabs.item.enableNotification": "Meldingen inschakelen",
  "tabs.item.enableService": "Service inschakelen",
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Herladen",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} is niet geldig",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} dient minimaal {length} karakters lang te zijn",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Minstens één vereist",
-  "validation.required": "{field} is vereist",
+  "validation.required": "{field} is required",
  "validation.url": "{field} is geen geldige URL",
  "webControls.back": "Terug",
-  "webControls.forward": "Forward",
+  "webControls.forward": "Doorsturen",
  "webControls.goHome": "Home",
-  "webControls.openInBrowser": "Open in Browser",
+  "webControls.openInBrowser": "Openen in Browser",
  "webControls.reload": "Herladen",
  "welcome.loginButton": "Log in op je account",
  "welcome.signupButton": "Maak een gratis account aan",
-  "workspaceDrawer.addNewWorkspaceLabel": "Voeg een nieuwe werkruimte toe",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Alle services",
  "workspaceDrawer.headline": "Werkruimtes",
  "workspaceDrawer.item.contextMenuEdit": "bewerken",
  "workspaceDrawer.item.noServicesAddedYet": "Nog geen services toegevoegd",
-  "workspaceDrawer.workspaceFeatureInfo": "Ferdi werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van services aan en schakel wanneer je wilt tussen de verschillende sets. Jij beslist welke services je wanneer en waar nodig hebt. Zo helpen wij jou je focus te behouden - of net zo gemakkelijk te switchen van werk naar ontspanning.",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Werkruimte instellingen aanpassen",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Overschakelen naar"
 }
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 548cba3ce..cfa523a35 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Last inn på nytt",
-  "app.errorHandler.headline": "Noe gikk galt",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Egendefinert tjener",
  "changeserver.headline": "Bytt tjener",
  "changeserver.label": "Tjener",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Hva skjedde?",
  "connectionLostBanner.message": "Å nei! Ferdi mistet forbindelsen til {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publiser feilsøkingsinformasjon",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Velg en tjeneste med TAB, ↑ og ↓. Åpne en tjeneste med ENTER.",
  "feature.quickSwitch.search": "Søk...",
  "feature.quickSwitch.title": "Hurtigbytte",
-  "global.api.unhealthy": "Kan ikke koble til Ferdi online-tjenester",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Avbryt",
+  "global.cancel": "Cancel",
  "global.edit": "Rediger",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Du er ikke koblet til Internett.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Innstillinger",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Bruk systemstandarden ({default})",
  "global.spellchecking.autodetect": "Oppdag språk automatisk",
  "global.spellchecking.autodetect.short": "Automatisk",
  "global.spellchecking.language": "Språk for stavekontroll",
-  "global.submit": "Send",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Importer Ferdi 4-tjenestene dine",
  "import.notSupportedHeadline": "Tjenester som ikke støttes enda i Ferdi 5",
  "import.skip.label": "Jeg ønsker å legge til tjenester manuelt",
-  "import.submit.label": "Importer tjenester",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "Det oppstod en feil under forsøket med en autentisert forespørsel. Prøv å logge ut og inn igjen om denne feilen vedvarer.",
-  "infobar.buttonChangelog": "Hva er nytt?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Start på nytt og installer oppdatering",
  "infobar.buttonReloadServices": "Last inn tjenestene på nytt",
  "infobar.hide": "Skjul",
@@ -75,7 +74,7 @@
  "login.email.label": "E-postadresse",
  "login.headline": "Logg inn",
  "login.invalidCredentials": "E-posten eller passordet er ikke gyldig",
-  "login.link.password": "Tilbakestill passord",
+  "login.link.password": "Reset password",
  "login.link.signup": "Opprett en gratis konto",
  "login.password.label": "Passord",
  "login.serverLogout": "Din økt er utløpet, vennligst logg inn igjen.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Brukerstøtte",
  "menu.help.tos": "Vilkår for bruk",
  "menu.services": "Tjenester",
-  "menu.services.activatePreviousService": "Aktiver forrige tjeneste",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Hjem",
-  "menu.services.setNextServiceActive": "Aktiver neste tjeneste",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Gjøremål",
  "menu.todos.enableTodos": "Aktiver gjøremål",
  "menu.view": "Vis",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Alle tjenester",
  "menu.workspaces.openWorkspaceDrawer": "Åpne skuff for arbeidsområder",
  "password.email.label": "E-postadresse",
-  "password.headline": "Tilbakestill passord",
+  "password.headline": "Reset password",
  "password.link.login": "Logg inn på kontoen din",
  "password.link.signup": "Opprett en gratis konto",
-  "password.noUser": "Ingen bruker med den e-postadressen ble funnet",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Vennligst sjekk e-posten din",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Konto synkronisering",
-  "pricing.features.customWebsites": "Legg til egendefinerte nettsteder",
-  "pricing.features.desktopNotifications": "Skrivebord varsler",
-  "pricing.features.onPremise": "On-premise og andre selvbetjente tjenester",
-  "pricing.features.recipes": "Velg fra mer enn 70 tjenester",
-  "pricing.features.serviceProxies": "Mellomtjenere for tjenester",
-  "pricing.features.spellchecker": "Støtte for stavekontroll",
-  "pricing.features.teamManagement": "Team-administrasjon",
-  "pricing.features.thirdPartyServices": "Installer tredjepartstjenester",
-  "pricing.features.unlimitedServices": "Legg til ubegrenset antall tjenester",
-  "pricing.features.workspaces": "Arbeidsområder",
  "service.crashHandler.action": "Last {name} inn på nytt",
  "service.crashHandler.autoReload": "Prøver å automatisk gjenopprette {name} om {seconds} sekunder",
  "service.crashHandler.headline": "Å nei!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Bruk Ferdi uten en konto",
  "services.welcome": "Velkommen til Ferdi",
-  "settings.account.account.editButton": "Rediger konto",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Kontoen er ikke tilgjengelig",
  "settings.account.accountUnavailableInfo": "Du bruker Ferdi uten en konto. Hvis du ønsker å bruke Ferdi med en konto og hold tjenestene dine synkronisert på tvers av installasjoner, velg en tjener i fanen innstillinger og logg inn.",
  "settings.account.buttonSave": "Oppdater profil",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "Du har mottatt en e-post med en lenke for å bekrefte sletting av kontoen din. Din konto og dine data kan ikke gjenopprettes!",
  "settings.account.deleteInfo": "Hvis du ikke trenger Ferdi-kontoen din lenger, så kan du slette kontoen din og alle de relaterte dataene her.",
  "settings.account.headline": "Konto",
-  "settings.account.headlineAccount": "Kontoinformasjon",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Faresone",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Fakturaer",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Endre passord",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Oppdater profil",
  "settings.account.successInfo": "Dine endringer har blitt lagret",
  "settings.account.tryReloadServices": "Prøv igjen",
  "settings.account.tryReloadUserInfoRequest": "Prøv igjen",
  "settings.account.userInfoRequestFailed": "Kunne ikke laste brukerinformasjonen",
-  "settings.account.yourLicense": "Din Ferdi lisens",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Tøm hurtiglager",
  "settings.app.buttonInstallUpdate": "Start på nytt og installer oppdatering",
@@ -219,13 +207,13 @@
  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "Egendefinerte gjøremål-tjener",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
  "settings.app.form.darkMode": "Aktiver mørkt tema",
  "settings.app.form.enableGPUAcceleration": "Aktiver GPU-akselerasjon",
  "settings.app.form.enableLock": "Aktiver passordlås",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Aktiver stavekontroll",
-  "settings.app.form.enableSystemTray": "Vis Ferdi i systemstatusfeltet",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Aktiver Ferdi gjøremål",
  "settings.app.form.hibernateOnStartup": "Hold tjenestene i dvalemodus ved oppstart",
  "settings.app.form.hibernationStrategy": "Dvalemodus-strategi",
@@ -251,9 +239,10 @@
  "settings.app.form.showDisabledServices": "Vis deaktiverte tjenestefaner",
  "settings.app.form.showDragArea": "Vis flyttbart område i vinduet",
  "settings.app.form.showMessagesBadgesWhenMuted": "Vis uleste meldingsetiketter når varsler er deaktivert",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimert",
  "settings.app.form.universalDarkMode": "Aktiver universelt mørkt tema",
-  "settings.app.form.useTouchIdToUnlock": "Tillat å bruke TouchID for å låse opp Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.form.useVerticalStyle": "Use horizontal style",
  "settings.app.form.wakeUpStrategy": "Wake up strategy",
  "settings.app.headlineAdvanced": "Avansert",
@@ -267,7 +256,7 @@
  "settings.app.languageDisclaimer": "Offisielle oversettelser er engelsk & tysk. Alle andre språk er samfunnsbaserte oversettelser.",
  "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 {lockShortcut}.",
  "settings.app.lockedPassword": "Passord",
-  "settings.app.lockedPasswordInfo": "Vennligst angi et passord du vil huske.\nHvis du mister dette passordet må du installere Ferdi på nytt.",
+  "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.restartRequired": "Endringer krever omstart",
  "settings.app.scheduledDNDInfo": "Planlagt ikke-forstyrr lar deg definere en tidsperiode hvor du ikke vil få varsler fra Ferdi.",
  "settings.app.scheduledDNDTimeInfo": "Tider i 24-Hour-Format. Sluttiden kan være før starttiden (f.eks start 17:00, slutt 09:00) for å aktivere ikke-forstyrr over natten.",
@@ -275,7 +264,7 @@
  "settings.app.spellCheckerLanguageInfo": "Ferdi bruker Mac'en sin innebygde stavekontroll, for å se etter skrivefeil. Hvis du vil endre språket på stavekontrollen, så kan du gjøre det under Mac'ens system-innstillinger.",
  "settings.app.subheadlineCache": "Hurtiglager",
  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Denne tjeneren vil ble brukt for \"Ferdi gjøremål\" funksjonen.",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
  "settings.app.translationHelp": "Hjelp oss med å oversette Ferdi til ditt språk.",
  "settings.app.universalDarkModeInfo": "Universelt mørkt tema prøver å dynamisk generere mørke stiler for tjenester som ikke har denne støtten enda.",
  "settings.app.updateStatusAvailable": "Oppdatering tilgjengelig, laster ned...",
@@ -294,9 +283,9 @@
  "settings.recipes.customService.headline.communityRecipes": "Fellesskap 3. parts oppskrifter",
  "settings.recipes.customService.headline.customRecipes": "Tilpassede 3. parts oppskrifter",
  "settings.recipes.customService.headline.devRecipes": "Dine utviklingstjeneste oppskrifter",
-  "settings.recipes.customService.intro": "Hvis du vil legge til en egendefinert tjeneste, så kan du kopiere oppskriften for tjenesten til:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Utviklerdokumentasjon",
-  "settings.recipes.customService.openFolder": "Åpne mappe",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Tilgjengelige tjenester",
  "settings.recipes.missingService": "Mangler en tjeneste?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Lysstyrke for lesing i mørket",
  "settings.service.form.darkReaderContrast": "Kontrast for lesing i mørket",
  "settings.service.form.darkReaderSepia": "Sepia for lesing i mørket",
-  "settings.service.form.deleteButton": "Slett tjeneste",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Rediger {name}",
  "settings.service.form.enableAudio": "Aktiver lyd",
  "settings.service.form.enableBadge": "Vis uleste meldingsetiketter",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Når deaktivert, blir alle varslingslyder og lydavspillinger dempet",
  "settings.service.form.name": "Navn",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Åpne darkmode.css",
  "settings.service.form.openUserCss": "Åpne user.css",
  "settings.service.form.openUserJs": "Åpne user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS mellomtjener-innstillinger",
  "settings.service.form.proxy.host": "Mellomtjener vert/IP",
-  "settings.service.form.proxy.info": "Mellomtjener-innstillinger vil ikke blir synkronisert med Ferdi tjenerne.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Bruk mellomtjener",
-  "settings.service.form.proxy.password": "Passord (valgfritt)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Vennligst start Ferdig på nytt etter å ha endre mellomtjener-innstillingene.",
-  "settings.service.form.proxy.user": "Bruker (valgfritt)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Brukerfilene dine vil bli plassert på nettsiden slik at du kan tilpasse tjenestene på alle måter du ønsker. Brukerfilene lagres bare lokalt og overføres ikke til andre datamaskiner som bruker samme konto.",
  "settings.service.form.saveButton": "Lagre tjeneste",
  "settings.service.form.tabHosted": "Selvbetjent",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Oppdag tjenester",
  "settings.services.headline": "Dine tjenester",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Kunne ikke laste dine tjenester",
  "settings.services.tooltip.isDisabled": "Tjenesten er deaktivert",
  "settings.services.tooltip.isMuted": "Alle lyder er dempet",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Ikke-profittbasert",
  "settings.user.form.currentPassword": "Nåværende passord",
  "settings.user.form.email": "E-post",
-  "settings.user.form.firstname": "Fornavn",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Etternavn",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Nytt passord",
  "settings.workspace.add.form.name": "Navn",
  "settings.workspace.add.form.submitButton": "Opprett arbeidsområde",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Prøv igjen",
  "settings.workspaces.updatedInfo": "Dine endringer har blitt lagret",
  "settings.workspaces.workspaceFeatureHeadline": "Mindre er mer: Vi innfører Ferdi arbeidsområder",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi arbeidsområder lar deg fokusere på hva som er viktig akkurat nå. Sett opp forskjellige sett av tjenester, og veksle enkelt mellom dem når som helst. Du bestemmer hvilke tjenester du trenger når og hvor, så vi kan hjelpe deg med å bli best i spillet - eller enkelt koble av fra jobb når du måtte trenge det.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Kunne ikke laste dine arbeidsområder",
  "setupAssistant.headline": "Let's get started",
  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Aktiver varsler og lyd",
  "signup.email.label": "E-postadresse",
  "signup.emailDuplicate": "Det finnes allerede en bruker med den e-postadressen",
-  "signup.firstname.label": "Fornavn",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Registrer deg",
-  "signup.lastname.label": "Etternavn",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Ved å opprette en Ferdi-konto godtar du",
  "signup.legal.privacy": "Personvernerklæring",
  "signup.legal.terms": "Vilkår for bruk",
@@ -430,11 +421,11 @@
  "signup.password.label": "Passord",
  "signup.submit.label": "Opprett konto",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Slett tjeneste",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Deaktiver lyd",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Deaktiver varslinger",
-  "tabs.item.disableService": "Deaktiver tjeneste",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Aktiver lyd",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Aktiver varsler",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Last inn på nytt",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} er ikke gyldig",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} bør være minst {length} tegn",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Minst en er påkrevd",
-  "validation.required": "{field} er påkrevd",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} er ikke en gyldig nettadresse",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Tilbake",
  "webControls.forward": "Videresend",
  "webControls.goHome": "Hjem",
@@ -454,12 +445,12 @@
  "webControls.reload": "Last inn på nytt",
  "welcome.loginButton": "Logg på kontoen din",
  "welcome.signupButton": "Opprett en gratis konto",
-  "workspaceDrawer.addNewWorkspaceLabel": "Opprett nytt arbeidsområde",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Alle tjenester",
  "workspaceDrawer.headline": "Arbeidsområder",
  "workspaceDrawer.item.contextMenuEdit": "rediger",
  "workspaceDrawer.item.noServicesAddedYet": "Ingen tjenester er lagt til ennå",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi arbeidsområder lar deg fokusere på hva som er viktig akkurat nå. Sett opp forskjellige sett av tjenester, og veksle enkelt mellom dem når som helst.</p><p>Du bestemmer hvilke tjenester du trenger når og hvor, så vi kan hjelpe deg med å bli best i spillet - eller enkelt koble av fra jobb når du måtte trenge det.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Rediger innstillinger for arbeidsområder",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Bytter til"
 }
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index ea37ec76c..a19c7c444 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Odśwież",
-  "app.errorHandler.headline": "Coś poszło nie tak",
+  "app.errorHandler.headline": "Coś poszło nie tak.",
  "changeserver.customServerLabel": "Spersonalizowany serwer",
  "changeserver.headline": "Zmień serwer",
  "changeserver.label": "Serwer",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Co się stało?",
  "connectionLostBanner.message": "O nie! Ferdi stracił połączenie z {name}.",
  "feature.basicAuth.signIn": "Zaloguj się",
-  "feature.debugger.title": "Opublikuj dane diagnostyczne",
  "feature.nightlyBuilds.activate": "Aktywuj",
  "feature.nightlyBuilds.info": "Kompilacje testowe to wysoce eksperymentalne wersje Ferdi, które mogą zawierać niedopracowane lub nieukończone funkcje. Te kompilacje są przewidziane głównie dla programistów testujących nowe funkcje będące w opracowaniu oraz ostateczne działanie ukończonej kompilacji. Jeśli nie masz pewności co do tej funkcji, zalecamy nie włączać wersji testowych.",
  "feature.nightlyBuilds.title": "Kompilacje testowe",
@@ -23,15 +22,15 @@
  "feature.publishDebugInfo.title": "Opublikuj dane diagnostyczne",
  "feature.quickSwitch.info": "Wybierz usługę naciskając TAB, ↑ oraz ↓. Otwórz usługę naciskając ENTER.",
  "feature.quickSwitch.search": "Szukaj...",
-  "feature.quickSwitch.title": "QuickSwitch",
+  "feature.quickSwitch.title": "Szybkie przełączenie",
-  "global.api.unhealthy": "Nie można połączyć się z usługami Ferdi online",
+  "global.api.unhealthy": "Nie można połączyć z usługami Ferdi",
  "global.cancel": "Anuluj",
  "global.edit": "Edytuj",
  "global.no": "Nie",
  "global.notConnectedToTheInternet": "Nie masz połączenia z Internetem.",
  "global.ok": "Ok",
  "global.quit": "Wyjdź",
-  "global.quitConfirmation": "Czy napewno chcesz wyjść z Ferdi?",
+  "global.quitConfirmation": "Czy chcesz wyjść z Ferdi?",
  "global.save": "Zapisz",
  "global.settings": "Ustawienia",
  "global.spellchecker.useDefault": "Użyj domyślnego dla systemu ({default})",
@@ -45,7 +44,7 @@
  "import.headline": "Importuj usługi Ferdi 4",
  "import.notSupportedHeadline": "Usługi, które nie są jeszcze obsługiwane w Ferdi 5",
  "import.skip.label": "Chcę dodać usługi samodzielnie",
-  "import.submit.label": "Zaimportuj usługi",
+  "import.submit.label": "Importuj {count} usług",
  "infobar.authRequestFailed": "Pojawiły się błędy podczas próby uwierzytelniania. Proszę spróbuj się wylogować i zalogować ponownie, jeśli ten błąd będzie się powtarzał.",
  "infobar.buttonChangelog": "Co nowego?",
  "infobar.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizację",
@@ -70,13 +69,13 @@
  "locked.touchIdPrompt": "odblokuj przez Touch ID",
  "locked.unlockWithPassword": "Odblokuj hasłem",
  "login.changeServer": "Zmień serwer",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
+  "login.customServerQuestion": "Używasz niestandardowego serwera Ferdi?",
-  "login.customServerSuggestion": "Try importing your Franz account",
+  "login.customServerSuggestion": "Spróbuj zaimportować konto Franz",
  "login.email.label": "Adres email",
  "login.headline": "Zaloguj się",
  "login.invalidCredentials": "Adres email lub hasło są błędne",
-  "login.link.password": "Zresetuj hasło",
+  "login.link.password": "Resetuj hasło",
-  "login.link.signup": "Załóż darmowe konto",
+  "login.link.signup": "Załóż konto",
  "login.password.label": "Hasło",
  "login.serverLogout": "Twoja sesja wygasła, zaloguj się ponownie.",
  "login.submit.label": "Zaloguj się",
@@ -117,17 +116,17 @@
  "menu.help.support": "Wsparcie",
  "menu.help.tos": "Warunki użytkowania",
  "menu.services": "Usługi",
-  "menu.services.activatePreviousService": "Poprzednia usługa",
+  "menu.services.activatePreviousService": "Aktywuj poprzednią usługę",
-  "menu.services.addNewService": "Dodaj nową usługę",
+  "menu.services.addNewService": "Dodaj nową usługę...",
  "menu.services.goHome": "Strona główna",
-  "menu.services.setNextServiceActive": "Następna usługa",
+  "menu.services.setNextServiceActive": "Aktywuj następną usługę",
  "menu.todos": "Lista zadań",
  "menu.todos.enableTodos": "Włącz listę zadań",
  "menu.view": "Widok",
  "menu.view.back": "Wstecz",
  "menu.view.forward": "Prześlij dalej",
  "menu.view.lockFerdi": "Zablokuj Ferdi",
-  "menu.view.openQuickSwitch": "Otwórz Quick Switch",
+  "menu.view.openQuickSwitch": "Otwórz szybki wybór",
  "menu.view.reloadFerdi": "Przeładuj Ferdi",
  "menu.view.reloadService": "Przeładuj usługę",
  "menu.view.reloadTodos": "Odśwież Zadania",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Wszystkie usługi",
  "menu.workspaces.openWorkspaceDrawer": "Otwórz edytor obszaru roboczego",
  "password.email.label": "Adres email",
-  "password.headline": "Zresetuj hasło",
+  "password.headline": "Resetuj hasło",
  "password.link.login": "Zaloguj się na swoje konto",
  "password.link.signup": "Załóż darmowe konto",
-  "password.noUser": "Nie znaleziono użytkownika z takim adresem email",
+  "password.noUser": "Użytkownik z podanym adresem email nie istnieje",
-  "password.successInfo": "Proszę sprawdzić swój email",
+  "password.successInfo": "Twoje nowe hasło zostało wysłane na Twoją skrzynkę mailową",
-  "pricing.features.accountSync": "Synchronizacja konta",
-  "pricing.features.customWebsites": "Dodawanie dowolnych stron internetowych",
-  "pricing.features.desktopNotifications": "Powiadomienia na pulpicie",
-  "pricing.features.onPremise": "Lokalne i inne hostowane usługi",
-  "pricing.features.recipes": "Wybierz spośród ponad 70 usług",
-  "pricing.features.serviceProxies": "Proxy usługi",
-  "pricing.features.spellchecker": "Obsługa sprawdzania pisowni",
-  "pricing.features.teamManagement": "Zarządzanie zespołem",
-  "pricing.features.thirdPartyServices": "Instalacja zewnętrznych usług",
-  "pricing.features.unlimitedServices": "Dodawanie nielimitowanych usług",
-  "pricing.features.workspaces": "Obszary robocze",
  "service.crashHandler.action": "Przeładuj {name}",
  "service.crashHandler.autoReload": "Próba automatycznego odnowienia {name} za {seconds} sekund/y",
  "service.crashHandler.headline": "O nie!",
@@ -178,10 +166,10 @@
  "service.webviewLoader.loading": "Wczytywanie {service}",
  "services.getStarted": "Zacznij",
  "services.login": "Zaloguj się, aby używać Ferdi.",
-  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
+  "services.serverInfo": "Opcjonalnie możesz zmienić swój serwer Ferdi klikając zębatkę w lewym dolnym rogu. Jeżeli przełączasz się (z jednego z hostowanych serwerów) do serwerów Ferdi bez konta, pamiętaj, że możesz wyeksportować swoje dane z tego serwera a następnie zaimportować je używając opcji Pomoc w menu aby przywrócić swoje obszary robocze i skonfigurowane usługi!",
  "services.serverless": "Używaj Ferdi bez konta",
  "services.welcome": "Witaj w programie Ferdi",
-  "settings.account.account.editButton": "Modyfikuj konta",
+  "settings.account.account.editButton": "Edytuj konto",
  "settings.account.accountUnavailable": "Konto jest niedostępne",
  "settings.account.accountUnavailableInfo": "Używasz Ferdi bez konta. Jeśli chcesz używać Ferdi z kontem i synchronizować swoje usługi pomiędzy klientami, wybierz serwer w zakładce Ustawienia i zaloguj się.",
  "settings.account.buttonSave": "Uaktualnij profil",
@@ -190,7 +178,7 @@
  "settings.account.deleteInfo": "Jeżeli nie potrzebujesz już konta Ferdi, możesz je usunąć oraz wszystkie dane na nim zapisane.",
  "settings.account.headline": "Konto",
  "settings.account.headlineAccount": "Informacje o koncie",
-  "settings.account.headlineDangerZone": "Niebezpieczna strefa",
+  "settings.account.headlineDangerZone": "Strefa niebezpieczna",
  "settings.account.headlineInvoices": "Faktury",
  "settings.account.headlinePassword": "Zmień hasło",
  "settings.account.headlineProfile": "Uaktualnij profil",
@@ -198,12 +186,12 @@
  "settings.account.tryReloadServices": "Spróbuj ponownie",
  "settings.account.tryReloadUserInfoRequest": "Spróbuj ponownie",
  "settings.account.userInfoRequestFailed": "Nie można wczytać informacji o użytkowniku",
-  "settings.account.yourLicense": "Twoja licencja Ferdi",
+  "settings.account.yourLicense": " Twoja licencja Ferdi:",
  "settings.app.accentColorInfo": "Zdefiniuj kolor akcentu w formacie zgodnym z CSS. (Domyślnie: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Wyczyść pamięć podręczną (cache)",
  "settings.app.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizację",
  "settings.app.buttonOpenFerdiProfileFolder": "Pokaż folder z profilami",
-  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Open Service Recipes folder",
+  "settings.app.buttonOpenFerdiServiceRecipesFolder": "Otwórz folder usług",
  "settings.app.buttonSearchForUpdate": "Sprawdź aktualizacje",
  "settings.app.cacheInfo": "Pamięć podręczna zajmuje obecnie {size} przestrzeni dyskowej",
  "settings.app.cacheNotCleared": "Błąd czyszczenia pamięci podręcznej",
@@ -219,24 +207,24 @@
  "settings.app.form.clipboardNotifications": "Nie wyświetlaj powiadomień dla schowka",
  "settings.app.form.closeToSystemTray": "Zminimalizuj Ferdi do paska zadań",
  "settings.app.form.confirmOnQuit": "Potwierdź podczas opuszczania Ferdi",
-  "settings.app.form.customTodoServer": "Własny serwer listy zadań",
+  "settings.app.form.customTodoServer": "Niestandardowy serwer Todo",
-  "settings.app.form.darkMode": "Włącz tryb ciemny",
+  "settings.app.form.darkMode": "Włącz Ciemny motyw",
  "settings.app.form.enableGPUAcceleration": "Włącz akcelerację GPU",
  "settings.app.form.enableLock": "Włącz blokadę hasłem",
  "settings.app.form.enableMenuBar": "Zawsze wyświetlaj Ferdi na pasku zadań",
  "settings.app.form.enableSpellchecking": "Włącz sprawdzanie pisowni",
-  "settings.app.form.enableSystemTray": "Pokaż Ferdia w obszarze powiadomień",
+  "settings.app.form.enableSystemTray": "Zawsze pokazuj Ferdi na pasku zadań",
  "settings.app.form.enableTodos": "Włącz Zadania Ferdi",
  "settings.app.form.hibernateOnStartup": "Hibernacja usług po starcie systemu",
  "settings.app.form.hibernationStrategy": "Strategia hibernacji",
  "settings.app.form.iconSize": "Rozmiar ikony usługi",
  "settings.app.form.inactivityLock": "Zablokuj przy braku aktywności",
-  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
+  "settings.app.form.keepAllWorkspacesLoaded": "Trzymaj wszystkie pola robocze załadowane",
  "settings.app.form.language": "Język",
  "settings.app.form.lockPassword": "Hasło",
  "settings.app.form.minimizeToSystemTray": "Zminimalizuj aplikację Ferdi",
  "settings.app.form.navigationBarBehaviour": "Zachowanie paska nawigacji",
-  "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
+  "settings.app.form.notifyTaskBarOnMessage": "Powiadom na pasku zadań o nowej wiadomości",
  "settings.app.form.passwordToggle": "Przełącznik hasła",
  "settings.app.form.predefinedTodoServer": "Serwer Todo",
  "settings.app.form.privateNotifications": "Nie pokazuj treści wiadomości w powiadomieniach",
@@ -249,11 +237,12 @@
  "settings.app.form.sentry": "Wysyłaj dane telemetrii",
  "settings.app.form.serviceRibbonWidth": "Szerokość paska bocznego",
  "settings.app.form.showDisabledServices": "Wyświetlaj karty wyłączonych usług",
-  "settings.app.form.showDragArea": "Show draggable area on window",
+  "settings.app.form.showDragArea": "Pokaż obszar do przeciągania w oknie",
  "settings.app.form.showMessagesBadgesWhenMuted": "Pokaż licznik nieprzeczytanych wiadomości gdy powiadomienia są wyłączone",
+  "settings.app.form.splitMode": "Aktywuj tryb podzielonego widoku",
  "settings.app.form.startMinimized": "Uruchom zminimalizowany",
  "settings.app.form.universalDarkMode": "Włącz uniwersalny tryb ciemny",
-  "settings.app.form.useTouchIdToUnlock": "Zezwól na odblokowanie Ferdi przez Touch ID",
+  "settings.app.form.useTouchIdToUnlock": "Zawsze używaj TouchID do odblokowania Ferdi",
  "settings.app.form.useVerticalStyle": "Użyj stylu poziomego",
  "settings.app.form.wakeUpStrategy": "Strategia wybudzania",
  "settings.app.headlineAdvanced": "Zaawansowane",
@@ -262,8 +251,8 @@
  "settings.app.headlineLanguage": "Język",
  "settings.app.headlinePrivacy": "Prywatność",
  "settings.app.headlineUpdates": "Aktualizacje",
-  "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.hibernateInfo": "Domyślnie, Ferdi trzyma wszystkie Twoje usługi włączone w tle, aby były gotowe w momencie kiedy będziesz ich potrzebował. Hibernacja usług odłączy Twoje usługi po określonym czasie. Dzięki temu zachowasz pamięć RAM lub zachowasz usługi od spowolnienia komputera.",
-  "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
+  "settings.app.inactivityLockInfo": "Minut do dezaktywacji, po których Ferdi automatycznie zablokuje. Wybierz 0 aby dezaktywować",
  "settings.app.languageDisclaimer": "Oficjalnymi językami są Angielski i Niemiecki. Inne języki są tłumaczone przez społeczność Ferdi.",
  "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 {lockShortcut}.",
  "settings.app.lockedPassword": "Hasło",
@@ -296,7 +285,7 @@
  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Dokumentacja deweloperska",
-  "settings.recipes.customService.openFolder": "Otwórz folder",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Dostępne usługi",
  "settings.recipes.missingService": "Brak usługi?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Usuń usługę",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Edytuj {name}",
  "settings.service.form.enableAudio": "Włącz dźwięk",
  "settings.service.form.enableBadge": "Pokaż znacznik nieprzeczytanych wiadomości",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Kiedy nieaktywne, wszystkie dźwięki powiadomień są wyciszone",
  "settings.service.form.name": "Imię",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Otwórz darkmode.css",
  "settings.service.form.openUserCss": "Otwórz user.css",
  "settings.service.form.openUserJs": "Otwórz user.js",
  "settings.service.form.proxy.headline": "Ustawienia Proxy HTTP/HTTPS",
  "settings.service.form.proxy.host": "Host Proxy/IP",
-  "settings.service.form.proxy.info": "Ustawienia proxy nie będą zsynchronizowane z serwerami Ferdia.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Użyj Proxy",
-  "settings.service.form.proxy.password": "Hasło (opcjonalnie)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Uruchom ponownie Ferdi po zmianie ustawień proxy.",
-  "settings.service.form.proxy.user": "Użytkownik (opcjonalnie)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "Zapisz usługę",
  "settings.service.form.tabHosted": "Hostowane",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Przeglądaj usługi",
  "settings.services.headline": "Twoje usługi",
  "settings.services.noServicesAdded": "Rozpocznij od dodania usługi.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Nie udało się załadować twoich usług",
  "settings.services.tooltip.isDisabled": "Usługa jest nieaktywna",
  "settings.services.tooltip.isMuted": "Wszystkie dźwięki są wyciszone",
@@ -362,12 +353,12 @@
  "settings.supportFerdi.aboutIntro": "<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
  "settings.supportFerdi.bannerText": "Do you want to help us improve Ferdi?",
  "settings.supportFerdi.headline": "O Ferdi",
-  "settings.supportFerdi.openSurvey": "Otwarta ankieta",
+  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
  "settings.supportFerdi.textDonationAnd": "i",
  "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
  "settings.supportFerdi.textGitHubSponsors": "Sponsor na Guthub",
-  "settings.supportFerdi.textListContributors": "Pełna lista współtwórców",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
  "settings.supportFerdi.textListContributorsHere": "tutaj",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
  "settings.supportFerdi.textSupportWelcome": "Doceniamy każde wsparcie. Listę rzeczy, z którymi potrzebujemy pomocy znajdziesz",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Non-Profit",
  "settings.user.form.currentPassword": "Obecne hasło",
  "settings.user.form.email": "Adres email",
-  "settings.user.form.firstname": "Imię",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Nazwisko",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Nowe hasło",
  "settings.workspace.add.form.name": "Imię",
  "settings.workspace.add.form.submitButton": "Stwórz obszar roboczy",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Spróbuj ponownie",
  "settings.workspaces.updatedInfo": "Twoje zmiany zostały zapisane",
  "settings.workspaces.workspaceFeatureHeadline": "Mniej znaczy więcej: Wprowadzenie do obszarów roboczych Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "Obszary robocze programu Ferdi pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. Decyduj, które usługi potrzebujesz  , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Nie można załadować obszaru roboczego",
  "setupAssistant.headline": "Zaczynajmy",
  "setupAssistant.subheadline": "Wybierz spośród naszych najczęściej używanych usług i powróć do rutynowej komunikacji.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Włącz powiadomienia i dźwięki",
  "signup.email.label": "Adres email",
  "signup.emailDuplicate": "Użytkownik z takim adresem email już istnieje",
-  "signup.firstname.label": "Imię",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Zarejestruj się",
-  "signup.lastname.label": "Nazwisko",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Poprzez utworzenie konta Ferdi akceptujesz",
  "signup.legal.privacy": "Polityka prywatności",
  "signup.legal.terms": "Warunki świadczenia usług",
@@ -430,23 +421,23 @@
  "signup.password.label": "Hasło",
  "signup.submit.label": "Stwórz konto",
  "tabs.item.confirmDeleteService": "Czy na pewno chcesz usunąć usługę {serviceName}?",
-  "tabs.item.deleteService": "Usuń usługę",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Wyłącz dźwięk",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Wyłącz powiadomienia",
-  "tabs.item.disableService": "Wyłącz usługę",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Włącz dźwięk",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Aktywuj powiadomienia",
  "tabs.item.enableService": "Aktywuj usługę",
-  "tabs.item.hibernateService": "Hibernuj usługę",
+  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Odśwież",
-  "tabs.item.wakeUpService": "Wybudź usługę",
+  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "Pole {field} nie jest poprawne",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "Pole {field} powinno składać się z co najmniej {length} znaków",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Przynajmniej jeden jest wymagany",
-  "validation.required": "Pole {field} jest wymagane",
+  "validation.required": "{field} is required",
-  "validation.url": "Pole {field} nie jest poprawnym ciągiem URL.",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Wstecz",
  "webControls.forward": "Prześlij dalej",
  "webControls.goHome": "Strona główna",
@@ -454,12 +445,12 @@
  "webControls.reload": "Odśwież",
  "welcome.loginButton": "Zaloguj się na swoje konto",
  "welcome.signupButton": "Załóż darmowe konto",
-  "workspaceDrawer.addNewWorkspaceLabel": "Dodaj nowy obszar roboczy",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Wszystkie usługi",
  "workspaceDrawer.headline": "Obszary robocze",
  "workspaceDrawer.item.contextMenuEdit": "Edycja",
  "workspaceDrawer.item.noServicesAddedYet": "Żadne usługi nie zostały jeszcze dodane",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Obszary robocze programu Ferdi pozawala Ci na skupieniu się na tym co ważne w danym momencie. Ustaw różne zestawy usług i przełączaj się między nimi w łatwiejszy sposób w dowolnym momencie. </p><p>Decyduj, które usługi potrzebujesz  , więc pomagamy Ci pozostawać na szczycie gry - lub łatwiej wyłączyć się z pracy kiedy tego potrzebujesz.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edytuj ustawienia obszaru roboczego",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Przełącz do"
 }
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 7760834a4..1d068e87e 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Recarregar",
-  "app.errorHandler.headline": "Algo deu errado",
+  "app.errorHandler.headline": "Algo deu errado.",
  "changeserver.customServerLabel": "Servidor personalizado",
  "changeserver.headline": "Alterar servidor",
  "changeserver.label": "Servidor",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "O que aconteceu?",
  "connectionLostBanner.message": "Ah não! Ferdi perdeu a conexão com {name}.",
  "feature.basicAuth.signIn": "Acessar",
-  "feature.debugger.title": "Publicar informações de depuração",
  "feature.nightlyBuilds.activate": "Ativar",
  "feature.nightlyBuilds.info": "Versões noturnas são versões do Ferdi altamente experimentais que podem conter funcionalidades não finalizadas ou não concluídas. Essas compilações noturnas são usadas principalmente por desenvolvedores para testar seus recursos recém-desenvolvidos e como eles irão se comportar na versão final. Se você não sabe o que está fazendo, sugerimos não ativar versões noturnas.",
  "feature.nightlyBuilds.title": "Versões noturnas",
@@ -24,7 +23,7 @@
  "feature.quickSwitch.info": "Selecione um serviço com TAB, ↑ e ↓. Abra um serviço com ENTER.",
  "feature.quickSwitch.search": "Localizar...",
  "feature.quickSwitch.title": "Troca Rápida",
-  "global.api.unhealthy": "Não foi possível estabelecer ligação aos serviços do Ferdi",
+  "global.api.unhealthy": "Não foi possível conectar ao serviço FreeCite",
  "global.cancel": "Cancelar",
  "global.edit": "Editar",
  "global.no": "Não",
@@ -45,7 +44,7 @@
  "import.headline": "Importar os seus serviços do Ferdi 4",
  "import.notSupportedHeadline": "Estes serviços ainda não são suportados pelo Ferdi 5",
  "import.skip.label": "Eu quero adicionar serviços manualmente",
-  "import.submit.label": "Importar serviços",
+  "import.submit.label": "Importar {count} serviços",
  "infobar.authRequestFailed": "Ocorreram erros ao tentar autenticar. Por favor, tente desconectar e autenticar novamente se o erro persistir.",
  "infobar.buttonChangelog": "O que há de novo?",
  "infobar.buttonInstallUpdate": "Reiniciar e instalar atualizações",
@@ -75,7 +74,7 @@
  "login.email.label": "Endereço de e-mail",
  "login.headline": "Iniciar Sessão",
  "login.invalidCredentials": "O email ou a palavra-passe incorretos",
-  "login.link.password": "Repor a minha palavra-passe",
+  "login.link.password": "Redefinir senha",
  "login.link.signup": "Criar uma conta gratuita",
  "login.password.label": "Senha",
  "login.serverLogout": "A sua sessão expirou, inicie sessão novamente.",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Termos do Serviço",
  "menu.services": "Serviços",
  "menu.services.activatePreviousService": "Ativar o serviço anterior",
-  "menu.services.addNewService": "Adicionar Novo Serviço",
+  "menu.services.addNewService": "Adicionar Novo Serviço...",
  "menu.services.goHome": "Início",
  "menu.services.setNextServiceActive": "Ativar o próximo serviço",
  "menu.todos": "Tarefas",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Todos os serviços",
  "menu.workspaces.openWorkspaceDrawer": "Abrir a janela da Área de trabalho",
  "password.email.label": "Endereço de e-mail",
-  "password.headline": "Repor a minha palavra-passe",
+  "password.headline": "Redefinir senha",
  "password.link.login": "Iniciar sessão",
  "password.link.signup": "Criar uma conta gratuita",
  "password.noUser": "Não existe nenhuma conta associada a esse endereço de e-mail",
-  "password.successInfo": "Por favor, verifique seu e-mail",
+  "password.successInfo": "Uma nova senha foi enviada a seu endereço de e-mail",
-  "pricing.features.accountSync": "Sincronização da conta",
-  "pricing.features.customWebsites": "Adicionar Websites Personalizados",
-  "pricing.features.desktopNotifications": "Notificações no ambiente de trabalho",
-  "pricing.features.onPremise": "On-Premise & Outros serviços hospedados",
-  "pricing.features.recipes": "Escolha entre mais de 70 serviços",
-  "pricing.features.serviceProxies": "Serviços de proxy",
-  "pricing.features.spellchecker": "Suporte ao corretor ortográfico",
-  "pricing.features.teamManagement": "Gestão de Equipes",
-  "pricing.features.thirdPartyServices": "Instalar serviços de terceiros",
-  "pricing.features.unlimitedServices": "Instalar serviços ilimitados",
-  "pricing.features.workspaces": "Áreas de trabalho",
  "service.crashHandler.action": "Recarregar {name}",
  "service.crashHandler.autoReload": "A tentar restaurar automaticamente {name} em {seconds} segundos",
  "service.crashHandler.headline": "Oh não!",
@@ -198,7 +186,7 @@
  "settings.account.tryReloadServices": "Tentar novamente",
  "settings.account.tryReloadUserInfoRequest": "Tentar novamente",
  "settings.account.userInfoRequestFailed": "Não é possível carregar a informação do utilizador",
-  "settings.account.yourLicense": "Sua lincença Ferdi",
+  "settings.account.yourLicense": "Sua lincença Ferdi:",
  "settings.app.accentColorInfo": "Informe sua cor de destaque em um formato compatível com CSS. (Padrão: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Limpar cache",
  "settings.app.buttonInstallUpdate": "Reiniciar e instalar atualizações",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Fechar o Ferdi para a barra do sistema",
  "settings.app.form.confirmOnQuit": "Exigir confirmação ao sair do Ferdi",
  "settings.app.form.customTodoServer": "Servidor de Tarefas Personalizado",
-  "settings.app.form.darkMode": "Habilitar modo noturno",
+  "settings.app.form.darkMode": "Ativar o Tema Escuro",
  "settings.app.form.enableGPUAcceleration": "Ativar Aceleração de GPU",
  "settings.app.form.enableLock": "Habilitar bloqueio por senha",
  "settings.app.form.enableMenuBar": "Sempre exibir Ferdi na Barra de Menu",
  "settings.app.form.enableSpellchecking": "Ativar verificação ortográfica",
-  "settings.app.form.enableSystemTray": "Mostrar o Ferdi na barra do sistema",
+  "settings.app.form.enableSystemTray": "Sempre mostrar o ícone na Bandeja de Sistema",
  "settings.app.form.enableTodos": "Ativar Tarefas",
  "settings.app.form.hibernateOnStartup": "Manter os serviços em hibernação ao inicializar",
  "settings.app.form.hibernationStrategy": "Estratégia de Hibernação",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Apresentar separadores de serviços desativados",
  "settings.app.form.showDragArea": "Mostrar área arrastável na janela",
  "settings.app.form.showMessagesBadgesWhenMuted": "Apresentar emblema com o número de mensagens não lidas quando as notificações estão desativadas",
+  "settings.app.form.splitMode": "Ativar modo de visualização dividida",
  "settings.app.form.startMinimized": "Iniciar minimizado",
  "settings.app.form.universalDarkMode": "Habilitar modo noturno universal",
  "settings.app.form.useTouchIdToUnlock": "Permitir usar TouchID para desbloquear Ferdi",
@@ -265,9 +254,9 @@
  "settings.app.hibernateInfo": "Por padrão, Ferdi manterá todos seus serviços abertos e carregados, assim eles estarão disponíveis quando você for usá-los. O Serviço de Hibernação irá finalizar seus serviços após um período específico. Isso é útil para evitar consumo excessivo de memória RAM evitando também que seu computador fique lento.",
  "settings.app.inactivityLockInfo": "Minutos de inatividade, após este tempo Ferdi irá automaticamente bloquear. Utilize 0 para desabilitar",
  "settings.app.languageDisclaimer": "As traduções oficiais são em inglês e alemão. As demais traduções são baseadas na ajuda da comunidade.",
-  "settings.app.lockInfo": "O bloqueio por senha permite a você proteger suas mensagens.\nUsando o bloqueio por senha, será necessário informar sua senha toda vez que o Ferdi for iniciado ou você solicite o bloqueio.",
+  "settings.app.lockInfo": "O bloqueio por senha permite a você proteger suas mensagens.\nUsando o bloqueio por senha, será necessário informar sua senha toda vez que o Ferdi for iniciado ou você solicite o bloqueio {lockShortcut}.",
  "settings.app.lockedPassword": "Senha",
-  "settings.app.lockedPasswordInfo": "Tenha certeza que a senha definida será lembrada.\nCaso você esqueça a senha, será necessário reinstalar o Ferdi.",
+  "settings.app.lockedPasswordInfo": "Por favor certifique-se de definir uma senha que você se lembrará.\nSe você perder esta senha, você terá que reinstalar o Ferdi.",
  "settings.app.restartRequired": "Essa alteração requer uma reinicialização",
  "settings.app.scheduledDNDInfo": "O modo Não perturbe agendado permite definir um período de tempo em que você não deseja receber notificações do Ferdi.",
  "settings.app.scheduledDNDTimeInfo": "Horários no formato de 24 horas. O horário de término pode ser anterior ao horário de início (por exemplo, início às 17:00 e término às 09:00) para ativar a opção Não perturbe da noite para o dia.",
@@ -294,12 +283,12 @@
  "settings.recipes.customService.headline.communityRecipes": "Serviços da comunidade",
  "settings.recipes.customService.headline.customRecipes": "Serviços personalizados",
  "settings.recipes.customService.headline.devRecipes": "Serviços em Desenvolvimento",
-  "settings.recipes.customService.intro": "Para adicionar um serviço personalizado, copie o serviço para:",
+  "settings.recipes.customService.intro": "Para adicionar um serviço personalizado, copie os dados do serviço para:",
  "settings.recipes.customService.openDevDocs": "Documentação do Desenvolvedor",
  "settings.recipes.customService.openFolder": "Abrir pasta",
  "settings.recipes.headline": "Serviços disponíveis",
  "settings.recipes.missingService": "Falta um serviço?",
-  "settings.recipes.nothingFound": "Desculpe, nenhum serviço corresponde ao seu termo de pesquisa - mas você provavelmente pode adicioná-lo usando a opção \"Site personalizado\". Por favor, note que o site pode mostrar mais serviços que foram adicionados ao Ferdi desde a versão em que você está atualmente. Para obter esses novos serviços, por favor, considere atualizar para uma versão mais recente da Ferdi.",
+  "settings.recipes.nothingFound": "Desculpe, mas nenhum serviço corresponde ao seu termo de pesquisa - mas você provavelmente pode adicioná-lo usando a opção \"Site personalizado\". Por favor, note que o site pode mostrar mais serviços que foram adicionados ao Ferdi desde a versão em que você está atualmente. Para obter esses novos serviços, por favor, considere atualizar para uma versão mais recente do Ferdi.",
  "settings.recipes.servicesSuccessfulAddedInfo": "Serviço adicionado com sucesso",
  "settings.searchService": "Pesquisar serviço",
  "settings.service.error.goBack": "Voltar aos serviços",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Brilho do Dark Reader",
  "settings.service.form.darkReaderContrast": "Contraste do Dark Reader",
  "settings.service.form.darkReaderSepia": "Sépia do Dark Reader",
-  "settings.service.form.deleteButton": "Apagar serviço",
+  "settings.service.form.deleteButton": "Deletar serviço",
  "settings.service.form.editServiceHeadline": "Editar {name}",
  "settings.service.form.enableAudio": "Ativar áudio",
  "settings.service.form.enableBadge": "Mostrar emblemas de mensagens não lidas",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "Quando ativado, o serviço será encerrado após um período de tempo para poupar recursos do sistema.",
  "settings.service.form.isMutedInfo": "Quando desativado, todos os sons e reproduções de áudio serão silenciados",
  "settings.service.form.name": "Nome",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Mostrar apenas os Favoritos na contagem de não lidos",
  "settings.service.form.openDarkmodeCss": "Abrir darkmode.css",
  "settings.service.form.openUserCss": "Abrir user.css",
  "settings.service.form.openUserJs": "Abrir user.js",
  "settings.service.form.proxy.headline": "Definições HTTP/HTTPS Proxy",
  "settings.service.form.proxy.host": "Host/IP proxy",
-  "settings.service.form.proxy.info": "As definições do proxy não serão guardadas nos servidores do Ferdi.",
+  "settings.service.form.proxy.info": "Os ajustes de proxy não serão sincronizados com os servidores do Ferdi.",
  "settings.service.form.proxy.isEnabled": "Usar Proxy",
-  "settings.service.form.proxy.password": "Palavra-chave (opcional)",
+  "settings.service.form.proxy.password": "Senha (opcional)",
  "settings.service.form.proxy.port": "Porta",
  "settings.service.form.proxy.restartInfo": "Reinicie, por favor, após atualizar as definições do Ferdi",
-  "settings.service.form.proxy.user": "Utilizador (opcional)",
+  "settings.service.form.proxy.user": "Usuário (opcional)",
  "settings.service.form.recipeFileInfo": "Seus arquivos de usuário serão inseridos na página web para que você possa personalizar os serviços da forma que preferir. Os arquivos de usuário são armazenados localmente e não são transferidos para outros computadores utilizando a mesma conta.",
  "settings.service.form.saveButton": "Salvar serviço",
  "settings.service.form.tabHosted": "Com domínio",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Descobrir serviços",
  "settings.services.headline": "Seus serviços",
  "settings.services.noServicesAdded": "Comece adicionando um serviço.",
+  "settings.services.nothingFound": "Desculpe, mas nenhum serviço corresponde ao seu termo de pesquisa - mas você provavelmente pode adicioná-lo usando a opção \"Site personalizado\". Por favor, note que o site pode mostrar mais serviços que foram adicionados ao Ferdi desde a versão em que você está atualmente. Para obter esses novos serviços, por favor, considere atualizar para uma versão mais recente do Ferdi.",
  "settings.services.servicesRequestFailed": "Não foi possível ler os seus serviços",
  "settings.services.tooltip.isDisabled": "O serviço está desativado",
  "settings.services.tooltip.isMuted": "Todos os sons estão silenciados",
@@ -377,7 +368,7 @@
  "settings.team.contentHeadline": "Gerenciamento de Equipe Franz",
  "settings.team.copy": "O Gerenciamento de Equipes de Franz permite gerenciar assinaturas do Franz para múltiplos usuários. Por favor, entenda que ter uma assinatura Franz Premium não lhe dará nenhuma vantagem em usar o Ferdi. A única razão em manter o acesso ao Gerenciamento de Equipes é permitir o gerenciamento de suas equipes legadas e não perder nenhuma funcionalidade no gerenciamento da sua conta.",
  "settings.team.headline": "Equipa",
-  "settings.team.intro": "Você está atualmente usando os Servidores de Franz, por isso tem acesso ao Gerenciamento de Times.",
+  "settings.team.intro": "Você está atualmente usando os Servidores do Franz, por isso tem acesso ao Gerenciamento de Times.",
  "settings.team.manageAction": "Gerencie sua Equipe em meetfranz.com",
  "settings.team.teamsUnavailable": "A funcionalidade de Equipes está indisponível",
  "settings.team.teamsUnavailableInfo": "Atualmente a funcionalidade de Equipes está disponível apenas utilizando o servidor Franz após adquirir um plano Franz Profissional. Por favor altere o seridor par https://api.franzinfra.com para utilizar esta funcionalidade.",
@@ -388,7 +379,7 @@
  "settings.user.form.currentPassword": "Palavra-passe atual",
  "settings.user.form.email": "E-mail",
  "settings.user.form.firstname": "Primeiro Nome",
-  "settings.user.form.lastname": "Último Nome",
+  "settings.user.form.lastname": "Sobrenome",
  "settings.user.form.newPassword": "Nova palavra-passe",
  "settings.workspace.add.form.name": "Nome",
  "settings.workspace.add.form.submitButton": "Nova Área de Trabalho",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Tentar novamente",
  "settings.workspaces.updatedInfo": "As suas alterações foram efetuadas com sucesso",
  "settings.workspaces.workspaceFeatureHeadline": "Menos é Mais: Introduzindo as Áreas de trabalho Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "As áreas de trabalho do Ferdi permite você focar no que realmente é importante agora. Configure diferentes conjuntos de serviços e alterne entre eles facilmente em qualquer momento. Você decide quais serviços você precisa e onde deseja colocá-los, então nós podemos te ajudar a aumentar a produtividade de suas tarefas. Ou facilmente deletar os aplicativos que você nunca irá precisar.",
+  "settings.workspaces.workspaceFeatureInfo": "Os espaços de trabalho do Ferdi te ajudam a focar no que realmente é importante agora. Configure diferente conjuntos de serviços e mude entre eles facilmente em qualquer momento. Você decide quais serviços precisa e onde deseja posicioná-los, e então nós podemos te ajudar a aumentar a sua produtividade - ou facilmente desconectá-lo do trabalho quando você quiser.",
  "settings.workspaces.workspacesRequestFailed": "Não foi possível carregar suas áreas de trabalho",
  "setupAssistant.headline": "Vamos começar",
  "setupAssistant.subheadline": "Escolha entre os serviços mais usados e volte a ter o controle das suas mensagens agora.",
@@ -422,7 +413,7 @@
  "signup.emailDuplicate": "Já existe uma conta associada a este endereço de email",
  "signup.firstname.label": "Primeiro Nome",
  "signup.headline": "Criar conta",
-  "signup.lastname.label": "Último Nome",
+  "signup.lastname.label": "Sobrenome",
  "signup.legal.info": "Ao criar uma conta Ferdi, aceita",
  "signup.legal.privacy": "Declaração de privacidade",
  "signup.legal.terms": "Termos do Serviço",
@@ -430,7 +421,7 @@
  "signup.password.label": "Senha",
  "signup.submit.label": "Criar uma conta",
  "tabs.item.confirmDeleteService": "Tem certeza de que deseja excluir o serviço {serviceName}?",
-  "tabs.item.deleteService": "Apagar serviço",
+  "tabs.item.deleteService": "Deletar serviço",
  "tabs.item.disableAudio": "Desativar áudio",
  "tabs.item.disableDarkMode": "Desativar o modo escuro",
  "tabs.item.disableNotifications": "Desativar notificações",
@@ -446,7 +437,7 @@
  "validation.minLength": "{field} deveria ter pelo menos {length} caracteres",
  "validation.oneRequired": "É necessário pelo menos um",
  "validation.required": "{field} é obrigatório",
-  "validation.url": "{field} não é uma hiperligação válida",
+  "validation.url": "{field} não é uma URL válida",
  "webControls.back": "Anterior",
  "webControls.forward": "Próximo",
  "webControls.goHome": "Início",
@@ -454,12 +445,12 @@
  "webControls.reload": "Recarregar",
  "welcome.loginButton": "Iniciar sessão",
  "welcome.signupButton": "Criar uma conta gratuita",
-  "workspaceDrawer.addNewWorkspaceLabel": "Adicionar uma nova área de trabalho",
+  "workspaceDrawer.addNewWorkspaceLabel": "Adicionar novo espaço de trabalho",
  "workspaceDrawer.allServices": "Todos os serviços",
  "workspaceDrawer.headline": "Áreas de trabalho",
  "workspaceDrawer.item.contextMenuEdit": "editar",
  "workspaceDrawer.item.noServicesAddedYet": "Nenhum serviço foi adicionado",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>As áreas de trabalho do Ferdi te ajuda a focar no que realmente é importante agora. Configure diferente cenários para serviços e mude entre eles facilmente em qualquer momento. </p><p>Você decide quais serviços precisa e onde deseja posicioná-los, e então nós iremos te ajudar em aumentar a sua produtividade. Você pode desligar os serviços que não são úteis para você.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Os espaços de trabalho do Ferdi te ajuda a focar no que realmente é importante agora. Configure diferente conjuntos de serviços e mude entre eles facilmente em qualquer momento.</p><p>Você decide quais serviços precisa e onde deseja posicioná-los, e então nós podemos te ajudar a aumentar a sua produtividade - ou facilmente desconectá-lo do trabalho quando você quiser.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Editar configurações das áreas de trabalho",
+  "workspaceDrawer.workspacesSettingsTooltip": "Editar configurações dos espaços de trabalho",
  "workspaces.switchingIndicator.switchingTo": "Trocando para"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index da431f4e3..9675d5d77 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Atualizar",
-  "app.errorHandler.headline": "Alguma coisa correu mal",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Servidor personalizado",
  "changeserver.headline": "Alterar servidor",
  "changeserver.label": "Servidor",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "O que aconteceu?",
  "connectionLostBanner.message": "Oh não! O Ferdi perdeu a ligação com {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publicar informações de depuração",
  "feature.nightlyBuilds.activate": "Activar",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Seleccione um serviço com TAB, ↑ e ↓. Abra um serviço com ENTER.",
  "feature.quickSwitch.search": "A procurar...",
  "feature.quickSwitch.title": "Troca Rápida",
-  "global.api.unhealthy": "Não é possível ligar aos serviços online de Ferdi",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Cancelar",
+  "global.cancel": "Cancel",
  "global.edit": "Editar",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Não está ligado à internet.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Configurações",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Use o padrão de sistema ({default})",
  "global.spellchecking.autodetect": "Detectar idioma automaticamente",
  "global.spellchecking.autodetect.short": "Automático",
  "global.spellchecking.language": "Idioma para corrector ortográfico",
-  "global.submit": "Enviar",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Importe os seus serviços do Ferdi 4",
  "import.notSupportedHeadline": "Serviços ainda não são suportados por Ferdi 5",
  "import.skip.label": "Quero adicionar serviços manualmente",
-  "import.submit.label": "Importar serviços",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "Houve erros na autenticaçao. Se este erro persistir, por favor, tente desligar e autenticar novamente.",
-  "infobar.buttonChangelog": "O que há de novo?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Reiniciar e instalar atualizações",
  "infobar.buttonReloadServices": "Reiniciar serviços",
  "infobar.hide": "Ocultar",
@@ -75,7 +74,7 @@
  "login.email.label": "Endereço de E-mail",
  "login.headline": "Entrar",
  "login.invalidCredentials": "E-mail ou palavra-passe inválidos",
-  "login.link.password": "Redefinir palavra-passe",
+  "login.link.password": "Reset password",
  "login.link.signup": "Criar uma conta gratuita",
  "login.password.label": "Palavra-passe",
  "login.serverLogout": "A sua sessão expirou, faça login novamente.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Suporte",
  "menu.help.tos": "Termos de Serviço",
  "menu.services": "Serviços",
-  "menu.services.activatePreviousService": "Ativar serviço anterior",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Início",
-  "menu.services.setNextServiceActive": "Ativar próximo serviço",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Tarefas",
  "menu.todos.enableTodos": "Ativar Tarefas",
  "menu.view": "Visualizar",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Todos os serviços",
  "menu.workspaces.openWorkspaceDrawer": "Abrir a barra lateral da área de trabalho",
  "password.email.label": "Endereço de E-mail",
-  "password.headline": "Redefinir palavra-passe",
+  "password.headline": "Reset password",
  "password.link.login": "Entrar na sua conta",
  "password.link.signup": "Criar uma conta gratuita",
-  "password.noUser": "Não foi encontrado nenhum utilizador com este e-mail",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Por favor, verifique o seu e-mail",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Sincronização de conta",
-  "pricing.features.customWebsites": "Adicionar Websites Personalizados",
-  "pricing.features.desktopNotifications": "Notificações no ambiente de trabalho",
-  "pricing.features.onPremise": "En sitio y otros servicios alojados",
-  "pricing.features.recipes": "Escolha entre mais de 70 serviços",
-  "pricing.features.serviceProxies": "Proxies de Serviço",
-  "pricing.features.spellchecker": "Suporte de correção ortográfica",
-  "pricing.features.teamManagement": "Gestão de Equipa",
-  "pricing.features.thirdPartyServices": "Instalar serviços de terceiros",
-  "pricing.features.unlimitedServices": "Adicionar serviços ilimitados",
-  "pricing.features.workspaces": "Áreas de trabalho",
  "service.crashHandler.action": "Recarregar {name}",
  "service.crashHandler.autoReload": "A tentar restabelecer {name} automaticamente em {seconds} segundos",
  "service.crashHandler.headline": "Oh não!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi sem conta",
  "services.welcome": "Bem-vindo ao Ferdi",
-  "settings.account.account.editButton": "Editar conta",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Conta indisponível",
  "settings.account.accountUnavailableInfo": "Está a usar o Ferdi sem uma conta. Se deseja usar o Ferdi com uma conta e manter os seus serviços sincronizados entre instalações, por favor, selecione um servidor no separador Configurações e faça a autenticação.",
  "settings.account.buttonSave": "Atualizar perfil",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "Recebeu um e-mail com um link para confirmar o cancelamento da sua conta. Atenção! A sua conta e dados não poderão ser restaurados!",
  "settings.account.deleteInfo": "Se não precisa mais de sua conta Ferdi, pode apagá-la juntamente com toda a sua informação aqui.",
  "settings.account.headline": "Conta",
-  "settings.account.headlineAccount": "Informações de conta",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Zona Perigosa",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Recibos",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Mudar palavra-passe",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Atualizar perfil",
  "settings.account.successInfo": "As suas alterações foram gravadas",
  "settings.account.tryReloadServices": "Tente novamente",
  "settings.account.tryReloadUserInfoRequest": "Tente novamente",
  "settings.account.userInfoRequestFailed": "Não foi possível carregar as informações de utilizador",
-  "settings.account.yourLicense": "A sua licença Ferdi",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Limpar cache",
  "settings.app.buttonInstallUpdate": "Reiniciar e instalar atualizações",
@@ -219,13 +207,13 @@
  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "Servidor Personalizado de Tarefas",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
  "settings.app.form.darkMode": "Ativar modo noturno",
  "settings.app.form.enableGPUAcceleration": "Ativar Aceleração de GPU",
  "settings.app.form.enableLock": "Ativar palavra-passe",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Ativar correção ortográfica",
-  "settings.app.form.enableSystemTray": "Mostrar Ferdi na barra de sistema",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Ativar Tarefas Ferdi",
  "settings.app.form.hibernateOnStartup": "Manter os serviços em hibernação durante a inicialização",
  "settings.app.form.hibernationStrategy": "Estratégia de hibernação",
@@ -251,9 +239,10 @@
  "settings.app.form.showDisabledServices": "Mostrar separadores de serviços desativados",
  "settings.app.form.showDragArea": "Mostrar área arrastável na janela",
  "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar ícone de mensagem não lida quando as notificações estiverem desativadas",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Iniciar minimizado",
  "settings.app.form.universalDarkMode": "Ativar o Modo Noturno Universal",
-  "settings.app.form.useTouchIdToUnlock": "Permite usar o TouchID para desbloquear Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.form.useVerticalStyle": "Use horizontal style",
  "settings.app.form.wakeUpStrategy": "Wake up strategy",
  "settings.app.headlineAdvanced": "Avançado",
@@ -267,7 +256,7 @@
  "settings.app.languageDisclaimer": "As traduções oficiais são Inglês e Alemão. Todas as outras traduções são feitas pela comunidade.",
  "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 {lockShortcut}.",
  "settings.app.lockedPassword": "Palavra-passe",
-  "settings.app.lockedPasswordInfo": "Por favor certifique-se de definir uma palavra-passe que se lembre.\nSe perder esta palavra-passe, terá que reinstalar Ferdi.",
+  "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.restartRequired": "As mudanças requerem reinício de sistema",
  "settings.app.scheduledDNDInfo": "O Não Incomodar permite definir um período de tempo em que não quer receber notificações.",
  "settings.app.scheduledDNDTimeInfo": "Horas em formato 24h. Pode definir a hora do fim antes da hora de início (p. ex. início 17:00, fim 09:00) para ativar o modo \"Não incomodar\" durante a noite.",
@@ -275,7 +264,7 @@
  "settings.app.spellCheckerLanguageInfo": "Ferdi usa o corretor ortográfico do seu Mac para verificar se há erros ortográficos. Se você quiser alterar os idiomas que o corretor ortográfico verifica, pode fazê-lo nas Preferências do Sistema do Mac.",
  "settings.app.subheadlineCache": "Memória cache",
  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Este servidor será usado para a funcionalidade \"Tarefas Ferdi\".",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
  "settings.app.translationHelp": "Ajude-nos a traduzir o Ferdi para o seu idioma.",
  "settings.app.universalDarkModeInfo": "O Modo Noturno Universal tenta gerar dinamicamente os estilos do modo noturno para serviços que não o suportem de outra forma atualmente.",
  "settings.app.updateStatusAvailable": "Atualização disponível, a fazer download...",
@@ -294,9 +283,9 @@
  "settings.recipes.customService.headline.communityRecipes": "Receitas da comunidade de terceiros",
  "settings.recipes.customService.headline.customRecipes": "Receitas personalizadas de terceiros",
  "settings.recipes.customService.headline.devRecipes": "As suas Receitas de Serviço de Desenvolvimento",
-  "settings.recipes.customService.intro": "Para adicionar um serviço personalizado, copie a receita do serviço para:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Documentação para programadores",
-  "settings.recipes.customService.openFolder": "Abrir pasta",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Serviços disponíveis",
  "settings.recipes.missingService": "Sente falta de algum serviço?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Brilho do Leitor Escuro",
  "settings.service.form.darkReaderContrast": "Contraste do Leitor Noturno",
  "settings.service.form.darkReaderSepia": "Leitor Noturno Sépia",
-  "settings.service.form.deleteButton": "Apagar serviço",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Editar {name}",
  "settings.service.form.enableAudio": "Ativar áudio",
  "settings.service.form.enableBadge": "Mostrar aviso de mensagens não lidas",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Quando desativado, as notificações sonoras e áudio serão silenciados",
  "settings.service.form.name": "Nome",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Abrir darkmode.css",
  "settings.service.form.openUserCss": "Abrir user.css",
  "settings.service.form.openUserJs": "Abrir user.js",
  "settings.service.form.proxy.headline": "Configurações de HTTP/HTTPS Proxy",
  "settings.service.form.proxy.host": "Servidor/IP Proxy",
-  "settings.service.form.proxy.info": "As configurações de proxy não serão sincronizadas com os servidores de Ferdi.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Usar Proxy",
-  "settings.service.form.proxy.password": "Palavra-passe (opcional)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Porta",
  "settings.service.form.proxy.restartInfo": "Por favor, reinicie o Ferdi após alterar as configurações de proxy.",
-  "settings.service.form.proxy.user": "Utilizador (opcional)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Os seus ficheiros serão inseridos na página da web para que possa personalizar os serviços da maneira que desejar. Os ficheiros são apenas armazenados localmente e não são transferidos para outros computadores usando a mesma conta.",
  "settings.service.form.saveButton": "Gravar serviço",
  "settings.service.form.tabHosted": "Alojado",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Descobrir serviços",
  "settings.services.headline": "Os seus serviços",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Não foi possível carregar os seus serviços",
  "settings.services.tooltip.isDisabled": "O serviço está desativado",
  "settings.services.tooltip.isMuted": "Sem som",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Sem fins lucrativos",
  "settings.user.form.currentPassword": "Palavra-passe atual",
  "settings.user.form.email": "E-mail",
-  "settings.user.form.firstname": "Nome",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Apelido",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Nova palavra-passe",
  "settings.workspace.add.form.name": "Nome",
  "settings.workspace.add.form.submitButton": "Criar área de trabalho",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Tente novamente",
  "settings.workspaces.updatedInfo": "As suas alterações foram gravadas",
  "settings.workspaces.workspaceFeatureHeadline": "Menos é Mais: Apresentando áreas de trabalho Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "As áreas de trabalho do Ferdi permitem que se concentre no que realmente é importante. Configure diferentes conjuntos de serviços e mude-os facilmente e a qualquer momento. Você decide quais os serviços que precisa e onde colocá-los, para que o possamos ajudar a estar no seu melhor. - Ou desligar do trabalho quando quiser.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Não foi possível carregar suas áreas de trabalho",
  "setupAssistant.headline": "Let's get started",
  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Ativar notificações e áudio",
  "signup.email.label": "Endereço de E-mail",
  "signup.emailDuplicate": "Já existe um utilizador com este endereço de e-mail",
-  "signup.firstname.label": "Nome",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Entrar",
-  "signup.lastname.label": "Apelido",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Ao criar uma conta Ferdi, você aceita os",
  "signup.legal.privacy": "Declaração de Privacidade",
  "signup.legal.terms": "Termos de serviço",
@@ -430,11 +421,11 @@
  "signup.password.label": "Palavra-passe",
  "signup.submit.label": "Criar conta",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Apagar serviço",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Desativar áudio",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Desativar notificações",
-  "tabs.item.disableService": "Desativar serviço",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Ativar áudio",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Ativar notificações",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Atualizar",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} é inválido",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} deve ter pelo menos {length} caracteres",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "É necessário pelo menos um",
-  "validation.required": "{field} é obrigatório",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} não é um URL válido",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Anterior",
  "webControls.forward": "Seguinte",
  "webControls.goHome": "Início",
@@ -454,12 +445,12 @@
  "webControls.reload": "Atualizar",
  "welcome.loginButton": "Entrar na sua conta",
  "welcome.signupButton": "Criar uma conta gratuita",
-  "workspaceDrawer.addNewWorkspaceLabel": "Adicionar nova área de trabalho",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Todos os serviços",
  "workspaceDrawer.headline": "Áreas de trabalho",
  "workspaceDrawer.item.contextMenuEdit": "editar",
  "workspaceDrawer.item.noServicesAddedYet": "Nenhum serviço adicionado",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>As áreas de trabalho do Ferdi permitem que se concentre no que realmente é importante. Configure diferentes conjuntos de serviços e mude-os facilmente e a qualquer momento.</p><p>Você decide quais os serviços que precisa e onde colocá-los, para que o possamos ajudar a estar no seu melhor. - Ou desligar do trabalho quando quiser.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Editar configurações das áreas de trabalho",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "A mudar para"
 }
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 6e2ee4c19..fad6dae82 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Reîncărcare",
-  "app.errorHandler.headline": "Ceva nu a funcționat corect",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Custom server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Ce s-a întâmplat?",
  "connectionLostBanner.message": "Oh nu! Ferdi a pierdut conexiunea cu {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activare",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,7 +23,7 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "Căutare...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Nu se pot conecta la Ferdi servicii online",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
  "global.cancel": "Cancel",
  "global.edit": "Edit",
  "global.no": "No",
@@ -45,7 +44,7 @@
  "import.headline": "Importă serviciile tale Ferdi 4",
  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
  "import.skip.label": "I want to add services manually",
-  "import.submit.label": "Import services",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Restart & install update",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Terms of Service",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -152,18 +151,7 @@
  "password.link.login": "Sign in to your account",
  "password.link.signup": "Create a free account",
  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Please check your email",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
  "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
  "settings.account.tryReloadServices": "Try again",
  "settings.account.tryReloadUserInfoRequest": "Try again",
  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Clear cache",
  "settings.app.buttonInstallUpdate": "Restart & install update",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 4a7222914..f7d25e08b 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Перезагрузить",
-  "app.errorHandler.headline": "Что-то пошло не так",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Пользовательский сервер",
  "changeserver.headline": "Изменить сервер",
  "changeserver.label": "Сервер",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Что случилось?",
  "connectionLostBanner.message": "О нет! Ферди потерял связь с {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Опубликовать отладочную информацию",
  "feature.nightlyBuilds.activate": "Активировать",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Выберите сервис с Tab, вверх и вниз. Откройте сервис нажав на ENTER.",
  "feature.quickSwitch.search": "Поиск...",
  "feature.quickSwitch.title": "Быстрое переключение",
-  "global.api.unhealthy": "Невозможно подключиться к онлайн-сервисам Ferdi",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Отмена",
+  "global.cancel": "Cancel",
  "global.edit": "Правка",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Вы не подключены к сети Интернет",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Настройки",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Использовать системные параметры по умолчанию ({default})",
  "global.spellchecking.autodetect": "Найти язык автоматически",
  "global.spellchecking.autodetect.short": "Авто",
  "global.spellchecking.language": "Проверка правописания",
-  "global.submit": "Принять",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Импортировать ваши сервисы из Ferdi 4",
  "import.notSupportedHeadline": "Сервисы пока ещё не поддерживаются в Ferdi 5",
  "import.skip.label": "Я хочу добавить сервисы вручную",
-  "import.submit.label": "Импортировать сервисы",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "При попытке выполнить запрос на аутентификацию произошли ошибки. Пожалуйста, попробуйте выйти из системы и вернуться назад, если эта ошибка повторяется.",
-  "infobar.buttonChangelog": "Что новенького?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Перезапустить и установить обновления",
  "infobar.buttonReloadServices": "Перезагрузить сервисы",
  "infobar.hide": "Скрыть",
@@ -75,7 +74,7 @@
  "login.email.label": "Адрес электронной почты",
  "login.headline": "Вход",
  "login.invalidCredentials": "Неправильный адрес электронной почты или пароль",
-  "login.link.password": "Восстановить пароль",
+  "login.link.password": "Reset password",
  "login.link.signup": "Создать бесплатный аккаунт",
  "login.password.label": "Пароль",
  "login.serverLogout": "Сессия устарела, пожалуйста, войдите снова.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Поддержка",
  "menu.help.tos": "Условия использования",
  "menu.services": "Сервис",
-  "menu.services.activatePreviousService": "Активировать предыдущий сервич",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Домой",
-  "menu.services.setNextServiceActive": "Активировать следующий сервис",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Задачи",
  "menu.todos.enableTodos": "Включить задачи",
  "menu.view": "Вид",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Все сервисы",
  "menu.workspaces.openWorkspaceDrawer": "Открыть меню окружений",
  "password.email.label": "Адрес электронной почты",
-  "password.headline": "Восстановить пароль",
+  "password.headline": "Reset password",
  "password.link.login": "Вход",
  "password.link.signup": "Создать бесплатный аккаунт",
-  "password.noUser": "Не найдено пользователя с таким адресом электронной почты",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Проверьте вашу электронную почту",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Добавить пользовательские веб-сайты",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Прокси сервиса",
-  "pricing.features.spellchecker": "Поддержка Spellchecker",
-  "pricing.features.teamManagement": "Команда управления",
-  "pricing.features.thirdPartyServices": "Установить сторонние сервисы",
-  "pricing.features.unlimitedServices": "Добавить неограниченные сервисы",
-  "pricing.features.workspaces": "Окружение",
  "service.crashHandler.action": "Перезагрузить {name}",
  "service.crashHandler.autoReload": "Пытаюсь автоматически восстановить {name} в течение {seconds} секунд",
  "service.crashHandler.headline": "О, нет!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Добро пожаловать во Ferdi",
-  "settings.account.account.editButton": "Редактировать аккаунт",
+  "settings.account.account.editButton": "Edit 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": "Обновить профиль",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "Вам выслано письмо с ссылкой для подтверждения удаления аккаунта. После этого ваш аккаунт и данные не смогут быть восстановлены!",
  "settings.account.deleteInfo": "Если вам больше не нужна ваша учетная запись в Ferdi, вы можете удалить аккаунт и всю связанную с ней информацию.",
  "settings.account.headline": "Аккаунт",
-  "settings.account.headlineAccount": "Информация аккаунта",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Запретная Зона",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Счета",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Сменить пароль",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Обновить профиль",
  "settings.account.successInfo": "Ваши изменения были сохранены",
  "settings.account.tryReloadServices": "Попробовать снова",
  "settings.account.tryReloadUserInfoRequest": "Попробовать снова",
  "settings.account.userInfoRequestFailed": "Невозможно загрузить информацию пользователя",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Очистить кэш",
  "settings.app.buttonInstallUpdate": "Перезапустить и установить обновления",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Включить Тёмный режим",
  "settings.app.form.enableGPUAcceleration": "Включить ускорение GPU",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Включить проверку правописания",
-  "settings.app.form.enableSystemTray": "Показывать Ferdi в системном трее",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Показывать вкладки отключённых служб",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Показывать значок непрочитанного сообщения при отключённых уведомлениях",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Запускать свернутым",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -294,9 +283,9 @@
  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
  "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "Чтобы добавить пользовательский сервис, скопируйте файлы сервиса:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Документация для разработчиков",
-  "settings.recipes.customService.openFolder": "Открыть папку",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Доступные сервисы",
  "settings.recipes.missingService": "Не можете найти сервис?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Удалить сервис",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Редактирование {name}",
  "settings.service.form.enableAudio": "Включить звук",
  "settings.service.form.enableBadge": "Показывать иконку непрочитанных сообщений",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "Когда включено, служба будет отключена по истечении времени, чтобы сохранить системные ресурсы.",
  "settings.service.form.isMutedInfo": "Когда выключено, все звуковые уведомления будут отключены",
  "settings.service.form.name": "Имя",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Открыть user.css",
  "settings.service.form.openUserJs": "Открыть user.js",
  "settings.service.form.proxy.headline": "Настройки Прокси HTTP/HTTPS",
  "settings.service.form.proxy.host": "Прокси Host/IP",
-  "settings.service.form.proxy.info": "Настройки прокси не будут синхронизированны с серверами Ferdi",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Использовать прокси",
-  "settings.service.form.proxy.password": "Пароль (опционально)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Порт",
  "settings.service.form.proxy.restartInfo": "Пожалуйста перезапустите Ferdi после изменения настроек прокси.",
-  "settings.service.form.proxy.user": "Пользователь (опционально)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Ваши пользовательские файлы будут вставлены на веб-страницу, чтобы вы могли настроить сервисы в любом удобном вам виде. Файлы пользователей хранятся только локально и не передаются на другие компьютеры, использующие ту же учетную запись.",
  "settings.service.form.saveButton": "Сохранить сервис",
  "settings.service.form.tabHosted": "Размещено",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Найти сервисы",
  "settings.services.headline": "Ваши сервисы",
  "settings.services.noServicesAdded": "Начните с добавления сервиса.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Ошибка загрузки сервисов",
  "settings.services.tooltip.isDisabled": "Сервис отключен",
  "settings.services.tooltip.isMuted": "Все звуки отключены",
@@ -362,12 +353,12 @@
  "settings.supportFerdi.aboutIntro": "<p>Ферди является приложением с открытым исходным кодом и разрабатывается сообществом.</p><p>Спасибо людям, которые делают это возможным:</p>",
  "settings.supportFerdi.bannerText": "Вы хотите помочь нам улучшить Ферди?",
  "settings.supportFerdi.headline": "О Ferdi",
-  "settings.supportFerdi.openSurvey": "Открыть опрос",
+  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "Если вы хотите поддержать развитие Ферди с пожертвованием, вы можете сделать это двумя способами,",
  "settings.supportFerdi.textDonationAnd": "и",
  "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
  "settings.supportFerdi.textGitHubSponsors": "Спонсоры на Github",
-  "settings.supportFerdi.textListContributors": "Полный список участников",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
  "settings.supportFerdi.textListContributorsHere": "here",
  "settings.supportFerdi.textOpenCollective": "Open Collective",
  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Некоммерческий",
  "settings.user.form.currentPassword": "Текущий пароль",
  "settings.user.form.email": "Адрес электронной почты",
-  "settings.user.form.firstname": "Имя",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Фамилия",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Новый пароль",
  "settings.workspace.add.form.name": "Имя",
  "settings.workspace.add.form.submitButton": "Создать окружение",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Включить уведомления и звук",
  "signup.email.label": "Адрес электронной почты",
  "signup.emailDuplicate": "Пользователь с таким адресом электронной почты уже существует",
-  "signup.firstname.label": "Имя",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Регистрация",
-  "signup.lastname.label": "Фамилия",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Создавая аккаунт Ferdi, вы принимаете",
  "signup.legal.privacy": "Политика конфиденциальности",
  "signup.legal.terms": "Условия обслуживания",
@@ -430,11 +421,11 @@
  "signup.password.label": "Пароль",
  "signup.submit.label": "Создать аккаунт",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Удалить сервис",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Отключить звук",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Отключить уведомления",
-  "tabs.item.disableService": "Отключить сервис",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Включить звук",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Включить уведомления",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Перезагрузить",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} недействительно",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} должно быть не менее {length} символов",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} обязательно",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} является недействительной ссылкой",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Назад",
  "webControls.forward": "Переслать",
  "webControls.goHome": "Домой",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 7e84088d1..02d325afd 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Obnoviť",
-  "app.errorHandler.headline": "Niečo sa pokazilo",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Vlastný server",
  "changeserver.headline": "Zmeniť server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Čo sa stalo?",
  "connectionLostBanner.message": "Oh nie! Ferdi stratil pripojenie k {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Zverejniť informácie ladenia",
  "feature.nightlyBuilds.activate": "Aktivovať",
  "feature.nightlyBuilds.info": "Tzv. \"nočné verzie\" sú vysoko experimentálne verzie Ferdi, ktoré môžu obsahovať nedoladená alebo nedokončené funkcie. Tieto verzie sú používané predovšetkým vývojármi, aby otestovali novo-vyvíjané funkcie a spôsob, akým sa budú správať vo finálnej verzii. Ak neviete čo robíte, navrhujeme neaktivovať tieto experimentálne verzie.",
  "feature.nightlyBuilds.title": "Vývojárske verzie",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "Hľadať...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Nedá sa pripojiť k online službám Ferdi",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Zrušiť",
+  "global.cancel": "Cancel",
  "global.edit": "Upraviť",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Nie ste pripojení k internetu.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Nastavenia",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Použiť predvolené nastavenie systému ({default})",
  "global.spellchecking.autodetect": "Automaticky rozpoznať jazyk",
  "global.spellchecking.autodetect.short": "Automatický",
  "global.spellchecking.language": "Jazyk kontroly pravopisu",
-  "global.submit": "Odoslať",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Importovať vaše služby z Ferdi 4",
  "import.notSupportedHeadline": "Služby zatiaľ nie sú podporované vo verzii Ferdi 5",
  "import.skip.label": "Chcem pridať služby ručne",
-  "import.submit.label": "Importovať služby",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Čo je nového?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Reštartovať a nainštalovať aktualizáciu",
  "infobar.buttonReloadServices": "Obnoviť služby",
  "infobar.hide": "Skryť",
@@ -75,7 +74,7 @@
  "login.email.label": "E-mailová adresa",
  "login.headline": "Prihlásiť sa",
  "login.invalidCredentials": "E-mail alebo heslo nesúhlasia",
-  "login.link.password": "Obnoviť heslo",
+  "login.link.password": "Reset password",
  "login.link.signup": "Vytvoriť používateľský účet zdarma",
  "login.password.label": "Heslo",
  "login.serverLogout": "Vaša relácia vypršala, prihláste sa prosím znovu.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Podpora",
  "menu.help.tos": "Podmienky použitia",
  "menu.services": "Služby",
-  "menu.services.activatePreviousService": "Aktivovať predchádzajúcu službu",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Úvod",
-  "menu.services.setNextServiceActive": "Aktivujte ďalšiu službu",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Enable Todos",
  "menu.view": "Zobraziť",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Všetky služby",
  "menu.workspaces.openWorkspaceDrawer": "Otvoriť workspace záložku",
  "password.email.label": "E-mailová adresa",
-  "password.headline": "Obnoviť heslo",
+  "password.headline": "Reset password",
  "password.link.login": "Prihlásiť sa do vášho účtu",
  "password.link.signup": "Vytvoriť používateľský účet zdarma",
-  "password.noUser": "Používateľ s touto e-mailovou adresou nebol nájdený",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Skontrolujte prosím váš e-mail",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Synchronizácia účtu",
-  "pricing.features.customWebsites": "Pridať vlastnú webstránku",
-  "pricing.features.desktopNotifications": "Upozornenie na ploche",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Proxy servery",
-  "pricing.features.spellchecker": "Podpora kontroly pravopisu",
-  "pricing.features.teamManagement": "Manažment tímu",
-  "pricing.features.thirdPartyServices": "Inštalovať inú službu",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Pracovný priestor",
  "service.crashHandler.action": "Znovu načítať {name}",
  "service.crashHandler.autoReload": "Najbližší pokus o automatické obnovenie {name} o {seconds} sekúnd",
  "service.crashHandler.headline": "Ale nie!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Vítajte v aplikácii Ferdi",
-  "settings.account.account.editButton": "Upraviť účet",
+  "settings.account.account.editButton": "Edit 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": "Aktualizovať profil",
@@ -189,16 +177,16 @@
  "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ť!",
  "settings.account.deleteInfo": "Ak už nepotrebujete váš Ferdi účet, tu ho môžete zmazať spolu so všetkými prislúchajúcimi údajmi.",
  "settings.account.headline": "Účet",
-  "settings.account.headlineAccount": "Informácie o účte",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Nebezpečná zóna",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Faktúry",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Zmeniť heslo",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Aktualizovať profil",
  "settings.account.successInfo": "Vaše zmeny boli uložené",
  "settings.account.tryReloadServices": "Skúsiť znova",
  "settings.account.tryReloadUserInfoRequest": "Skúsiť znova",
  "settings.account.userInfoRequestFailed": "Nebolo možné načítať informácie o používateľovi",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Vyčistiť vyrovnávaciu pamäť",
  "settings.app.buttonInstallUpdate": "Reštartovať a nainštalovať aktualizáciu",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Zapnúť Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Zapnúť GPU zrýchlenie",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Zapnúť kontrolu pravopisu",
-  "settings.app.form.enableSystemTray": "Zobrazovať Ferdi v systémovej lište",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Zobraziť záložky vypnutých služieb",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Zobraziť symbol pre neprečítané správy, keď sú vypnuté upozornenia",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -296,7 +285,7 @@
  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
-  "settings.recipes.customService.openFolder": "Otvoriť priečinok",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Dostupné služby",
  "settings.recipes.missingService": "Chýba vám služba?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Odstrániť službu",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Upraviť {name}",
  "settings.service.form.enableAudio": "Zapnúť zvuk",
  "settings.service.form.enableBadge": "Zobraziť symboly neprečítaných správ",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Ak je vypnuté, všetky zvuky oznámení a iné prehrávania budú stíšené",
  "settings.service.form.name": "Meno",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Nastavenia servera proxy sa nebudú synchronizovať so servermi Ferdi.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Použiť Proxy",
-  "settings.service.form.proxy.password": "Heslo (voliteľné)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Po zmene nastavení servera proxy reštartujte Ferdi.",
-  "settings.service.form.proxy.user": "Používateľ (voliteľné)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "Uložiť službu",
  "settings.service.form.tabHosted": "Hostované",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Preskúmať služby",
  "settings.services.headline": "Vaše služby",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Nepodarilo sa načítať vaše služby",
  "settings.services.tooltip.isDisabled": "Služba je vypnutá",
  "settings.services.tooltip.isMuted": "Všetky zvuky sú stíšené",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Nezisková organizácia",
  "settings.user.form.currentPassword": "Súčasné heslo",
  "settings.user.form.email": "E-mail",
-  "settings.user.form.firstname": "Krstné meno",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Priezvisko",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Nové heslo",
  "settings.workspace.add.form.name": "Meno",
  "settings.workspace.add.form.submitButton": "Vytvoriť pracovný priestor",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Skúsiť znova",
  "settings.workspaces.updatedInfo": "Vaše zmeny boli uložené",
  "settings.workspaces.workspaceFeatureHeadline": "Menej je viac: Predstavenie Ferdi Pracovné priestory",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspace vám umožňujú sústrediť sa na to, čo je práve dôležité. Nastavte si rozličné skupiny služieb a jednoducho medzi nimi kedykoľvek prepínajte. Vy rozhodujete ktoré služby, kedy a kde potrebujete, a my vám potom vieme pomôcť sústrediť sa na prácu - alebo jednoducho prepnúť z práce na čokoľvek iné.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Nebolo možné načítať vaše workspace",
  "setupAssistant.headline": "Let's get started",
  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Povoliť oznámenia a zvuky",
  "signup.email.label": "E-mailová adresa",
  "signup.emailDuplicate": "Používateľ s touto e-mailovou adresou už jestvuje",
-  "signup.firstname.label": "Krstné meno",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Prihlásiť sa",
-  "signup.lastname.label": "Priezvisko",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Vytvorením účtu Ferdi súhlasíte s",
  "signup.legal.privacy": "Vyhlásenie o ochrane súkromia",
  "signup.legal.terms": "Podmienky služby",
@@ -430,11 +421,11 @@
  "signup.password.label": "Heslo",
  "signup.submit.label": "Vytvoriť účet",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Odstrániť službu",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Vypnúť zvuk",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Zakázať oznámenia",
-  "tabs.item.disableService": "Vypnúť službu",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Zapnúť zvuk",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Povoliť oznámenia",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Obnoviť",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} je neplatný",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} by malo byť dlhé aspoň {length} znakov",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Je nutné zadať aspoň jeden",
-  "validation.required": "{field} je povinné",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} nie je platné URL",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Naspäť",
  "webControls.forward": "Forward",
  "webControls.goHome": "Úvod",
@@ -454,12 +445,12 @@
  "webControls.reload": "Obnoviť",
  "welcome.loginButton": "Prihlásiť sa do vášho účtu",
  "welcome.signupButton": "Vytvoriť používateľský účet zdarma",
-  "workspaceDrawer.addNewWorkspaceLabel": "Pridať nový workspace",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Všetky služby",
  "workspaceDrawer.headline": "Pracovný priestor",
  "workspaceDrawer.item.contextMenuEdit": "Upraviť",
  "workspaceDrawer.item.noServicesAddedYet": "Zatiaľ žiadne služby",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspace vám umožňujú sústrediť sa na to, čo je práve dôležité. Nastavte si rozličné skupiny služieb a jednoducho medzi nimi kedykoľvek prepínajte.</p><p>Vy rozhodujete ktoré služby, kedy a kde potrebujete, a my vám potom vieme pomôcť sústrediť sa na prácu - alebo jednoducho prepnúť z práce na čokoľvek iné. </p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Upraviť nastavenia workspace",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Prepínanie na"
 }
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 2c145d6f4..041b02632 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Custom server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -45,7 +44,7 @@
  "import.headline": "Import your Ferdi 4 services",
  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
  "import.skip.label": "I want to add services manually",
-  "import.submit.label": "Import services",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Restart & install update",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Terms of Service",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -152,18 +151,7 @@
  "password.link.login": "Sign in to your account",
  "password.link.signup": "Create a free account",
  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Please check your email",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
  "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
  "settings.account.tryReloadServices": "Try again",
  "settings.account.tryReloadUserInfoRequest": "Try again",
  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Clear cache",
  "settings.app.buttonInstallUpdate": "Restart & install update",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 8ee9417f6..85068ee5c 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Ponovno učitavanje",
-  "app.errorHandler.headline": "Дошло је до грешке",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Prilagođen server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Сервер",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Шта се десило?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Активирај",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "Search...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Nije moguće pristupiti Ferdi-ovim on-line servisima. ",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Odustani",
+  "global.cancel": "Cancel",
  "global.edit": "Uredi",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Niste povezani sa serverom.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Postavke",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Use System Default ({default})",
  "global.spellchecking.autodetect": "Detect language automatically",
  "global.spellchecking.autodetect.short": "Аутоматски",
  "global.spellchecking.language": "Spell checking language",
-  "global.submit": "Pošalji",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Uvezite svoje Ferdi 4 servise",
  "import.notSupportedHeadline": "Servis trenutno nije podržan u Ferdi 5",
  "import.skip.label": "Желим да додам услуге ручно",
-  "import.submit.label": "Uvezi servise",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Šta je novo? ",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Ponovo pokreni i instaliraj ažuriranje ",
  "infobar.buttonReloadServices": "Ponovo učitaj servise ",
  "infobar.hide": "Sakrij",
@@ -75,7 +74,7 @@
  "login.email.label": "Vaša e-adresa",
  "login.headline": "Prijavite se",
  "login.invalidCredentials": "E-mail ili lozinka nisu točni",
-  "login.link.password": "Stvaranje nove lozinke",
+  "login.link.password": "Reset password",
  "login.link.signup": "Stvorite besplatan račun",
  "login.password.label": "Лозинка",
  "login.serverLogout": "Vaša sesija je istekla, prijavite se ponovo.",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Услови коришћења услуге",
  "menu.services": "Usluge",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Sve usluge",
  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
  "password.email.label": "Vaša e-adresa",
-  "password.headline": "Stvaranje nove lozinke",
+  "password.headline": "Reset password",
  "password.link.login": "Prijavite se na Vaš račun",
  "password.link.signup": "Stvorite besplatan račun",
-  "password.noUser": "Ne postoji ni jedan korisnik s tom e-mail adresom",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Molimo Vas da provjerite vašu e-mail adresu",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Osvježi {name}",
  "service.crashHandler.autoReload": "Pokušaću automatski povratiti {name} u {seconds} sekundi",
  "service.crashHandler.headline": "O, ne! ",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Dobrodošli u Ferdi",
-  "settings.account.account.editButton": "Uredi račun",
+  "settings.account.account.editButton": "Edit 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": "Ažuriraj profil",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "Добили сте имејл са линком путем којег потврђујете брисање свог налога. Ваш налог и подаци не могу бити повраћени!",
  "settings.account.deleteInfo": "Уколико Вам више није потребан Франз налог, овде можете обрисати свој налог и све податке везане за исти.",
  "settings.account.headline": "Korisnički nalog",
-  "settings.account.headlineAccount": "Podaci o nalogu",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Зона опреза",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Fakture",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Promijenite lozinku",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Ažuriraj profil",
  "settings.account.successInfo": "Vaše promjene su spremljene",
  "settings.account.tryReloadServices": "Pokušajte ponovno",
  "settings.account.tryReloadUserInfoRequest": "Pokušajte ponovno",
  "settings.account.userInfoRequestFailed": "Nije moguće učitati informacije o korisniku",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Очисти кеш",
  "settings.app.buttonInstallUpdate": "Ponovo pokreni i instaliraj ažuriranje ",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Омогући убрзање графичке јединице",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Omogući provjeru pravopisa",
-  "settings.app.form.enableSystemTray": "Prikaži aplikaciju u sustavskoj traci",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Prikaži ploče s onemogućenim servisima",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Покажи беџ за непрочитане поруке када су обавештења онемогућена",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Izbriši uslugu",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Uredite {name}",
  "settings.service.form.enableAudio": "Omogućite zvuk",
  "settings.service.form.enableBadge": "Покажи беџеве за непрочитане поруке",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Kada je onemogućeno, sve obavijesti, svi zvukovi i sva pozadinska podrška će biti nečujna.",
  "settings.service.form.name": "Ime",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Pronađite usluge",
  "settings.services.headline": "Vaše usluge",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Usluga je onemogućena.",
  "settings.services.tooltip.isMuted": "Svi zvukovi su onemogućeni.",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Neprofitno",
  "settings.user.form.currentPassword": "Trenutna lozinka",
  "settings.user.form.email": "E-pošta",
-  "settings.user.form.firstname": "Ime",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Prezime",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Nova lozinka",
  "settings.workspace.add.form.name": "Ime",
  "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Искључи обавештења и звукове",
  "signup.email.label": "Vaša e-adresa",
  "signup.emailDuplicate": "Već postoji korisnik s tom e-mail adresom",
-  "signup.firstname.label": "Ime",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Prijava",
-  "signup.lastname.label": "Prezime",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Prilikom stvaranja Ferdi računa, slažete se sa sljedećim stavkama",
  "signup.legal.privacy": "Izjava o privatnosti",
  "signup.legal.terms": "Uvjeti korištenja",
@@ -430,11 +421,11 @@
  "signup.password.label": "Лозинка",
  "signup.submit.label": "Napravite novi račun",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Izbriši uslugu",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Onemogući zvuk",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Onemogući obavijesti",
-  "tabs.item.disableService": "Onemogući servis",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Omogućite zvuk",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Omogućite obavijesti",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Ponovno učitavanje",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} није валидно",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} треба да буде најмање {length} карактера дугачко",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} је неопходно",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} није валидан УРЛ",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Back",
  "webControls.forward": "Forward",
  "webControls.goHome": "Home",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index 87b92e398..ef254fc5d 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Ladda om",
-  "app.errorHandler.headline": "Någonting gick snett",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Anpassad server",
  "changeserver.headline": "Byt server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Vad hände?",
  "connectionLostBanner.message": "Åh nej! Ferdi förlorade anslutningen till {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Skicka felsökningsinformation",
  "feature.nightlyBuilds.activate": "Aktivera",
  "feature.nightlyBuilds.info": "Nattliga kompileringar är väldigt experimentella versioner av Ferdi som kan innehålla ofärdiga och ännu ej testade funktioner. Nattliga kompilering är i första hand tänkt för utvecklare för att kunna testa hur nya funktioner fungerar och presterar. Är du osäker på vad detta innebär rekommenderas du att inte aktivera nattliga kompileringar.",
  "feature.nightlyBuilds.title": "Nattlig kompilering",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Välj en tjänst med TAB, ↑ and ↓. Öppna en tjänst med ENTER.",
  "feature.quickSwitch.search": "Sök...",
  "feature.quickSwitch.title": "Snabbväxling",
-  "global.api.unhealthy": "Kan inte ansluta till Ferdis onlinetjänster",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Avbryt",
+  "global.cancel": "Cancel",
  "global.edit": "Redigera",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Du är inte ansluten till Internet.",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Inställningar",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Använd systemstandard ({default})",
  "global.spellchecking.autodetect": "Identifiera språk automatiskt",
  "global.spellchecking.autodetect.short": "Automatisk",
  "global.spellchecking.language": "Rättstavningsspråk",
-  "global.submit": "Skicka",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Importera dina Ferdi 4-tjänster",
  "import.notSupportedHeadline": "Tjänster som ännu inte stöds i Ferdi 5",
  "import.skip.label": "Jag vill lägga till tjänster manuellt",
-  "import.submit.label": "Importera tjänster",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "Det uppstod fel vid försök då en autentiserad begäran utfördes. Prova att logga ut och in igen om felet kvarstår.",
-  "infobar.buttonChangelog": "Vad nytt har hänt?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Starta om & installera uppdatering",
  "infobar.buttonReloadServices": "Ladda om tjänster",
  "infobar.hide": "Dölj",
@@ -75,7 +74,7 @@
  "login.email.label": "E-postadress",
  "login.headline": "Logga in",
  "login.invalidCredentials": "E-post eller lösenord är felaktigt",
-  "login.link.password": "Återställ lösenord",
+  "login.link.password": "Reset password",
  "login.link.signup": "Skapa ett gratis konto",
  "login.password.label": "Lösenord",
  "login.serverLogout": "Din session har gått ut. Vänligen logga in på nytt.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Support",
  "menu.help.tos": "Användarvillkor",
  "menu.services": "Tjänster",
-  "menu.services.activatePreviousService": "Aktivera föregående tjänst",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Lägg till ny tjänst",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Hem",
-  "menu.services.setNextServiceActive": "Aktivera nästa tjänst",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
  "menu.todos.enableTodos": "Aktivera Todos",
  "menu.view": "Visa",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Alla tjänster",
  "menu.workspaces.openWorkspaceDrawer": "Öppna arbetsytan",
  "password.email.label": "E-postadress",
-  "password.headline": "Återställ lösenord",
+  "password.headline": "Reset password",
  "password.link.login": "Logga in på ditt konto",
  "password.link.signup": "Skapa ett gratis konto",
-  "password.noUser": "Ingen användare med den e-postadressen hittades",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Vänligen kontrollera din e-post",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Synkronisering av konto",
-  "pricing.features.customWebsites": "Lägg till egna webbplatser",
-  "pricing.features.desktopNotifications": "Skrivbordsaviseringar",
-  "pricing.features.onPremise": "Lokala tjänster och andra värdtjänster",
-  "pricing.features.recipes": "Välj mellan fler än 70 tjänster",
-  "pricing.features.serviceProxies": "Tjänstens proxies",
-  "pricing.features.spellchecker": "Stöd för stavningskontroll",
-  "pricing.features.teamManagement": "Hantera grupp",
-  "pricing.features.thirdPartyServices": "Installera tjänster från tredje part",
-  "pricing.features.unlimitedServices": "Lägg till obegränsat antal tjänster",
-  "pricing.features.workspaces": "Arbetsytor",
  "service.crashHandler.action": "Ladda om {name}",
  "service.crashHandler.autoReload": "Försöker automatiskt återställa {name} om {seconds} sekunder",
  "service.crashHandler.headline": "Åh nej!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Använd Ferdi utan ett konto",
  "services.welcome": "Välkommen till Ferdi",
-  "settings.account.account.editButton": "Redigera konto",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Kontot är inte tillgängligt",
  "settings.account.accountUnavailableInfo": "Du använder Ferdi utan ett konto. Om du vill använda Ferdi med ett konto och hålla dina tjänster synkroniserade mellan installationer, välj en server i fliken Inställningar och logga in.",
  "settings.account.buttonSave": "Uppdatera profil",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "Du har fått ett e-postmeddelande med en länk för att bekräfta raderingen av ditt konto. Ditt konto och data kan inte återställas!",
  "settings.account.deleteInfo": "Om du inte behöver ditt Ferdi-konto längre, kan du ta bort ditt konto och all anknuten information här.",
  "settings.account.headline": "Konto",
-  "settings.account.headlineAccount": "Kontoinformation",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Högrisksområde",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Fakturor",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Ändra lösenord",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Uppdatera profil",
  "settings.account.successInfo": "Dina ändringar har sparats",
  "settings.account.tryReloadServices": "Försök igen",
  "settings.account.tryReloadUserInfoRequest": "Försök igen",
  "settings.account.userInfoRequestFailed": "Kunde inte ladda användarinformation",
-  "settings.account.yourLicense": "Din Ferdi-licens",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Rensa cache",
  "settings.app.buttonInstallUpdate": "Starta om & installera uppdatering",
@@ -219,13 +207,13 @@
  "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "Anpassad Todo-server",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
  "settings.app.form.darkMode": "Aktivera mörkt läge",
  "settings.app.form.enableGPUAcceleration": "Aktivera GPU-hårdvaruacceleration",
  "settings.app.form.enableLock": "Aktivera lösenordslås",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Aktivera stavningskontroll",
-  "settings.app.form.enableSystemTray": "Visa Ferdi i systemfältet",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Aktivera Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Strategi för vila",
@@ -251,9 +239,10 @@
  "settings.app.form.showDisabledServices": "Visa flikar för inaktiverade tjänster",
  "settings.app.form.showDragArea": "Visa dragbart område i fönstret",
  "settings.app.form.showMessagesBadgesWhenMuted": "Visa antal olästa meddelanden när aviseringar är inaktiverade",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Starta i minimerat läge",
  "settings.app.form.universalDarkMode": "Aktivera globalt mörkt läge",
-  "settings.app.form.useTouchIdToUnlock": "Tillåt att TouchID används för att låsa upp Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.form.useVerticalStyle": "Use horizontal style",
  "settings.app.form.wakeUpStrategy": "Wake up strategy",
  "settings.app.headlineAdvanced": "Avancerat",
@@ -267,7 +256,7 @@
  "settings.app.languageDisclaimer": "Engelska och tyska är officella översättningar. Övriga språk har översatts av gemenskapen.",
  "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 {lockShortcut}.",
  "settings.app.lockedPassword": "Lösenord",
-  "settings.app.lockedPasswordInfo": "Se till att du anger ett lösenord du kommer att komma ihåg.\nOm du tappar bort detta lösenord måste du installera om Ferdi.",
+  "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.restartRequired": "Ändringar kräver omstart",
  "settings.app.scheduledDNDInfo": "Schemalagd \"Stör ej\" låter dig definiera en tidsperiod inom vilken du inte vill få meddelanden från Ferdi.",
  "settings.app.scheduledDNDTimeInfo": "Tid i 24-timmarsformat. Sluttid kan vara före starttid (t.ex. start 17:00, slut 09:00) för att aktivera \"Stör ej\" över natten.",
@@ -275,7 +264,7 @@
  "settings.app.spellCheckerLanguageInfo": "Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
  "settings.app.subheadlineCache": "Cache",
  "settings.app.subheadlineFerdiProfile": "Ferdi Profile",
-  "settings.app.todoServerInfo": "Denna server kommer att användas för \"Ferdi Todo\"-funktionen.",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
  "settings.app.translationHelp": "Hjälp oss att översätta Ferdi till ditt språk.",
  "settings.app.universalDarkModeInfo": "Globalt mörkt läge försöker att dynamiskt generera en mörk stil för tjänster som ännu inte stöds.",
  "settings.app.updateStatusAvailable": "Uppdatering tillgänglig, laddar ner...",
@@ -294,9 +283,9 @@
  "settings.recipes.customService.headline.communityRecipes": "Tredjepartsrecept från gemenskapen",
  "settings.recipes.customService.headline.customRecipes": "Egna tredjepartsrecept",
  "settings.recipes.customService.headline.devRecipes": "Dina recept för utvecklingsservice",
-  "settings.recipes.customService.intro": "För att lägga till en anpassad tjänst, kopiera receptet för tjänsten till:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Dokumentation för utvecklare",
-  "settings.recipes.customService.openFolder": "Öppna mapp",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Tillgängliga tjänster",
  "settings.recipes.missingService": "Saknar du en tjänst?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Ta bort tjänst",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Redigera {name}",
  "settings.service.form.enableAudio": "Aktivera ljud",
  "settings.service.form.enableBadge": "Visa olästa meddelandemärken",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Om inaktiverad kommer alla aviseringsljud och ljuduppspelning att tystas",
  "settings.service.form.name": "Namn",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Öppna darkmode.css",
  "settings.service.form.openUserCss": "Öppna user.css",
  "settings.service.form.openUserJs": "Öppna user.js",
  "settings.service.form.proxy.headline": "Inställningar för HTTP/HTTPS-proxy",
  "settings.service.form.proxy.host": "Proxy-värd/IP",
-  "settings.service.form.proxy.info": "Proxyinställningar kommer inte att synkroniseras med Ferdi-servrarna.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Använd proxy",
-  "settings.service.form.proxy.password": "Lösenord (frivilligt)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Vänligen starta om Ferdi efter att du ändrat proxyinställningar.",
-  "settings.service.form.proxy.user": "Användare (valfritt)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Dina användarfiler kommer att infogas i webbsidan så att du kan anpassa tjänsterna hur du vill. Användarfiler lagras endast lokalt och överförs inte till andra datorer som använer samma konto.",
  "settings.service.form.saveButton": "Spara tjänst",
  "settings.service.form.tabHosted": "Värd",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Upptäck tjänster",
  "settings.services.headline": "Dina tjänster",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Kunde inte ladda dina tjänster",
  "settings.services.tooltip.isDisabled": "Tjänsten är inaktiverad",
  "settings.services.tooltip.isMuted": "Alla ljud är avstängda",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Ideell organisation",
  "settings.user.form.currentPassword": "Nuvarande lösenord",
  "settings.user.form.email": "E-post",
-  "settings.user.form.firstname": "Förnamn",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Efternamn",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Nytt lösenord",
  "settings.workspace.add.form.name": "Namn",
  "settings.workspace.add.form.submitButton": "Skapa arbetsyta",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Försök igen",
  "settings.workspaces.updatedInfo": "Dina ändringar har sparats",
  "settings.workspaces.workspaceFeatureHeadline": "\"Less is more\": Vi presenterar Ferdi-arbetsytor",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi-arbetsytor låter dig fokusera på det som är viktigt just nu. Konfigurera olika uppsättningar av tjänster och växla enkelt mellan dem när som helst. Du bestämmer vilka tjänster du behöver när och var, så att vi kan hjälpa dig att hålla koll på läget - eller enkelt koppla bort från jobbet när du vill.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Kunde inte ladda dina arbetsytor",
  "setupAssistant.headline": "Let's get started",
  "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Aktivera aviseringar och ljud",
  "signup.email.label": "E-postadress",
  "signup.emailDuplicate": "En användare med den e-postadressen finns redan",
-  "signup.firstname.label": "Förnamn",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Registrera dig",
-  "signup.lastname.label": "Efternamn",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Genom att skapa ett Ferdi konto accepterar du",
  "signup.legal.privacy": "Integritetspolicy",
  "signup.legal.terms": "Användarvillkor",
@@ -430,11 +421,11 @@
  "signup.password.label": "Lösenord",
  "signup.submit.label": "Skapa konto",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Ta bort tjänst",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Inaktivera ljud",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Inaktivera aviseringar",
-  "tabs.item.disableService": "Inaktivera tjänst",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Aktivera ljud",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Aktivera aviseringar",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Ladda om",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} är felaktig",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} bör vara minst {length} tecken lång",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Minst en krävs",
-  "validation.required": "{field} är obligatoriskt",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} är inte en giltig URL",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Tillbaka",
  "webControls.forward": "Framåt",
  "webControls.goHome": "Hem",
@@ -454,12 +445,12 @@
  "webControls.reload": "Ladda om",
  "welcome.loginButton": "Logga in på ditt konto",
  "welcome.signupButton": "Skapa ett gratis konto",
-  "workspaceDrawer.addNewWorkspaceLabel": "Skapa ny arbetsyta",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Alla tjänster",
  "workspaceDrawer.headline": "Arbetsytor",
  "workspaceDrawer.item.contextMenuEdit": "redigera",
  "workspaceDrawer.item.noServicesAddedYet": "Inga tjänster har lagts till",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi-arbetsytor låter dig fokusera på det som är viktigt just nu. Konfigurera olika uppsättningar av tjänster och växla enkelt mellan dem när som helst.</p><p>Du bestämmer vilka tjänster du behöver när och var, så att vi kan hjälpa dig att hålla koll på läget - eller enkelt koppla bort från jobbet när du vill.</p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Redigera inställningar för arbetsytor",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Byter till"
 }
diff --git a/src/i18n/locales/te.json b/src/i18n/locales/te.json
index be9bbb961..812ec8c4c 100644
--- a/src/i18n/locales/te.json
+++ b/src/i18n/locales/te.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Custom server",
  "changeserver.headline": "Change server",
  "changeserver.label": "Server",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Publish debugging information",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -45,7 +44,7 @@
  "import.headline": "Import your Ferdi 4 services",
  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
  "import.skip.label": "I want to add services manually",
-  "import.submit.label": "Import services",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Restart & install update",
@@ -118,7 +117,7 @@
  "menu.help.tos": "Terms of Service",
  "menu.services": "Services",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Home",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -152,18 +151,7 @@
  "password.link.login": "Sign in to your account",
  "password.link.signup": "Create a free account",
  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Please check your email",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
  "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
  "settings.account.tryReloadServices": "Try again",
  "settings.account.tryReloadUserInfoRequest": "Try again",
  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Clear cache",
  "settings.app.buttonInstallUpdate": "Restart & install update",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "Name",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 3b91dfad0..b0368a18a 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Yenile",
-  "app.errorHandler.headline": "Bir terslik çıktı",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Özel sunucu",
  "changeserver.headline": "Sunucuyu değiştir",
  "changeserver.label": "Sunucu",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Ne oldu?",
  "connectionLostBanner.message": "Nayır, nolamaz! Ferdi {name} ile bağlantısını yitirdi.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Hata ayıklama bilgisini yayımla",
  "feature.nightlyBuilds.activate": "Etkinleştir",
  "feature.nightlyBuilds.info": "Nightly yapılar Ferdi'nin deneysel sürümleri olup tamamlanmamış özellikler içerebilir. Bu nightly yapılar genellikle geliştiriciler tarafından yeni özellikleri deneyip geliştirmek için kullanılır. Ne yaptığınızı bilmiyorsanız nightly yapıları etkinleştirmeyin.",
  "feature.nightlyBuilds.title": "Nightly Yapılar",
@@ -24,30 +23,30 @@
  "feature.quickSwitch.info": "TAB, ↑ ve ↓ ile bir servis seç. ENTER ile bir servisi aç.",
  "feature.quickSwitch.search": "Ara...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Ferdi hizmetlerine şu anda erişilemiyor",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "İptal",
+  "global.cancel": "Cancel",
  "global.edit": "Düzenle",
  "global.no": "No",
  "global.notConnectedToTheInternet": "İnternete bağlı değilsiniz.",
  "global.ok": "Ok",
-  "global.quit": "Çık",
+  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Ayarlar",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Sistem Dilini Kullan ({default})",
  "global.spellchecking.autodetect": "Dili otomatik tespit et",
  "global.spellchecking.autodetect.short": "Otomatik",
  "global.spellchecking.language": "İmla kontrol dili",
-  "global.submit": "Gönder",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "Ferdi 4 servislerinizi içeri aktarın",
  "import.notSupportedHeadline": "Henüz Ferdi 5'te desteklenmeyen servisler",
  "import.skip.label": "Servisleri kendim eklemek istiyorum",
-  "import.submit.label": "Servisleri içe aktar",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "Yetkili bir işlem yapılmaya çalışırken hatalar ortaya çıktı. Lütfen bu hata tekrarlarsa çıkış yapıp tekrar girmeyi dene.",
-  "infobar.buttonChangelog": "Yeni ne var?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Yeniden Başlat ve Güncelleştirmeleri Kur",
  "infobar.buttonReloadServices": "Hizmetleri yeniden yükle",
  "infobar.hide": "Gizle",
@@ -75,7 +74,7 @@
  "login.email.label": "E-posta adresi",
  "login.headline": "Oturum Aç",
  "login.invalidCredentials": "Yanlış parola ya da e-posta adresi",
-  "login.link.password": "Parola sıfırla",
+  "login.link.password": "Reset password",
  "login.link.signup": "Ücretsiz hesap oluştur",
  "login.password.label": "Şifre",
  "login.serverLogout": "Oturum süreniz dolmuş, lütfen tekrar giriş yapın.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Destek",
  "menu.help.tos": "Kullanım Şartları",
  "menu.services": "Hizmetler",
-  "menu.services.activatePreviousService": "Bir önceki servisi aktive et",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Yeni Servis Ekle",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Ana Sayfa",
-  "menu.services.setNextServiceActive": "Bir sonraki servisi aktive et",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Yapılacaklar",
  "menu.todos.enableTodos": "Yapılacaklar Listesi'ni Aç",
  "menu.view": "Görünüm",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Tüm servisler",
  "menu.workspaces.openWorkspaceDrawer": "Çalışma alanı çekmecesini aç",
  "password.email.label": "E-posta adresi",
-  "password.headline": "Parola sıfırla",
+  "password.headline": "Reset password",
  "password.link.login": "Hesabına giriş yap",
  "password.link.signup": "Ücretsiz hesap oluştur",
-  "password.noUser": "Bu e-posta adresinde bir kullanıcı bulunamadı",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "E-postanızı kontrol ediniz",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Hesap Eşitleme",
-  "pricing.features.customWebsites": "Özel Siteler Ekle",
-  "pricing.features.desktopNotifications": "Masaüstü Bildirimleri",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Servis proxy'leri",
-  "pricing.features.spellchecker": "Yazım denetimi desteği",
-  "pricing.features.teamManagement": "Takım yönetimi",
-  "pricing.features.thirdPartyServices": "3. parti servisleri yükleme",
-  "pricing.features.unlimitedServices": "Sınırsız servis ekleme",
-  "pricing.features.workspaces": "Çalışma Alanları",
  "service.crashHandler.action": "{name} yeniden yükle",
  "service.crashHandler.autoReload": "{name}'i {seconds} saniye içerisinde otomatik onarmayı deniyoruz",
  "service.crashHandler.headline": "Olamaz!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Ferdi'yi bir hesap olmadan kullan",
  "services.welcome": "Ferdi'a Hoşgeldiniz",
-  "settings.account.account.editButton": "Hesabı düzenle",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Hesap kullanılamıyor",
  "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",
@@ -189,16 +177,16 @@
  "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!",
  "settings.account.deleteInfo": "Ferdi hesabınıza artık ihtiyaç duymuyorsanız, hesabınızı ve buradaki bütün bağlantılı bilgilerinizi silebilirsiniz.",
  "settings.account.headline": "Hesap",
-  "settings.account.headlineAccount": "Hesap bilgileri",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Tehlike Bölgesi",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Faturalar",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Parolayı değiştir",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Profili güncelle",
  "settings.account.successInfo": "Değişikliklerin kaydedildi",
  "settings.account.tryReloadServices": "Tekrar deneyin",
  "settings.account.tryReloadUserInfoRequest": "Tekrar deneyin",
  "settings.account.userInfoRequestFailed": "Kullanıcı bilgisi yüklenemedi",
-  "settings.account.yourLicense": "Ferdi Lisansınız",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Önbelleği temizle",
  "settings.app.buttonInstallUpdate": "Yeniden Başlat ve Güncelleştirmeleri Kur",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Karanlık modu aç",
  "settings.app.form.enableGPUAcceleration": "Grafik İşlemci Ünitesi (GPU) Hızlandırıcısını Aktif et",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Yazım denetimini etkinleştir",
-  "settings.app.form.enableSystemTray": "Ferdi'ı sistem tepsisinde göster",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Devre dışı bırakılan servis sekmelerini göster",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Bildirimler kapalı iken okunmamış mesaj sayısını göster",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -296,7 +285,7 @@
  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
-  "settings.recipes.customService.openFolder": "Klasör aç",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Mevcut servisler",
  "settings.recipes.missingService": "Aradığın servisi bulamadın mı?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Servisi sil",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "{name} düzenle",
  "settings.service.form.enableAudio": "Sesi etkinleştirin",
  "settings.service.form.enableBadge": "Okunmamış mesajları göster",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Devre dışı bırakıldığında, tüm bildirim sesleri sessize alınır",
  "settings.service.form.name": "Ad",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Ayarları",
  "settings.service.form.proxy.host": "Proxy Sunucusu/IP",
-  "settings.service.form.proxy.info": "Proxy ayarları Ferdi serverlarına yüklenmeyecektir.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Proxy Kullan",
-  "settings.service.form.proxy.password": "Parola (opsiyonel)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
  "settings.service.form.proxy.restartInfo": "Proxy ayarlarını değiştirdikten sonra Ferdi'ı yeniden başlatınız.",
-  "settings.service.form.proxy.user": "Kullanıcı (opsiyonel)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "Servisi kaydet",
  "settings.service.form.tabHosted": "Barındırılan",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Servisleri keşfet",
  "settings.services.headline": "Servislerin",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Hizmetiniz yüklenemedi",
  "settings.services.tooltip.isDisabled": "Servis devre dışı",
  "settings.services.tooltip.isMuted": "Tüm sesler kapalı",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Kar amacı gütmeyen",
  "settings.user.form.currentPassword": "Mevcut şifre",
  "settings.user.form.email": "E-posta",
-  "settings.user.form.firstname": "Ad",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Soyad",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Yeni şifre",
  "settings.workspace.add.form.name": "Ad",
  "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Bildirimleri ve sesli uyarıları etkinleştir",
  "signup.email.label": "E-posta adresi",
  "signup.emailDuplicate": "Bu email adresine sahip bir kullanıcı zaten mevcut",
-  "signup.firstname.label": "Ad",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Hesap oluştur",
-  "signup.lastname.label": "Soyad",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Ferdi'ı hesabı oluşturark kabul ediyorsun",
  "signup.legal.privacy": "Gizlilik Sözleşmesi",
  "signup.legal.terms": "Kullanım Koşulları",
@@ -430,11 +421,11 @@
  "signup.password.label": "Şifre",
  "signup.submit.label": "Hesap oluştur",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Servisi sil",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Sesi kapat",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Bildirimleri devre dışı bırak",
-  "tabs.item.disableService": "Servisi devre dışı bırak",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Sesi etkinleştirin",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Bildirimleri etkinleştir",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Yenile",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} geçerli değil",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} en az {length} karakter uzunluğunda olmalı",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} gereklidir",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} geçerli bir URL değil",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Geri",
  "webControls.forward": "İleri",
  "webControls.goHome": "Ana Sayfa",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index b4f1fb66c..b03bf9072 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Перезавантажити",
-  "app.errorHandler.headline": "Щось пішло не так",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Користувацький сервер",
  "changeserver.headline": "Змінити сервер",
  "changeserver.label": "Сервер",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Що трапилось?",
  "connectionLostBanner.message": "О ні! Ферді втратив з'єднання з {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Опублікувати інформацію для налагодження",
  "feature.nightlyBuilds.activate": "Активувати",
  "feature.nightlyBuilds.info": "Нічні збірки - це високоекспериментальні версії Ferdi, що можуть містити \"неполіровані\" або незавершені функції. Нічні збірки в основному використовуються розробниками, щоб перевірити свої нові функції та те, як вони будуть працювати в фінальній версії. Якщо ви не знаєте, що ви робите, то радимо не активувати нічні збірки.",
  "feature.nightlyBuilds.title": "Нічні збірки",
@@ -24,30 +23,30 @@
  "feature.quickSwitch.info": "Виберіть сервіс за допомогою TAB, стрілок ↑ та ↓. Натисніть ENTER, щоб відкрити.",
  "feature.quickSwitch.search": "Пошук...",
  "feature.quickSwitch.title": "Швидке перемикання",
-  "global.api.unhealthy": "Не можливо підключитись до онлайн сервісів Ferdi",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Відмінити",
+  "global.cancel": "Cancel",
  "global.edit": "Редагувати",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Ви не підключені до Інтернету.",
  "global.ok": "Ok",
-  "global.quit": "Вийти",
+  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Налаштування",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Використовувати системні параметри за змовчуванням ({default})",
  "global.spellchecking.autodetect": "Автоматично визначати мову",
  "global.spellchecking.autodetect.short": "Автоматично",
  "global.spellchecking.language": "Мова перевірки правопису",
-  "global.submit": "Подати",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "Ідентифікатор браузера",
  "global.yes": "Yes",
  "import.headline": "Імпортувати ваші сервіси з Ferdi 4",
  "import.notSupportedHeadline": "Наразі сервіси не підтримуються у Ferdi 5",
  "import.skip.label": "Я бажаю додати сервіс вручну",
-  "import.submit.label": "Імпортувати сервіси",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Що нового?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Перезавантажити і встановити оновлення",
  "infobar.buttonReloadServices": "Перезавантажити сервіси",
  "infobar.hide": "Приховати",
@@ -75,7 +74,7 @@
  "login.email.label": "Email адреса",
  "login.headline": "Увійти",
  "login.invalidCredentials": "Email або пароль некоректні",
-  "login.link.password": "Скинути пароль",
+  "login.link.password": "Reset password",
  "login.link.signup": "Створити безплатний акаунт",
  "login.password.label": "Пароль",
  "login.serverLogout": "Ваша сесія закінчилась, будь ласка, увійдіть знову.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Підтримка",
  "menu.help.tos": "Умови використання",
  "menu.services": "Служби",
-  "menu.services.activatePreviousService": "Активувати попередню службу",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Додати новий сервіс",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Головна",
-  "menu.services.setNextServiceActive": "Активувати наступний сервіс",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Завдання",
  "menu.todos.enableTodos": "Увімкнути Завдання",
  "menu.view": "Вигляд",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Усі сервіси",
  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
  "password.email.label": "Email адреса",
-  "password.headline": "Скинути пароль",
+  "password.headline": "Reset password",
  "password.link.login": "Увійти до вашого акаунту",
  "password.link.signup": "Створити безплатний акаунт",
-  "password.noUser": "Не знайдено жодного користувача з цією email адресою",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Будь ласка, перевірте ваш email",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Перезавантажити {name}",
  "service.crashHandler.autoReload": "Спробую автоматично відновити {name} через {seconds} с",
  "service.crashHandler.headline": "О, ні!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "Ласкаво просимо в Ferdi",
-  "settings.account.account.editButton": "Редагувати акаунт",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Обліковий запис недоступний",
  "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": "Оновити профіль",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "Ви отримали електронного листа з посиланням, щоб підтвердити видалення облікового запису. Ваш обліковий запис і дані не можна буде відновити!",
  "settings.account.deleteInfo": "Якщо Вам більше не потрібний обліковий запис Ferdi, Ви можете його видалити і всі суміжні дані.",
  "settings.account.headline": "Акаунт",
-  "settings.account.headlineAccount": "Інформація про акаунт",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "На свій страх і ризик",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Інвойси",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Змінити пароль",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Оновити профіль",
  "settings.account.successInfo": "Ваші зміни були збережені",
  "settings.account.tryReloadServices": "Спробуйте ще раз",
  "settings.account.tryReloadUserInfoRequest": "Спробуйте ще раз",
  "settings.account.userInfoRequestFailed": "Не вдалося завантажити інформацію користувача",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Очистити кеш",
  "settings.app.buttonInstallUpdate": "Перезавантажити і встановити оновлення",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Переходь на Темну Сторону",
  "settings.app.form.enableGPUAcceleration": "Ввімкнути прискорення GPU",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Увімкнути перевірку орфографії",
-  "settings.app.form.enableSystemTray": "Показувати Ferdi у системному лотку",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,9 +239,10 @@
  "settings.app.form.showDisabledServices": "Показати вкладку вимкнених сервісів",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Показувати значок непрочитаних повідомлень коли сповіщення вимкнені",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Запускати згорнутим",
  "settings.app.form.universalDarkMode": "Увімкнути універсальний темний режим",
-  "settings.app.form.useTouchIdToUnlock": "Дозволити використання TouchID для розблокування Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.form.useVerticalStyle": "Use horizontal style",
  "settings.app.form.wakeUpStrategy": "Wake up strategy",
  "settings.app.headlineAdvanced": "Додаткові налаштування",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Видалити сервіс",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Редагувати {name}",
  "settings.service.form.enableAudio": "Увімкнути звук",
  "settings.service.form.enableBadge": "Показувати непрочитані повідомлення",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "Коли вимкнено, всі сповищення та відтворення ігноруються",
  "settings.service.form.name": "Ім'я",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Відкрити user.css",
  "settings.service.form.openUserJs": "Відкрити user.js",
  "settings.service.form.proxy.headline": "Налаштування HTTP/HTTPS проксі ",
  "settings.service.form.proxy.host": "Проксі Host/IP",
-  "settings.service.form.proxy.info": "Налаштування проксі не будуть синхронізовані із серверами Ferdi",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Використовувати проксі",
-  "settings.service.form.proxy.password": "Пароль (опційно)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Порт",
  "settings.service.form.proxy.restartInfo": "Будь ласка, перезапустіть Ferdi після зміни налуштувань проксі",
-  "settings.service.form.proxy.user": "Користувач (опційно)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "Зберегти сервіс",
  "settings.service.form.tabHosted": "Розміщений",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Відкрийте для себе сервіси",
  "settings.services.headline": "Ваші сервіси",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Сервіс відключений",
  "settings.services.tooltip.isMuted": "Всі звуки вимкнено",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Некомерційний",
  "settings.user.form.currentPassword": "Поточний пароль",
  "settings.user.form.email": "Ел. пошта",
-  "settings.user.form.firstname": "Ім`я",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Прізвище",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Новий пароль",
  "settings.workspace.add.form.name": "Ім'я",
  "settings.workspace.add.form.submitButton": "Create workspace",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Увімкнути сповіщення та звуки",
  "signup.email.label": "Email адреса",
  "signup.emailDuplicate": "Користувач із цією email адресою вже існує",
-  "signup.firstname.label": "Ім`я",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Увійти",
-  "signup.lastname.label": "Прізвище",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Створенням акаунту Ferdi ви приймаєте",
  "signup.legal.privacy": "Заява про конфіденційність",
  "signup.legal.terms": "Умови використання",
@@ -430,11 +421,11 @@
  "signup.password.label": "Пароль",
  "signup.submit.label": "Створити акаунт",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Видалити сервіс",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "відключити звук",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "Вимкнути сповіщення",
-  "tabs.item.disableService": "Вимкнути сервіс",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Увімкнути звук",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "Увімкнути сповіщення",
@@ -442,11 +433,11 @@
  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Перезавантажити",
  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} не валідне",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "Кількість символів в {field} повина бути не меньше {length} ",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} обов'язвоке",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} не валідний URL",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Назад",
  "webControls.forward": "Вперед",
  "webControls.goHome": "Головна",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index 0bf52bf1d..668b75127 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "Tải lại",
-  "app.errorHandler.headline": "Đã xảy ra lỗi",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Máy chủ tùy chỉnh",
  "changeserver.headline": "Thay đổi máy chủ",
  "changeserver.label": "Máy chủ",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "Điều gì đã xảy ra?",
  "connectionLostBanner.message": "Mất kết nối tới {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "Gửi thông tin gỡ lỗi",
  "feature.nightlyBuilds.activate": "Kích hoạt",
  "feature.nightlyBuilds.info": "Các bản Nightly là các phiên bản Ferdi mang tính thử nghiệm có thể chứa các tính năng chưa được hoàn thiện. Các bản Nightly chủ yếu được các nhà phát triển sử dụng để kiểm tra các tính năng mới được phát triển của họ và cách chúng sẽ hoạt động trong bản dựng cuối cùng. Nếu bạn không biết mình đang làm gì, chúng tôi khuyên bạn không nên kích hoạt các bản dựng hàng đêm.",
  "feature.nightlyBuilds.title": "Phiên bản Nightly",
@@ -24,30 +23,30 @@
  "feature.quickSwitch.info": "Chọn một dịch vụ với TAB, ↑ và ↓. Mở một dịch vụ bằng ENTER.",
  "feature.quickSwitch.search": "Tìm kiếm...",
  "feature.quickSwitch.title": "Chuyển đổi nhanh",
-  "global.api.unhealthy": "Không thể kết nối đến máy chủ trực tuyến của Ferdi",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "Hủy",
+  "global.cancel": "Cancel",
  "global.edit": "Chỉnh sửa",
  "global.no": "No",
  "global.notConnectedToTheInternet": "Bạn không kết nối với Internet.",
  "global.ok": "Ok",
-  "global.quit": "Thoát",
+  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "Các thiết lập",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "Dùng mặc định hệ thống ({default})",
  "global.spellchecking.autodetect": "Tự động phát hiện ngôn ngữ",
  "global.spellchecking.autodetect.short": "Tự động",
  "global.spellchecking.language": "Ngôn ngữ kiểm tra chính tả",
-  "global.submit": "Gửi",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Sử dụng 'https://whatmyuseragent.com/' (để khám phá) hoặc 'https://developers.whatismybrowser.com/useragents/explore/' (để chọn) tác nhân người dùng mong muốn của bạn và sao chép-dán nó vào đây.",
  "global.userAgentPref": "Tác nhân Người dùng",
  "global.yes": "Yes",
  "import.headline": "Nhập các dịch vụ Ferdi 4 của bạn",
  "import.notSupportedHeadline": "Các dịch vụ chưa được hỗ trợ trong Ferdi 5",
  "import.skip.label": "Tôi muốn thêm dịch vụ theo cách thủ công",
-  "import.submit.label": "Nhập Dịch vụ",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "Đã xảy ra lỗi khi cố gắng thực hiện một yêu cầu đã xác thực. Vui lòng thử đăng xuất và đăng nhập lại nếu lỗi này vẫn tiếp diễn.",
-  "infobar.buttonChangelog": "Có gì mới?",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "Khởi động lại và cài đặt bản cập nhật",
  "infobar.buttonReloadServices": "Tải lại dịch vụ",
  "infobar.hide": "Ẩn",
@@ -75,7 +74,7 @@
  "login.email.label": "Địa chỉ E-mail",
  "login.headline": "Đăng nhập",
  "login.invalidCredentials": "Email hoặc mật khẩu chưa chính xác",
-  "login.link.password": "Đặt lại mật khẩu",
+  "login.link.password": "Reset password",
  "login.link.signup": "Tạo tài khoản miễn phí",
  "login.password.label": "Mật khẩu",
  "login.serverLogout": "Phiên làm việc của bạn bị quá hạn, hãy đăng nhập lại.",
@@ -117,10 +116,10 @@
  "menu.help.support": "Hỗ trợ",
  "menu.help.tos": "Điều khoản Dịch vụ",
  "menu.services": "Dịch vụ",
-  "menu.services.activatePreviousService": "Kích hoạt dịch vụ trước đó",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Thêm Dịch vụ mới",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "Trang chủ",
-  "menu.services.setNextServiceActive": "Kích hoạt dịch vụ tiếp theo",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Danh sách cần làm",
  "menu.todos.enableTodos": "Mở danh sách cần làm",
  "menu.view": "Hiển thị",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "Tất cả Dịch vụ",
  "menu.workspaces.openWorkspaceDrawer": "Mở không gian làm việc",
  "password.email.label": "Địa chỉ E-mail",
-  "password.headline": "Đặt lại mật khẩu",
+  "password.headline": "Reset password",
  "password.link.login": "Đăng nhập Tài khoản",
  "password.link.signup": "Tạo tài khoản miễn phí",
-  "password.noUser": "Không tìm thấy người dùng được đăng ký với địa chỉ e-mail này",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Vui lòng kiểm tra hộp thư của bạn",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Đồng bộ hóa Tài khoản",
-  "pricing.features.customWebsites": "Thêm Trang web tùy chỉnh",
-  "pricing.features.desktopNotifications": "Thông báo",
-  "pricing.features.onPremise": "Tại chỗ & các dịch vụ được lưu trữ khác",
-  "pricing.features.recipes": "Chọn từ hơn 70 Dịch vụ",
-  "pricing.features.serviceProxies": "Các Proxy Dịch vụ",
-  "pricing.features.spellchecker": "Hỗ trợ Công cụ kiểm tra chính tả",
-  "pricing.features.teamManagement": "Quản lý nhóm",
-  "pricing.features.thirdPartyServices": "Cài đặt dịch vụ của bên thứ 3",
-  "pricing.features.unlimitedServices": "Thêm dịch vụ không giới hạn",
-  "pricing.features.workspaces": "Không gian làm việc",
  "service.crashHandler.action": "Tải lại {name}",
  "service.crashHandler.autoReload": "Đang cố gắng tự động khôi phục {name} sau {seconds} giây",
  "service.crashHandler.headline": "Ồ không!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Theo tùy chọn, bạn có thể thay đổi máy chủ Ferdi của mình bằng cách nhấp vào bánh răng ở góc dưới cùng bên trái. Nếu bạn đang chuyển qua (từ một trong các máy chủ được lưu trữ) sang sử dụng Ferdi mà không có tài khoản, vui lòng thông báo rằng bạn có thể xuất dữ liệu của mình từ máy chủ đó và sau đó nhập dữ liệu đó bằng menu Trợ giúp để phục hồi tất cả không gian làm việc và dịch vụ đã định cấu hình của bạn!",
  "services.serverless": "Sử dụng Ferdi không cần Đăng nhập Tài khoản",
  "services.welcome": "Chào mừng bạn đến với Ferdi",
-  "settings.account.account.editButton": "Chỉnh sửa Tài khoản",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "Tài khoản không hợp lệ",
  "settings.account.accountUnavailableInfo": "Bạn đang sử dụng Ferdi mà không có tài khoản. Nếu bạn muốn sử dụng Ferdi với một tài khoản và giữ cho các dịch vụ của mình được đồng bộ hóa giữa các bản cài đặt, vui lòng chọn một máy chủ trong tab Cài đặt rồi đăng nhập.",
  "settings.account.buttonSave": "Cập nhật Hồ sơ",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "Bạn đã nhận được một email có liên kết để xác nhận việc xóa tài khoản của bạn. Tài khoản và dữ liệu của bạn không thể được khôi phục!",
  "settings.account.deleteInfo": "Nếu bạn không cần tài khoản Ferdi nữa, bạn có thể xóa tài khoản của mình và tất cả dữ liệu liên quan tại đây.",
  "settings.account.headline": "Tài khoản",
-  "settings.account.headlineAccount": "Thông tin Tài khoản",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Vùng Nguy hiểm",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Thanh toán",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Thay đổi Mật khẩu",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "Cập nhật Hồ sơ",
  "settings.account.successInfo": "Mọi thay đổi đã được lưu lại",
  "settings.account.tryReloadServices": "Thử lại",
  "settings.account.tryReloadUserInfoRequest": "Thử lại",
  "settings.account.userInfoRequestFailed": "Không thể tải được thông tin người dùng",
-  "settings.account.yourLicense": "Giấy phép Ferdi của bạn",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Viết màu nhấn của bạn ở định dạng tương thích với CSS. (Mặc định: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Xóa bộ nhớ cache",
  "settings.app.buttonInstallUpdate": "Khởi động lại và cài đặt bản cập nhật",
@@ -219,13 +207,13 @@
  "settings.app.form.clipboardNotifications": "Không hiển thị thông báo cho các sự kiện khay nhớ tạm",
  "settings.app.form.closeToSystemTray": "Thu nhỏ Ferdi xuống khay hệ thống",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "Tùy chỉnh Server Todo",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Cho phép Chế độ nền tối",
+  "settings.app.form.darkMode": "Cho phép chế độ nền tối",
  "settings.app.form.enableGPUAcceleration": "Bật Tăng tốc GPU",
  "settings.app.form.enableLock": "Cho phép khóa bằng mật khẩu",
  "settings.app.form.enableMenuBar": "Luôn hiển thị Ferdi trong Menu Bar",
  "settings.app.form.enableSpellchecking": "Kích hoạt tính năng kiểm tra chính tả",
-  "settings.app.form.enableSystemTray": "Hiển thị Ferdi trong khay hệ thống",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Cho phép Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Giữ các dịch vụ ở chế độ ngủ đông khi khởi động",
  "settings.app.form.hibernationStrategy": "Chiến lược ngủ đông",
@@ -251,9 +239,10 @@
  "settings.app.form.showDisabledServices": "Hiển thị các tab dịch vụ bị vô hiệu hóa",
  "settings.app.form.showDragArea": "Hiển thị khu vực có thể kéo trên cửa sổ",
  "settings.app.form.showMessagesBadgesWhenMuted": "Hiển thị huy hiệu tin nhắn chưa đọc khi tắt thông báo",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Bắt đầu thu nhỏ",
  "settings.app.form.universalDarkMode": "Bật Chế độ tối chung",
-  "settings.app.form.useTouchIdToUnlock": "Cho phép sử dụng TouchID để mở khóa Ferdi",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
  "settings.app.form.useVerticalStyle": "Sử dụng kiểu ngang",
  "settings.app.form.wakeUpStrategy": "Chiến lược đánh thức",
  "settings.app.headlineAdvanced": "Nâng cao",
@@ -265,9 +254,9 @@
  "settings.app.hibernateInfo": "Theo mặc định, Ferdi sẽ giữ cho tất cả các dịch vụ của bạn luôn mở và được tải ở chế độ nền để chúng luôn sẵn sàng khi bạn muốn sử dụng. Service Hibernation sẽ dỡ bỏ các dịch vụ của bạn sau một khoảng thời gian cụ thể. Điều này rất hữu ích để tiết kiệm RAM hoặc giữ cho các dịch vụ không làm chậm máy tính của bạn.",
  "settings.app.inactivityLockInfo": "Vài phút không hoạt động, sau đó Ferdi sẽ tự động khóa. Sử dụng 0 để tắt",
  "settings.app.languageDisclaimer": "Bản dịch chính thức là tiếng Anh và tiếng Đức. Tất cả các ngôn ngữ khác là bản dịch dựa trên cộng đồng.",
-  "settings.app.lockInfo": "Khóa mật khẩu cho phép bạn bảo vệ tin nhắn của mình.\nSử dụng Khóa mật khẩu, bạn sẽ được nhắc nhập mật khẩu của mình mỗi khi khởi động Ferdi hoặc tự khóa Ferdi bằng biểu tượng ổ khóa ở góc dưới cùng bên trái hoặc phím tắt {lockShortcut}.",
+  "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 {lockShortcut}.",
  "settings.app.lockedPassword": "Mật khẩu",
-  "settings.app.lockedPasswordInfo": "Hãy chắc chắn rằng bạn đã đặt mật khẩu mà bạn sẽ nhớ.\nNếu bạn mất mật khẩu này, bạn sẽ phải cài đặt lại Ferdi.",
+  "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.restartRequired": "Các thay đổi yêu cầu khởi động lại",
  "settings.app.scheduledDNDInfo": "Theo lịch trình Không làm phiền cho phép bạn xác định khoảng thời gian mà bạn không muốn nhận Thông báo từ Ferdi.",
  "settings.app.scheduledDNDTimeInfo": "Thời gian ở định dạng 24 giờ. Thời gian kết thúc có thể trước thời gian bắt đầu (ví dụ: bắt đầu từ 17:00, kết thúc lúc 09:00) để bật chế độ Không làm phiền qua đêm.",
@@ -275,7 +264,7 @@
  "settings.app.spellCheckerLanguageInfo": "Ferdi sử dụng trình kiểm tra chính tả tích hợp trên máy Mac của bạn để kiểm tra lỗi chính tả. Nếu bạn muốn thay đổi ngôn ngữ mà trình kiểm tra chính tả kiểm tra, bạn có thể làm như vậy trong Tùy chọn hệ thống của máy Mac.",
  "settings.app.subheadlineCache": "Bộ nhớ đệm",
  "settings.app.subheadlineFerdiProfile": "Hồ sơ Ferdi",
-  "settings.app.todoServerInfo": "Máy chủ này sẽ được sử dụng cho tính năng \"Ferdi Todo\".",
+  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.",
  "settings.app.translationHelp": "Giúp chúng tôi dịch Ferdi sang ngôn ngữ của bạn.",
  "settings.app.universalDarkModeInfo": "Chế độ tối chung cố gắng tạo động các kiểu chế độ tối cho các dịch vụ hiện không được hỗ trợ.",
  "settings.app.updateStatusAvailable": "Bản cập nhật phù hợp, đang tải...",
@@ -294,12 +283,12 @@
  "settings.recipes.customService.headline.communityRecipes": "Công thức của cộng đồng bên thứ 3",
  "settings.recipes.customService.headline.customRecipes": "Công thức của tùy chỉnh bên thứ 3",
  "settings.recipes.customService.headline.devRecipes": "Công thức dịch vụ phát triển của bạn",
-  "settings.recipes.customService.intro": "Để thêm một dịch vụ tùy chỉnh, hãy sao chép công thức dịch vụ vào:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Tài liệu dành cho nhà phát triển",
-  "settings.recipes.customService.openFolder": "Mở thư mục",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "Các dịch vụ có sẵn",
  "settings.recipes.missingService": "Thiếu một dịch vụ?",
-  "settings.recipes.nothingFound": "Xin lỗi, không có dịch vụ nào phù hợp với cụm từ tìm kiếm của bạn - nhưng bạn vẫn có thể thêm nó bằng cách sử dụng tùy chọn \"Trang web tùy chỉnh\". Xin lưu ý rằng trang web có thể hiển thị nhiều dịch vụ hơn đã được thêm vào Ferdi kể từ phiên bản bạn đang sử dụng. Để nhận các dịch vụ mới đó, vui lòng xem xét nâng cấp lên phiên bản Ferdi mới hơn.",
+  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.recipes.servicesSuccessfulAddedInfo": "Đã thêm dịch vụ thành công",
  "settings.searchService": "Tìm kiếm dịch vụ",
  "settings.service.error.goBack": "Quay lại dịch vụ",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Độ sáng trình đọc tối",
  "settings.service.form.darkReaderContrast": "Độ tương phản trình đọc tối",
  "settings.service.form.darkReaderSepia": "Màu nâu đỏ của trình đọc tối",
-  "settings.service.form.deleteButton": "Xóa dịch vụ",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "Chỉnh sửa {name}",
  "settings.service.form.enableAudio": "Cho phép âm thanh",
  "settings.service.form.enableBadge": "Hiển thị huy hiệu tin nhắn chưa đọc",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "Khi được kích hoạt, một dịch vụ sẽ bị tắt sau một khoảng thời gian để tiết kiệm tài nguyên hệ thống.",
  "settings.service.form.isMutedInfo": "Khi bị vô hiệu hóa, tất cả âm thanh thông báo và phát lại âm thanh sẽ bị tắt tiếng",
  "settings.service.form.name": "Tên",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Mở darkmode.css",
  "settings.service.form.openUserCss": "Mở user.css",
  "settings.service.form.openUserJs": "Mở user.js",
  "settings.service.form.proxy.headline": "Cài đặt Proxy HTTP / HTTPS",
  "settings.service.form.proxy.host": "Máy chủ Proxy/IP",
-  "settings.service.form.proxy.info": "Cài đặt proxy sẽ không được đồng bộ hóa với máy chủ Ferdi.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Sử dụng Proxy",
-  "settings.service.form.proxy.password": "Mật khẩu (tùy chọn)",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Cổng",
  "settings.service.form.proxy.restartInfo": "Vui lòng khởi động lại Ferdi sau khi thay đổi Cài đặt proxy.",
-  "settings.service.form.proxy.user": "Người dùng (tùy chọn)",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Các tệp người dùng của bạn sẽ được chèn vào trang web để bạn có thể tùy chỉnh các dịch vụ theo bất kỳ cách nào bạn muốn. Các tệp người dùng chỉ được lưu trữ cục bộ và không được chuyển sang các máy tính khác sử dụng cùng một tài khoản.",
  "settings.service.form.saveButton": "Lưu dịch vụ",
  "settings.service.form.tabHosted": "Trở thành host",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Khám phá các dịch vụ",
  "settings.services.headline": "Dịch vụ của bạn",
  "settings.services.noServicesAdded": "Bắt đầu bằng cách thêm một dịch vụ.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Không thể tải các dịch vụ của bạn",
  "settings.services.tooltip.isDisabled": "Dịch vụ bị vô hiệu hóa",
  "settings.services.tooltip.isMuted": "Tất cả âm thanh đều bị tắt tiếng",
@@ -362,12 +353,12 @@
  "settings.supportFerdi.aboutIntro": "<p>Ferdi là một ứng dụng mã nguồn mở và dẫn dắt cộng đồng.</p><p>Cảm ơn những người tạo nên sự khả thi này:</p>",
  "settings.supportFerdi.bannerText": "Bạn có muốn giúp chúng tôi cải thiện Ferdi không?",
  "settings.supportFerdi.headline": "Giới thiệu về phần mềm Ferdi",
-  "settings.supportFerdi.openSurvey": "Mở khảo sát",
+  "settings.supportFerdi.openSurvey": "Open survey",
  "settings.supportFerdi.textDonation": "Nếu bạn cảm thấy muốn hỗ trợ sự phát triển của Ferdi bằng một khoản đóng góp, bạn có thể làm như vậy trên cả hai,",
  "settings.supportFerdi.textDonationAnd": "và",
  "settings.supportFerdi.textExpenses": "Trong khi các tình nguyện viên thực hiện hầu hết công việc, chúng tôi vẫn cần trả tiền cho các máy chủ và chứng chỉ. Là một cộng đồng, chúng tôi hoàn toàn minh bạch về các khoản tiền mà chúng tôi thu thập và chi tiêu - hãy xem",
  "settings.supportFerdi.textGitHubSponsors": "Tài trợ bởi GitHub",
-  "settings.supportFerdi.textListContributors": "Toàn danh sách người đóng góp",
+  "settings.supportFerdi.textListContributors": "Full list of contributors",
  "settings.supportFerdi.textListContributorsHere": "tại đây",
  "settings.supportFerdi.textOpenCollective": "Mở Cộng đồng",
  "settings.supportFerdi.textSupportWelcome": "Hỗ trợ luôn được chào đón. Bạn có thể tìm thấy danh sách trợ giúp mà chúng tôi cần",
@@ -377,7 +368,7 @@
  "settings.team.contentHeadline": "Quản lý nhóm Franz",
  "settings.team.copy": "Quản lý nhóm của Franz cho phép bạn quản lý Đăng ký Franz cho nhiều người dùng. Xin lưu ý rằng việc đăng ký Franz Premium sẽ không mang lại lợi ích gì cho bạn khi sử dụng Ferdi: Lý do duy nhất bạn vẫn có quyền truy cập vào Quản lý nhóm là để bạn có thể quản lý Nhóm Franz cũ của mình và để bạn không mất bất kỳ chức năng nào trong việc quản lý tài khoản của bạn.",
  "settings.team.headline": "Nhóm",
-  "settings.team.intro": "Bạn hiện đang sử dụng Máy chủ Franz, đó là lý do bạn có quyền truy cập vào Quản lý nhóm.",
+  "settings.team.intro": "You are currently using Franz Servers, which is why you have access to Team Management.",
  "settings.team.manageAction": "Quản lý Nhóm của bạn trên meetfranz.com",
  "settings.team.teamsUnavailable": "Các đội không có sẵn",
  "settings.team.teamsUnavailableInfo": "Nhóm hiện chỉ khả dụng khi sử dụng Máy chủ Franz và sau khi thanh toán cho Franz Professional. Vui lòng thay đổi máy chủ của bạn thành https://api.franzinfra.com để sử dụng nhóm.",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "Phi lợi nhuận",
  "settings.user.form.currentPassword": "Mật khẩu hiện tại",
  "settings.user.form.email": "E-mail",
-  "settings.user.form.firstname": "Tên",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Họ, tên đệm",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "Mật khẩu mới",
  "settings.workspace.add.form.name": "Tên",
  "settings.workspace.add.form.submitButton": "Tạo không gian làm việc",
@@ -405,7 +396,7 @@
  "settings.workspaces.tryReloadWorkspaces": "Thử lại",
  "settings.workspaces.updatedInfo": "Mọi thay đổi đã được lưu lại",
  "settings.workspaces.workspaceFeatureHeadline": "Ít hơn là Nhiều hơn: Giới thiệu Không gian làm việc Ferdi",
-  "settings.workspaces.workspaceFeatureInfo": "Không gian làm việc Ferdi cho phép bạn tập trung vào những gì quan trọng ngay bây giờ. Thiết lập các nhóm dịch vụ khác nhau và dễ dàng chuyển đổi giữa chúng bất kỳ lúc nào. Bạn quyết định dịch vụ nào bạn cần khi nào và ở đâu, vì vậy chúng tôi có thể giúp bạn luôn cập nhật trò chơi của mình - hoặc dễ dàng tắt công việc bất cứ khi nào bạn muốn.",
+  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
  "settings.workspaces.workspacesRequestFailed": "Không thể tải không gian làm việc của bạn",
  "setupAssistant.headline": "Bắt đầu nào",
  "setupAssistant.subheadline": "Chọn từ các dịch vụ được sử dụng nhiều nhất của chúng tôi và nhận lại tin nhắn của bạn ngay bây giờ.",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "Bật thông báo và âm thanh",
  "signup.email.label": "Địa chỉ E-mail",
  "signup.emailDuplicate": "Một người dùng với địa chỉ email đó đã tồn tại",
-  "signup.firstname.label": "Tên",
+  "signup.firstname.label": "First Name",
  "signup.headline": "Đăng ký",
-  "signup.lastname.label": "Họ, tên đệm",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "Bằng cách tạo tài khoản Ferdi, bạn chấp nhận",
  "signup.legal.privacy": "Cam kết Bảo mật",
  "signup.legal.terms": "Điều khoản dịch vụ",
@@ -430,23 +421,23 @@
  "signup.password.label": "Mật khẩu",
  "signup.submit.label": "Tạo Tài khoản",
  "tabs.item.confirmDeleteService": "Bạn có thực sự muốn xóa dịch vụ {serviceName} không?",
-  "tabs.item.deleteService": "Xóa dịch vụ",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "Vô hiệu hóa âm thanh",
  "tabs.item.disableDarkMode": "Vô hiệu hóa chế độ tối",
  "tabs.item.disableNotifications": "Vô hiệu hóa thông báo",
-  "tabs.item.disableService": "Vô hiệu hóa dịch vụ",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "Cho phép âm thanh",
  "tabs.item.enableDarkMode": "Kích hoạt chế độ tối",
  "tabs.item.enableNotification": "Kích hoạt thông báo",
  "tabs.item.enableService": "Kích hoạt dịch vụ",
-  "tabs.item.hibernateService": "Đưa dịch vụ vào trạng thái ngủ đông",
+  "tabs.item.hibernateService": "Hibernate service",
  "tabs.item.reload": "Tải lại",
-  "tabs.item.wakeUpService": "Đánh thức dịch vụ",
+  "tabs.item.wakeUpService": "Wake up service",
-  "validation.email": "{field} không hợp lệ",
+  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} phải dài ít nhất {length} ký tự",
+  "validation.minLength": "{field} should be at least {length} characters long",
  "validation.oneRequired": "Ít nhất một cái được yêu cầu",
-  "validation.required": "{field} là bắt buộc",
+  "validation.required": "{field} is required",
-  "validation.url": "{field} không phải là URL hợp lệ",
+  "validation.url": "{field} is not a valid URL",
  "webControls.back": "Quay lại",
  "webControls.forward": "Tới trước",
  "webControls.goHome": "Trang chủ",
@@ -454,12 +445,12 @@
  "webControls.reload": "Tải lại",
  "welcome.loginButton": "Đăng nhập vào tài khoản của bạn",
  "welcome.signupButton": "Tạo tài khoản miễn phí",
-  "workspaceDrawer.addNewWorkspaceLabel": "Thêm Không gian làm việc mới",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "Tất cả Dịch vụ",
  "workspaceDrawer.headline": "Không gian làm việc",
  "workspaceDrawer.item.contextMenuEdit": "chỉnh sửa",
  "workspaceDrawer.item.noServicesAddedYet": "Không có dịch vụ bổ sung",
-  "workspaceDrawer.workspaceFeatureInfo": "<p> Ferdi Workspaces cho phép bạn tập trung vào những gì quan trọng ngay bây giờ. Thiết lập các nhóm dịch vụ khác nhau và dễ dàng chuyển đổi giữa chúng bất kỳ lúc nào. </p> <p> Bạn quyết định dịch vụ nào bạn cần khi nào và ở đâu, vì vậy chúng tôi có thể giúp bạn luôn cập nhật trò chơi của mình - hoặc dễ dàng tắt khỏi công việc bất cứ khi nào bạn muốn. </p>",
+  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Chỉnh sửa cài đặt không gian làm việc",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
  "workspaces.switchingIndicator.switchingTo": "Chuyển sang"
 }
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
deleted file mode 100644
index 632127f4d..000000000
--- a/src/i18n/locales/zh-CN.json
+++ /dev/null
@@ -1,413 +0,0 @@
-{
-  "app.errorHandler.action": "Reload",
-  "app.errorHandler.headline": "Something went wrong",
-  "feature.announcements.changelog.headline": "Changes in Ferdi {version}",
-  "feature.debugger.title": "Publish debugging information",
-  "feature.publishDebugInfo.error": "There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-  "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
-  "feature.publishDebugInfo.privacy": "Privacy policy",
-  "feature.publishDebugInfo.publish": "Accept and publish",
-  "feature.publishDebugInfo.published": "Your debug log was published and is now availible at",
-  "feature.publishDebugInfo.terms": "Terms of service",
-  "feature.publishDebugInfo.title": "Publish debug information",
-  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-  "feature.quickSwitch.search": "Search...",
-  "feature.quickSwitch.title": "QuickSwitch",
-  "feature.shareFranz.action.email": "Send as email",
-  "feature.shareFranz.action.facebook": "Share on Facebook",
-  "feature.shareFranz.action.twitter": "Share on Twitter",
-  "feature.shareFranz.headline": "Ferdi is better together!",
-  "feature.shareFranz.shareText.email": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com",
-  "feature.shareFranz.shareText.twitter": "I've added {count} services to Ferdi! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.getferdi.com /cc @FerdiMessenger",
-  "feature.shareFranz.text": "Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.",
-  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.edit": "Edit",
-  "global.franzProRequired": "Ferdi Professional Required",
-  "global.notConnectedToTheInternet": "You are not connected to the internet.",
-  "global.quit": "Quit",
-  "global.settings": "Settings",
-  "global.spellchecker.useDefault": "Use System Default ({default})",
-  "global.spellchecking.autodetect": "Detect language automatically",
-  "global.spellchecking.autodetect.short": "Automatic",
-  "global.spellchecking.language": "Spell checking language",
-  "global.submit": "Submit",
-  "import.headline": "Import your Ferdi 4 services",
-  "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
-  "import.skip.label": "I want to add services manually",
-  "import.submit.label": "Import services",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "What is new?",
-  "infobar.buttonInstallUpdate": "Restart & install update",
-  "infobar.buttonReloadServices": "Reload services",
-  "infobar.requiredRequestsFailed": "Could not load services and user information",
-  "infobar.servicesUpdated": "Your services have been updated.",
-  "infobar.updateAvailable": "A new update for Ferdi is available.",
-  "invite.email.label": "Email address",
-  "invite.headline.friends": "Invite 3 of your friends or colleagues",
-  "invite.name.label": "Name",
-  "invite.skip.label": "I want to do this later",
-  "invite.submit.label": "Send invites",
-  "invite.successInfo": "Invitations sent successfully",
-  "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",
-  "login.changeServer": "Change server",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
-  "login.customServerSuggestion": "Try importing your Franz account",
-  "login.email.label": "Email address",
-  "login.headline": "Sign in",
-  "login.invalidCredentials": "Email or password not valid",
-  "login.link.password": "Reset password",
-  "login.link.signup": "Create a free account",
-  "login.password.label": "Password",
-  "login.serverLogout": "Your session expired, please login again.",
-  "login.submit.label": "Sign in",
-  "login.tokenExpired": "Your session expired, please login again.",
-  "menu.Todoss.closeTodosDrawer": "Close Todos drawer",
-  "menu.Todoss.openTodosDrawer": "Open Todos drawer",
-  "menu.app.about": "About Ferdi",
-  "menu.app.announcement": "What's new?",
-  "menu.app.autohideMenuBar": "Auto-hide menu bar",
-  "menu.app.checkForUpdates": "Check for updates",
-  "menu.app.hide": "Hide",
-  "menu.app.hideOthers": "Hide Others",
-  "menu.app.unhide": "Unhide",
-  "menu.edit": "Edit",
-  "menu.edit.copy": "Copy",
-  "menu.edit.cut": "Cut",
-  "menu.edit.delete": "Delete",
-  "menu.edit.emojiSymbols": "Emoji & Symbols",
-  "menu.edit.paste": "Paste",
-  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
-  "menu.edit.redo": "Redo",
-  "menu.edit.selectAll": "Select All",
-  "menu.edit.speech": "Speech",
-  "menu.edit.startDictation": "Start Dictation",
-  "menu.edit.startSpeaking": "Start Speaking",
-  "menu.edit.stopSpeaking": "Stop Speaking",
-  "menu.edit.undo": "Undo",
-  "menu.file": "File",
-  "menu.help": "Help",
-  "menu.help.changelog": "Changelog",
-  "menu.help.debugInfo": "Copy Debug Information",
-  "menu.help.debugInfoCopiedBody": "Your Debug Information has been copied to your clipboard.",
-  "menu.help.debugInfoCopiedHeadline": "Ferdi Debug Information",
-  "menu.help.learnMore": "Learn More",
-  "menu.help.privacy": "Privacy Statement",
-  "menu.help.publishDebugInfo": "Publish Debug Information",
-  "menu.help.support": "Support",
-  "menu.help.tos": "Terms of Service",
-  "menu.services": "Services",
-  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service...",
-  "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Activate next service",
-  "menu.todos": "Todos",
-  "menu.todos.enableTodos": "Enable Todos",
-  "menu.view": "View",
-  "menu.view.back": "Back",
-  "menu.view.forward": "Forward",
-  "menu.view.lockFerdi": "Lock Ferdi",
-  "menu.view.openQuickSwitch": "Open Quick Switch",
-  "menu.view.reloadFerdi": "Reload Ferdi",
-  "menu.view.reloadService": "Reload Service",
-  "menu.view.resetZoom": "Actual Size",
-  "menu.view.toggleDevTools": "Toggle Developer Tools",
-  "menu.view.toggleFullScreen": "Toggle Full Screen",
-  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
-  "menu.view.toggleTodosDevTools": "Toggle Todos Developer Tools",
-  "menu.view.zoomIn": "Zoom In",
-  "menu.view.zoomOut": "Zoom Out",
-  "menu.window": "Window",
-  "menu.window.close": "Close",
-  "menu.window.minimize": "Minimize",
-  "menu.workspaces": "Workspaces",
-  "menu.workspaces.addNewWorkspace": "Add New Workspace...",
-  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
-  "menu.workspaces.defaultWorkspace": "All services",
-  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
-  "password.email.label": "Email address",
-  "password.headline": "Reset password",
-  "password.link.login": "Sign in to your account",
-  "password.link.signup": "Create a free account",
-  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Please check your email",
-  "premiumFeature.button.upgradeAccount": "Upgrade account",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.adFree": "Forever ad-free",
-  "pricing.features.appDelays": "No Waiting Screens",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.upToSixServices": "Add up to 6 services",
-  "pricing.features.upToThreeServices": "Add up to 3 services",
-  "pricing.features.workspaces": "Workspaces",
-  "service.crashHandler.action": "Reload {name}",
-  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
-  "service.crashHandler.headline": "Oh no!",
-  "service.crashHandler.text": "{name} has caused an error.",
-  "service.disabledHandler.action": "Enable {name}",
-  "service.disabledHandler.headline": "{name} is disabled",
-  "service.errorHandler.action": "Reload {name}",
-  "service.errorHandler.editAction": "Edit {name}",
-  "service.errorHandler.headline": "Oh no!",
-  "service.errorHandler.message": "Error",
-  "service.errorHandler.text": "{name} has failed to load.",
-  "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. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
-  "services.serverless": "Use Ferdi without an Account",
-  "services.welcome": "Welcome to Ferdi",
-  "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!",
-  "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
-  "settings.account.headline": "Account",
-  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Change password",
-  "settings.account.headlineProfile": "Update profile",
-  "settings.account.successInfo": "Your changes have been saved",
-  "settings.account.tryReloadServices": "Try again",
-  "settings.account.tryReloadUserInfoRequest": "Try again",
-  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
-  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
-  "settings.app.buttonClearAllCache": "Clear cache",
-  "settings.app.buttonInstallUpdate": "Restart & install update",
-  "settings.app.buttonSearchForUpdate": "Check for updates",
-  "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.",
-  "settings.app.currentVersion": "Current version:",
-  "settings.app.form.accentColor": "Accent color",
-  "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
-  "settings.app.form.autoLaunchInBackground": "Open in background",
-  "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
-  "settings.app.form.beta": "Include beta versions",
-  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
-  "settings.app.form.darkMode": "Enable dark mode",
-  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
-  "settings.app.form.enableLock": "Enable Password Lock",
-  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
-  "settings.app.form.enableTodos": "Enable Ferdi Todos",
-  "settings.app.form.hibernationStrategy": "Hibernation strategy",
-  "settings.app.form.iconSize": "Service icon size",
-  "settings.app.form.inactivityLock": "Lock after inactivity",
-  "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
-  "settings.app.form.language": "Language",
-  "settings.app.form.lockPassword": "Password",
-  "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
-  "settings.app.form.noUpdates": "Disable updates",
-  "settings.app.form.privateNotifications": "Don't show message content in notifications",
-  "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
-  "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
-  "settings.app.form.scheduledDNDEnd": "To",
-  "settings.app.form.scheduledDNDStart": "From",
-  "settings.app.form.sentry": "Send telemetry data",
-  "settings.app.form.server": "Server",
-  "settings.app.form.serviceRibbonWidth": "Sidebar width",
-  "settings.app.form.showDisabledServices": "Display disabled services tabs",
-  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
-  "settings.app.form.showServiceNavigationBar": "Always show service navigation bar",
-  "settings.app.form.startMinimized": "Start minimized in tray",
-  "settings.app.form.todoServer": "Todo Server",
-  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
-  "settings.app.headlineAdvanced": "Advanced",
-  "settings.app.headlineAppearance": "Appearance",
-  "settings.app.headlineGeneral": "General",
-  "settings.app.headlineLanguage": "Language",
-  "settings.app.headlineUpdates": "Updates",
-  "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.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
-  "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 {lockShortcut}.",
-  "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.restartRequired": "Changes require restart",
-  "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.",
-  "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
-  "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
-  "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.subheadlineCache": "Cache",
-  "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
-  "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
-  "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
-  "settings.app.updateStatusAvailable": "Update available, downloading...",
-  "settings.app.updateStatusSearching": "Is searching for update",
-  "settings.app.updateStatusUpToDate": "You are using the latest version of Ferdi",
-  "settings.invite.headline": "Invite Friends",
-  "settings.navigation.account": "Account",
-  "settings.navigation.availableServices": "Available services",
-  "settings.navigation.logout": "Logout",
-  "settings.navigation.supportFerdi": "Support Ferdi",
-  "settings.navigation.team": "Manage Team",
-  "settings.navigation.yourServices": "Your services",
-  "settings.navigation.yourWorkspaces": "Your workspaces",
-  "settings.recipes.all": "All services",
-  "settings.recipes.custom": "Custom Services",
-  "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
-  "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
-  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
-  "settings.recipes.customService.openDevDocs": "Developer Documentation",
-  "settings.recipes.customService.openFolder": "Open folder",
-  "settings.recipes.headline": "Available services",
-  "settings.recipes.missingService": "Missing a service?",
-  "settings.recipes.nothingFound": "Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-  "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
-  "settings.searchService": "Search service",
-  "settings.service.error.goBack": "Back to services",
-  "settings.service.error.headline": "Error",
-  "settings.service.error.message": "Could not load service recipe.",
-  "settings.service.form.addServiceHeadline": "Add {name}",
-  "settings.service.form.availableServices": "Available services",
-  "settings.service.form.customUrl": "Custom server",
-  "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
-  "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
-  "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
-  "settings.service.form.deleteButton": "Delete service",
-  "settings.service.form.editServiceHeadline": "Edit {name}",
-  "settings.service.form.enableAudio": "Enable audio",
-  "settings.service.form.enableBadge": "Show unread message badges",
-  "settings.service.form.enableDarkMode": "Enable Dark Mode",
-  "settings.service.form.enableNotification": "Enable notifications",
-  "settings.service.form.enableService": "Enable service",
-  "settings.service.form.headlineBadges": "Unread message badges",
-  "settings.service.form.headlineGeneral": "General",
-  "settings.service.form.headlineNotifications": "Notifications",
-  "settings.service.form.icon": "Custom icon",
-  "settings.service.form.iconDelete": "Delete",
-  "settings.service.form.iconUpload": "Drop your image, or click here",
-  "settings.service.form.indirectMessageInfo": "You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-  "settings.service.form.indirectMessages": "Show message badge for all new messages",
-  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
-  "settings.service.form.name": "Name",
-  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
-  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
-  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
-  "settings.service.form.proxy.isEnabled": "Use Proxy",
-  "settings.service.form.proxy.password": "Password (optional)",
-  "settings.service.form.proxy.port": "Port",
-  "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
-  "settings.service.form.proxy.user": "User (optional)",
-  "settings.service.form.saveButton": "Save service",
-  "settings.service.form.tabHosted": "Hosted",
-  "settings.service.form.tabOnPremise": "Self hosted ⭐️",
-  "settings.service.form.team": "Team",
-  "settings.service.form.useHostedService": "Use the hosted {name} service.",
-  "settings.service.form.yourServices": "Your services",
-  "settings.services.deletedInfo": "Service has been deleted",
-  "settings.services.discoverServices": "Discover services",
-  "settings.services.headline": "Your services",
-  "settings.services.noServicesAdded": "You haven't added any services yet.",
-  "settings.services.servicesRequestFailed": "Could not load your services",
-  "settings.services.tooltip.isDisabled": "Service is disabled",
-  "settings.services.tooltip.isMuted": "All sounds are muted",
-  "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
-  "settings.services.updatedInfo": "Your changes have been saved",
-  "settings.supportFerdi.github": "Star on GitHub",
-  "settings.supportFerdi.headline": "Support Ferdi",
-  "settings.supportFerdi.openCollective": "Support our Open Collective",
-  "settings.supportFerdi.share": "Tell your Friends",
-  "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!",
-  "settings.team.contentHeadline": "Ferdi for Teams",
-  "settings.team.copy": "Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
-  "settings.team.headline": "Team",
-  "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
-  "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailable": "Teams are unavailable",
-  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-  "settings.team.upgradeAction": "Upgrade your Account",
-  "settings.user.form.accountType.company": "Company",
-  "settings.user.form.accountType.individual": "Individual",
-  "settings.user.form.accountType.label": "Account type",
-  "settings.user.form.accountType.non-profit": "Non-Profit",
-  "settings.user.form.currentPassword": "Current password",
-  "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "Last Name",
-  "settings.user.form.newPassword": "New password",
-  "settings.workspace.add.form.name": "Name",
-  "settings.workspace.add.form.submitButton": "Create workspace",
-  "settings.workspace.form.buttonDelete": "Delete workspace",
-  "settings.workspace.form.buttonSave": "Save workspace",
-  "settings.workspace.form.keepLoaded": "Keep this workspace loaded*",
-  "settings.workspace.form.keepLoadedInfo": "*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
-  "settings.workspace.form.name": "Name",
-  "settings.workspace.form.servicesInWorkspaceHeadline": "Services in this Workspace",
-  "settings.workspace.form.yourWorkspaces": "Your workspaces",
-  "settings.workspaces.deletedInfo": "Workspace has been deleted",
-  "settings.workspaces.headline": "Your workspaces",
-  "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.",
-  "settings.workspaces.tryReloadWorkspaces": "Try again",
-  "settings.workspaces.updatedInfo": "Your changes have been saved",
-  "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
-  "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
-  "sidebar.addNewService": "Add new service",
-  "sidebar.closeTodosDrawer": "Close Ferdi Todos",
-  "sidebar.closeWorkspaceDrawer": "Close workspace drawer",
-  "sidebar.lockFerdi": "Lock Ferdi",
-  "sidebar.muteApp": "Disable notifications & audio",
-  "sidebar.openTodosDrawer": "Open Ferdi Todos",
-  "sidebar.openWorkspaceDrawer": "Open workspace drawer",
-  "sidebar.unmuteApp": "Enable notifications & audio",
-  "signup.email.label": "Email address",
-  "signup.emailDuplicate": "A user with that email address already exists",
-  "signup.firstname.label": "First Name",
-  "signup.headline": "Sign up",
-  "signup.lastname.label": "Last Name",
-  "signup.legal.info": "By creating a Ferdi account you accept the",
-  "signup.legal.privacy": "Privacy Statement",
-  "signup.legal.terms": "Terms of service",
-  "signup.link.login": "Already have an account, sign in?",
-  "signup.password.label": "Password",
-  "signup.submit.label": "Create account",
-  "tabs.item.deleteService": "Delete service",
-  "tabs.item.disableAudio": "Disable audio",
-  "tabs.item.disableNotifications": "Disable notifications",
-  "tabs.item.disableService": "Disable service",
-  "tabs.item.enableAudio": "Enable audio",
-  "tabs.item.enableNotification": "Enable notifications",
-  "tabs.item.enableService": "Enable service",
-  "tabs.item.reload": "Reload",
-  "validation.email": "{field} is not valid",
-  "validation.minLength": "{field} should be at least {length} characters long",
-  "validation.oneRequired": "At least one is required",
-  "validation.required": "{field} is required",
-  "validation.url": "{field} is not a valid URL",
-  "webControls.back": "Back",
-  "webControls.forward": "Forward",
-  "webControls.goHome": "Home",
-  "webControls.openInBrowser": "Open in Browser",
-  "webControls.reload": "Reload",
-  "welcome.loginButton": "Login to your account",
-  "welcome.signupButton": "Create a free account",
-  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
-  "workspaceDrawer.allServices": "All services",
-  "workspaceDrawer.headline": "Workspaces",
-  "workspaceDrawer.item.contextMenuEdit": "edit",
-  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.premiumCtaButtonLabel": "Create your first workspace",
-  "workspaceDrawer.reactivatePremiumAccountLabel": "Reactivate premium account",
-  "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
-  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
-  "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 22a0b6771..ec6d9085b 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "重新加載",
-  "app.errorHandler.headline": "出現錯誤",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Custom server",
  "changeserver.headline": "切換服務器",
  "changeserver.label": "伺服器",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "What happened?",
  "connectionLostBanner.message": "Oh no! Ferdi lost the connection to {name}.",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "發布除錯訊息",
  "feature.nightlyBuilds.activate": "Activate",
  "feature.nightlyBuilds.info": "Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
  "feature.nightlyBuilds.title": "Nightly Builds",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
  "feature.quickSwitch.search": "搜尋...",
  "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "無法連接到Ferdi網路服務",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "取消",
+  "global.cancel": "Cancel",
  "global.edit": "編輯",
  "global.no": "No",
  "global.notConnectedToTheInternet": "您未連上網際網路",
@@ -33,21 +32,21 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "設置",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "使用系統預設值({default})",
  "global.spellchecking.autodetect": "自動檢測語言",
  "global.spellchecking.autodetect.short": "自動",
  "global.spellchecking.language": "拼字檢查語言",
-  "global.submit": "送出",
+  "global.submit": "Submit",
  "global.userAgentHelp": "Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
  "global.userAgentPref": "User Agent",
  "global.yes": "Yes",
  "import.headline": "匯入您的 Ferdi 4 服務",
  "import.notSupportedHeadline": "此服務不被 Ferdi 5 支持",
  "import.skip.label": "我想手動匯入",
-  "import.submit.label": "匯入服務",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "最新消息!",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "重新啟動並且更新",
  "infobar.buttonReloadServices": "重新載入",
  "infobar.hide": "隱藏",
@@ -75,7 +74,7 @@
  "login.email.label": "電子郵件信箱",
  "login.headline": "登入",
  "login.invalidCredentials": "電子郵件帳戶或密碼有誤",
-  "login.link.password": "密碼重設",
+  "login.link.password": "Reset password",
  "login.link.signup": "建立一個免費帳戶",
  "login.password.label": "密碼",
  "login.serverLogout": "登入狀態過期，請重新登入",
@@ -118,7 +117,7 @@
  "menu.help.tos": "服務條款",
  "menu.services": "服務",
  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "主頁",
  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "Todos",
@@ -148,22 +147,11 @@
  "menu.workspaces.defaultWorkspace": "所有服務",
  "menu.workspaces.openWorkspaceDrawer": "打開工作區",
  "password.email.label": "電子郵件信箱",
-  "password.headline": "密碼重設",
+  "password.headline": "Reset password",
  "password.link.login": "登入您的帳戶",
  "password.link.signup": "建立一個免費帳戶",
-  "password.noUser": "此電子郵件帳戶不存在",
+  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "請重新確認您的電子郵件信箱",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "帳號同步",
-  "pricing.features.customWebsites": "添加自訂網站",
-  "pricing.features.desktopNotifications": "桌面通知",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "工作區",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
  "service.crashHandler.headline": "唉呀 糟糕!",
@@ -181,7 +169,7 @@
  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
  "services.serverless": "Use Ferdi without an Account",
  "services.welcome": "歡迎使用 Ferdi",
-  "settings.account.account.editButton": "更改帳戶資訊",
+  "settings.account.account.editButton": "Edit account",
  "settings.account.accountUnavailable": "帳號無法使用",
  "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": "更新帳戶資訊",
@@ -189,16 +177,16 @@
  "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
  "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
  "settings.account.headline": "帳戶",
-  "settings.account.headlineAccount": "帳戶資訊",
+  "settings.account.headlineAccount": "Account information",
-  "settings.account.headlineDangerZone": "危險操作區",
+  "settings.account.headlineDangerZone": "Danger Zone",
-  "settings.account.headlineInvoices": "发票",
+  "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "更改密碼",
+  "settings.account.headlinePassword": "Change password",
  "settings.account.headlineProfile": "更新帳戶資訊",
  "settings.account.successInfo": "您的更改已經儲存",
  "settings.account.tryReloadServices": "再試一次",
  "settings.account.tryReloadUserInfoRequest": "再試一次",
  "settings.account.userInfoRequestFailed": "無法載入帳戶資訊",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "清除緩存",
  "settings.app.buttonInstallUpdate": "重新啟動並且更新",
@@ -225,7 +213,7 @@
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "在系統匣上顯示",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -296,7 +285,7 @@
  "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
  "settings.recipes.customService.openDevDocs": "Developer Documentation",
-  "settings.recipes.customService.openFolder": "開啟資料夾",
+  "settings.recipes.customService.openFolder": "Open folder",
  "settings.recipes.headline": "可用服務",
  "settings.recipes.missingService": "Missing a service?",
  "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
@@ -312,7 +301,7 @@
  "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
  "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
  "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "刪除",
+  "settings.service.form.deleteButton": "Delete service",
  "settings.service.form.editServiceHeadline": "編輯 {name}",
  "settings.service.form.enableAudio": "啟用音效",
  "settings.service.form.enableBadge": "Show unread message badges",
@@ -332,17 +321,18 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "名子",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "使用代理",
-  "settings.service.form.proxy.password": "密碼（可選擇）",
+  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "連接埠",
  "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
-  "settings.service.form.proxy.user": "用戶（可選擇）",
+  "settings.service.form.proxy.user": "User (optional)",
  "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
  "settings.service.form.saveButton": "儲存",
  "settings.service.form.tabHosted": "Hosted",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "服務列表",
  "settings.services.headline": "您的服務",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "已停用服務",
  "settings.services.tooltip.isMuted": "All sounds are muted",
@@ -387,8 +378,8 @@
  "settings.user.form.accountType.non-profit": "非營利",
  "settings.user.form.currentPassword": "舊密碼",
  "settings.user.form.email": "電子郵件信箱",
-  "settings.user.form.firstname": "名子",
+  "settings.user.form.firstname": "First Name",
-  "settings.user.form.lastname": "姓氏",
+  "settings.user.form.lastname": "Last Name",
  "settings.user.form.newPassword": "新密碼",
  "settings.workspace.add.form.name": "名子",
  "settings.workspace.add.form.submitButton": "建立工作區",
@@ -420,9 +411,9 @@
  "sidebar.unmuteApp": "啟用通知",
  "signup.email.label": "電子郵件信箱",
  "signup.emailDuplicate": "此電子郵件信箱已被註冊",
-  "signup.firstname.label": "名子",
+  "signup.firstname.label": "First Name",
  "signup.headline": "註冊",
-  "signup.lastname.label": "姓氏",
+  "signup.lastname.label": "Last Name",
  "signup.legal.info": "在建立帳戶同時，您同意：",
  "signup.legal.privacy": "隱私聲明",
  "signup.legal.terms": "服務條款",
@@ -430,11 +421,11 @@
  "signup.password.label": "密碼",
  "signup.submit.label": "建立帳戶",
  "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "刪除",
+  "tabs.item.deleteService": "Delete service",
  "tabs.item.disableAudio": "停用音效",
  "tabs.item.disableDarkMode": "Disable Dark mode",
  "tabs.item.disableNotifications": "停用通知",
-  "tabs.item.disableService": "停用服務",
+  "tabs.item.disableService": "Disable service",
  "tabs.item.enableAudio": "啟用音效",
  "tabs.item.enableDarkMode": "Enable Dark mode",
  "tabs.item.enableNotification": "啟用通知",
@@ -454,7 +445,7 @@
  "webControls.reload": "重新加載",
  "welcome.loginButton": "登入",
  "welcome.signupButton": "建立一個免費帳戶",
-  "workspaceDrawer.addNewWorkspaceLabel": "新增工作區",
+  "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace",
  "workspaceDrawer.allServices": "所有服務",
  "workspaceDrawer.headline": "工作區",
  "workspaceDrawer.item.contextMenuEdit": "編輯",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index fa30d636a..648d75a6d 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -1,6 +1,6 @@
 {
  "app.errorHandler.action": "重新加载",
-  "app.errorHandler.headline": "出了些问题",
+  "app.errorHandler.headline": "Something went wrong.",
  "changeserver.customServerLabel": "Custom server",
  "changeserver.headline": "Change server",
  "changeserver.label": "服务器：",
@@ -10,7 +10,6 @@
  "connectionLostBanner.informationLink": "发生了什么？",
  "connectionLostBanner.message": "哦不！Ferdi失去了与 {name} 的连接。",
  "feature.basicAuth.signIn": "Sign In",
-  "feature.debugger.title": "发布调试信息",
  "feature.nightlyBuilds.activate": "激活",
  "feature.nightlyBuilds.info": "每夜版(Nightly builds) 是Ferdi的实验性版本，可能包含未完善或未完成的功能。这些每夜版主要由开发人员来测试他们新开发的功能及它们在最终版本的的表现。如果您不知道自己在做什么，我们建议您不要激活每夜版。",
  "feature.nightlyBuilds.title": "每夜版",
@@ -24,8 +23,8 @@
  "feature.quickSwitch.info": "使用 TAB ，↑ 和 ↓ 选择服务。使用回车键（ENTER）打开服务",
  "feature.quickSwitch.search": "搜索...",
  "feature.quickSwitch.title": "快速切换",
-  "global.api.unhealthy": "无法链接到 Ferdi 在线服务",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
-  "global.cancel": "取消",
+  "global.cancel": "Cancel",
  "global.edit": "编辑",
  "global.no": "No",
  "global.notConnectedToTheInternet": "您没有连接到互联网。",
@@ -33,7 +32,7 @@
  "global.quit": "Quit",
  "global.quitConfirmation": "Do you really want to quit Ferdi?",
  "global.save": "Save",
-  "global.settings": "设置",
+  "global.settings": "Settings",
  "global.spellchecker.useDefault": "使用系统默认值 ({default})",
  "global.spellchecking.autodetect": "自动检测语言",
  "global.spellchecking.autodetect.short": "自动",
@@ -45,9 +44,9 @@
  "import.headline": "导入你的 Ferdi 4 服务",
  "import.notSupportedHeadline": "Ferdi 5尚未支持的服务",
  "import.skip.label": "我想手动添加服务",
-  "import.submit.label": "导入服务",
+  "import.submit.label": "Import {count} services",
  "infobar.authRequestFailed": "尝试进行身份验证时出错。如果此错误仍存在，请尝试注销并重新登录。",
-  "infobar.buttonChangelog": "有什么新鲜事？",
+  "infobar.buttonChangelog": "What is new?",
  "infobar.buttonInstallUpdate": "重启并安装更新",
  "infobar.buttonReloadServices": "重载服务",
  "infobar.hide": "隐藏",
@@ -117,10 +116,10 @@
  "menu.help.support": "支持",
  "menu.help.tos": "服务条款",
  "menu.services": "服务",
-  "menu.services.activatePreviousService": "激活以前的服务",
+  "menu.services.activatePreviousService": "Activate previous service",
-  "menu.services.addNewService": "Add New Service",
+  "menu.services.addNewService": "Add New Service...",
  "menu.services.goHome": "主页",
-  "menu.services.setNextServiceActive": "激活下一个服务",
+  "menu.services.setNextServiceActive": "Activate next service",
  "menu.todos": "待办事项",
  "menu.todos.enableTodos": "启用待办事项",
  "menu.view": "查看",
@@ -152,18 +151,7 @@
  "password.link.login": "Sign in to your account",
  "password.link.signup": "Create a free account",
  "password.noUser": "No user with that email address was found",
-  "password.successInfo": "Please check your email",
+  "password.successInfo": "Your new password was sent to your email address",
-  "pricing.features.accountSync": "Account Synchronisation",
-  "pricing.features.customWebsites": "Add Custom Websites",
-  "pricing.features.desktopNotifications": "Desktop Notifications",
-  "pricing.features.onPremise": "On-premise & other Hosted Services",
-  "pricing.features.recipes": "Choose from more than 70 Services",
-  "pricing.features.serviceProxies": "Service Proxies",
-  "pricing.features.spellchecker": "Spellchecker support",
-  "pricing.features.teamManagement": "Team Management",
-  "pricing.features.thirdPartyServices": "Install 3rd party services",
-  "pricing.features.unlimitedServices": "Add unlimited services",
-  "pricing.features.workspaces": "Workspaces",
  "service.crashHandler.action": "Reload {name}",
  "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
  "service.crashHandler.headline": "Oh no!",
@@ -198,7 +186,7 @@
  "settings.account.tryReloadServices": "Try again",
  "settings.account.tryReloadUserInfoRequest": "Try again",
  "settings.account.userInfoRequestFailed": "Could not load user information",
-  "settings.account.yourLicense": "Your Ferdi License",
+  "settings.account.yourLicense": "Your Ferdi License:",
  "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
  "settings.app.buttonClearAllCache": "Clear cache",
  "settings.app.buttonInstallUpdate": "重启并安装更新",
@@ -220,12 +208,12 @@
  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
  "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
  "settings.app.form.customTodoServer": "Custom Todo Server",
-  "settings.app.form.darkMode": "Enable dark mode",
+  "settings.app.form.darkMode": "Enable Dark Mode",
  "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
  "settings.app.form.enableLock": "Enable Password Lock",
  "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
  "settings.app.form.enableSpellchecking": "Enable spell checking",
-  "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
+  "settings.app.form.enableSystemTray": "Always show Ferdi in System Tray",
  "settings.app.form.enableTodos": "Enable Ferdi Todos",
  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
  "settings.app.form.hibernationStrategy": "Hibernation strategy",
@@ -251,6 +239,7 @@
  "settings.app.form.showDisabledServices": "Display disabled services tabs",
  "settings.app.form.showDragArea": "Show draggable area on window",
  "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
+  "settings.app.form.splitMode": "Enable Split View Mode",
  "settings.app.form.startMinimized": "Start minimized",
  "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
@@ -332,12 +321,13 @@
  "settings.service.form.isHibernatedEnabledInfo": "When enabled, a service will be shut down after a period of time to save system resources.",
  "settings.service.form.isMutedInfo": "When disabled, all notification sounds and audio playback are muted",
  "settings.service.form.name": "名称",
+  "settings.service.form.onlyShowFavoritesInUnreadCount": "Only show Favorites in unread count",
  "settings.service.form.openDarkmodeCss": "Open darkmode.css",
  "settings.service.form.openUserCss": "Open user.css",
  "settings.service.form.openUserJs": "Open user.js",
  "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings",
  "settings.service.form.proxy.host": "Proxy Host/IP",
-  "settings.service.form.proxy.info": "Proxy settings will not synced with the Ferdi servers.",
+  "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
  "settings.service.form.proxy.isEnabled": "Use Proxy",
  "settings.service.form.proxy.password": "Password (optional)",
  "settings.service.form.proxy.port": "Port",
@@ -354,6 +344,7 @@
  "settings.services.discoverServices": "Discover services",
  "settings.services.headline": "Your services",
  "settings.services.noServicesAdded": "Start by adding a service.",
+  "settings.services.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
  "settings.services.servicesRequestFailed": "Could not load your services",
  "settings.services.tooltip.isDisabled": "Service is disabled",
  "settings.services.tooltip.isMuted": "All sounds are muted",
diff --git a/src/i18n/manage-translations.js b/src/i18n/manage-translations.js
deleted file mode 100644
index ee64c9c09..000000000
--- a/src/i18n/manage-translations.js
+++ /dev/null
@@ -1,9 +0,0 @@
-require('@babel/register');
-const manageTranslations = require('react-intl-translations-manager').default;
-manageTranslations({
-  messagesDirectory: 'src/i18n/messages',
-  translationsDirectory: 'src/i18n/locales',
-  singleMessagesFile: true,
-  languages: ['en-US'],
-});
diff --git a/src/i18n/messages/src/components/AppUpdateInfoBar.json b/src/i18n/messages/src/components/AppUpdateInfoBar.json
deleted file mode 100644
index b99eaff67..000000000
--- a/src/i18n/messages/src/components/AppUpdateInfoBar.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "infobar.updateAvailable",
-    "defaultMessage": "!!!A new update for Ferdi is available.",
-    "file": "src/components/AppUpdateInfoBar.js",
-    "start": {
-      "line": 10,
-      "column": 19
-    },
-    "end": {
-      "line": 13,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.buttonChangelog",
-    "defaultMessage": "!!!Changelog",
-    "file": "src/components/AppUpdateInfoBar.js",
-    "start": {
-      "line": 14,
-      "column": 13
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.buttonInstallUpdate",
-    "defaultMessage": "!!!Restart & install update",
-    "file": "src/components/AppUpdateInfoBar.js",
-    "start": {
-      "line": 18,
-      "column": 23
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/ChangeServer.json b/src/i18n/messages/src/components/auth/ChangeServer.json
deleted file mode 100644
index 87e0b5857..000000000
--- a/src/i18n/messages/src/components/auth/ChangeServer.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "changeserver.headline",
-    "defaultMessage": "!!!Change server",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.label",
-    "defaultMessage": "!!!Server",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 19,
-      "column": 9
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.warning",
-    "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 23,
-      "column": 11
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.customServerLabel",
-    "defaultMessage": "!!!Custom server",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 27,
-      "column": 21
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.urlError",
-    "defaultMessage": "!!!Enter a valid URL",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
-      "line": 31,
-      "column": 12
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Import.json b/src/i18n/messages/src/components/auth/Import.json
deleted file mode 100644
index 98ae2e61f..000000000
--- a/src/i18n/messages/src/components/auth/Import.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "import.headline",
-    "defaultMessage": "!!!Import your Ferdi 4 services",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 13,
-      "column": 12
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "import.notSupportedHeadline",
-    "defaultMessage": "!!!Services not yet supported in Ferdi 5",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 17,
-      "column": 24
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "import.submit.label",
-    "defaultMessage": "!!!Import {count} services",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 21,
-      "column": 21
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "import.skip.label",
-    "defaultMessage": "!!!I want to add services manually",
-    "file": "src/components/auth/Import.js",
-    "start": {
-      "line": 25,
-      "column": 19
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Invite.json b/src/i18n/messages/src/components/auth/Invite.json
deleted file mode 100644
index 57c9bddcf..000000000
--- a/src/i18n/messages/src/components/auth/Invite.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.invite.headline",
-    "defaultMessage": "!!!Invite Friends",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 16,
-      "column": 20
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.headline.friends",
-    "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.name.label",
-    "defaultMessage": "!!!Name",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 24,
-      "column": 13
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 28,
-      "column": 14
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.submit.label",
-    "defaultMessage": "!!!Send invites",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.skip.label",
-    "defaultMessage": "!!!I want to do this later",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 36,
-      "column": 19
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.successInfo",
-    "defaultMessage": "!!!Invitations sent successfully",
-    "file": "src/components/auth/Invite.js",
-    "start": {
-      "line": 40,
-      "column": 21
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Locked.json b/src/i18n/messages/src/components/auth/Locked.json
deleted file mode 100644
index a871d6fc8..000000000
--- a/src/i18n/messages/src/components/auth/Locked.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-  {
-    "id": "locked.headline",
-    "defaultMessage": "!!!Locked",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 16,
-      "column": 12
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.info",
-    "defaultMessage": "!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 20,
-      "column": 8
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchId",
-    "defaultMessage": "!!!Unlock with Touch ID",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 24,
-      "column": 11
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchIdPrompt",
-    "defaultMessage": "!!!unlock via Touch ID",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.password.label",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 32,
-      "column": 17
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.submit.label",
-    "defaultMessage": "!!!Unlock",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 36,
-      "column": 21
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.unlockWithPassword",
-    "defaultMessage": "!!!Unlock with Password",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 40,
-      "column": 22
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.invalidCredentials",
-    "defaultMessage": "!!!Password invalid",
-    "file": "src/components/auth/Locked.js",
-    "start": {
-      "line": 44,
-      "column": 22
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json
deleted file mode 100644
index 275b04478..000000000
--- a/src/i18n/messages/src/components/auth/Login.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "login.headline",
-    "defaultMessage": "!!!Sign in",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 24,
-      "column": 14
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.password.label",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.submit.label",
-    "defaultMessage": "!!!Sign in",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.invalidCredentials",
-    "defaultMessage": "!!!Email or password not valid",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 36,
-      "column": 22
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.customServerQuestion",
-    "defaultMessage": "!!!Using a Franz account to log in?",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 40,
-      "column": 24
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.customServerSuggestion",
-    "defaultMessage": "!!!Try importing your Franz account into Ferdi",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 44,
-      "column": 26
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.tokenExpired",
-    "defaultMessage": "!!!Your session expired, please login again.",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 48,
-      "column": 16
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.serverLogout",
-    "defaultMessage": "!!!Your session expired, please login again.",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 52,
-      "column": 16
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.link.signup",
-    "defaultMessage": "!!!Create a free account",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 56,
-      "column": 14
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.changeServer",
-    "defaultMessage": "!!!Change server",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 60,
-      "column": 16
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 64,
-      "column": 14
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.link.password",
-    "defaultMessage": "!!!Forgot password",
-    "file": "src/components/auth/Login.js",
-    "start": {
-      "line": 68,
-      "column": 16
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Password.json b/src/i18n/messages/src/components/auth/Password.json
deleted file mode 100644
index 336ba42ef..000000000
--- a/src/i18n/messages/src/components/auth/Password.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-  {
-    "id": "password.headline",
-    "defaultMessage": "!!!Forgot password",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 19,
-      "column": 14
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.successInfo",
-    "defaultMessage": "!!!Your new password was sent to your email address",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 23,
-      "column": 15
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.noUser",
-    "defaultMessage": "!!!No user affiliated with that email address",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 27,
-      "column": 10
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.link.signup",
-    "defaultMessage": "!!!Create a free account",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 31,
-      "column": 14
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.link.login",
-    "defaultMessage": "!!!Sign in to your account",
-    "file": "src/components/auth/Password.js",
-    "start": {
-      "line": 35,
-      "column": 13
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/ServiceAssistant.json b/src/i18n/messages/src/components/auth/ServiceAssistant.json
deleted file mode 100644
index 9170fc183..000000000
--- a/src/i18n/messages/src/components/auth/ServiceAssistant.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.invite.headline",
-    "defaultMessage": "!!!Invite Friends",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 16,
-      "column": 20
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.headline.friends",
-    "defaultMessage": "!!!Invite 3 of your friends or colleagues",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.name.label",
-    "defaultMessage": "!!!Name",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 24,
-      "column": 13
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 28,
-      "column": 14
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.submit.label",
-    "defaultMessage": "!!!Send invites",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.skip.label",
-    "defaultMessage": "!!!I want to do this later",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 36,
-      "column": 19
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.successInfo",
-    "defaultMessage": "!!!Invitations sent successfully",
-    "file": "src/components/auth/ServiceAssistant.js",
-    "start": {
-      "line": 40,
-      "column": 21
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/SetupAssistant.json b/src/i18n/messages/src/components/auth/SetupAssistant.json
deleted file mode 100644
index 108adab26..000000000
--- a/src/i18n/messages/src/components/auth/SetupAssistant.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "setupAssistant.headline",
-    "defaultMessage": "!!!Let's get started",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "setupAssistant.subheadline",
-    "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 24,
-      "column": 15
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "setupAssistant.submit.label",
-    "defaultMessage": "!!!Let's go",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 29,
-      "column": 21
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "invite.successInfo",
-    "defaultMessage": "!!!Invitations sent successfully",
-    "file": "src/components/auth/SetupAssistant.js",
-    "start": {
-      "line": 33,
-      "column": 21
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Signup.json b/src/i18n/messages/src/components/auth/Signup.json
deleted file mode 100644
index 4a32628ef..000000000
--- a/src/i18n/messages/src/components/auth/Signup.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "signup.headline",
-    "defaultMessage": "!!!Sign up",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 20,
-      "column": 12
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.firstname.label",
-    "defaultMessage": "!!!Firstname",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 24,
-      "column": 18
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.lastname.label",
-    "defaultMessage": "!!!Lastname",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.email.label",
-    "defaultMessage": "!!!Email address",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 32,
-      "column": 14
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.password.label",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 40,
-      "column": 17
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.legal.info",
-    "defaultMessage": "!!!By creating a Ferdi account you accept the",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 44,
-      "column": 13
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.legal.terms",
-    "defaultMessage": "!!!Terms of service",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 48,
-      "column": 9
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.legal.privacy",
-    "defaultMessage": "!!!Privacy Statement",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 52,
-      "column": 11
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.submit.label",
-    "defaultMessage": "!!!Create account",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 56,
-      "column": 21
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.link.login",
-    "defaultMessage": "!!!Already have an account, sign in?",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 60,
-      "column": 13
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "login.changeServer",
-    "defaultMessage": "!!!Change server",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 64,
-      "column": 16
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 68,
-      "column": 14
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "signup.emailDuplicate",
-    "defaultMessage": "!!!A user with that email address already exists",
-    "file": "src/components/auth/Signup.js",
-    "start": {
-      "line": 72,
-      "column": 18
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/auth/Welcome.json b/src/i18n/messages/src/components/auth/Welcome.json
deleted file mode 100644
index 3f0c1e5c2..000000000
--- a/src/i18n/messages/src/components/auth/Welcome.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "welcome.signupButton",
-    "defaultMessage": "!!!Create a free account",
-    "file": "src/components/auth/Welcome.js",
-    "start": {
-      "line": 11,
-      "column": 16
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "welcome.loginButton",
-    "defaultMessage": "!!!Login to your account",
-    "file": "src/components/auth/Welcome.js",
-    "start": {
-      "line": 15,
-      "column": 15
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/auth/Welcome.js",
-    "start": {
-      "line": 19,
-      "column": 14
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
deleted file mode 100644
index 807490a4f..000000000
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "infobar.servicesUpdated",
-    "defaultMessage": "!!!Your services have been updated.",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 28,
-      "column": 19
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.buttonReloadServices",
-    "defaultMessage": "!!!Reload services",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 32,
-      "column": 24
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.requiredRequestsFailed",
-    "defaultMessage": "!!!Could not load services and user information",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 36,
-      "column": 26
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "infobar.authRequestFailed",
-    "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-    "file": "src/components/layout/AppLayout.js",
-    "start": {
-      "line": 40,
-      "column": 21
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
deleted file mode 100644
index 9bc435f12..000000000
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-  {
-    "id": "sidebar.addNewService",
-    "defaultMessage": "!!!Add new service",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 18,
-      "column": 17
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.muteApp",
-    "defaultMessage": "!!!Disable notifications & audio",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 22,
-      "column": 8
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.unmuteApp",
-    "defaultMessage": "!!!Enable notifications & audio",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 26,
-      "column": 10
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.openWorkspaceDrawer",
-    "defaultMessage": "!!!Open workspace drawer",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 30,
-      "column": 23
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.closeWorkspaceDrawer",
-    "defaultMessage": "!!!Close workspace drawer",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 34,
-      "column": 24
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.openTodosDrawer",
-    "defaultMessage": "!!!Open Ferdi Todos",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 38,
-      "column": 19
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.closeTodosDrawer",
-    "defaultMessage": "!!!Close Ferdi Todos",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 42,
-      "column": 20
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.lockFerdi",
-    "defaultMessage": "!!!Lock Ferdi",
-    "file": "src/components/layout/Sidebar.js",
-    "start": {
-      "line": 46,
-      "column": 13
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionBanner.json b/src/i18n/messages/src/components/services/content/ConnectionBanner.json
deleted file mode 100644
index 1047c28b5..000000000
--- a/src/i18n/messages/src/components/services/content/ConnectionBanner.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/content/ConnectionBanner.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLost.json b/src/i18n/messages/src/components/services/content/ConnectionLost.json
deleted file mode 100644
index ee3f7a4ba..000000000
--- a/src/i18n/messages/src/components/services/content/ConnectionLost.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/content/ConnectionLost.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
deleted file mode 100644
index 6805b4d67..000000000
--- a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "connectionLostBanner.message",
-    "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.",
-    "file": "src/components/services/content/ConnectionLostBanner.js",
-    "start": {
-      "line": 13,
-      "column": 8
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "connectionLostBanner.informationLink",
-    "defaultMessage": "!!!What happened?",
-    "file": "src/components/services/content/ConnectionLostBanner.js",
-    "start": {
-      "line": 17,
-      "column": 19
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "connectionLostBanner.cta",
-    "defaultMessage": "!!!Reload Service",
-    "file": "src/components/services/content/ConnectionLostBanner.js",
-    "start": {
-      "line": 21,
-      "column": 7
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json b/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json
deleted file mode 100644
index c8fe802df..000000000
--- a/src/i18n/messages/src/components/services/content/ErrorHandlers/WebviewErrorHandler.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "service.errorHandler.headline",
-    "defaultMessage": "!!!Oh no!",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 12,
-      "column": 12
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.text",
-    "defaultMessage": "!!!{name} has failed to load.",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 16,
-      "column": 8
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.action",
-    "defaultMessage": "!!!Reload {name}",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 20,
-      "column": 10
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.editAction",
-    "defaultMessage": "!!!Edit {name}",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 24,
-      "column": 14
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.errorHandler.message",
-    "defaultMessage": "!!!Error:",
-    "file": "src/components/services/content/ErrorHandlers/WebviewErrorHandler.js",
-    "start": {
-      "line": 28,
-      "column": 16
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/ServiceDisabled.json b/src/i18n/messages/src/components/services/content/ServiceDisabled.json
deleted file mode 100644
index 8bfad28c7..000000000
--- a/src/i18n/messages/src/components/services/content/ServiceDisabled.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "service.disabledHandler.headline",
-    "defaultMessage": "!!!{name} is disabled",
-    "file": "src/components/services/content/ServiceDisabled.js",
-    "start": {
-      "line": 9,
-      "column": 12
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.disabledHandler.action",
-    "defaultMessage": "!!!Enable {name}",
-    "file": "src/components/services/content/ServiceDisabled.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json
deleted file mode 100644
index 304c93f3c..000000000
--- a/src/i18n/messages/src/components/services/content/Services.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "services.welcome",
-    "defaultMessage": "!!!Welcome to Ferdi",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 15,
-      "column": 11
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.getStarted",
-    "defaultMessage": "!!!Get started",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 19,
-      "column": 14
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.login",
-    "defaultMessage": "!!!Please login to use Ferdi.",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 23,
-      "column": 9
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverless",
-    "defaultMessage": "!!!Use Ferdi without an Account",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 27,
-      "column": 14
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "services.serverInfo",
-    "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
-    "file": "src/components/services/content/Services.js",
-    "start": {
-      "line": 31,
-      "column": 14
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/WebControls.json b/src/i18n/messages/src/components/services/content/WebControls.json
deleted file mode 100644
index 5af5143d0..000000000
--- a/src/i18n/messages/src/components/services/content/WebControls.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/content/WebControls.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json b/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json
deleted file mode 100644
index c3d6c41a5..000000000
--- a/src/i18n/messages/src/components/services/content/WebviewCrashHandler.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "service.crashHandler.headline",
-    "defaultMessage": "!!!Oh no!",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 10,
-      "column": 12
-    },
-    "end": {
-      "line": 13,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.crashHandler.text",
-    "defaultMessage": "!!!{name} has caused an error.",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 14,
-      "column": 8
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.crashHandler.action",
-    "defaultMessage": "!!!Reload {name}",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 18,
-      "column": 10
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "service.crashHandler.autoReload",
-    "defaultMessage": "!!!Trying to automatically restore {name} in {seconds} seconds",
-    "file": "src/components/services/content/WebviewCrashHandler.js",
-    "start": {
-      "line": 22,
-      "column": 14
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/tabs/TabItem.json b/src/i18n/messages/src/components/services/tabs/TabItem.json
deleted file mode 100644
index de854f1e1..000000000
--- a/src/i18n/messages/src/components/services/tabs/TabItem.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "tabs.item.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 21,
-      "column": 10
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableNotifications",
-    "defaultMessage": "!!!Disable notifications",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 25,
-      "column": 24
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableNotification",
-    "defaultMessage": "!!!Enable notifications",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 29,
-      "column": 23
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableAudio",
-    "defaultMessage": "!!!Disable audio",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 33,
-      "column": 16
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableAudio",
-    "defaultMessage": "!!!Enable audio",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 37,
-      "column": 15
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableDarkMode",
-    "defaultMessage": "!!!Enable Dark mode",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 41,
-      "column": 18
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableDarkMode",
-    "defaultMessage": "!!!Disable Dark mode",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 45,
-      "column": 19
-    },
-    "end": {
-      "line": 48,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.disableService",
-    "defaultMessage": "!!!Disable Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 49,
-      "column": 18
-    },
-    "end": {
-      "line": 52,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.enableService",
-    "defaultMessage": "!!!Enable Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 53,
-      "column": 17
-    },
-    "end": {
-      "line": 56,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.hibernateService",
-    "defaultMessage": "!!!Hibernate Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 57,
-      "column": 20
-    },
-    "end": {
-      "line": 60,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.wakeUpService",
-    "defaultMessage": "!!!Wake Up Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 61,
-      "column": 17
-    },
-    "end": {
-      "line": 64,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.deleteService",
-    "defaultMessage": "!!!Delete Service",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 65,
-      "column": 17
-    },
-    "end": {
-      "line": 68,
-      "column": 3
-    }
-  },
-  {
-    "id": "tabs.item.confirmDeleteService",
-    "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
-    "file": "src/components/services/tabs/TabItem.js",
-    "start": {
-      "line": 69,
-      "column": 24
-    },
-    "end": {
-      "line": 73,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/SettingsLayout.json b/src/i18n/messages/src/components/settings/SettingsLayout.json
deleted file mode 100644
index 99337a315..000000000
--- a/src/i18n/messages/src/components/settings/SettingsLayout.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "settings.app.closeSettings",
-    "defaultMessage": "!!!Close settings",
-    "file": "src/components/settings/SettingsLayout.js",
-    "start": {
-      "line": 11,
-      "column": 17
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
deleted file mode 100644
index b0cc2dcc7..000000000
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ /dev/null
@@ -1,158 +0,0 @@
-[
-  {
-    "id": "settings.account.headline",
-    "defaultMessage": "!!!Account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 14,
-      "column": 12
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineDangerZone",
-    "defaultMessage": "!!Danger Zone",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 18,
-      "column": 22
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.account.editButton",
-    "defaultMessage": "!!!Edit Account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 22,
-      "column": 21
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineInvoices",
-    "defaultMessage": "!!Invoices",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 26,
-      "column": 18
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.userInfoRequestFailed",
-    "defaultMessage": "!!!Could not load user information",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 30,
-      "column": 25
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.tryReloadUserInfoRequest",
-    "defaultMessage": "!!!Try again",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 34,
-      "column": 28
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.deleteAccount",
-    "defaultMessage": "!!!Delete account",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 38,
-      "column": 17
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.deleteInfo",
-    "defaultMessage": "!!!If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 42,
-      "column": 14
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.deleteEmailSent",
-    "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 19
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.yourLicense",
-    "defaultMessage": "!!!Your Franz License:",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 52,
-      "column": 15
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.accountUnavailable",
-    "defaultMessage": "Account is unavailable",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 56,
-      "column": 22
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.accountUnavailableInfo",
-    "defaultMessage": "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.",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 60,
-      "column": 26
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
deleted file mode 100644
index 2029ad7af..000000000
--- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.navigation.availableServices",
-    "defaultMessage": "!!!Available services",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 16,
-      "column": 21
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.yourServices",
-    "defaultMessage": "!!!Your services",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 20,
-      "column": 16
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.yourWorkspaces",
-    "defaultMessage": "!!!Your workspaces",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 24,
-      "column": 18
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.account",
-    "defaultMessage": "!!!Account",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 28,
-      "column": 11
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.team",
-    "defaultMessage": "!!!Manage Team",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 32,
-      "column": 8
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.supportFerdi",
-    "defaultMessage": "!!!About Ferdi",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 36,
-      "column": 16
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.navigation.logout",
-    "defaultMessage": "!!!Logout",
-    "file": "src/components/settings/navigation/SettingsNavigation.js",
-    "start": {
-      "line": 40,
-      "column": 10
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json b/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
deleted file mode 100644
index 7ab2916f5..000000000
--- a/src/i18n/messages/src/components/settings/recipes/RecipesDashboard.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-    "id": "settings.recipes.headline",
-    "defaultMessage": "!!!Available Services",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 12
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.searchService",
-    "defaultMessage": "!!!Search service",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 17
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.all",
-    "defaultMessage": "!!!All services",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 14
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.custom",
-    "defaultMessage": "!!!Custom Services",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 17
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.nothingFound",
-    "defaultMessage": "!!!Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 16
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.servicesSuccessfulAddedInfo",
-    "defaultMessage": "!!!Service successfully added",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 31
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.missingService",
-    "defaultMessage": "!!!Missing a service?",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 43,
-      "column": 18
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.intro",
-    "defaultMessage": "!!!To add a custom service, copy the recipe folder into:",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 21
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.openFolder",
-    "defaultMessage": "!!!Open directory",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 51,
-      "column": 14
-    },
-    "end": {
-      "line": 54,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.openDevDocs",
-    "defaultMessage": "!!!Developer Documentation",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 55,
-      "column": 15
-    },
-    "end": {
-      "line": 58,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.headline.customRecipes",
-    "defaultMessage": "!!!Custom 3rd Party Recipes",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 59,
-      "column": 25
-    },
-    "end": {
-      "line": 62,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.headline.communityRecipes",
-    "defaultMessage": "!!!Community 3rd Party Recipes",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 63,
-      "column": 28
-    },
-    "end": {
-      "line": 66,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.customService.headline.devRecipes",
-    "defaultMessage": "!!!Your Development Service Recipes",
-    "file": "src/components/settings/recipes/RecipesDashboard.js",
-    "start": {
-      "line": 67,
-      "column": 22
-    },
-    "end": {
-      "line": 70,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
deleted file mode 100644
index d7830f198..000000000
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ /dev/null
@@ -1,340 +0,0 @@
-[
-  {
-    "id": "settings.service.form.saveButton",
-    "defaultMessage": "!!!Save service",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 23,
-      "column": 15
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.deleteButton",
-    "defaultMessage": "!!!Delete Service",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 27,
-      "column": 17
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.openDarkmodeCss",
-    "defaultMessage": "!!!Open darkmode.css",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 31,
-      "column": 19
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.openUserCss",
-    "defaultMessage": "!!!Open user.css",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 35,
-      "column": 15
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.openUserJs",
-    "defaultMessage": "!!!Open user.js",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 39,
-      "column": 14
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.recipeFileInfo",
-    "defaultMessage": "!!!Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 43,
-      "column": 18
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.availableServices",
-    "defaultMessage": "!!!Available services",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 47,
-      "column": 21
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.yourServices",
-    "defaultMessage": "!!!Your services",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 51,
-      "column": 16
-    },
-    "end": {
-      "line": 54,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.addServiceHeadline",
-    "defaultMessage": "!!!Add {name}",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 55,
-      "column": 22
-    },
-    "end": {
-      "line": 58,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.editServiceHeadline",
-    "defaultMessage": "!!!Edit {name}",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 59,
-      "column": 23
-    },
-    "end": {
-      "line": 62,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.tabHosted",
-    "defaultMessage": "!!!Hosted",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 63,
-      "column": 13
-    },
-    "end": {
-      "line": 66,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.tabOnPremise",
-    "defaultMessage": "!!!Self hosted ⭐️",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 67,
-      "column": 16
-    },
-    "end": {
-      "line": 70,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.useHostedService",
-    "defaultMessage": "!!!Use the hosted {name} service.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 71,
-      "column": 20
-    },
-    "end": {
-      "line": 74,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.customUrlValidationError",
-    "defaultMessage": "!!!Could not validate custom {name} server.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 75,
-      "column": 28
-    },
-    "end": {
-      "line": 78,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.indirectMessageInfo",
-    "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 79,
-      "column": 23
-    },
-    "end": {
-      "line": 82,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.isMutedInfo",
-    "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 83,
-      "column": 15
-    },
-    "end": {
-      "line": 86,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.isHibernatedEnabledInfo",
-    "defaultMessage": "!!!When enabled, a service will be shut down after a period of time to save system resources.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 87,
-      "column": 28
-    },
-    "end": {
-      "line": 90,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineNotifications",
-    "defaultMessage": "!!!Notifications",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 91,
-      "column": 25
-    },
-    "end": {
-      "line": 94,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineBadges",
-    "defaultMessage": "!!!Unread message badges",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 95,
-      "column": 18
-    },
-    "end": {
-      "line": 98,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineGeneral",
-    "defaultMessage": "!!!General",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 99,
-      "column": 19
-    },
-    "end": {
-      "line": 102,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.headlineDarkReaderSettings",
-    "defaultMessage": "!!!Dark Reader Settings",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 103,
-      "column": 30
-    },
-    "end": {
-      "line": 106,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.iconDelete",
-    "defaultMessage": "!!!Delete",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 107,
-      "column": 14
-    },
-    "end": {
-      "line": 110,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.iconUpload",
-    "defaultMessage": "!!!Drop your image, or click here",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 111,
-      "column": 14
-    },
-    "end": {
-      "line": 114,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.headline",
-    "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 115,
-      "column": 17
-    },
-    "end": {
-      "line": 118,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.restartInfo",
-    "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 119,
-      "column": 20
-    },
-    "end": {
-      "line": 122,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.info",
-    "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
-    "file": "src/components/settings/services/EditServiceForm.js",
-    "start": {
-      "line": 123,
-      "column": 13
-    },
-    "end": {
-      "line": 126,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServiceError.json b/src/i18n/messages/src/components/settings/services/ServiceError.json
deleted file mode 100644
index 648fc5b3e..000000000
--- a/src/i18n/messages/src/components/settings/services/ServiceError.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "id": "settings.service.error.headline",
-    "defaultMessage": "!!!Error",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 10,
-      "column": 12
-    },
-    "end": {
-      "line": 13,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.error.goBack",
-    "defaultMessage": "!!!Back to services",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 14,
-      "column": 10
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.availableServices",
-    "defaultMessage": "!!!Available services",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 18,
-      "column": 21
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.error.message",
-    "defaultMessage": "!!!Could not load service recipe.",
-    "file": "src/components/settings/services/ServiceError.js",
-    "start": {
-      "line": 22,
-      "column": 16
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServiceItem.json b/src/i18n/messages/src/components/settings/services/ServiceItem.json
deleted file mode 100644
index ffea8b9e1..000000000
--- a/src/i18n/messages/src/components/settings/services/ServiceItem.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "settings.services.tooltip.isDisabled",
-    "defaultMessage": "!!!Service is disabled",
-    "file": "src/components/settings/services/ServiceItem.js",
-    "start": {
-      "line": 11,
-      "column": 21
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.tooltip.notificationsDisabled",
-    "defaultMessage": "!!!Notifications are disabled",
-    "file": "src/components/settings/services/ServiceItem.js",
-    "start": {
-      "line": 15,
-      "column": 32
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.tooltip.isMuted",
-    "defaultMessage": "!!!All sounds are muted",
-    "file": "src/components/settings/services/ServiceItem.js",
-    "start": {
-      "line": 19,
-      "column": 18
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
deleted file mode 100644
index 7e7c5d67e..000000000
--- a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json
+++ /dev/null
@@ -1,119 +0,0 @@
-[
-  {
-    "id": "settings.services.headline",
-    "defaultMessage": "!!!Your services",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.searchService",
-    "defaultMessage": "!!!Search service",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 17
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.noServicesAdded",
-    "defaultMessage": "!!!Start by adding a service.",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 19
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.recipes.nothingFound",
-    "defaultMessage": "!!!Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 18
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.discoverServices",
-    "defaultMessage": "!!!Discover services",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 20
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.servicesRequestFailed",
-    "defaultMessage": "!!!Could not load your services",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 25
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.tryReloadServices",
-    "defaultMessage": "!!!Try again",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 21
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.updatedInfo",
-    "defaultMessage": "!!!Your changes have been saved",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 43,
-      "column": 15
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.deletedInfo",
-    "defaultMessage": "!!!Service has been deleted",
-    "file": "src/components/settings/services/ServicesDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 15
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
deleted file mode 100644
index c281ebff3..000000000
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ /dev/null
@@ -1,444 +0,0 @@
-[
-  {
-    "id": "settings.app.headlineGeneral",
-    "defaultMessage": "!!!General",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 21,
-      "column": 19
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.sentryInfo",
-    "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 25,
-      "column": 14
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.hibernateInfo",
-    "defaultMessage": "!!!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.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 29,
-      "column": 17
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.inactivityLockInfo",
-    "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 33,
-      "column": 22
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.todoServerInfo",
-    "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 37,
-      "column": 18
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.lockedPassword",
-    "defaultMessage": "!!!Password",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 41,
-      "column": 18
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.lockedPasswordInfo",
-    "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 45,
-      "column": 22
-    },
-    "end": {
-      "line": 48,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.lockInfo",
-    "defaultMessage": "!!!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 {lockShortcut}.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 49,
-      "column": 12
-    },
-    "end": {
-      "line": 52,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.scheduledDNDTimeInfo",
-    "defaultMessage": "!!!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.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 53,
-      "column": 24
-    },
-    "end": {
-      "line": 56,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.scheduledDNDInfo",
-    "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 57,
-      "column": 20
-    },
-    "end": {
-      "line": 60,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineLanguage",
-    "defaultMessage": "!!!Language",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 61,
-      "column": 20
-    },
-    "end": {
-      "line": 64,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineUpdates",
-    "defaultMessage": "!!!Updates",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 65,
-      "column": 19
-    },
-    "end": {
-      "line": 68,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineAppearance",
-    "defaultMessage": "!!!Appearance",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 69,
-      "column": 22
-    },
-    "end": {
-      "line": 72,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.universalDarkModeInfo",
-    "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 73,
-      "column": 25
-    },
-    "end": {
-      "line": 76,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.accentColorInfo",
-    "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 77,
-      "column": 19
-    },
-    "end": {
-      "line": 80,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlinePrivacy",
-    "defaultMessage": "!!!Privacy",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 81,
-      "column": 19
-    },
-    "end": {
-      "line": 84,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.headlineAdvanced",
-    "defaultMessage": "!!!Advanced",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 85,
-      "column": 20
-    },
-    "end": {
-      "line": 88,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.translationHelp",
-    "defaultMessage": "!!!Help us to translate Ferdi into your language.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 89,
-      "column": 19
-    },
-    "end": {
-      "line": 92,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.spellCheckerLanguageInfo",
-    "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 93,
-      "column": 28
-    },
-    "end": {
-      "line": 96,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.subheadlineCache",
-    "defaultMessage": "!!!Cache",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 97,
-      "column": 20
-    },
-    "end": {
-      "line": 100,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.cacheInfo",
-    "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 101,
-      "column": 13
-    },
-    "end": {
-      "line": 104,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.cacheNotCleared",
-    "defaultMessage": "!!!Couldn't clear all cache",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 105,
-      "column": 19
-    },
-    "end": {
-      "line": 108,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonClearAllCache",
-    "defaultMessage": "!!!Clear cache",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 109,
-      "column": 23
-    },
-    "end": {
-      "line": 112,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.subheadlineFerdiProfile",
-    "defaultMessage": "!!!Ferdi Profile",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 113,
-      "column": 27
-    },
-    "end": {
-      "line": 116,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonOpenFerdiProfileFolder",
-    "defaultMessage": "!!!Open Profile folder",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 117,
-      "column": 32
-    },
-    "end": {
-      "line": 120,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonOpenFerdiServiceRecipesFolder",
-    "defaultMessage": "!!!Open Service Recipes folder",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 121,
-      "column": 39
-    },
-    "end": {
-      "line": 124,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonSearchForUpdate",
-    "defaultMessage": "!!!Check for updates",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 125,
-      "column": 25
-    },
-    "end": {
-      "line": 128,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.buttonInstallUpdate",
-    "defaultMessage": "!!!Restart & install update",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 129,
-      "column": 23
-    },
-    "end": {
-      "line": 132,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.updateStatusSearching",
-    "defaultMessage": "!!!Is searching for update",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 133,
-      "column": 25
-    },
-    "end": {
-      "line": 136,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.updateStatusAvailable",
-    "defaultMessage": "!!!Update available, downloading...",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 137,
-      "column": 25
-    },
-    "end": {
-      "line": 140,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.updateStatusUpToDate",
-    "defaultMessage": "!!!You are using the latest version of Ferdi",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 141,
-      "column": 24
-    },
-    "end": {
-      "line": 144,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.currentVersion",
-    "defaultMessage": "!!!Current version:",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 145,
-      "column": 18
-    },
-    "end": {
-      "line": 148,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.restartRequired",
-    "defaultMessage": "!!!Changes require restart",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 149,
-      "column": 22
-    },
-    "end": {
-      "line": 152,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.languageDisclaimer",
-    "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
-    "file": "src/components/settings/settings/EditSettingsForm.js",
-    "start": {
-      "line": 153,
-      "column": 22
-    },
-    "end": {
-      "line": 156,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json b/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json
deleted file mode 100644
index e63c2801f..000000000
--- a/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json
+++ /dev/null
@@ -1,197 +0,0 @@
-[
-  {
-    "id": "settings.supportFerdi.headline",
-    "defaultMessage": "!!!About Ferdi",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 7,
-      "column": 12
-    },
-    "end": {
-      "line": 10,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.title",
-    "defaultMessage": "!!!Do you like Ferdi?",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 11,
-      "column": 9
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.aboutIntro",
-    "defaultMessage": "!!!<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 15,
-      "column": 14
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textListContributors",
-    "defaultMessage": "!!!Full list of contributor",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 24
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textListContributorsHere",
-    "defaultMessage": "!!!here",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 28
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textVolunteers",
-    "defaultMessage": "!!!The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 18
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textSupportWelcome",
-    "defaultMessage": "!!!Support is always welcome. You can find a list of the help we need",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 22
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textSupportWelcomeHere",
-    "defaultMessage": "!!!here",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 26
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textExpenses",
-    "defaultMessage": "!!!While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 16
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textOpenCollective",
-    "defaultMessage": "!!!Open Collective",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 43,
-      "column": 22
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textDonation",
-    "defaultMessage": "!!!If you feel like supporting Ferdi development with a donation, you can do so on both,",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 47,
-      "column": 16
-    },
-    "end": {
-      "line": 50,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textDonationAnd",
-    "defaultMessage": "!!!and",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 51,
-      "column": 19
-    },
-    "end": {
-      "line": 54,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.textGitHubSponsors",
-    "defaultMessage": "!!!GitHub Sponsors",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 55,
-      "column": 22
-    },
-    "end": {
-      "line": 58,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.openSurvey",
-    "defaultMessage": "!!!Open Survey",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 59,
-      "column": 14
-    },
-    "end": {
-      "line": 62,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.supportFerdi.bannerText",
-    "defaultMessage": "!!!Do you want to help us improve Ferdi?",
-    "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js",
-    "start": {
-      "line": 63,
-      "column": 14
-    },
-    "end": {
-      "line": 66,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
deleted file mode 100644
index ac42ad98a..000000000
--- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "settings.team.headline",
-    "defaultMessage": "!!!Team",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.contentHeadline",
-    "defaultMessage": "!!!Franz Team Management",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 19,
-      "column": 19
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.intro",
-    "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 23,
-      "column": 9
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.copy",
-    "defaultMessage": "!!!Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 27,
-      "column": 8
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.manageAction",
-    "defaultMessage": "!!!Manage your Team on meetfranz.com",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 31,
-      "column": 16
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.teamsUnavailable",
-    "defaultMessage": "!!!Teams are unavailable",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 35,
-      "column": 20
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.team.teamsUnavailableInfo",
-    "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
-    "file": "src/components/settings/team/TeamDashboard.js",
-    "start": {
-      "line": 39,
-      "column": 24
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/settings/user/EditUserForm.json b/src/i18n/messages/src/components/settings/user/EditUserForm.json
deleted file mode 100644
index 3a59f8681..000000000
--- a/src/i18n/messages/src/components/settings/user/EditUserForm.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-  {
-    "id": "settings.account.headline",
-    "defaultMessage": "!!!Account",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineProfile",
-    "defaultMessage": "!!!Update Profile",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 19,
-      "column": 19
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlineAccount",
-    "defaultMessage": "!!!Account Information",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 23,
-      "column": 19
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.headlinePassword",
-    "defaultMessage": "!!!Change Password",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 27,
-      "column": 20
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.successInfo",
-    "defaultMessage": "!!!Your changes have been saved",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 31,
-      "column": 15
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.account.buttonSave",
-    "defaultMessage": "!!!Update profile",
-    "file": "src/components/settings/user/EditUserForm.js",
-    "start": {
-      "line": 35,
-      "column": 14
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/FeatureList.json b/src/i18n/messages/src/components/ui/FeatureList.json
deleted file mode 100644
index eb4bc483b..000000000
--- a/src/i18n/messages/src/components/ui/FeatureList.json
+++ /dev/null
@@ -1,145 +0,0 @@
-[
-  {
-    "id": "pricing.features.recipes",
-    "defaultMessage": "!!!Choose from more than 70 Services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 8,
-      "column": 20
-    },
-    "end": {
-      "line": 11,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.accountSync",
-    "defaultMessage": "!!!Account Synchronisation",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 12,
-      "column": 15
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.desktopNotifications",
-    "defaultMessage": "!!!Desktop Notifications",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 16,
-      "column": 24
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.unlimitedServices",
-    "defaultMessage": "!!!Add unlimited services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 20,
-      "column": 21
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.spellchecker",
-    "defaultMessage": "!!!Spellchecker support",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 24,
-      "column": 16
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.workspaces",
-    "defaultMessage": "!!!Workspaces",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 28,
-      "column": 14
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.customWebsites",
-    "defaultMessage": "!!!Add Custom Websites",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 32,
-      "column": 18
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.onPremise",
-    "defaultMessage": "!!!On-premise & other Hosted Services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 36,
-      "column": 13
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.thirdPartyServices",
-    "defaultMessage": "!!!Install 3rd party services",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 40,
-      "column": 22
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.serviceProxies",
-    "defaultMessage": "!!!Service Proxies",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 44,
-      "column": 18
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.features.teamManagement",
-    "defaultMessage": "!!!Team Management",
-    "file": "src/components/ui/FeatureList.js",
-    "start": {
-      "line": 48,
-      "column": 18
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/InfoBar.json b/src/i18n/messages/src/components/ui/InfoBar.json
deleted file mode 100644
index a6a629c71..000000000
--- a/src/i18n/messages/src/components/ui/InfoBar.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "infobar.hide",
-    "defaultMessage": "!!!Hide",
-    "file": "src/components/ui/InfoBar.js",
-    "start": {
-      "line": 12,
-      "column": 8
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/Infobox.json b/src/i18n/messages/src/components/ui/Infobox.json
deleted file mode 100644
index 296c2ad3e..000000000
--- a/src/i18n/messages/src/components/ui/Infobox.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "infobox.dismiss",
-    "defaultMessage": "!!!Dismiss",
-    "file": "src/components/ui/Infobox.js",
-    "start": {
-      "line": 9,
-      "column": 11
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/Input.json b/src/i18n/messages/src/components/ui/Input.json
deleted file mode 100644
index 6240badfb..000000000
--- a/src/i18n/messages/src/components/ui/Input.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "settings.app.form.passwordToggle",
-    "defaultMessage": "!!!Password toggle",
-    "file": "src/components/ui/Input.js",
-    "start": {
-      "line": 11,
-      "column": 18
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/ui/WebviewLoader/index.json b/src/i18n/messages/src/components/ui/WebviewLoader/index.json
deleted file mode 100644
index 9caabef25..000000000
--- a/src/i18n/messages/src/components/ui/WebviewLoader/index.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "service.webviewLoader.loading",
-    "defaultMessage": "!!!Loading {service}",
-    "file": "src/components/ui/WebviewLoader/index.js",
-    "start": {
-      "line": 11,
-      "column": 11
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/components/util/ErrorBoundary/index.json b/src/i18n/messages/src/components/util/ErrorBoundary/index.json
deleted file mode 100644
index 43c323031..000000000
--- a/src/i18n/messages/src/components/util/ErrorBoundary/index.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "app.errorHandler.headline",
-    "defaultMessage": "!!!Something went wrong.",
-    "file": "src/components/util/ErrorBoundary/index.js",
-    "start": {
-      "line": 11,
-      "column": 12
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "app.errorHandler.action",
-    "defaultMessage": "!!!Reload",
-    "file": "src/components/util/ErrorBoundary/index.js",
-    "start": {
-      "line": 15,
-      "column": 10
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditServiceScreen.json b/src/i18n/messages/src/containers/settings/EditServiceScreen.json
deleted file mode 100644
index 6744a9ff3..000000000
--- a/src/i18n/messages/src/containers/settings/EditServiceScreen.json
+++ /dev/null
@@ -1,249 +0,0 @@
-[
-  {
-    "id": "settings.service.form.name",
-    "defaultMessage": "!!!Name",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 28,
-      "column": 8
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableService",
-    "defaultMessage": "!!!Enable service",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 32,
-      "column": 17
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableHibernation",
-    "defaultMessage": "!!!Enable hibernation",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 36,
-      "column": 21
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableNotification",
-    "defaultMessage": "!!!Enable Notifications",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 40,
-      "column": 22
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableBadge",
-    "defaultMessage": "!!!Show unread message badges",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 44,
-      "column": 15
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableAudio",
-    "defaultMessage": "!!!Enable audio",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 48,
-      "column": 15
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.team",
-    "defaultMessage": "!!!Team",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 52,
-      "column": 8
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.customUrl",
-    "defaultMessage": "!!!Service URL",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 56,
-      "column": 13
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.indirectMessages",
-    "defaultMessage": "!!!Show message badge for all new messages",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 60,
-      "column": 20
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.icon",
-    "defaultMessage": "!!!Custom icon",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 64,
-      "column": 8
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.enableDarkMode",
-    "defaultMessage": "!!!Enable Dark Mode",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 68,
-      "column": 18
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.darkReaderBrightness",
-    "defaultMessage": "!!!Dark Reader Brightness",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 72,
-      "column": 24
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.darkReaderContrast",
-    "defaultMessage": "!!!Dark Reader Contrast",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 76,
-      "column": 22
-    },
-    "end": {
-      "line": 79,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.darkReaderSepia",
-    "defaultMessage": "!!!Dark Reader Sepia",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 80,
-      "column": 19
-    },
-    "end": {
-      "line": 83,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.isEnabled",
-    "defaultMessage": "!!!Use Proxy",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 84,
-      "column": 15
-    },
-    "end": {
-      "line": 87,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.host",
-    "defaultMessage": "!!!Proxy Host/IP",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 88,
-      "column": 13
-    },
-    "end": {
-      "line": 91,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.port",
-    "defaultMessage": "!!!Port",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 92,
-      "column": 13
-    },
-    "end": {
-      "line": 95,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.user",
-    "defaultMessage": "!!!User",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 96,
-      "column": 13
-    },
-    "end": {
-      "line": 99,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.service.form.proxy.password",
-    "defaultMessage": "!!!Password",
-    "file": "src/containers/settings/EditServiceScreen.js",
-    "start": {
-      "line": 100,
-      "column": 17
-    },
-    "end": {
-      "line": 103,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
deleted file mode 100644
index b0087e5dd..000000000
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ /dev/null
@@ -1,600 +0,0 @@
-[
-  {
-    "id": "settings.app.form.autoLaunchOnStart",
-    "defaultMessage": "!!!Launch Ferdi on start",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 32,
-      "column": 21
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.autoLaunchInBackground",
-    "defaultMessage": "!!!Open in background",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 36,
-      "column": 26
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.runInBackground",
-    "defaultMessage": "!!!Keep Ferdi in background when closing the window",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 40,
-      "column": 19
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.startMinimized",
-    "defaultMessage": "!!!Start minimized",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 44,
-      "column": 18
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.confirmOnQuit",
-    "defaultMessage": "!!!Confirm when quitting Ferdi",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 48,
-      "column": 17
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableSystemTray",
-    "defaultMessage": "!!!Always show Ferdi in System Tray",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 52,
-      "column": 20
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableMenuBar",
-    "defaultMessage": "!!!Always show Ferdi in Menu Bar",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 56,
-      "column": 17
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.reloadAfterResume",
-    "defaultMessage": "!!!Reload Ferdi after system resume",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 60,
-      "column": 21
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.minimizeToSystemTray",
-    "defaultMessage": "!!!Minimize Ferdi to system tray",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 64,
-      "column": 24
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.closeToSystemTray",
-    "defaultMessage": "!!!Close Ferdi to system tray",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 68,
-      "column": 21
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.privateNotifications",
-    "defaultMessage": "!!!Don't show message content in notifications",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 72,
-      "column": 24
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.clipboardNotifications",
-    "defaultMessage": "!!!Don't show notifications for clipboard events",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 76,
-      "column": 26
-    },
-    "end": {
-      "line": 79,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.notifyTaskBarOnMessage",
-    "defaultMessage": "!!!Notify TaskBar/Dock on new message",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 80,
-      "column": 26
-    },
-    "end": {
-      "line": 83,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.navigationBarBehaviour",
-    "defaultMessage": "!!!Navigation bar behaviour",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 84,
-      "column": 26
-    },
-    "end": {
-      "line": 87,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.searchEngine",
-    "defaultMessage": "!!!Search engine",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 88,
-      "column": 16
-    },
-    "end": {
-      "line": 91,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.sentry",
-    "defaultMessage": "!!!Send telemetry data",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 92,
-      "column": 10
-    },
-    "end": {
-      "line": 95,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.hibernateOnStartup",
-    "defaultMessage": "!!!Keep services in hibernation on startup",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 96,
-      "column": 22
-    },
-    "end": {
-      "line": 99,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.hibernationStrategy",
-    "defaultMessage": "!!!Hibernation strategy",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 100,
-      "column": 23
-    },
-    "end": {
-      "line": 103,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.wakeUpStrategy",
-    "defaultMessage": "!!!Wake up strategy",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 104,
-      "column": 18
-    },
-    "end": {
-      "line": 107,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.predefinedTodoServer",
-    "defaultMessage": "!!!Todo Server",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 108,
-      "column": 24
-    },
-    "end": {
-      "line": 111,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.customTodoServer",
-    "defaultMessage": "!!!Custom TodoServer",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 112,
-      "column": 20
-    },
-    "end": {
-      "line": 115,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableLock",
-    "defaultMessage": "!!!Enable Password Lock",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 116,
-      "column": 14
-    },
-    "end": {
-      "line": 119,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.lockPassword",
-    "defaultMessage": "!!!Password",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 120,
-      "column": 16
-    },
-    "end": {
-      "line": 123,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.useTouchIdToUnlock",
-    "defaultMessage": "!!!Allow using Touch ID to unlock",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 124,
-      "column": 22
-    },
-    "end": {
-      "line": 127,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.inactivityLock",
-    "defaultMessage": "!!!Lock after inactivity",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 128,
-      "column": 18
-    },
-    "end": {
-      "line": 131,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.scheduledDNDEnabled",
-    "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 132,
-      "column": 23
-    },
-    "end": {
-      "line": 135,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.scheduledDNDStart",
-    "defaultMessage": "!!!From",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 136,
-      "column": 21
-    },
-    "end": {
-      "line": 139,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.scheduledDNDEnd",
-    "defaultMessage": "!!!To",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 140,
-      "column": 19
-    },
-    "end": {
-      "line": 143,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.language",
-    "defaultMessage": "!!!Language",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 144,
-      "column": 12
-    },
-    "end": {
-      "line": 147,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.darkMode",
-    "defaultMessage": "!!!Dark Mode",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 148,
-      "column": 12
-    },
-    "end": {
-      "line": 151,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.adaptableDarkMode",
-    "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 152,
-      "column": 21
-    },
-    "end": {
-      "line": 155,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.universalDarkMode",
-    "defaultMessage": "!!!Enable universal Dark Mode",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 156,
-      "column": 21
-    },
-    "end": {
-      "line": 159,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.serviceRibbonWidth",
-    "defaultMessage": "!!!Sidebar width",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 160,
-      "column": 22
-    },
-    "end": {
-      "line": 163,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.iconSize",
-    "defaultMessage": "!!!Service icon size",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 164,
-      "column": 12
-    },
-    "end": {
-      "line": 167,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.useVerticalStyle",
-    "defaultMessage": "!!!Use horizontal style",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 168,
-      "column": 20
-    },
-    "end": {
-      "line": 171,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.alwaysShowWorkspaces",
-    "defaultMessage": "!!!Always show workspace drawer",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 172,
-      "column": 24
-    },
-    "end": {
-      "line": 175,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.accentColor",
-    "defaultMessage": "!!!Accent color",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 176,
-      "column": 15
-    },
-    "end": {
-      "line": 179,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.showDisabledServices",
-    "defaultMessage": "!!!Display disabled services tabs",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 180,
-      "column": 24
-    },
-    "end": {
-      "line": 183,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.showMessagesBadgesWhenMuted",
-    "defaultMessage": "!!!Show unread message badge when notifications are disabled",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 184,
-      "column": 29
-    },
-    "end": {
-      "line": 187,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.showDragArea",
-    "defaultMessage": "!!!Show draggable area on window",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 188,
-      "column": 16
-    },
-    "end": {
-      "line": 191,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableSpellchecking",
-    "defaultMessage": "!!!Enable spell checking",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 192,
-      "column": 23
-    },
-    "end": {
-      "line": 195,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableGPUAcceleration",
-    "defaultMessage": "!!!Enable GPU Acceleration",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 196,
-      "column": 25
-    },
-    "end": {
-      "line": 199,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.beta",
-    "defaultMessage": "!!!Include beta versions",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 200,
-      "column": 8
-    },
-    "end": {
-      "line": 203,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.automaticUpdates",
-    "defaultMessage": "!!!Enable updates",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 204,
-      "column": 20
-    },
-    "end": {
-      "line": 207,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableTodos",
-    "defaultMessage": "!!!Enable Franz Todos",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 208,
-      "column": 15
-    },
-    "end": {
-      "line": 211,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.keepAllWorkspacesLoaded",
-    "defaultMessage": "!!!Keep all workspaces loaded",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 212,
-      "column": 27
-    },
-    "end": {
-      "line": 215,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditUserScreen.json b/src/i18n/messages/src/containers/settings/EditUserScreen.json
deleted file mode 100644
index 70ff29945..000000000
--- a/src/i18n/messages/src/containers/settings/EditUserScreen.json
+++ /dev/null
@@ -1,119 +0,0 @@
-[
-  {
-    "id": "settings.user.form.firstname",
-    "defaultMessage": "!!!Firstname",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 14,
-      "column": 13
-    },
-    "end": {
-      "line": 17,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.lastname",
-    "defaultMessage": "!!!Lastname",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 18,
-      "column": 12
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.email",
-    "defaultMessage": "!!!Email",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 22,
-      "column": 9
-    },
-    "end": {
-      "line": 25,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.label",
-    "defaultMessage": "!!!Account type",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 26,
-      "column": 20
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.individual",
-    "defaultMessage": "!!!Individual",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 30,
-      "column": 25
-    },
-    "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.non-profit",
-    "defaultMessage": "!!!Non-Profit",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 34,
-      "column": 24
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.accountType.company",
-    "defaultMessage": "!!!Company",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 38,
-      "column": 22
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.currentPassword",
-    "defaultMessage": "!!!Current password",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 42,
-      "column": 19
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.user.form.newPassword",
-    "defaultMessage": "!!!New password",
-    "file": "src/containers/settings/EditUserScreen.js",
-    "start": {
-      "line": 46,
-      "column": 15
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/basicAuth/Component.json b/src/i18n/messages/src/features/basicAuth/Component.json
deleted file mode 100644
index fea1b0838..000000000
--- a/src/i18n/messages/src/features/basicAuth/Component.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "feature.basicAuth.signIn",
-    "defaultMessage": "!!!Sign In",
-    "file": "src/features/basicAuth/Component.js",
-    "start": {
-      "line": 24,
-      "column": 10
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/debugger/Component.json b/src/i18n/messages/src/features/debugger/Component.json
deleted file mode 100644
index 86a5a05f4..000000000
--- a/src/i18n/messages/src/features/debugger/Component.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "feature.debugger.title",
-    "defaultMessage": "!!!Publish debugging information",
-    "file": "src/features/debugger/Component.js",
-    "start": {
-      "line": 16,
-      "column": 9
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/nightlyBuilds/Component.json b/src/i18n/messages/src/features/nightlyBuilds/Component.json
deleted file mode 100644
index 0b2eab354..000000000
--- a/src/i18n/messages/src/features/nightlyBuilds/Component.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "feature.nightlyBuilds.title",
-    "defaultMessage": "!!!Nightly Builds",
-    "file": "src/features/nightlyBuilds/Component.js",
-    "start": {
-      "line": 17,
-      "column": 9
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.nightlyBuilds.info",
-    "defaultMessage": "!!!Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
-    "file": "src/features/nightlyBuilds/Component.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.nightlyBuilds.activate",
-    "defaultMessage": "!!!Activate",
-    "file": "src/features/nightlyBuilds/Component.js",
-    "start": {
-      "line": 25,
-      "column": 12
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/publishDebugInfo/Component.json b/src/i18n/messages/src/features/publishDebugInfo/Component.json
deleted file mode 100644
index 4d07a4794..000000000
--- a/src/i18n/messages/src/features/publishDebugInfo/Component.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "id": "feature.publishDebugInfo.title",
-    "defaultMessage": "!!!Publish debug information",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 19,
-      "column": 9
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.info",
-    "defaultMessage": "!!!Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 23,
-      "column": 8
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.error",
-    "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 27,
-      "column": 9
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.privacy",
-    "defaultMessage": "!!!Privacy policy",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 31,
-      "column": 11
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.terms",
-    "defaultMessage": "!!!Terms of service",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 35,
-      "column": 9
-    },
-    "end": {
-      "line": 38,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.publish",
-    "defaultMessage": "!!!Accept and publish",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 39,
-      "column": 11
-    },
-    "end": {
-      "line": 42,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.publishDebugInfo.published",
-    "defaultMessage": "!!!Your debug log was published and is now availible at",
-    "file": "src/features/publishDebugInfo/Component.js",
-    "start": {
-      "line": 43,
-      "column": 13
-    },
-    "end": {
-      "line": 46,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/quickSwitch/Component.json b/src/i18n/messages/src/features/quickSwitch/Component.json
deleted file mode 100644
index e112bedc1..000000000
--- a/src/i18n/messages/src/features/quickSwitch/Component.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "id": "feature.quickSwitch.title",
-    "defaultMessage": "!!!QuickSwitch",
-    "file": "src/features/quickSwitch/Component.js",
-    "start": {
-      "line": 17,
-      "column": 9
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.quickSwitch.search",
-    "defaultMessage": "!!!Search...",
-    "file": "src/features/quickSwitch/Component.js",
-    "start": {
-      "line": 21,
-      "column": 10
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.quickSwitch.info",
-    "defaultMessage": "!!!Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
-    "file": "src/features/quickSwitch/Component.js",
-    "start": {
-      "line": 25,
-      "column": 8
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json b/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json
deleted file mode 100644
index f3bcaf345..000000000
--- a/src/i18n/messages/src/features/recipeConnectionLost/components/WebControls.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 13,
-      "column": 10
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 17,
-      "column": 17
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 21,
-      "column": 8
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 25,
-      "column": 11
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/features/recipeConnectionLost/components/WebControls.js",
-    "start": {
-      "line": 29,
-      "column": 10
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/webControls/components/WebControls.json b/src/i18n/messages/src/features/webControls/components/WebControls.json
deleted file mode 100644
index 7676ec0b1..000000000
--- a/src/i18n/messages/src/features/webControls/components/WebControls.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "webControls.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 17,
-      "column": 10
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.openInBrowser",
-    "defaultMessage": "!!!Open in Browser",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 21,
-      "column": 17
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 25,
-      "column": 8
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 29,
-      "column": 11
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "webControls.reload",
-    "defaultMessage": "!!!Reload",
-    "file": "src/features/webControls/components/WebControls.js",
-    "start": {
-      "line": 33,
-      "column": 10
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
deleted file mode 100644
index 1aabfb520..000000000
--- a/src/i18n/messages/src/features/workspaces/components/CreateWorkspaceForm.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "settings.workspace.add.form.submitButton",
-    "defaultMessage": "!!!Create workspace",
-    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-    "start": {
-      "line": 12,
-      "column": 16
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.add.form.name",
-    "defaultMessage": "!!!Name",
-    "file": "src/features/workspaces/components/CreateWorkspaceForm.js",
-    "start": {
-      "line": 16,
-      "column": 8
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
deleted file mode 100644
index 804e30070..000000000
--- a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
+++ /dev/null
@@ -1,119 +0,0 @@
-[
-  {
-    "id": "settings.workspace.form.buttonDelete",
-    "defaultMessage": "!!!Delete workspace",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 21,
-      "column": 16
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.buttonSave",
-    "defaultMessage": "!!!Save workspace",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 25,
-      "column": 14
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.name",
-    "defaultMessage": "!!!Name",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 29,
-      "column": 8
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.yourWorkspaces",
-    "defaultMessage": "!!!Your workspaces",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 33,
-      "column": 18
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.keepLoaded",
-    "defaultMessage": "!!!Keep this workspace loaded*",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 37,
-      "column": 14
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.keepLoadedInfo",
-    "defaultMessage": "!!!*This option will be overwritten by the global \"Keep all workspaces loaded\" option.",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 41,
-      "column": 18
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspace.form.servicesInWorkspaceHeadline",
-    "defaultMessage": "!!!Services in this Workspace",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 46,
-      "column": 31
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.noServicesAdded",
-    "defaultMessage": "!!!Start by adding a service.",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 50,
-      "column": 19
-    },
-    "end": {
-      "line": 53,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.services.discoverServices",
-    "defaultMessage": "!!!Discover services",
-    "file": "src/features/workspaces/components/EditWorkspaceForm.js",
-    "start": {
-      "line": 54,
-      "column": 20
-    },
-    "end": {
-      "line": 57,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
deleted file mode 100644
index 431f12710..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawer.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "workspaceDrawer.headline",
-    "defaultMessage": "!!!Workspaces",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 15,
-      "column": 12
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.allServices",
-    "defaultMessage": "!!!All services",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 19,
-      "column": 15
-    },
-    "end": {
-      "line": 22,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.workspacesSettingsTooltip",
-    "defaultMessage": "!!!Workspaces settings",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 23,
-      "column": 29
-    },
-    "end": {
-      "line": 26,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.workspaceFeatureInfo",
-    "defaultMessage": "!!!Info about workspace feature",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 27,
-      "column": 24
-    },
-    "end": {
-      "line": 30,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.addNewWorkspaceLabel",
-    "defaultMessage": "!!!add new workspace",
-    "file": "src/features/workspaces/components/WorkspaceDrawer.js",
-    "start": {
-      "line": 31,
-      "column": 24
-    },
-    "end": {
-      "line": 34,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json
deleted file mode 100644
index 737dee59b..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "id": "workspaceDrawer.item.noServicesAddedYet",
-    "defaultMessage": "!!!No services added yet",
-    "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-    "start": {
-      "line": 11,
-      "column": 22
-    },
-    "end": {
-      "line": 14,
-      "column": 3
-    }
-  },
-  {
-    "id": "workspaceDrawer.item.contextMenuEdit",
-    "defaultMessage": "!!!edit",
-    "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
-    "start": {
-      "line": 15,
-      "column": 19
-    },
-    "end": {
-      "line": 18,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json
deleted file mode 100644
index 4f3e6d55c..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspaceSwitchingIndicator.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "id": "workspaces.switchingIndicator.switchingTo",
-    "defaultMessage": "!!!Switching to",
-    "file": "src/features/workspaces/components/WorkspaceSwitchingIndicator.js",
-    "start": {
-      "line": 12,
-      "column": 15
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
deleted file mode 100644
index 39c9c30fb..000000000
--- a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-  {
-    "id": "settings.workspaces.headline",
-    "defaultMessage": "!!!Your workspaces",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 17,
-      "column": 12
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.noWorkspacesAdded",
-    "defaultMessage": "!!!You haven't created any workspaces yet.",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 21,
-      "column": 19
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.workspacesRequestFailed",
-    "defaultMessage": "!!!Could not load your workspaces",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 25,
-      "column": 27
-    },
-    "end": {
-      "line": 28,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.tryReloadWorkspaces",
-    "defaultMessage": "!!!Try again",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 29,
-      "column": 23
-    },
-    "end": {
-      "line": 32,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.updatedInfo",
-    "defaultMessage": "!!!Your changes have been saved",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 33,
-      "column": 15
-    },
-    "end": {
-      "line": 36,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.deletedInfo",
-    "defaultMessage": "!!!Workspace has been deleted",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 37,
-      "column": 15
-    },
-    "end": {
-      "line": 40,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.workspaceFeatureInfo",
-    "defaultMessage": "!!!Info about workspace feature",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 41,
-      "column": 24
-    },
-    "end": {
-      "line": 44,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.workspaces.workspaceFeatureHeadline",
-    "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces",
-    "file": "src/features/workspaces/components/WorkspacesDashboard.js",
-    "start": {
-      "line": 45,
-      "column": 28
-    },
-    "end": {
-      "line": 48,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/helpers/validation-helpers.json b/src/i18n/messages/src/helpers/validation-helpers.json
deleted file mode 100644
index 6be1d33e9..000000000
--- a/src/i18n/messages/src/helpers/validation-helpers.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "id": "validation.required",
-    "defaultMessage": "!!!Field is required",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 5,
-      "column": 12
-    },
-    "end": {
-      "line": 8,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.email",
-    "defaultMessage": "!!!Email not valid",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 9,
-      "column": 9
-    },
-    "end": {
-      "line": 12,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.url",
-    "defaultMessage": "!!!Not a valid URL",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 13,
-      "column": 7
-    },
-    "end": {
-      "line": 16,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.minLength",
-    "defaultMessage": "!!!Too few characters",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 17,
-      "column": 13
-    },
-    "end": {
-      "line": 20,
-      "column": 3
-    }
-  },
-  {
-    "id": "validation.oneRequired",
-    "defaultMessage": "!!!At least one is required",
-    "file": "src/helpers/validation-helpers.js",
-    "start": {
-      "line": 21,
-      "column": 15
-    },
-    "end": {
-      "line": 24,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
deleted file mode 100644
index bc1ec7397..000000000
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ /dev/null
@@ -1,236 +0,0 @@
-[
-  {
-    "id": "global.api.unhealthy",
-    "defaultMessage": "!!!Can't connect to Ferdi Online Services",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 4,
-      "column": 16
-    },
-    "end": {
-      "line": 7,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.notConnectedToTheInternet",
-    "defaultMessage": "!!!You are not connected to the internet.",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 8,
-      "column": 29
-    },
-    "end": {
-      "line": 11,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecking.language",
-    "defaultMessage": "!!!Spell checking language",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 12,
-      "column": 24
-    },
-    "end": {
-      "line": 15,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecker.useDefault",
-    "defaultMessage": "!!!Use System Default ({default})",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 16,
-      "column": 29
-    },
-    "end": {
-      "line": 19,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecking.autodetect",
-    "defaultMessage": "!!!Detect language automatically",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 20,
-      "column": 34
-    },
-    "end": {
-      "line": 23,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.spellchecking.autodetect.short",
-    "defaultMessage": "!!!Automatic",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 24,
-      "column": 39
-    },
-    "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.userAgentPref",
-    "defaultMessage": "!!!User Agent",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 28,
-      "column": 17
-    },
-    "end": {
-      "line": 31,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.userAgentHelp",
-    "defaultMessage": "!!!Use 'https://whatmyuseragent.com/' (to discover) or 'https://developers.whatismybrowser.com/useragents/explore/' (to choose) your desired user agent and copy-paste it here.",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 32,
-      "column": 17
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.yes",
-    "defaultMessage": "!!!Yes",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 36,
-      "column": 7
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.no",
-    "defaultMessage": "!!!No",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 40,
-      "column": 6
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.ok",
-    "defaultMessage": "!!!Ok",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 44,
-      "column": 6
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.cancel",
-    "defaultMessage": "!!!Cancel",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 48,
-      "column": 10
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.save",
-    "defaultMessage": "!!!Save",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 52,
-      "column": 8
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.submit",
-    "defaultMessage": "!!!Submit",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 56,
-      "column": 10
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.quit",
-    "defaultMessage": "!!!Quit",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 60,
-      "column": 8
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.quitConfirmation",
-    "defaultMessage": "!!!Do you really want to quit Ferdi?",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 64,
-      "column": 20
-    },
-    "end": {
-      "line": 68,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.settings",
-    "defaultMessage": "!!!Settings",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 69,
-      "column": 12
-    },
-    "end": {
-      "line": 72,
-      "column": 3
-    }
-  },
-  {
-    "id": "global.edit",
-    "defaultMessage": "!!!Edit",
-    "file": "src/i18n/globalMessages.js",
-    "start": {
-      "line": 73,
-      "column": 8
-    },
-    "end": {
-      "line": 76,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
deleted file mode 100644
index 35f2e3b7b..000000000
--- a/src/i18n/messages/src/lib/Menu.json
+++ /dev/null
@@ -1,912 +0,0 @@
-[
-  {
-    "id": "menu.edit",
-    "defaultMessage": "!!!Edit",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 32,
-      "column": 8
-    },
-    "end": {
-      "line": 35,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.undo",
-    "defaultMessage": "!!!Undo",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 36,
-      "column": 8
-    },
-    "end": {
-      "line": 39,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.redo",
-    "defaultMessage": "!!!Redo",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 40,
-      "column": 8
-    },
-    "end": {
-      "line": 43,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.cut",
-    "defaultMessage": "!!!Cut",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 44,
-      "column": 7
-    },
-    "end": {
-      "line": 47,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.copy",
-    "defaultMessage": "!!!Copy",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 48,
-      "column": 8
-    },
-    "end": {
-      "line": 51,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.paste",
-    "defaultMessage": "!!!Paste",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 52,
-      "column": 9
-    },
-    "end": {
-      "line": 55,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.pasteAndMatchStyle",
-    "defaultMessage": "!!!Paste And Match Style",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 56,
-      "column": 22
-    },
-    "end": {
-      "line": 59,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.delete",
-    "defaultMessage": "!!!Delete",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 60,
-      "column": 10
-    },
-    "end": {
-      "line": 63,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.selectAll",
-    "defaultMessage": "!!!Select All",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 64,
-      "column": 13
-    },
-    "end": {
-      "line": 67,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.findInPage",
-    "defaultMessage": "!!!Find in Page",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 68,
-      "column": 14
-    },
-    "end": {
-      "line": 71,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.speech",
-    "defaultMessage": "!!!Speech",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 72,
-      "column": 10
-    },
-    "end": {
-      "line": 75,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.startSpeaking",
-    "defaultMessage": "!!!Start Speaking",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 76,
-      "column": 17
-    },
-    "end": {
-      "line": 79,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.stopSpeaking",
-    "defaultMessage": "!!!Stop Speaking",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 80,
-      "column": 16
-    },
-    "end": {
-      "line": 83,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.startDictation",
-    "defaultMessage": "!!!Start Dictation",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 84,
-      "column": 18
-    },
-    "end": {
-      "line": 87,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.edit.emojiSymbols",
-    "defaultMessage": "!!!Emoji & Symbols",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 88,
-      "column": 16
-    },
-    "end": {
-      "line": 91,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.openQuickSwitch",
-    "defaultMessage": "!!!Open Quick Switch",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 92,
-      "column": 19
-    },
-    "end": {
-      "line": 95,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.back",
-    "defaultMessage": "!!!Back",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 96,
-      "column": 8
-    },
-    "end": {
-      "line": 99,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.forward",
-    "defaultMessage": "!!!Forward",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 100,
-      "column": 11
-    },
-    "end": {
-      "line": 103,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.resetZoom",
-    "defaultMessage": "!!!Actual Size",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 104,
-      "column": 13
-    },
-    "end": {
-      "line": 107,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.zoomIn",
-    "defaultMessage": "!!!Zoom In",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 108,
-      "column": 10
-    },
-    "end": {
-      "line": 111,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.zoomOut",
-    "defaultMessage": "!!!Zoom Out",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 112,
-      "column": 11
-    },
-    "end": {
-      "line": 115,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleFullScreen",
-    "defaultMessage": "!!!Toggle Full Screen",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 116,
-      "column": 20
-    },
-    "end": {
-      "line": 119,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleDarkMode",
-    "defaultMessage": "!!!Toggle Dark Mode",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 120,
-      "column": 18
-    },
-    "end": {
-      "line": 123,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleDevTools",
-    "defaultMessage": "!!!Toggle Developer Tools",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 124,
-      "column": 18
-    },
-    "end": {
-      "line": 127,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleTodosDevTools",
-    "defaultMessage": "!!!Toggle Todos Developer Tools",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 128,
-      "column": 23
-    },
-    "end": {
-      "line": 131,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.toggleServiceDevTools",
-    "defaultMessage": "!!!Toggle Service Developer Tools",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 132,
-      "column": 25
-    },
-    "end": {
-      "line": 135,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.reloadService",
-    "defaultMessage": "!!!Reload Service",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 136,
-      "column": 17
-    },
-    "end": {
-      "line": 139,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.reloadFerdi",
-    "defaultMessage": "!!!Reload Ferdi",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 140,
-      "column": 15
-    },
-    "end": {
-      "line": 143,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.lockFerdi",
-    "defaultMessage": "!!!Lock Ferdi",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 144,
-      "column": 13
-    },
-    "end": {
-      "line": 147,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view.reloadTodos",
-    "defaultMessage": "!!!Reload ToDos",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 148,
-      "column": 15
-    },
-    "end": {
-      "line": 151,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window.minimize",
-    "defaultMessage": "!!!Minimize",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 152,
-      "column": 12
-    },
-    "end": {
-      "line": 155,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window.close",
-    "defaultMessage": "!!!Close",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 156,
-      "column": 9
-    },
-    "end": {
-      "line": 159,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.learnMore",
-    "defaultMessage": "!!!Learn More",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 160,
-      "column": 13
-    },
-    "end": {
-      "line": 163,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.changelog",
-    "defaultMessage": "!!!Changelog",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 164,
-      "column": 13
-    },
-    "end": {
-      "line": 167,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.importExportData",
-    "defaultMessage": "!!!Import/Export Configuration Data",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 168,
-      "column": 20
-    },
-    "end": {
-      "line": 171,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.support",
-    "defaultMessage": "!!!Support",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 172,
-      "column": 11
-    },
-    "end": {
-      "line": 175,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.debugInfo",
-    "defaultMessage": "!!!Copy Debug Information",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 176,
-      "column": 13
-    },
-    "end": {
-      "line": 179,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.publishDebugInfo",
-    "defaultMessage": "!!!Publish Debug Information",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 180,
-      "column": 20
-    },
-    "end": {
-      "line": 183,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.debugInfoCopiedHeadline",
-    "defaultMessage": "!!!Ferdi Debug Information",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 184,
-      "column": 27
-    },
-    "end": {
-      "line": 187,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.debugInfoCopiedBody",
-    "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 188,
-      "column": 23
-    },
-    "end": {
-      "line": 192,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchId",
-    "defaultMessage": "!!!Unlock with Touch ID",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 193,
-      "column": 11
-    },
-    "end": {
-      "line": 196,
-      "column": 3
-    }
-  },
-  {
-    "id": "locked.touchIdPrompt",
-    "defaultMessage": "!!!unlock via Touch ID",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 197,
-      "column": 17
-    },
-    "end": {
-      "line": 200,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.tos",
-    "defaultMessage": "!!!Terms of Service",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 201,
-      "column": 7
-    },
-    "end": {
-      "line": 204,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help.privacy",
-    "defaultMessage": "!!!Privacy Statement",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 205,
-      "column": 11
-    },
-    "end": {
-      "line": 208,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.file",
-    "defaultMessage": "!!!File",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 209,
-      "column": 8
-    },
-    "end": {
-      "line": 212,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.view",
-    "defaultMessage": "!!!View",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 213,
-      "column": 8
-    },
-    "end": {
-      "line": 216,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services",
-    "defaultMessage": "!!!Services",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 217,
-      "column": 12
-    },
-    "end": {
-      "line": 220,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.window",
-    "defaultMessage": "!!!Window",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 221,
-      "column": 10
-    },
-    "end": {
-      "line": 224,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.help",
-    "defaultMessage": "!!!Help",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 225,
-      "column": 8
-    },
-    "end": {
-      "line": 228,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.about",
-    "defaultMessage": "!!!About Ferdi",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 229,
-      "column": 9
-    },
-    "end": {
-      "line": 232,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.checkForUpdates",
-    "defaultMessage": "!!!Check for updates",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 233,
-      "column": 19
-    },
-    "end": {
-      "line": 236,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.hide",
-    "defaultMessage": "!!!Hide",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 237,
-      "column": 8
-    },
-    "end": {
-      "line": 240,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.hideOthers",
-    "defaultMessage": "!!!Hide Others",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 241,
-      "column": 14
-    },
-    "end": {
-      "line": 244,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.unhide",
-    "defaultMessage": "!!!Unhide",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 245,
-      "column": 10
-    },
-    "end": {
-      "line": 248,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.app.autohideMenuBar",
-    "defaultMessage": "!!!Auto-hide menu bar",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 249,
-      "column": 19
-    },
-    "end": {
-      "line": 252,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.addNewService",
-    "defaultMessage": "!!!Add New Service...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 253,
-      "column": 17
-    },
-    "end": {
-      "line": 256,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.addNewWorkspace",
-    "defaultMessage": "!!!Add New Workspace...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 257,
-      "column": 19
-    },
-    "end": {
-      "line": 260,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.openWorkspaceDrawer",
-    "defaultMessage": "!!!Open workspace drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 261,
-      "column": 23
-    },
-    "end": {
-      "line": 264,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.closeWorkspaceDrawer",
-    "defaultMessage": "!!!Close workspace drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 265,
-      "column": 24
-    },
-    "end": {
-      "line": 268,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.setNextServiceActive",
-    "defaultMessage": "!!!Activate next service...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 269,
-      "column": 23
-    },
-    "end": {
-      "line": 272,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.activatePreviousService",
-    "defaultMessage": "!!!Activate previous service...",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 273,
-      "column": 27
-    },
-    "end": {
-      "line": 276,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.muteApp",
-    "defaultMessage": "!!!Disable notifications & audio",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 277,
-      "column": 11
-    },
-    "end": {
-      "line": 280,
-      "column": 3
-    }
-  },
-  {
-    "id": "sidebar.unmuteApp",
-    "defaultMessage": "!!!Enable notifications & audio",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 281,
-      "column": 13
-    },
-    "end": {
-      "line": 284,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces",
-    "defaultMessage": "!!!Workspaces",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 285,
-      "column": 14
-    },
-    "end": {
-      "line": 288,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.workspaces.defaultWorkspace",
-    "defaultMessage": "!!!Default",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 289,
-      "column": 20
-    },
-    "end": {
-      "line": 292,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.todos",
-    "defaultMessage": "!!!Todos",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 293,
-      "column": 9
-    },
-    "end": {
-      "line": 296,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.Todoss.openTodosDrawer",
-    "defaultMessage": "!!!Open Todos drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 297,
-      "column": 19
-    },
-    "end": {
-      "line": 300,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.Todoss.closeTodosDrawer",
-    "defaultMessage": "!!!Close Todos drawer",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 301,
-      "column": 20
-    },
-    "end": {
-      "line": 304,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.todos.enableTodos",
-    "defaultMessage": "!!!Enable Todos",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 305,
-      "column": 15
-    },
-    "end": {
-      "line": 308,
-      "column": 3
-    }
-  },
-  {
-    "id": "menu.services.goHome",
-    "defaultMessage": "!!!Home",
-    "file": "src/lib/Menu.js",
-    "start": {
-      "line": 309,
-      "column": 17
-    },
-    "end": {
-      "line": 312,
-      "column": 3
-    }
-  }
-]
-\ No newline at end of file
diff --git a/src/i18n/translations.js b/src/i18n/translations.js
deleted file mode 100644
index 161a172ba..000000000
--- a/src/i18n/translations.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { APP_LOCALES } from './languages';
-const translations = [];
-Object.keys(APP_LOCALES).forEach((key) => {
-  try {
-    const translation = require(`./locales/${key}.json`); // eslint-disable-line
-    translations[key] = translation;
-  } catch (err) {
-    console.warn(`Can't find translations for ${key}`);
-  }
-});
-module.exports = translations;
diff --git a/src/i18n/translations.ts b/src/i18n/translations.ts
new file mode 100644
index 000000000..9a7dc7453
--- /dev/null
+++ b/src/i18n/translations.ts
@@ -0,0 +1,15 @@
+/* eslint-disable global-require */
+import { APP_LOCALES } from './languages';
+const translations = [];
+for (const key of Object.keys(APP_LOCALES)) {
+  try {
+    // eslint-disable-next-line import/no-dynamic-require
+    const translation = require(`./locales/${key}.json`);
+    translations[key] = translation;
+  } catch {
+    console.warn(`Can't find translations for ${key}`);
+  }
+}
+module.exports = translations;
author	Vijay A <vraravam@users.noreply.github.com>	2021-10-06 22:59:03 +0530
committer	Vijay A <vraravam@users.noreply.github.com>	2021-10-06 22:59:03 +0530
commit	5fd7cd12cc62ceb6c4d654b3cb3b536412ed1216 (patch)
tree	10cea6c608baea3481595ed9eb7be63ef03ca6c4 /src/i18n
parent	Bumped up version to: 5.6.2 (hotfix) (diff)
parent	5.6.3-nightly.25 [skip ci] (diff)
download	ferdium-app-5fd7cd12cc62ceb6c4d654b3cb3b536412ed1216.tar.gz ferdium-app-5fd7cd12cc62ceb6c4d654b3cb3b536412ed1216.tar.zst ferdium-app-5fd7cd12cc62ceb6c4d654b3cb3b536412ed1216.zip