From aadf6fa9b1236ced177f1026406512187a231897 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 19 Oct 2018 07:03:29 +0900
Subject: [PATCH] =?UTF-8?q?UI=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/ja-JP.yml                              |  1 +
 .../app/desktop/views/components/settings.vue  | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e5ab80c2f1..f14d9bf9ce 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -851,6 +851,7 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "リプライ先を表示する"
+  timeline: "タイムライン"
   show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index 069d50181c..cd91c1461a 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -56,6 +56,13 @@
 				</details>
 			</section>
 
+			<section>
+				<header>%i18n:@timeline%</header>
+				<ui-switch v-model="showMyRenotes">%i18n:@show-my-renotes%</ui-switch>
+				<ui-switch v-model="showRenotedMyNotes">%i18n:@show-renoted-my-notes%</ui-switch>
+				<ui-switch v-model="showLocalRenotes">%i18n:@show-local-renotes%</ui-switch>
+			</section>
+
 			<section>
 				<header>%i18n:@note-visibility%</header>
 				<ui-switch v-model="rememberNoteVisibility">%i18n:@remember-note-visibility%</ui-switch>
@@ -76,6 +83,7 @@
 			<div slot="title">%fa:desktop% %i18n:@display%</div>
 
 			<section>
+				<ui-switch v-model="showPostFormOnTopOfTl">%i18n:@post-form-on-timeline%</ui-switch>
 				<ui-button @click="customizeHome">%i18n:@customize%</ui-button>
 			</section>
 			<section>
@@ -100,24 +108,22 @@
 				<ui-switch v-model="iLikeSushi">%i18n:common.i-like-sushi%</ui-switch>
 			</section>
 			<section>
-				<ui-switch v-model="showPostFormOnTopOfTl">%i18n:@post-form-on-timeline%</ui-switch>
 				<ui-switch v-model="suggestRecentHashtags">%i18n:@suggest-recent-hashtags%</ui-switch>
 				<ui-switch v-model="showClockOnHeader">%i18n:@show-clock-on-header%</ui-switch>
 				<ui-switch v-model="alwaysShowNsfw">%i18n:common.always-show-nsfw%</ui-switch>
 				<ui-switch v-model="showReplyTarget">%i18n:@show-reply-target%</ui-switch>
-				<ui-switch v-model="showMyRenotes">%i18n:@show-my-renotes%</ui-switch>
-				<ui-switch v-model="showRenotedMyNotes">%i18n:@show-renoted-my-notes%</ui-switch>
-				<ui-switch v-model="showLocalRenotes">%i18n:@show-local-renotes%</ui-switch>
 				<ui-switch v-model="showMaps">%i18n:@show-maps%</ui-switch>
 				<ui-switch v-model="disableAnimatedMfm">%i18n:common.disable-animated-mfm%</ui-switch>
-				<ui-switch v-model="games_reversi_showBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch>
-				<ui-switch v-model="games_reversi_useContrastStones">%i18n:common.use-contrast-reversi-stones%</ui-switch>
 			</section>
 			<section>
 				<header>%i18n:@deck-column-align%</header>
 				<ui-radio v-model="deckColumnAlign" value="center">%i18n:@deck-column-align-center%</ui-radio>
 				<ui-radio v-model="deckColumnAlign" value="left">%i18n:@deck-column-align-left%</ui-radio>
 			</section>
+			<section>
+				<ui-switch v-model="games_reversi_showBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch>
+				<ui-switch v-model="games_reversi_useContrastStones">%i18n:common.use-contrast-reversi-stones%</ui-switch>
+			</section>
 		</ui-card>
 
 		<ui-card class="web" v-show="page == 'web'">