4 files changed, 258 insertions, 163 deletions

diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
index 4969db910..1e21bad69 100644
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 14,
+      "line": 18,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 21,
       "column": 3
     }
   },
@@ -17,24 +17,24 @@
     "defaultMessage": "!!!Your Subscription",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 18,
+      "line": 22,
       "column": 24
     },
     "end": {
-      "line": 21,
+      "line": 25,
       "column": 3
     }
   },
   {
-    "id": "settings.account.headlineUpgrade",
-    "defaultMessage": "!!!Upgrade your Account",
+    "id": "settings.account.headlineTrialUpgrade",
+    "defaultMessage": "!!!Get the free 14 day Franz Professional Trial",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 22,
+      "line": 26,
       "column": 19
     },
     "end": {
-      "line": 25,
+      "line": 29,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!Danger Zone",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 26,
+      "line": 30,
       "column": 22
     },
     "end": {
-      "line": 29,
+      "line": 33,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Manage your subscription",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 30,
+      "line": 34,
       "column": 33
     },
     "end": {
-      "line": 33,
+      "line": 37,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Basic Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 34,
+      "line": 38,
       "column": 20
     },
     "end": {
-      "line": 37,
+      "line": 41,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Premium Supporter Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 38,
+      "line": 42,
       "column": 22
     },
     "end": {
-      "line": 41,
+      "line": 45,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Edit Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 42,
+      "line": 46,
       "column": 21
     },
     "end": {
-      "line": 45,
+      "line": 49,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!Invoices",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 46,
+      "line": 50,
       "column": 18
     },
     "end": {
-      "line": 49,
+      "line": 53,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Download",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 50,
+      "line": 54,
       "column": 19
     },
     "end": {
-      "line": 53,
+      "line": 57,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Could not load user information",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 54,
+      "line": 58,
       "column": 25
     },
     "end": {
-      "line": 57,
+      "line": 61,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Try again",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 58,
+      "line": 62,
       "column": 28
     },
     "end": {
-      "line": 61,
+      "line": 65,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Delete account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 62,
+      "line": 66,
       "column": 17
     },
     "end": {
-      "line": 65,
+      "line": 69,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 66,
+      "line": 70,
       "column": 14
     },
     "end": {
-      "line": 69,
+      "line": 73,
       "column": 3
     }
   },
@@ -186,11 +186,63 @@
     "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": 70,
+      "line": 74,
       "column": 19
     },
     "end": {
-      "line": 73,
+      "line": 77,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.trial",
+    "defaultMessage": "!!!Free Trial",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 78,
+      "column": 9
+    },
+    "end": {
+      "line": 81,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.yourLicense",
+    "defaultMessage": "!!!Your license:",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 82,
+      "column": 15
+    },
+    "end": {
+      "line": 85,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.trialEndsIn",
+    "defaultMessage": "!!!Your free trial ends in {duration}.",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 86,
+      "column": 15
+    },
+    "end": {
+      "line": 89,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.trialUpdateBillingInfo",
+    "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
+    "file": "src/components/settings/account/AccountDashboard.js",
+    "start": {
+      "line": 90,
+      "column": 33
+    },
+    "end": {
+      "line": 93,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionForm.json b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
index f98eb986f..224a78c4c 100644
--- a/src/i18n/messages/src/components/subscription/SubscriptionForm.json
+++ b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
@@ -1,7 +1,7 @@
 [
   {
-    "id": "subscription.submit.label",
-    "defaultMessage": "!!!Support the development of Franz",
+    "id": "subscription.cta.activateTrial",
+    "defaultMessage": "!!!Yes, upgrade my account to Franz Professional",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
       "line": 14,
@@ -13,12 +13,12 @@
     }
   },
   {
-    "id": "subscription.paymentSessionError",
-    "defaultMessage": "!!!Could not initialize payment form",
+    "id": "subscription.includedProFeatures",
+    "defaultMessage": "!!!The Franz Professional Plan includes:",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
       "line": 18,
-      "column": 23
+      "column": 20
     },
     "end": {
       "line": 21,
@@ -26,12 +26,12 @@
     }
   },
   {
-    "id": "subscription.type.free",
-    "defaultMessage": "!!!free",
+    "id": "pricing.trial.terms.headline",
+    "defaultMessage": "!!!No strings attached",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
       "line": 22,
-      "column": 12
+      "column": 29
     },
     "end": {
       "line": 25,
@@ -39,12 +39,12 @@
     }
   },
   {
-    "id": "subscription.type.month",
-    "defaultMessage": "!!!month",
+    "id": "pricing.trial.terms.noCreditCard",
+    "defaultMessage": "!!!No credit card required",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
       "line": 26,
-      "column": 15
+      "column": 16
     },
     "end": {
       "line": 29,
@@ -52,133 +52,16 @@
     }
   },
   {
-    "id": "subscription.type.year",
-    "defaultMessage": "!!!year",
+    "id": "pricing.trial.terms.automaticTrialEnd",
+    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
       "line": 30,
-      "column": 14
+      "column": 21
     },
     "end": {
       "line": 33,
       "column": 3
     }
