1 files changed, 68 insertions, 42 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index e68ec41af..fe324cd67 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -1533,169 +1533,169 @@
         "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 20
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headline",
         "start": {
           "column": 12,
-          "line": 18
+          "line": 17
         }
       },
       {
         "defaultMessage": "!!!Your Subscription",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 24
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineSubscription",
         "start": {
           "column": 24,
-          "line": 22
+          "line": 21
         }
       },
       {
         "defaultMessage": "!!Danger Zone",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 28
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineDangerZone",
         "start": {
           "column": 22,
-          "line": 26
+          "line": 25
         }
       },
       {
         "defaultMessage": "!!!Manage your subscription",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 32
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.manageSubscription.label",
         "start": {
           "column": 33,
-          "line": 30
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Upgrade to Franz Professional",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 36
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.upgradeToPro.label",
         "start": {
           "column": 23,
-          "line": 34
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Basic Account",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 40
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.accountType.basic",
         "start": {
           "column": 20,
-          "line": 38
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Premium Supporter Account",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 44
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.accountType.premium",
         "start": {
           "column": 22,
-          "line": 42
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!Edit Account",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 48
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.account.editButton",
         "start": {
           "column": 21,
-          "line": 46
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!Invoices",
         "end": {
           "column": 3,
-          "line": 53
+          "line": 52
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineInvoices",
         "start": {
           "column": 18,
-          "line": 50
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Download",
         "end": {
           "column": 3,
-          "line": 57
+          "line": 56
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.invoiceDownload",
         "start": {
           "column": 19,
-          "line": 54
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Could not load user information",
         "end": {
           "column": 3,
-          "line": 61
+          "line": 60
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.userInfoRequestFailed",
         "start": {
           "column": 25,
-          "line": 58
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!Try again",
         "end": {
           "column": 3,
-          "line": 65
+          "line": 64
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.tryReloadUserInfoRequest",
         "start": {
           "column": 28,
-          "line": 62
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Delete account",
         "end": {
           "column": 3,
-          "line": 69
+          "line": 68
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteAccount",
         "start": {
           "column": 17,
-          "line": 66
+          "line": 65
         }
       },
       {
@@ -1708,14 +1708,14 @@
         "id": "settings.account.deleteInfo",
         "start": {
           "column": 14,
-          "line": 70
+          "line": 69
         }
       },
       {
         "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": 77
+          "line": 78
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteEmailSent",
@@ -1728,52 +1728,78 @@
         "defaultMessage": "!!!Free Trial",
         "end": {
           "column": 3,
-          "line": 81
+          "line": 82
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.trial",
         "start": {
           "column": 9,
-          "line": 78
+          "line": 79
         }
       },
       {
         "defaultMessage": "!!!Your Franz License:",
         "end": {
           "column": 3,
-          "line": 85
+          "line": 86
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.yourLicense",
         "start": {
           "column": 15,
-          "line": 82
+          "line": 83
         }
       },
       {
         "defaultMessage": "!!!Your free trial ends in {duration}.",
         "end": {
           "column": 3,
-          "line": 89
+          "line": 90
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.trialEndsIn",
         "start": {
           "column": 15,
-          "line": 86
+          "line": 87
         }
       },
       {
         "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
         "end": {
           "column": 3,
-          "line": 93
+          "line": 95
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.trialUpdateBillingInfo",
         "start": {
           "column": 33,
-          "line": 90
+          "line": 91
+        }
+      },
+      {
+        "defaultMessage": "Account is unavailable",
+        "end": {
+          "column": 3,
+          "line": 99
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.accountUnavailable",
+        "start": {
+          "column": 22,
+          "line": 96
+        }
+      },
+      {
+        "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": 103
+        },
+        "file": "src/components/settings/account/AccountDashboard.js",
+        "id": "settings.account.accountUnavailableInfo",
+        "start": {
+          "column": 26,
+          "line": 100
         }
       }
     ],
@@ -2683,7 +2709,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Ferdi Lock Password",
+        "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
           "line": 54
@@ -2709,7 +2735,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
+        "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 CMD/CTRL+Shift+L.",
         "end": {
           "column": 3,
           "line": 62
@@ -3783,7 +3809,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Loading",
+        "defaultMessage": "!!!Loading {service}",
         "end": {
           "column": 3,
           "line": 14
@@ -3910,7 +3936,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Custom server",
+        "defaultMessage": "!!!Service URL",
         "end": {
           "column": 3,
           "line": 55
@@ -4175,7 +4201,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Enable Ferdi password lock",
+        "defaultMessage": "!!!Enable Password Lock",
         "end": {
           "column": 3,
           "line": 76
@@ -4188,7 +4214,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Ferdi Lock password",
+        "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
           "line": 80