Merge branch 'develop' of https://github.com/syuilo/misskey into develop

2019-01-18 16:47:03 +09:00
parent 9fc1cc5255 1aa274e10d
commit abddea0443
7 changed files with 17 additions and 10 deletions
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@ -196,7 +196,7 @@
 		</ui-card>

 		<ui-card class="2fa" v-show="page == 'security'">
-			<div slot="title"><fa icon="mobile-alt"/> {{ $t('2fa') }}</div>
+			<div slot="title"><fa icon="mobile-alt"/> {{ $t('@.2fa') }}</div>
 			<section>
 				<x-2fa/>
 			</section>