refactor: revert the text for some more fields.

9 files changed, 52 insertions, 52 deletions

diff --git a/src/components/AppUpdateInfoBar.js b/src/components/AppUpdateInfoBar.js
index 9dc86bd1d..47b730bde 100644
--- a/src/components/AppUpdateInfoBar.js
+++ b/src/components/AppUpdateInfoBar.js
@@ -13,7 +13,7 @@ const messages = defineMessages({
   },
   changelog: {
     id: 'infobar.buttonChangelog',
-    defaultMessage: 'Changelog',
+    defaultMessage: 'What is new?',
   },
   buttonInstallUpdate: {
     id: 'infobar.buttonInstallUpdate',
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index a47834e19..286d2dec8 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -67,7 +67,7 @@ const messages = defineMessages({
   },
   passwordLink: {
     id: 'login.link.password',
-    defaultMessage: 'Forgot password',
+    defaultMessage: 'Reset password',
   },
 });
 
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index 74346b382..3e678f638 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -14,7 +14,7 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   headline: {
     id: 'password.headline',
-    defaultMessage: 'Forgot password',
+    defaultMessage: 'Reset password',
   },
   emailLabel: {
     id: 'password.email.label',
@@ -26,7 +26,7 @@ const messages = defineMessages({
   },
   noUser: {
     id: 'password.noUser',
-    defaultMessage: 'No user affiliated with that email address',
+    defaultMessage: 'No user with that email address was found',
   },
   signupLink: {
     id: 'password.link.signup',
diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
index 41d84c0b0..b00db8c3f 100644
--- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
+++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
@@ -27,7 +27,7 @@ const messages = defineMessages({
   },
   errorMessage: {
     id: 'service.errorHandler.message',
-    defaultMessage: 'Error:',
+    defaultMessage: 'Error',
   },
 });
 
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 8e9e668d0..66edc4975 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -21,7 +21,7 @@ const messages = defineMessages({
   },
   accountEditButton: {
     id: 'settings.account.account.editButton',
-    defaultMessage: 'Edit Account',
+    defaultMessage: 'Edit account',
   },
   invoicesButton: {
     id: 'settings.account.headlineInvoices',
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index 4067881b8..adc107ccc 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -18,15 +18,15 @@ const messages = defineMessages({
   },
   headlineProfile: {
     id: 'settings.account.headlineProfile',
-    defaultMessage: 'Update Profile',
+    defaultMessage: 'Update profile',
   },
   headlineAccount: {
     id: 'settings.account.headlineAccount',
-    defaultMessage: 'Account Information',
+    defaultMessage: 'Account information',
   },
   headlinePassword: {
     id: 'settings.account.headlinePassword',
-    defaultMessage: 'Change Password',
+    defaultMessage: 'Change password',
   },
   successInfo: {
     id: 'settings.account.successInfo',
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index bc3c559bf..8e1df10f7 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -3,7 +3,7 @@ import { defineMessages } from 'react-intl';
 export default defineMessages({
   APIUnhealthy: {
     id: 'global.api.unhealthy',
-    defaultMessage: "Can't connect to Ferdi Online Services",
+    defaultMessage: "Can't connect to Ferdi online services",
   },
   notConnectedToTheInternet: {
     id: 'global.notConnectedToTheInternet',
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 217ae2110..aae78999d 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -23,7 +23,7 @@
   "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.",
   "feature.quickSwitch.search": "Search...",
   "feature.quickSwitch.title": "QuickSwitch",
-  "global.api.unhealthy": "Can't connect to Ferdi Online Services",
+  "global.api.unhealthy": "Can't connect to Ferdi online services",
   "global.cancel": "Cancel",
   "global.edit": "Edit",
   "global.no": "No",
@@ -46,7 +46,7 @@
   "import.skip.label": "I want to add services manually",
   "import.submit.label": "Import {count} services",
   "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
-  "infobar.buttonChangelog": "Changelog",
+  "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Restart & install update",
   "infobar.buttonReloadServices": "Reload services",
   "infobar.hide": "Hide",
@@ -74,7 +74,7 @@
   "login.email.label": "Email address",
   "login.headline": "Sign in",
   "login.invalidCredentials": "Email or password not valid",
-  "login.link.password": "Forgot password",
+  "login.link.password": "Reset password",
   "login.link.signup": "Create a free account",
   "login.password.label": "Password",
   "login.serverLogout": "Your session expired, please login again.",
@@ -116,10 +116,10 @@
   "menu.help.support": "Support",
   "menu.help.tos": "Terms of Service",
   "menu.services": "Services",
-  "menu.services.activatePreviousService": "Activate previous service...",
+  "menu.services.activatePreviousService": "Activate previous service",
   "menu.services.addNewService": "Add New Service...",
   "menu.services.goHome": "Home",
-  "menu.services.setNextServiceActive": "Activate next service...",
+  "menu.services.setNextServiceActive": "Activate next service",
   "menu.todos": "Todos",
   "menu.todos.enableTodos": "Enable Todos",
   "menu.view": "View",
@@ -147,10 +147,10 @@
   "menu.workspaces.defaultWorkspace": "All services",
   "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "Email address",
-  "password.headline": "Forgot password",
+  "password.headline": "Reset password",
   "password.link.login": "Sign in to your account",
   "password.link.signup": "Create a free account",
-  "password.noUser": "No user affiliated with that email address",
+  "password.noUser": "No user with that email address was found",
   "password.successInfo": "Your new password was sent to your email address",
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
@@ -161,7 +161,7 @@
   "service.errorHandler.action": "Reload {name}",
   "service.errorHandler.editAction": "Edit {name}",
   "service.errorHandler.headline": "Oh no!",
-  "service.errorHandler.message": "Error:",
+  "service.errorHandler.message": "Error",
   "service.errorHandler.text": "{name} has failed to load.",
   "service.webviewLoader.loading": "Loading {service}",
   "services.getStarted": "Get started",
@@ -169,7 +169,7 @@
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner. If you are switching over (from one of the hosted servers) to using Ferdi without an account, please be informed that you can export your data from that server and subsequently import it using the Help menu to resurrect all your workspaces and configured services!",
   "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "Welcome to Ferdi",
-  "settings.account.account.editButton": "Edit Account",
+  "settings.account.account.editButton": "Edit account",
   "settings.account.accountUnavailable": "Account is unavailable",
   "settings.account.accountUnavailableInfo": "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.",
   "settings.account.buttonSave": "Update profile",
@@ -177,11 +177,11 @@
   "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
   "settings.account.deleteInfo": "If you don't need your Ferdi account any longer, you can delete your account and all related data here.",
   "settings.account.headline": "Account",
-  "settings.account.headlineAccount": "Account Information",
+  "settings.account.headlineAccount": "Account information",
   "settings.account.headlineDangerZone": "Danger Zone",
   "settings.account.headlineInvoices": "Invoices",
-  "settings.account.headlinePassword": "Change Password",
-  "settings.account.headlineProfile": "Update Profile",
+  "settings.account.headlinePassword": "Change password",
+  "settings.account.headlineProfile": "Update profile",
   "settings.account.successInfo": "Your changes have been saved",
   "settings.account.tryReloadServices": "Try again",
   "settings.account.tryReloadUserInfoRequest": "Try again",
@@ -207,8 +207,8 @@
   "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
   "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.confirmOnQuit": "Confirm when quitting Ferdi",
-  "settings.app.form.customTodoServer": "Custom TodoServer",
-  "settings.app.form.darkMode": "Dark Mode",
+  "settings.app.form.customTodoServer": "Custom Todo Server",
+  "settings.app.form.darkMode": "Enable Dark Mode",
   "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration",
   "settings.app.form.enableLock": "Enable Password Lock",
   "settings.app.form.enableMenuBar": "Always show Ferdi in Menu Bar",
@@ -241,7 +241,7 @@
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
-  "settings.app.form.useTouchIdToUnlock": "Allow using Touch ID to unlock",
+  "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
   "settings.app.form.useVerticalStyle": "Use horizontal style",
   "settings.app.form.wakeUpStrategy": "Wake up strategy",
   "settings.app.headlineAdvanced": "Advanced",
@@ -282,10 +282,10 @@
   "settings.recipes.customService.headline.communityRecipes": "Community 3rd Party Recipes",
   "settings.recipes.customService.headline.customRecipes": "Custom 3rd Party Recipes",
   "settings.recipes.customService.headline.devRecipes": "Your Development Service Recipes",
-  "settings.recipes.customService.intro": "To add a custom service, copy the recipe folder into:",
+  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe to:",
   "settings.recipes.customService.openDevDocs": "Developer Documentation",
-  "settings.recipes.customService.openFolder": "Open directory",
-  "settings.recipes.headline": "Available Services",
+  "settings.recipes.customService.openFolder": "Open folder",
+  "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
@@ -295,18 +295,18 @@
   "settings.service.error.message": "Could not load service recipe.",
   "settings.service.form.addServiceHeadline": "Add {name}",
   "settings.service.form.availableServices": "Available services",
-  "settings.service.form.customUrl": "Service URL",
+  "settings.service.form.customUrl": "Custom server",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
   "settings.service.form.darkReaderBrightness": "Dark Reader Brightness",
   "settings.service.form.darkReaderContrast": "Dark Reader Contrast",
   "settings.service.form.darkReaderSepia": "Dark Reader Sepia",
-  "settings.service.form.deleteButton": "Delete Service",
+  "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.editServiceHeadline": "Edit {name}",
   "settings.service.form.enableAudio": "Enable audio",
   "settings.service.form.enableBadge": "Show unread message badges",
   "settings.service.form.enableDarkMode": "Enable Dark Mode",
   "settings.service.form.enableHibernation": "Enable hibernation",
-  "settings.service.form.enableNotification": "Enable Notifications",
+  "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
   "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
@@ -327,10 +327,10 @@
   "settings.service.form.proxy.host": "Proxy Host/IP",
   "settings.service.form.proxy.info": "Proxy settings will not be synchronized with the Ferdi servers.",
   "settings.service.form.proxy.isEnabled": "Use Proxy",
-  "settings.service.form.proxy.password": "Password",
+  "settings.service.form.proxy.password": "Password (optional)",
   "settings.service.form.proxy.port": "Port",
   "settings.service.form.proxy.restartInfo": "Please restart Ferdi after changing proxy Settings.",
-  "settings.service.form.proxy.user": "User",
+  "settings.service.form.proxy.user": "User (optional)",
   "settings.service.form.recipeFileInfo": "Your user files will be inserted into the webpage so you can customize services in any way you like. User files are only stored locally and are not transferred to other computers using the same account.",
   "settings.service.form.saveButton": "Save service",
   "settings.service.form.tabHosted": "Hosted",
@@ -350,7 +350,7 @@
   "settings.supportFerdi.aboutIntro": "<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>",
   "settings.supportFerdi.bannerText": "Do you want to help us improve Ferdi?",
   "settings.supportFerdi.headline": "About Ferdi",
-  "settings.supportFerdi.openSurvey": "Open Survey",
+  "settings.supportFerdi.openSurvey": "Open survey",
   "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
   "settings.supportFerdi.textDonationAnd": "and",
   "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our",
@@ -375,8 +375,8 @@
   "settings.user.form.accountType.non-profit": "Non-Profit",
   "settings.user.form.currentPassword": "Current password",
   "settings.user.form.email": "Email",
-  "settings.user.form.firstname": "Firstname",
-  "settings.user.form.lastname": "Lastname",
+  "settings.user.form.firstname": "First Name",
+  "settings.user.form.lastname": "Last Name",
   "settings.user.form.newPassword": "New password",
   "settings.workspace.add.form.name": "Name",
   "settings.workspace.add.form.submitButton": "Create workspace",
@@ -393,7 +393,7 @@
   "settings.workspaces.tryReloadWorkspaces": "Try again",
   "settings.workspaces.updatedInfo": "Your changes have been saved",
   "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces",
-  "settings.workspaces.workspaceFeatureInfo": "Info about workspace feature",
+  "settings.workspaces.workspaceFeatureInfo": "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.",
   "settings.workspaces.workspacesRequestFailed": "Could not load your workspaces",
   "setupAssistant.headline": "Let's get started",
   "setupAssistant.subheadline": "Choose from our most used services and get back on top of your messaging now.",
@@ -408,9 +408,9 @@
   "sidebar.unmuteApp": "Enable notifications & audio",
   "signup.email.label": "Email address",
   "signup.emailDuplicate": "A user with that email address already exists",
-  "signup.firstname.label": "Firstname",
+  "signup.firstname.label": "First Name",
   "signup.headline": "Sign up",
-  "signup.lastname.label": "Lastname",
+  "signup.lastname.label": "Last Name",
   "signup.legal.info": "By creating a Ferdi account you accept the",
   "signup.legal.privacy": "Privacy Statement",
   "signup.legal.terms": "Terms of service",
@@ -418,23 +418,23 @@
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
   "tabs.item.confirmDeleteService": "Do you really want to delete the {serviceName} service?",
-  "tabs.item.deleteService": "Delete Service",
+  "tabs.item.deleteService": "Delete service",
   "tabs.item.disableAudio": "Disable audio",
   "tabs.item.disableDarkMode": "Disable Dark mode",
   "tabs.item.disableNotifications": "Disable notifications",
-  "tabs.item.disableService": "Disable Service",
+  "tabs.item.disableService": "Disable service",
   "tabs.item.enableAudio": "Enable audio",
   "tabs.item.enableDarkMode": "Enable Dark mode",
   "tabs.item.enableNotification": "Enable notifications",
-  "tabs.item.enableService": "Enable Service",
-  "tabs.item.hibernateService": "Hibernate Service",
+  "tabs.item.enableService": "Enable service",
+  "tabs.item.hibernateService": "Hibernate service",
   "tabs.item.reload": "Reload",
-  "tabs.item.wakeUpService": "Wake Up Service",
-  "validation.email": "Email not valid",
-  "validation.minLength": "Too few characters",
+  "tabs.item.wakeUpService": "Wake up service",
+  "validation.email": "{field} is not valid",
+  "validation.minLength": "{field} should be at least {length} characters long",
   "validation.oneRequired": "At least one is required",
-  "validation.required": "Field is required",
-  "validation.url": "Not a valid URL",
+  "validation.required": "{field} is required",
+  "validation.url": "{field} is not a valid URL",
   "webControls.back": "Back",
   "webControls.forward": "Forward",
   "webControls.goHome": "Home",
@@ -447,7 +447,7 @@
   "workspaceDrawer.headline": "Workspaces",
   "workspaceDrawer.item.contextMenuEdit": "edit",
   "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
-  "workspaceDrawer.workspaceFeatureInfo": "Info about workspace feature",
-  "workspaceDrawer.workspacesSettingsTooltip": "Workspaces settings",
+  "workspaceDrawer.workspaceFeatureInfo": "<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>",
+  "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
 }
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index f5e8b2cdf..8e2d8bdca 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -268,11 +268,11 @@ const menuItems = defineMessages({
   },
   activateNextService: {
     id: 'menu.services.setNextServiceActive',
-    defaultMessage: 'Activate next service...',
+    defaultMessage: 'Activate next service',
   },
   activatePreviousService: {
     id: 'menu.services.activatePreviousService',
-    defaultMessage: 'Activate previous service...',
+    defaultMessage: 'Activate previous service',
   },
   muteApp: {
     id: 'sidebar.muteApp',