diff options
-rw-r--r-- | src/features/todos/containers/TodosScreen.js | 2 | ||||
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 12 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 14 |
3 files changed, 7 insertions, 21 deletions
diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js index a5da0b014..0bd591c59 100644 --- a/src/features/todos/containers/TodosScreen.js +++ b/src/features/todos/containers/TodosScreen.js | |||
@@ -25,7 +25,7 @@ class TodosScreen extends Component { | |||
25 | width={todosStore.width} | 25 | width={todosStore.width} |
26 | minWidth={TODOS_MIN_WIDTH} | 26 | minWidth={TODOS_MIN_WIDTH} |
27 | resize={width => todoActions.resize({ width })} | 27 | resize={width => todoActions.resize({ width })} |
28 | isTodosIncludedInCurrentPlan={this.props.stores.features.features.isTodosIncludedInCurrentPlan || false} | 28 | isTodosIncludedInCurrentPlan={true} |
29 | /> | 29 | /> |
30 | </ErrorBoundary> | 30 | </ErrorBoundary> |
31 | ); | 31 | ); |
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 2dd778434..51306eceb 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -773,7 +773,7 @@ | |||
773 | "defaultMessage": "!!!Could not load services and user information", | 773 | "defaultMessage": "!!!Could not load services and user information", |
774 | "end": { | 774 | "end": { |
775 | "column": 3, | 775 | "column": 3, |
776 | "line": 39 | 776 | "line": 36 |
777 | }, | 777 | }, |
778 | "file": "src/components/layout/AppLayout.js", | 778 | "file": "src/components/layout/AppLayout.js", |
779 | "id": "infobar.requiredRequestsFailed", | 779 | "id": "infobar.requiredRequestsFailed", |
@@ -3207,13 +3207,13 @@ | |||
3207 | "defaultMessage": "!!!Upgrade account", | 3207 | "defaultMessage": "!!!Upgrade account", |
3208 | "end": { | 3208 | "end": { |
3209 | "column": 3, | 3209 | "column": 3, |
3210 | "line": 19 | 3210 | "line": 17 |
3211 | }, | 3211 | }, |
3212 | "file": "src/components/ui/PremiumFeatureContainer/index.js", | 3212 | "file": "src/components/ui/PremiumFeatureContainer/index.js", |
3213 | "id": "premiumFeature.button.upgradeAccount", | 3213 | "id": "premiumFeature.button.upgradeAccount", |
3214 | "start": { | 3214 | "start": { |
3215 | "column": 10, | 3215 | "column": 10, |
3216 | "line": 16 | 3216 | "line": 14 |
3217 | } | 3217 | } |
3218 | } | 3218 | } |
3219 | ], | 3219 | ], |
@@ -3920,7 +3920,7 @@ | |||
3920 | "defaultMessage": "!!!Upgrade account", | 3920 | "defaultMessage": "!!!Upgrade account", |
3921 | "end": { | 3921 | "end": { |
3922 | "column": 3, | 3922 | "column": 3, |
3923 | "line": 17 | 3923 | "line": 18 |
3924 | }, | 3924 | }, |
3925 | "file": "src/features/serviceLimit/components/LimitReachedInfobox.js", | 3925 | "file": "src/features/serviceLimit/components/LimitReachedInfobox.js", |
3926 | "id": "premiumFeature.button.upgradeAccount", | 3926 | "id": "premiumFeature.button.upgradeAccount", |
@@ -3935,7 +3935,7 @@ | |||
3935 | { | 3935 | { |
3936 | "descriptors": [ | 3936 | "descriptors": [ |
3937 | { | 3937 | { |
3938 | "defaultMessage": "!!!Franz is better together!", | 3938 | "defaultMessage": "!!!Ferdi is better together!", |
3939 | "end": { | 3939 | "end": { |
3940 | "column": 3, | 3940 | "column": 3, |
3941 | "line": 21 | 3941 | "line": 21 |
@@ -4433,7 +4433,7 @@ | |||
4433 | } | 4433 | } |
4434 | }, | 4434 | }, |
4435 | { | 4435 | { |
4436 | "defaultMessage": "!!!Less is More: Introducing Franz Workspaces", | 4436 | "defaultMessage": "!!!Less is More: Introducing Ferdi Workspaces", |
4437 | "end": { | 4437 | "end": { |
4438 | "column": 3, | 4438 | "column": 3, |
4439 | "line": 50 | 4439 | "line": 50 |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 55de9bdeb..72a296430 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -351,20 +351,6 @@ | |||
351 | "signup.link.login": "Already have an account, sign in?", | 351 | "signup.link.login": "Already have an account, sign in?", |
352 | "signup.password.label": "Password", | 352 | "signup.password.label": "Password", |
353 | "signup.submit.label": "Create account", | 353 | "signup.submit.label": "Create account", |
354 | "subscription.euTaxInfo": "EU residents: local sales tax may apply", | ||
355 | "subscription.features.ads": "No ads, ever!", | ||
356 | "subscription.features.comingSoon": "coming soon", | ||
357 | "subscription.features.noInterruptions": "No app delays & nagging to upgrade license", | ||
358 | "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost", | ||
359 | "subscription.features.proxy": "Proxy support for services", | ||
360 | "subscription.features.spellchecker": "Support for spellchecker", | ||
361 | "subscription.features.workspaces": "Organize your services in workspaces", | ||
362 | "subscription.includedFeatures": "Paid Ferdi Premium Supporter Account includes", | ||
363 | "subscription.paymentSessionError": "Could not initialize payment form", | ||
364 | "subscription.submit.label": "I want to support the development of Franz", | ||
365 | "subscription.type.free": "free", | ||
366 | "subscription.type.month": "month", | ||
367 | "subscription.type.year": "year", | ||
368 | "subscription.cta.activateTrial": "Yes, start the free Franz Professional trial", | 354 | "subscription.cta.activateTrial": "Yes, start the free Franz Professional trial", |
369 | "subscription.cta.allOptions": "See all options", | 355 | "subscription.cta.allOptions": "See all options", |
370 | "subscription.cta.choosePlan": "Choose your plan", | 356 | "subscription.cta.choosePlan": "Choose your plan", |