diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 749fffb88b..9171e6203b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -354,15 +354,25 @@ reduceUiAnimation: "UIのアニメーションを減らす"
 share: "共有"
 notFound: "見つかりません"
 notFoundDescription: "指定されたURLに該当するページはありませんでした。"
+uploadFolder: "既定アップロード先"
+cacheClear: "キャッシュを削除"
+markAsReadAllNotifications: "すべての通知を既読にする"
+markAsReadAllUnreadNotes: "すべての投稿を既読にする"
+markAsReadAllTalkMessages: "すべてのトークを既読にする"
 help: "ヘルプ"
+inputMessageHere: "ここにメッセージを入力"
+close: "閉じる"
 
 _2fa:
+  totpHeader: "認証アプリ"
+  alreadyRegistered: "既に設定は完了しています。"
   registerDevice: "デバイスを登録"
+  registerKey: "キーを登録"
   step1: "まず、{a}や{b}などの認証アプリをお使いのデバイスにインストールします。"
   step2: "次に、表示されているQRコードをアプリでスキャンします。"
   step3: "アプリに表示されているトークンを入力して完了です。"
   step4: "これからログインするときも、同じようにトークンを入力します。"
-  securityKeyInfo: "FIDO2をサポートするハードウェアセキュリティキーを使用してログインするように設定できます。"
+  securityKeyInfo: "FIDO2をサポートするハードウェアセキュリティキーもしくは端末の指紋認証やPINを使用してログインするように設定できます。"
 
 _permissions:
   "read:account": "アカウントの情報を見る"
diff --git a/src/client/components/drive.folder.vue b/src/client/components/drive.folder.vue
index 39a9588772..658aced3e8 100644
--- a/src/client/components/drive.folder.vue
+++ b/src/client/components/drive.folder.vue
@@ -19,7 +19,7 @@
 		{{ folder.name }}
 	</p>
 	<p class="upload" v-if="$store.state.settings.uploadFolder == folder.id">
-		{{ $t('upload-folder') }}
+		{{ $t('uploadFolder') }}
 	</p>
 </div>
 </template>
diff --git a/src/client/pages/messaging-room.form.vue b/src/client/pages/messaging-room.form.vue
index 2e6ac758bb..7dff9d6b2e 100644
--- a/src/client/pages/messaging-room.form.vue
+++ b/src/client/pages/messaging-room.form.vue
@@ -8,7 +8,7 @@
 		ref="text"
 		@keypress="onKeypress"
 		@paste="onPaste"
-		:placeholder="$t('input-message-here')"
+		:placeholder="$t('inputMessageHere')"
 		v-autocomplete="{ model: 'text' }"
 	></textarea>
 	<div class="file" @click="file = null" v-if="file">{{ file.name }}</div>
diff --git a/src/client/pages/settings/2fa.vue b/src/client/pages/settings/2fa.vue
index 6791894d34..8ec96cf356 100644
--- a/src/client/pages/settings/2fa.vue
+++ b/src/client/pages/settings/2fa.vue
@@ -4,8 +4,8 @@
 	<div class="_content">
 		<p v-if="!data && !$store.state.i.twoFactorEnabled"><mk-button @click="register">{{ $t('_2fa.registerDevice') }}</mk-button></p>
 		<template v-if="$store.state.i.twoFactorEnabled">
-			<h2 class="heading">{{ $t('totp-header') }}</h2>
-			<p>{{ $t('already-registered') }}</p>
+			<h2 class="heading">{{ $t('_2fa.totpHeader') }}</h2>
+			<p>{{ $t('_2fa.alreadyRegistered') }}</p>
 			<mk-button @click="unregister">{{ $t('unregister') }}</mk-button>
 
 			<template v-if="supportsCredentials">
@@ -24,7 +24,7 @@
 				<mk-switch v-model="usePasswordLessLogin" @change="updatePasswordLessLogin" v-if="$store.state.i.securityKeysList.length > 0">{{ $t('passwordLessLogin') }}</mk-switch>
 
 				<mk-info warn v-if="registration && registration.error">{{ $t('something-went-wrong') }} {{ registration.error }}</mk-info>
-				<mk-button v-if="!registration || registration.error" @click="addSecurityKey">{{ $t('register') }}</mk-button>
+				<mk-button v-if="!registration || registration.error" @click="addSecurityKey">{{ $t('_2fa.registerKey') }}</mk-button>
 
 				<ol v-if="registration && !registration.error">
 					<li v-if="registration.stage >= 0">
diff --git a/src/client/pages/settings/general.vue b/src/client/pages/settings/general.vue
index b52254397f..85a4ac2cfe 100644
--- a/src/client/pages/settings/general.vue
+++ b/src/client/pages/settings/general.vue
@@ -18,9 +18,9 @@
 		</mk-switch>
 	</div>
 	<div class="_content">
-		<mk-button @click="readAllNotifications">{{ $t('mark-as-read-all-notifications') }}</mk-button>
-		<mk-button @click="readAllUnreadNotes">{{ $t('mark-as-read-all-unread-notes') }}</mk-button>
-		<mk-button @click="readAllMessagingMessages">{{ $t('mark-as-read-all-talk-messages') }}</mk-button>
+		<mk-button @click="readAllNotifications">{{ $t('markAsReadAllNotifications') }}</mk-button>
+		<mk-button @click="readAllUnreadNotes">{{ $t('markAsReadAllUnreadNotes') }}</mk-button>
+		<mk-button @click="readAllMessagingMessages">{{ $t('markAsReadAllTalkMessages') }}</mk-button>
 	</div>
 	<div class="_content">
 		<mk-switch v-model="reduceAnimation">
diff --git a/src/client/pages/share.vue b/src/client/pages/share.vue
index 07bb70737f..566650e309 100644
--- a/src/client/pages/share.vue
+++ b/src/client/pages/share.vue
@@ -7,7 +7,8 @@
 		<div class="_title" v-if="title">{{ title }}</div>
 		<div class="_content">
 			<div>{{ text }}</div>
-			<mk-button @click="post()">{{ $t('post') }}</mk-button>
+			<mk-button @click="post()" v-if="!posted">{{ $t('post') }}</mk-button>
+			<mk-button primary @click="close()" v-else>{{ $t('close') }}</mk-button>
 		</div>
 		<div class="_footer" v-if="url">{{ url }}</div>
 	</section>
@@ -39,6 +40,8 @@ export default Vue.extend({
 			title: null,
 			text: null,
 			url: null,
+			posted: false,
+
 			faShareAlt
 		}
 	},
@@ -64,9 +67,15 @@ export default Vue.extend({
 				instant: true,
 				initialText: text.trim()
 			}).$once('posted', () => {
-				alert('a');
-				window.close();
+				this.posted = true;
+				this.$root.dialog({
+					type: 'success',
+					iconOnly: true, autoClose: true
+				});
 			});
+		},
+		close() {
+			window.close()
 		}
 	}
 });