Start removing superfluous text

2 files changed, 17 insertions, 34 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>
             )}