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

2018-05-26 13:31:52 +09:00
parent 65a3bac543 f848e3f226
commit 19f6af475a
12 changed files with 114 additions and 91 deletions
--- a/src/client/app/desktop/views/components/settings-window.vue
+++ b/src/client/app/desktop/views/components/settings-window.vue
@ -1,6 +1,6 @@
 <template>
 <mk-window ref="window" is-modal width="700px" height="550px" @closed="$destroy">
-	<span slot="header" :class="$style.header">%fa:cog%設定</span>
+	<span slot="header" :class="$style.header">%fa:cog%%i18n:@settings%</span>
 	<mk-settings @done="close"/>
 </mk-window>
 </template>