refactor: revert the text for some more fields.

11 files changed, 28 insertions, 28 deletions

diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 4d39835a2..936e0202d 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -23,11 +23,11 @@ const messages = defineMessages({
   },
   firstnameLabel: {
     id: 'signup.firstname.label',
-    defaultMessage: 'Firstname',
+    defaultMessage: 'First Name',
   },
   lastnameLabel: {
     id: 'signup.lastname.label',
-    defaultMessage: 'Lastname',
+    defaultMessage: 'Last Name',
   },
   emailLabel: {
     id: 'signup.email.label',
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index b1a3ffbbb..84cef8c0e 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -48,23 +48,23 @@ const messages = defineMessages({
   },
   disableService: {
     id: 'tabs.item.disableService',
-    defaultMessage: 'Disable Service',
+    defaultMessage: 'Disable service',
   },
   enableService: {
     id: 'tabs.item.enableService',
-    defaultMessage: 'Enable Service',
+    defaultMessage: 'Enable service',
   },
   hibernateService: {
     id: 'tabs.item.hibernateService',
-    defaultMessage: 'Hibernate Service',
+    defaultMessage: 'Hibernate service',
   },
   wakeUpService: {
     id: 'tabs.item.wakeUpService',
-    defaultMessage: 'Wake Up Service',
+    defaultMessage: 'Wake up service',
   },
   deleteService: {
     id: 'tabs.item.deleteService',
-    defaultMessage: 'Delete Service',
+    defaultMessage: 'Delete service',
   },
   confirmDeleteService: {
     id: 'tabs.item.confirmDeleteService',
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index e620abf93..44f5bc39a 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -18,7 +18,7 @@ import RecipePreview from '../../../models/RecipePreview';
 const messages = defineMessages({
   headline: {
     id: 'settings.recipes.headline',
-    defaultMessage: 'Available Services',
+    defaultMessage: 'Available services',
   },
   searchService: {
     id: 'settings.searchService',
@@ -47,11 +47,11 @@ const messages = defineMessages({
   },
   customRecipeIntro: {
     id: 'settings.recipes.customService.intro',
-    defaultMessage: 'To add a custom service, copy the recipe folder into:',
+    defaultMessage: 'To add a custom service, copy the service recipe to:',
   },
   openFolder: {
     id: 'settings.recipes.customService.openFolder',
-    defaultMessage: 'Open directory',
+    defaultMessage: 'Open folder',
   },
   openDevDocs: {
     id: 'settings.recipes.customService.openDevDocs',
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 3fbb57cbb..9a9abeab4 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -26,7 +26,7 @@ const messages = defineMessages({
   },
   deleteService: {
     id: 'settings.service.form.deleteButton',
-    defaultMessage: 'Delete Service',
+    defaultMessage: 'Delete service',
   },
   openDarkmodeCss: {
     id: 'settings.service.form.openDarkmodeCss',
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
index 64ffe8692..f24e4bd62 100644
--- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js
+++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
@@ -63,7 +63,7 @@ const messages = defineMessages({
   },
   openSurvey: {
     id: 'settings.supportFerdi.openSurvey',
-    defaultMessage: 'Open Survey',
+    defaultMessage: 'Open survey',
   },
   bannerText: {
     id: 'settings.supportFerdi.bannerText',
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 12e7b9e95..e2ed4eeac 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -39,7 +39,7 @@ const messages = defineMessages({
   },
   enableNotification: {
     id: 'settings.service.form.enableNotification',
-    defaultMessage: 'Enable Notifications',
+    defaultMessage: 'Enable notifications',
   },
   enableBadge: {
     id: 'settings.service.form.enableBadge',
@@ -55,7 +55,7 @@ const messages = defineMessages({
   },
   customUrl: {
     id: 'settings.service.form.customUrl',
-    defaultMessage: 'Service URL',
+    defaultMessage: 'Custom server',
   },
   indirectMessages: {
     id: 'settings.service.form.indirectMessages',
@@ -95,11 +95,11 @@ const messages = defineMessages({
   },
   proxyUser: {
     id: 'settings.service.form.proxy.user',
-    defaultMessage: 'User',
+    defaultMessage: 'User (optional)',
   },
   proxyPassword: {
     id: 'settings.service.form.proxy.password',
-    defaultMessage: 'Password',
+    defaultMessage: 'Password (optional)',
   },
 });
 
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 8834aa1ae..3df433160 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -118,7 +118,7 @@ const messages = defineMessages({
   },
   customTodoServer: {
     id: 'settings.app.form.customTodoServer',
-    defaultMessage: 'Custom TodoServer',
+    defaultMessage: 'Custom Todo Server',
   },
   enableLock: {
     id: 'settings.app.form.enableLock',
@@ -130,7 +130,7 @@ const messages = defineMessages({
   },
   useTouchIdToUnlock: {
     id: 'settings.app.form.useTouchIdToUnlock',
-    defaultMessage: 'Allow using Touch ID to unlock',
+    defaultMessage: 'Allow using TouchID to unlock Ferdi',
   },
   inactivityLock: {
     id: 'settings.app.form.inactivityLock',
@@ -154,7 +154,7 @@ const messages = defineMessages({
   },
   darkMode: {
     id: 'settings.app.form.darkMode',
-    defaultMessage: 'Dark Mode',
+    defaultMessage: 'Enable Dark Mode',
   },
   adaptableDarkMode: {
     id: 'settings.app.form.adaptableDarkMode',
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index 92ef94c29..ca1363c59 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -13,11 +13,11 @@ import { required, email, minLength } from '../../helpers/validation-helpers';
 const messages = defineMessages({
   firstname: {
     id: 'settings.user.form.firstname',
-    defaultMessage: 'Firstname',
+    defaultMessage: 'First Name',
   },
   lastname: {
     id: 'settings.user.form.lastname',
-    defaultMessage: 'Lastname',
+    defaultMessage: 'Last Name',
   },
   email: {
     id: 'settings.user.form.email',
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index 2f57e34a2..63eb4f75c 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -22,11 +22,11 @@ const messages = defineMessages({
   },
   workspacesSettingsTooltip: {
     id: 'workspaceDrawer.workspacesSettingsTooltip',
-    defaultMessage: 'Workspaces settings',
+    defaultMessage: 'Edit workspaces settings',
   },
   workspaceFeatureInfo: {
     id: 'workspaceDrawer.workspaceFeatureInfo',
-    defaultMessage: 'Info about workspace feature',
+    defaultMessage: '<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>',
   },
   addNewWorkspaceLabel: {
     id: 'workspaceDrawer.addNewWorkspaceLabel',
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index fd279f896..49552df6b 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -40,7 +40,7 @@ const messages = defineMessages({
   },
   workspaceFeatureInfo: {
     id: 'settings.workspaces.workspaceFeatureInfo',
-    defaultMessage: 'Info about workspace feature',
+    defaultMessage: '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.',
   },
   workspaceFeatureHeadline: {
     id: 'settings.workspaces.workspaceFeatureHeadline',
diff --git a/src/helpers/validation-helpers.ts b/src/helpers/validation-helpers.ts
index 80d368b2e..3a9622309 100644
--- a/src/helpers/validation-helpers.ts
+++ b/src/helpers/validation-helpers.ts
@@ -4,19 +4,19 @@ import isEmail from 'validator/lib/isEmail';
 const messages = defineMessages({
   required: {
     id: 'validation.required',
-    defaultMessage: 'Field is required',
+    defaultMessage: '{field} is required',
   },
   email: {
     id: 'validation.email',
-    defaultMessage: 'Email not valid',
+    defaultMessage: '{field} is not valid',
   },
   url: {
     id: 'validation.url',
-    defaultMessage: 'Not a valid URL',
+    defaultMessage: '{field} is not a valid URL',
   },
   minLength: {
     id: 'validation.minLength',
-    defaultMessage: 'Too few characters',
+    defaultMessage: '{field} should be at least {length} characters long',
   },
   oneRequired: {
     id: 'validation.oneRequired',