3 files changed, 18 insertions, 37 deletions

diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js
index 2ed429199..ac1bc4e8c 100644
--- a/src/components/auth/Locked.js
+++ b/src/components/auth/Locked.js
@@ -7,7 +7,6 @@ import { defineMessages, injectIntl } from 'react-intl';
 import Form from '../../lib/Form';
 import Input from '../ui/Input';
 import Button from '../ui/Button';
-import Infobox from '../ui/Infobox';
 import { isMac } from '../../environment';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
@@ -17,11 +16,6 @@ const messages = defineMessages({
     id: 'locked.headline',
     defaultMessage: 'Locked',
   },
-  info: {
-    id: 'locked.info',
-    defaultMessage:
-      'Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.',
-  },
   touchId: {
     id: 'locked.touchId',
     defaultMessage: 'Unlock with Touch ID',
@@ -107,7 +101,6 @@ class Locked extends Component {
         <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
           <img src="./assets/images/logo.svg" className="auth__logo" alt="" />
           <h1>{intl.formatMessage(messages.headline)}</h1>
-          <Infobox type="warning">{intl.formatMessage(messages.info)}</Infobox>
 
           {touchIdEnabled && (
             <>
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index d9df9c41c..1757ac297 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -5,7 +5,7 @@ import { observer } from 'mobx-react';
 import prettyBytes from 'pretty-bytes';
 import { defineMessages, injectIntl } from 'react-intl';
 
-import { mdiGithub, mdiInformation, mdiOpenInNew } from '@mdi/js';
+import { mdiGithub, mdiOpenInNew } from '@mdi/js';
 import Form from '../../../lib/Form';
 import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
@@ -175,11 +175,6 @@ const messages = defineMessages({
     id: 'settings.app.restartRequired',
     defaultMessage: 'Changes require restart',
   },
-  languageDisclaimer: {
-    id: 'settings.app.languageDisclaimer',
-    defaultMessage:
-      'Official translations are English & German. All other languages are community based translations.',
-  },
   numberOfColumns: {
     id: 'settings.app.form.splitColumns',
     defaultMessage: 'Number of columns',
@@ -815,27 +810,22 @@ class EditSettingsForm extends Component {
                 )}
                 <p className="settings__message">
                   <Icon icon={mdiGithub} />
-                  <span>
-                    Ferdi is based on{' '}
-                    <a
-                      href={`${GITHUB_FRANZ_URL}/franz`}
-                      target="_blank"
-                      rel="noreferrer"
-                    >
-                      Franz
-                    </a>
-                    , a project published under the{' '}
-                    <a
-                      href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`}
-                      target="_blank"
-                      rel="noreferrer"
-                    >
-                      Apache-2.0 License
-                    </a>
-                  </span>
-                  <br />
-                  <Icon icon={mdiInformation} />
-                  {intl.formatMessage(messages.languageDisclaimer)}
+                  Ferdi is based on{' '}
+                  <a
+                    href={`${GITHUB_FRANZ_URL}/franz`}
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    Franz
+                  </a>
+                  , a project published under the{' '}
+                  <a
+                    href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`}
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    Apache-2.0 License
+                  </a>
                 </p>
               </div>
             )}
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index ffaab387b..213525284 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -61,7 +61,6 @@
   "invite.submit.label": "Send invites",
   "invite.successInfo": "Invitations sent successfully",
   "locked.headline": "Locked",
-  "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
   "locked.invalidCredentials": "Password invalid",
   "locked.password.label": "Password",
   "locked.submit.label": "Unlock",
@@ -257,7 +256,6 @@
   "settings.app.headlineUpdates": "Updates",
   "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.",
   "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable",
-  "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
   "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.",
   "settings.app.lockedPassword": "Password",
   "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
@@ -455,4 +453,4 @@
   "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"
-}
+}
\ No newline at end of file