Merge branch 'develop' of https://github.com/meetfranz/franz into develop

1 files changed, 51 insertions, 20 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 367184c01..1204005dc 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2530,78 +2530,78 @@
         "defaultMessage": "!!!Team",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 19
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.headline",
         "start": {
           "column": 12,
-          "line": 14
+          "line": 16
         }
       },
       {
         "defaultMessage": "!!!Franz for Teams",
         "end": {
           "column": 3,
-          "line": 21
+          "line": 23
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.contentHeadline",
         "start": {
           "column": 19,
-          "line": 18
+          "line": 20
         }
       },
       {
         "defaultMessage": "!!!You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 27
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.intro",
         "start": {
           "column": 9,
-          "line": 22
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!Franz 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!",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 31
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.copy",
         "start": {
           "column": 8,
-          "line": 26
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Manage your Team on meetfranz.com",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 35
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.manageAction",
         "start": {
           "column": 16,
-          "line": 30
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Upgrade your Account",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 39
         },
         "file": "src/components/settings/team/TeamDashboard.js",
         "id": "settings.team.upgradeAction",
         "start": {
           "column": 17,
-          "line": 34
+          "line": 36
         }
       }
     ],
@@ -3105,6 +3105,24 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Upgrade to Franz Professional",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/ui/UpgradeButton/index.js",
+        "id": "global.upgradeButton.upgradeToPro",
+        "start": {
+          "column": 16,
+          "line": 13
+        }
+      }
+    ],
+    "path": "src/components/ui/UpgradeButton/index.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Loading",
         "end": {
           "column": 3,
@@ -3870,42 +3888,42 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!The Franz Todos Preview is currently only available for Franz Premium accounts.",
+        "defaultMessage": "!!!Franz Todos are available to premium users now!",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 21
         },
         "file": "src/features/todos/components/TodosWebview.js",
         "id": "feature.todos.premium.info",
         "start": {
           "column": 15,
-          "line": 19
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Upgrade Account",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 25
         },
         "file": "src/features/todos/components/TodosWebview.js",
         "id": "feature.todos.premium.upgrade",
         "start": {
           "column": 14,
-          "line": 23
+          "line": 22
         }
       },
       {
-        "defaultMessage": "!!!Franz Todos will be available to everyone soon.",
+        "defaultMessage": "!!!Everyone else will have to wait a little longer.",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 29
         },
         "file": "src/features/todos/components/TodosWebview.js",
         "id": "feature.todos.premium.rollout",
         "start": {
           "column": 15,
-          "line": 27
+          "line": 26
         }
       }
     ],
@@ -4594,6 +4612,19 @@
           "column": 39,
           "line": 24
         }
+      },
+      {
+        "defaultMessage": "!!!Franz Professional Required",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/i18n/globalMessages.js",
+        "id": "global.franzProRequired",
+        "start": {
+          "column": 15,
+          "line": 28
+        }
       }
     ],
     "path": "src/i18n/globalMessages.json"