diff --git a/build/extract-l10n.js b/build/extract-l10n.js
index dcd9b06201..401e106300 100644
--- a/build/extract-l10n.js
+++ b/build/extract-l10n.js
@@ -11,8 +11,8 @@ extractor
         }),
         JsExtractors.callExpression('n', {
             arguments: {
-                text: 1,
-                textPlural: 2,
+                text: 0,
+                textPlural: 1,
             }
         }),
     ])
diff --git a/l10n/messages.pot b/l10n/messages.pot
index 63a6e780c9..6c8267744f 100644
--- a/l10n/messages.pot
+++ b/l10n/messages.pot
@@ -26,6 +26,9 @@ msgstr ""
 msgid "Custom"
 msgstr ""
 
+msgid "External documentation for {title}"
+msgstr ""
+
 msgid "Flags"
 msgstr ""
 
@@ -83,6 +86,9 @@ msgstr ""
 msgid "Start slideshow"
 msgstr ""
 
+msgid "Submit"
+msgstr ""
+
 msgid "Symbols"
 msgstr ""
 
diff --git a/src/components/AppSidebar/AppSidebar.vue b/src/components/AppSidebar/AppSidebar.vue
index e4ed81a789..07303a12d2 100644
--- a/src/components/AppSidebar/AppSidebar.vue
+++ b/src/components/AppSidebar/AppSidebar.vue
@@ -131,7 +131,7 @@
 				class="app-sidebar-header">
 				<!-- close sidebar button -->
 				<a
-					v-tooltip.auto="t('close')"
+					v-tooltip.auto="closeTranslated"
 					href="#"
 					class="app-sidebar__close icon-close"
 					@click.prevent="closeSidebar" />
@@ -237,9 +237,9 @@ import Actions from '../Actions'
 import Focus from '../../directives/Focus'
 import Linkify from '../../directives/Linkify'
 import Tooltip from '../../directives/Tooltip'
-import l10n from '../../mixins/l10n'
 import AppSidebarTabs from './AppSidebarTabs'
 import EmptyContent from '../EmptyContent/EmptyContent'
+import { t } from '../../l10n'
 import { directive as ClickOutside } from 'v-click-outside'
 
 export default {
@@ -258,8 +258,6 @@ export default {
 		Tooltip,
 	},
 
-	mixins: [l10n],
-
 	props: {
 		active: {
 			type: String,
@@ -365,6 +363,7 @@ export default {
 
 	data() {
 		return {
+			closeTranslated: t('Close'),
 			isStarred: this.starred,
 		}
 	},
diff --git a/src/components/SettingsInputText/SettingsInputText.vue b/src/components/SettingsInputText/SettingsInputText.vue
index 749bb75135..51ae456232 100644
--- a/src/components/SettingsInputText/SettingsInputText.vue
+++ b/src/components/SettingsInputText/SettingsInputText.vue
@@ -33,7 +33,7 @@
 				@input="onInput"
 				@change="onChange">
 			<input :id="idSubmit"
-				:value="t('Submit')"
+				:value="submitTranslated"
 				type="submit"
 				class="action-input__submit">
 			<label v-show="!disabled" :for="idSubmit" class="action-input__label" />
@@ -45,7 +45,9 @@
 </template>
 
 <script>
+import { t } from '../../l10n'
 import GenRandomId from '../../utils/GenRandomId'
+
 export default {
 	name: 'SettingsInputText',
 	props: {
@@ -90,6 +92,13 @@ export default {
 			validator: id => id.trim() !== '',
 		},
 	},
+
+	data() {
+		return {
+			submitTranslated: t('Submit'),
+		}
+	},
+
 	computed: {
 		/**
 		 * @returns {string}
diff --git a/src/components/SettingsSection/SettingsSection.vue b/src/components/SettingsSection/SettingsSection.vue
index 0b9be12be7..0e9a8585ca 100644
--- a/src/components/SettingsSection/SettingsSection.vue
+++ b/src/components/SettingsSection/SettingsSection.vue
@@ -48,7 +48,7 @@ This component is to be used in the settings section of nextcloud.
 				:href="docUrl"
 				class="settings-section__info"
 				role=""
-				:title="t('External documentation for {title}', {title})" />
+				:title="docTitleTranslated" />
 		</h2>
 		<p v-if="hasDescription"
 			class="settings-section__desc">
@@ -59,14 +59,14 @@ This component is to be used in the settings section of nextcloud.
 </template>
 
 <script>
-import l10n from '../../mixins/l10n'
+import { t } from '../../l10n'
 
 export default {
 	name: 'SettingsSection',
 	components: {
 
 	},
-	mixins: [l10n],
+
 	props: {
 		title: {
 			type: String,
@@ -82,6 +82,14 @@ export default {
 		},
 	},
 
+	data() {
+		return {
+			docTitleTranslated: t('External documentation for {title}', {
+				title: this.title,
+			}),
+		}
+	},
+
 	computed: {
 		hasDescription() {
 			return this.description.length > 0