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

.circleci/config.yml

@@ -141,7 +141,14 @@ workflows:
                 - l10n_develop
                 - imgbot
                 - patch-autogen
+      - hold:
+          type: approval
+          filters:
+            branches:
+              ignore: master
       - build:
+          requires:
+            - hold
           filters:
             branches:
               ignore:

locales/ja-JP.yml

@@ -61,6 +61,7 @@ common:
   drive: "ドライブ"
   messaging: "トーク"
   deck: "デッキ"
+  timeline: "タイムライン"
   explore: "みつける"
   following: "フォロー中"
   followers: "フォロワー"
@@ -1087,7 +1088,6 @@ desktop/views/components/ui.header.account.vue:
   dark: "闇に飲まれる"
 
 desktop/views/components/ui.header.nav.vue:
-  home: "ホーム"
   game: "ゲーム"
 
 desktop/views/components/ui.header.notifications.vue:

src/client/app/desktop/views/components/ui.header.nav.vue

@@ -1,8 +1,8 @@
 <template>
 <div class="nav">
 	<ul>
-		<li class="home active" @click="goToTop">
+		<li v-if="!$store.state.device.deckMode" class="timeline" @click="goToTop">
-			<router-link to="/"><fa icon="home"/><p>{{ $t('home') }}</p></router-link>
+			<router-link to="/"><fa icon="list"/><p>{{ $t('@.timeline') }}</p></router-link>
 		</li>
 		<li class="featured">
 			<router-link to="/featured"><fa :icon="faNewspaper"/><p>{{ $t('@.featured-notes') }}</p></router-link>