-  },
-  {
-    "id": "subscription.includedFeatures",
-    "defaultMessage": "!!!The Franz Premium Supporter Account includes",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 34,
-      "column": 20
-    },
-    "end": {
-      "line": 37,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.onpremise.mattermost",
-    "defaultMessage": "!!!Add on-premise/hosted services like Mattermost",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 38,
-      "column": 13
-    },
-    "end": {
-      "line": 41,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.noInterruptions",
-    "defaultMessage": "!!!No app delays & nagging to upgrade license",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 42,
-      "column": 19
-    },
-    "end": {
-      "line": 45,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.proxy",
-    "defaultMessage": "!!!Proxy support for services",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 46,
-      "column": 9
-    },
-    "end": {
-      "line": 49,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.spellchecker",
-    "defaultMessage": "!!!Support for Spellchecker",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 50,
-      "column": 16
-    },
-    "end": {
-      "line": 53,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.workspaces",
-    "defaultMessage": "!!!Organize your services in workspaces",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 54,
-      "column": 14
-    },
-    "end": {
-      "line": 57,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.ads",
-    "defaultMessage": "!!!No ads, ever!",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 58,
-      "column": 7
-    },
-    "end": {
-      "line": 61,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.features.comingSoon",
-    "defaultMessage": "!!!coming soon",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 62,
-      "column": 14
-    },
-    "end": {
-      "line": 65,
-      "column": 3
-    }
-  },
-  {
-    "id": "subscription.euTaxInfo",
-    "defaultMessage": "!!!EU residents: local sales tax may apply",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 66,
-      "column": 13
-    },
-    "end": {
-      "line": 69,
-      "column": 3
-    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/helpers/plan-helpers.json b/src/i18n/messages/src/helpers/plan-helpers.json
new file mode 100644
index 000000000..de27dfcfd
--- /dev/null
+++ b/src/i18n/messages/src/helpers/plan-helpers.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "pricing.plan.pro-yearly",
+    "defaultMessage": "!!!Franz Professional Yearly",
+    "file": "src/helpers/plan-helpers.js",
+    "start": {
+      "line": 5,
+      "column": 22
+    },
+    "end": {
+      "line": 8,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.pro-monthly",
+    "defaultMessage": "!!!Franz Professional Monthly",
+    "file": "src/helpers/plan-helpers.js",
+    "start": {
+      "line": 9,
+      "column": 23
+    },
+    "end": {
+      "line": 12,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.personal-yearly",
+    "defaultMessage": "!!!Franz Personal Yearly",
+    "file": "src/helpers/plan-helpers.js",
+    "start": {
+      "line": 13,
+      "column": 27
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.personal-monthly",
+    "defaultMessage": "!!!Franz Personal Monthly",
+    "file": "src/helpers/plan-helpers.js",
+    "start": {
+      "line": 17,
+      "column": 28
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.free",
+    "defaultMessage": "!!!Franz Free",
+    "file": "src/helpers/plan-helpers.js",
+    "start": {
+      "line": 21,
+      "column": 16
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.legacy",
+    "defaultMessage": "!!!Franz Premium",
+    "file": "src/helpers/plan-helpers.js",
+    "start": {
+      "line": 25,
+      "column": 18
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/helpers/pricing-helpers.json b/src/i18n/messages/src/helpers/pricing-helpers.json
new file mode 100644
index 000000000..4030a3e3b
--- /dev/null
+++ b/src/i18n/messages/src/helpers/pricing-helpers.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "pricing.plan.pro-yearly",
+    "defaultMessage": "!!!Franz Professional Yearly",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 5,
+      "column": 22
+    },
+    "end": {
+      "line": 8,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.pro-monthly",
+    "defaultMessage": "!!!Franz Professional Monthly",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 9,
+      "column": 23
+    },
+    "end": {
+      "line": 12,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.personal-yearly",
+    "defaultMessage": "!!!Franz Personal Yearly",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 13,
+      "column": 27
+    },
+    "end": {
+      "line": 16,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.personal-monthly",
+    "defaultMessage": "!!!Franz Personal Monthly",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 17,
+      "column": 28
+    },
+    "end": {
+      "line": 20,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.free",
+    "defaultMessage": "!!!Franz Free",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 21,
+      "column": 16
+    },
+    "end": {
+      "line": 24,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.plan.legacy",
+    "defaultMessage": "!!!Franz Premium",
+    "file": "src/helpers/pricing-helpers.js",
+    "start": {
+      "line": 25,
+      "column": 18
+    },
+    "end": {
+      "line": 28,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file