From 9cab2cd9401a3a265a0fdf5513db73e5f3d85cec Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 24 Apr 2021 18:38:38 +0900
Subject: [PATCH 01/10] Tweak animation

---
 src/client/components/launch-pad.vue | 4 ++--
 src/client/directives/click-anime.ts | 4 ++++
 src/client/style.scss                | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/client/components/launch-pad.vue b/src/client/components/launch-pad.vue
index e3d24c70f..e66bbd73e 100644
--- a/src/client/components/launch-pad.vue
+++ b/src/client/components/launch-pad.vue
@@ -3,12 +3,12 @@
 	<div class="szkkfdyq _popup">
 		<div class="main">
 			<template v-for="item in items">
-				<button v-if="item.action" class="_button" @click="$event => { item.action($event); close(); }">
+				<button v-if="item.action" class="_button" @click="$event => { item.action($event); close(); }" v-click-anime>
 					<i class="icon" :class="item.icon"></i>
 					<div class="text">{{ item.text }}</div>
 					<span v-if="item.indicate" class="indicator"><i class="fas fa-circle"></i></span>
 				</button>
-				<MkA v-else :to="item.to" @click.passive="close()">
+				<MkA v-else :to="item.to" @click.passive="close()" v-click-anime>
 					<i class="icon" :class="item.icon"></i>
 					<div class="text">{{ item.text }}</div>
 					<span v-if="item.indicate" class="indicator"><i class="fas fa-circle"></i></span>
diff --git a/src/client/directives/click-anime.ts b/src/client/directives/click-anime.ts
index 864155f07..9fd583d6d 100644
--- a/src/client/directives/click-anime.ts
+++ b/src/client/directives/click-anime.ts
@@ -2,7 +2,10 @@ import { Directive } from 'vue';
 
 export default {
 	mounted(el, binding, vn) {
+		el.classList.add('_anime_bounce_standBy');
+
 		el.addEventListener('mousedown', () => {
+			el.classList.add('_anime_bounce_standBy');
 			el.classList.add('_anime_bounce_ready');
 
 			el.addEventListener('mouseleave', () => {
@@ -17,6 +20,7 @@ export default {
 		el.addEventListener('animationend', () => {
 			el.classList.remove('_anime_bounce_ready');
 			el.classList.remove('_anime_bounce');
+			el.classList.add('_anime_bounce_standBy');
 		});
 	}
 } as Directive;
diff --git a/src/client/style.scss b/src/client/style.scss
index 07b80d553..aa00303a1 100644
--- a/src/client/style.scss
+++ b/src/client/style.scss
@@ -522,13 +522,18 @@ hr {
 }
 
 ._anime_bounce {
+	will-change: transform;
   animation: bounce ease 0.7s;
   animation-iteration-count: 1;
   transform-origin: 50% 50%;
 }
 ._anime_bounce_ready {
+	will-change: transform;
 	transform:  scaleX(0.90) scaleY(0.90) ;
 }
+._anime_bounce_standBy {
+	transition: transform 0.1s ease;
+}
 
 @keyframes bounce{
   0% {

From ccf063709e7a33a6690f84a19acbbf9ef0209efe Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 24 Apr 2021 22:36:28 +0900
Subject: [PATCH 02/10] Tweak UI

---
 src/client/components/tab.vue      | 6 ++++--
 src/client/ui/chat/index.vue       | 2 +-
 src/client/ui/deck/main-column.vue | 2 +-
 src/client/ui/default.vue          | 2 +-
 src/client/ui/universal.vue        | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/client/components/tab.vue b/src/client/components/tab.vue
index 96cbe50fb..5e54fc968 100644
--- a/src/client/components/tab.vue
+++ b/src/client/components/tab.vue
@@ -12,14 +12,16 @@ export default defineComponent({
 
 		return withDirectives(h('div', {
 			class: 'pxhvhrfw',
-		}, options.map(option => h('button', {
+		}, options.map(option => withDirectives(h('button', {
 			class: ['_button', { active: this.value === option.props.value }],
 			key: option.props.value,
 			disabled: this.value === option.props.value,
 			onClick: () => {
 				this.$emit('update:value', option.props.value);
 			}
-		}, option.children))), [
+		}, option.children), [
+			[resolveDirective('click-anime')]
+		]))), [
 			[resolveDirective('size'), { max: [500] }]
 		]);
 	}
diff --git a/src/client/ui/chat/index.vue b/src/client/ui/chat/index.vue
index b498d70a7..be1bd7758 100644
--- a/src/client/ui/chat/index.vue
+++ b/src/client/ui/chat/index.vue
@@ -313,7 +313,7 @@ export default defineComponent({
 				}
 			};
 			if (isLink(e.target)) return;
-			if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
+			if (['INPUT', 'TEXTAREA', 'IMG'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
 			if (window.getSelection().toString() !== '') return;
 			const path = this.$route.path;
 			os.contextMenu([{
diff --git a/src/client/ui/deck/main-column.vue b/src/client/ui/deck/main-column.vue
index 75cf94aae..de36fd596 100644
--- a/src/client/ui/deck/main-column.vue
+++ b/src/client/ui/deck/main-column.vue
@@ -64,7 +64,7 @@ export default defineComponent({
 				}
 			};
 			if (isLink(e.target)) return;
-			if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
+			if (['INPUT', 'TEXTAREA', 'IMG'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
 			if (window.getSelection().toString() !== '') return;
 			const path = this.$route.path;
 			os.contextMenu([{
diff --git a/src/client/ui/default.vue b/src/client/ui/default.vue
index 0cc969272..6cfb68071 100644
--- a/src/client/ui/default.vue
+++ b/src/client/ui/default.vue
@@ -165,7 +165,7 @@ export default defineComponent({
 				}
 			};
 			if (isLink(e.target)) return;
-			if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
+			if (['INPUT', 'TEXTAREA', 'IMG'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
 			if (window.getSelection().toString() !== '') return;
 			const path = this.$route.path;
 			os.contextMenu([{
diff --git a/src/client/ui/universal.vue b/src/client/ui/universal.vue
index a44dfc42f..478fa1307 100644
--- a/src/client/ui/universal.vue
+++ b/src/client/ui/universal.vue
@@ -191,7 +191,7 @@ export default defineComponent({
 				}
 			};
 			if (isLink(e.target)) return;
-			if (['INPUT', 'TEXTAREA'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
+			if (['INPUT', 'TEXTAREA', 'IMG'].includes(e.target.tagName) || e.target.attributes['contenteditable']) return;
 			if (window.getSelection().toString() !== '') return;
 			const path = this.$route.path;
 			os.contextMenu([{

From fec3c70886c13a267814e7eba5d2dd9aa807687b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 24 Apr 2021 22:38:24 +0900
Subject: [PATCH 03/10] Gallery (#7194)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip
---
 locales/ja-JP.yml                             |  12 +
 migration/1611397665007-gallery.ts            |  40 +++
 .../components/gallery-post-preview.vue       | 126 ++++++++
 src/client/components/ui/button.vue           |   7 +-
 src/client/components/ui/container.vue        |   1 +
 src/client/components/ui/pagination.vue       |  10 +-
 src/client/pages/gallery/index.vue            | 152 ++++++++++
 src/client/pages/gallery/new.vue              | 110 +++++++
 src/client/pages/gallery/post.vue             | 271 ++++++++++++++++++
 src/client/pages/page.vue                     |   3 +-
 src/client/pages/user/gallery.vue             |  63 ++++
 src/client/pages/user/index.vue               |   6 +
 src/client/router.ts                          |   3 +
 src/client/sidebar.ts                         |   5 +
 src/db/postgre.ts                             |   4 +
 src/models/entities/gallery-like.ts           |  33 +++
 src/models/entities/gallery-post.ts           |  79 +++++
 src/models/index.ts                           |   4 +
 src/models/repositories/gallery-like.ts       |  25 ++
 src/models/repositories/gallery-post.ts       | 113 ++++++++
 src/server/api/endpoints/gallery/featured.ts  |  29 ++
 src/server/api/endpoints/gallery/popular.ts   |  28 ++
 src/server/api/endpoints/gallery/posts.ts     |  43 +++
 .../api/endpoints/gallery/posts/create.ts     |  76 +++++
 .../api/endpoints/gallery/posts/like.ts       |  71 +++++
 .../api/endpoints/gallery/posts/show.ts       |  43 +++
 .../api/endpoints/gallery/posts/unlike.ts     |  54 ++++
 src/server/api/endpoints/i/gallery/likes.ts   |  57 ++++
 src/server/api/endpoints/i/gallery/posts.ts   |  49 ++++
 .../api/endpoints/users/gallery/posts.ts      |  39 +++
 src/server/web/index.ts                       |  25 +-
 src/server/web/views/gallery-post.pug         |  35 +++
 32 files changed, 1607 insertions(+), 9 deletions(-)
 create mode 100644 migration/1611397665007-gallery.ts
 create mode 100644 src/client/components/gallery-post-preview.vue
 create mode 100644 src/client/pages/gallery/index.vue
 create mode 100644 src/client/pages/gallery/new.vue
 create mode 100644 src/client/pages/gallery/post.vue
 create mode 100644 src/client/pages/user/gallery.vue
 create mode 100644 src/models/entities/gallery-like.ts
 create mode 100644 src/models/entities/gallery-post.ts
 create mode 100644 src/models/repositories/gallery-like.ts
 create mode 100644 src/models/repositories/gallery-post.ts
 create mode 100644 src/server/api/endpoints/gallery/featured.ts
 create mode 100644 src/server/api/endpoints/gallery/popular.ts
 create mode 100644 src/server/api/endpoints/gallery/posts.ts
 create mode 100644 src/server/api/endpoints/gallery/posts/create.ts
 create mode 100644 src/server/api/endpoints/gallery/posts/like.ts
 create mode 100644 src/server/api/endpoints/gallery/posts/show.ts
 create mode 100644 src/server/api/endpoints/gallery/posts/unlike.ts
 create mode 100644 src/server/api/endpoints/i/gallery/likes.ts
 create mode 100644 src/server/api/endpoints/i/gallery/posts.ts
 create mode 100644 src/server/api/endpoints/users/gallery/posts.ts
 create mode 100644 src/server/web/views/gallery-post.pug

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 3824d437f..041bdfb11 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -704,6 +704,7 @@ editCode: "コードを編集"
 apply: "適用"
 receiveAnnouncementFromInstance: "インスタンスからのお知らせを受け取る"
 emailNotification: "メール通知"
+publish: "公開"
 inChannelSearch: "チャンネル内検索"
 useReactionPickerForContextMenu: "右クリックでリアクションピッカーを開く"
 typingUsers: "{users}が入力中"
@@ -741,6 +742,17 @@ switch: "切り替え"
 noMaintainerInformationWarning: "管理者情報が設定されていません。"
 noBotProtectionWarning: "Bot防御が設定されていません。"
 configure: "設定する"
+postToGallery: "ギャラリーへ投稿"
+gallery: "ギャラリー"
+recentPosts: "最近の投稿"
+popularPosts: "人気の投稿"
+shareWithNote: "ノートで共有"
+
+_gallery:
+  my: "自分の投稿"
+  liked: "いいねした投稿"
+  like: "いいね！"
+  unlike: "いいね解除"
 
 _email:
   _follow:
diff --git a/migration/1611397665007-gallery.ts b/migration/1611397665007-gallery.ts
new file mode 100644
index 000000000..1b64490fe
--- /dev/null
+++ b/migration/1611397665007-gallery.ts
@@ -0,0 +1,40 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class gallery1611397665007 implements MigrationInterface {
+    name = 'gallery1611397665007'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "gallery_post" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "title" character varying(256) NOT NULL, "description" character varying(2048), "userId" character varying(32) NOT NULL, "fileIds" character varying(32) array NOT NULL DEFAULT '{}'::varchar[], "isSensitive" boolean NOT NULL DEFAULT false, "likedCount" integer NOT NULL DEFAULT '0', "tags" character varying(128) array NOT NULL DEFAULT '{}'::varchar[], CONSTRAINT "PK_8e90d7b6015f2c4518881b14753" PRIMARY KEY ("id")); COMMENT ON COLUMN "gallery_post"."createdAt" IS 'The created date of the GalleryPost.'; COMMENT ON COLUMN "gallery_post"."updatedAt" IS 'The updated date of the GalleryPost.'; COMMENT ON COLUMN "gallery_post"."userId" IS 'The ID of author.'; COMMENT ON COLUMN "gallery_post"."isSensitive" IS 'Whether the post is sensitive.'`);
+        await queryRunner.query(`CREATE INDEX "IDX_8f1a239bd077c8864a20c62c2c" ON "gallery_post" ("createdAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_f631d37835adb04792e361807c" ON "gallery_post" ("updatedAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_985b836dddd8615e432d7043dd" ON "gallery_post" ("userId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_3ca50563facd913c425e7a89ee" ON "gallery_post" ("fileIds") `);
+        await queryRunner.query(`CREATE INDEX "IDX_f2d744d9a14d0dfb8b96cb7fc5" ON "gallery_post" ("isSensitive") `);
+        await queryRunner.query(`CREATE INDEX "IDX_1a165c68a49d08f11caffbd206" ON "gallery_post" ("likedCount") `);
+        await queryRunner.query(`CREATE INDEX "IDX_05cca34b985d1b8edc1d1e28df" ON "gallery_post" ("tags") `);
+        await queryRunner.query(`CREATE TABLE "gallery_like" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "postId" character varying(32) NOT NULL, CONSTRAINT "PK_853ab02be39b8de45cd720cc15f" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_8fd5215095473061855ceb948c" ON "gallery_like" ("userId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_df1b5f4099e99fb0bc5eae53b6" ON "gallery_like" ("userId", "postId") `);
+        await queryRunner.query(`ALTER TABLE "gallery_post" ADD CONSTRAINT "FK_985b836dddd8615e432d7043ddb" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "gallery_like" ADD CONSTRAINT "FK_8fd5215095473061855ceb948cf" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "gallery_like" ADD CONSTRAINT "FK_b1cb568bfe569e47b7051699fc8" FOREIGN KEY ("postId") REFERENCES "gallery_post"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "gallery_like" DROP CONSTRAINT "FK_b1cb568bfe569e47b7051699fc8"`);
+        await queryRunner.query(`ALTER TABLE "gallery_like" DROP CONSTRAINT "FK_8fd5215095473061855ceb948cf"`);
+        await queryRunner.query(`ALTER TABLE "gallery_post" DROP CONSTRAINT "FK_985b836dddd8615e432d7043ddb"`);
+        await queryRunner.query(`DROP INDEX "IDX_df1b5f4099e99fb0bc5eae53b6"`);
+        await queryRunner.query(`DROP INDEX "IDX_8fd5215095473061855ceb948c"`);
+        await queryRunner.query(`DROP TABLE "gallery_like"`);
+        await queryRunner.query(`DROP INDEX "IDX_05cca34b985d1b8edc1d1e28df"`);
+        await queryRunner.query(`DROP INDEX "IDX_1a165c68a49d08f11caffbd206"`);
+        await queryRunner.query(`DROP INDEX "IDX_f2d744d9a14d0dfb8b96cb7fc5"`);
+        await queryRunner.query(`DROP INDEX "IDX_3ca50563facd913c425e7a89ee"`);
+        await queryRunner.query(`DROP INDEX "IDX_985b836dddd8615e432d7043dd"`);
+        await queryRunner.query(`DROP INDEX "IDX_f631d37835adb04792e361807c"`);
+        await queryRunner.query(`DROP INDEX "IDX_8f1a239bd077c8864a20c62c2c"`);
+        await queryRunner.query(`DROP TABLE "gallery_post"`);
+    }
+
+}
diff --git a/src/client/components/gallery-post-preview.vue b/src/client/components/gallery-post-preview.vue
new file mode 100644
index 000000000..5c3bdb134
--- /dev/null
+++ b/src/client/components/gallery-post-preview.vue
@@ -0,0 +1,126 @@
+<template>
+<MkA :to="`/gallery/${post.id}`" class="ttasepnz _panel" tabindex="-1">
+	<div class="thumbnail">
+		<ImgWithBlurhash class="img" :src="post.files[0].thumbnailUrl" :hash="post.files[0].blurhash"/>
+	</div>
+	<article>
+		<header>
+			<MkAvatar :user="post.user" class="avatar"/>
+		</header>
+		<footer>
+			<span class="title">{{ post.title }}</span>
+		</footer>
+	</article>
+</MkA>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { userName } from '@client/filters/user';
+import ImgWithBlurhash from '@client/components/img-with-blurhash.vue';
+import * as os from '@client/os';
+
+export default defineComponent({
+	components: {
+		ImgWithBlurhash
+	},
+	props: {
+		post: {
+			type: Object,
+			required: true
+		},
+	},
+	methods: {
+		userName
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.ttasepnz {
+	display: block;
+	position: relative;
+	height: 200px;
+
+	&:hover {
+		text-decoration: none;
+		color: var(--accent);
+
+		> .thumbnail {
+			transform: scale(1.1);
+		}
+
+		> article {
+			> footer {
+				&:before {
+					opacity: 1;
+				}
+			}
+		}
+	}
+
+	> .thumbnail {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		transition: all 0.5s ease;
+
+		> .img {
+			width: 100%;
+			height: 100%;
+			object-fit: cover;
+		}
+	}
+
+	> article {
+		position: absolute;
+		z-index: 1;
+		width: 100%;
+		height: 100%;
+
+		> header {
+			position: absolute;
+			top: 0;
+			width: 100%;
+			padding: 12px;
+			box-sizing: border-box;
+			display: flex;
+
+			> .avatar {
+				margin-left: auto;
+				width: 32px;
+				height: 32px;
+			}
+		}
+
+		> footer {
+			position: absolute;
+			bottom: 0;
+			width: 100%;
+			padding: 16px;
+			box-sizing: border-box;
+			color: #fff;
+			text-shadow: 0 0 8px #000;
+			background: linear-gradient(transparent, rgba(0, 0, 0, 0.7));
+
+			&:before {
+				content: "";
+				display: block;
+				position: absolute;
+				z-index: -1;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				background: linear-gradient(rgba(0, 0, 0, 0.4), transparent);
+				opacity: 0;
+				transition: opacity 0.5s ease;
+			}
+
+			> .title {
+				font-weight: bold;
+			}
+		}
+	}
+}
+</style>
diff --git a/src/client/components/ui/button.vue b/src/client/components/ui/button.vue
index 3901e8ae4..c92f30db9 100644
--- a/src/client/components/ui/button.vue
+++ b/src/client/components/ui/button.vue
@@ -139,7 +139,8 @@ export default defineComponent({
 	}
 
 	&.primary {
-		color: #fff;
+		font-weight: bold;
+		color: #fff !important;
 		background: var(--accent);
 
 		&:not(:disabled):hover {
@@ -200,10 +201,6 @@ export default defineComponent({
 		min-width: 100px;
 	}
 
-	&.primary {
-		font-weight: bold;
-	}
-
 	> .ripples {
 		position: absolute;
 		z-index: 0;
diff --git a/src/client/components/ui/container.vue b/src/client/components/ui/container.vue
index cfd928518..2e8eea713 100644
--- a/src/client/components/ui/container.vue
+++ b/src/client/components/ui/container.vue
@@ -199,6 +199,7 @@ export default defineComponent({
 			> .fade {
 				display: block;
 				position: absolute;
+				z-index: 10;
 				bottom: 0;
 				left: 0;
 				width: 100%;
diff --git a/src/client/components/ui/pagination.vue b/src/client/components/ui/pagination.vue
index ac8ed01e1..1bd77447b 100644
--- a/src/client/components/ui/pagination.vue
+++ b/src/client/components/ui/pagination.vue
@@ -10,8 +10,8 @@
 
 	<div v-else class="cxiknjgy">
 		<slot :items="items"></slot>
-		<div class="more" v-show="more" key="_more_">
-			<MkButton class="button" v-appear="$store.state.enableInfiniteScroll ? fetchMore : null" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary>
+		<div class="more _gap" v-show="more" key="_more_">
+			<MkButton class="button" v-appear="($store.state.enableInfiniteScroll && !disableAutoLoad) ? fetchMore : null" @click="fetchMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary>
 				<template v-if="!moreFetching">{{ $ts.loadMore }}</template>
 				<template v-if="moreFetching"><MkLoading inline/></template>
 			</MkButton>
@@ -38,6 +38,12 @@ export default defineComponent({
 		pagination: {
 			required: true
 		},
+
+		disableAutoLoad: {
+			type: Boolean,
+			required: false,
+			default: false,
+		}
 	},
 });
 </script>
diff --git a/src/client/pages/gallery/index.vue b/src/client/pages/gallery/index.vue
new file mode 100644
index 000000000..9e726e70f
--- /dev/null
+++ b/src/client/pages/gallery/index.vue
@@ -0,0 +1,152 @@
+<template>
+<div class="xprsixdl _root">
+	<MkTab v-model:value="tab" v-if="$i">
+		<option value="explore"><i class="fas fa-icons"></i> {{ $ts.gallery }}</option>
+		<option value="liked"><i class="fas fa-heart"></i> {{ $ts._gallery.liked }}</option>
+		<option value="my"><i class="fas fa-edit"></i> {{ $ts._gallery.my }}</option>
+	</MkTab>
+
+	<div v-if="tab === 'explore'">
+		<MkFolder class="_gap">
+			<template #header><i class="fas fa-clock"></i>{{ $ts.recentPosts }}</template>
+			<MkPagination :pagination="recentPostsPagination" #default="{items}" :disable-auto-load="true">
+				<div class="vfpdbgtk">
+					<MkGalleryPostPreview v-for="post in items" :post="post" :key="post.id" class="post"/>
+				</div>
+			</MkPagination>
+		</MkFolder>
+		<MkFolder class="_gap">
+			<template #header><i class="fas fa-fire-alt"></i>{{ $ts.popularPosts }}</template>
+			<MkPagination :pagination="popularPostsPagination" #default="{items}" :disable-auto-load="true">
+				<div class="vfpdbgtk">
+					<MkGalleryPostPreview v-for="post in items" :post="post" :key="post.id" class="post"/>
+				</div>
+			</MkPagination>
+		</MkFolder>
+	</div>
+	<div v-else-if="tab === 'liked'">
+		<MkPagination :pagination="likedPostsPagination" #default="{items}">
+			<div class="vfpdbgtk">
+				<MkGalleryPostPreview v-for="like in items" :post="like.post" :key="like.id" class="post"/>
+			</div>
+		</MkPagination>
+	</div>
+	<div v-else-if="tab === 'my'">
+		<MkA to="/gallery/new" class="_link" style="margin: 16px;"><i class="fas fa-plus"></i> {{ $ts.postToGallery }}</MkA>
+		<MkPagination :pagination="myPostsPagination" #default="{items}">
+			<div class="vfpdbgtk">
+				<MkGalleryPostPreview v-for="post in items" :post="post" :key="post.id" class="post"/>
+			</div>
+		</MkPagination>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+import XUserList from '@client/components/user-list.vue';
+import MkFolder from '@client/components/ui/folder.vue';
+import MkInput from '@client/components/ui/input.vue';
+import MkButton from '@client/components/ui/button.vue';
+import MkTab from '@client/components/tab.vue';
+import MkPagination from '@client/components/ui/pagination.vue';
+import MkGalleryPostPreview from '@client/components/gallery-post-preview.vue';
+import number from '@client/filters/number';
+import * as os from '@client/os';
+import * as symbols from '@client/symbols';
+
+export default defineComponent({
+	components: {
+		XUserList,
+		MkFolder,
+		MkInput,
+		MkButton,
+		MkTab,
+		MkPagination,
+		MkGalleryPostPreview,
+	},
+
+	props: {
+		tag: {
+			type: String,
+			required: false
+		}
+	},
+
+	data() {
+		return {
+			[symbols.PAGE_INFO]: {
+				title: this.$ts.gallery,
+				icon: 'fas fa-icons'
+			},
+			tab: 'explore',
+			recentPostsPagination: {
+				endpoint: 'gallery/posts',
+				limit: 6,
+			},
+			popularPostsPagination: {
+				endpoint: 'gallery/featured',
+				limit: 5,
+			},
+			myPostsPagination: {
+				endpoint: 'i/gallery/posts',
+				limit: 5,
+			},
+			likedPostsPagination: {
+				endpoint: 'i/gallery/likes',
+				limit: 5,
+			},
+			tags: [],
+		};
+	},
+
+	computed: {
+		meta() {
+			return this.$instance;
+		},
+		tagUsers(): any {
+			return {
+				endpoint: 'hashtags/users',
+				limit: 30,
+				params: {
+					tag: this.tag,
+					origin: 'combined',
+					sort: '+follower',
+				}
+			};
+		},
+	},
+
+	watch: {
+		tag() {
+			if (this.$refs.tags) this.$refs.tags.toggleContent(this.tag == null);
+		},
+	},
+
+	created() {
+
+	},
+
+	methods: {
+
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.xprsixdl {
+	max-width: 1400px;
+	margin: 0 auto;
+}
+
+.vfpdbgtk {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
+	grid-gap: 12px;
+	margin: 0 var(--margin);
+
+	> .post {
+
+	}
+}
+</style>
diff --git a/src/client/pages/gallery/new.vue b/src/client/pages/gallery/new.vue
new file mode 100644
index 000000000..3f9756df8
--- /dev/null
+++ b/src/client/pages/gallery/new.vue
@@ -0,0 +1,110 @@
+<template>
+<FormBase>
+	<FormInput v-model:value="title">
+		<span>{{ $ts.title }}</span>
+	</FormInput>
+
+	<FormTextarea v-model:value="description" :max="500">
+		<span>{{ $ts.description }}</span>
+	</FormTextarea>
+
+	<FormGroup>
+		<div v-for="file in files" :key="file.id" class="_formItem _formPanel wqugxsfx" :style="{ backgroundImage: file ? `url(${ file.thumbnailUrl })` : null }">
+			<div class="name">{{ file.name }}</div>
+			<button class="remove _button" @click="remove(file)" v-tooltip="$ts.remove"><i class="fas fa-times"></i></button>
+		</div>
+		<FormButton @click="selectFile" primary><i class="fas fa-plus"></i> {{ $ts.attachFile }}</FormButton>
+	</FormGroup>
+
+	<FormSwitch v-model:value="isSensitive">{{ $ts.markAsSensitive }}</FormSwitch>
+
+	<FormButton @click="publish" primary><i class="fas fa-save"></i> {{ $ts.publish }}</FormButton>
+</FormBase>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import FormButton from '@client/components/form/button.vue';
+import FormInput from '@client/components/form/input.vue';
+import FormTextarea from '@client/components/form/textarea.vue';
+import FormSwitch from '@client/components/form/switch.vue';
+import FormTuple from '@client/components/form/tuple.vue';
+import FormBase from '@client/components/form/base.vue';
+import FormGroup from '@client/components/form/group.vue';
+import { selectFile } from '@client/scripts/select-file';
+import * as os from '@client/os';
+import * as symbols from '@client/symbols';
+
+export default defineComponent({
+	components: {
+		FormButton,
+		FormInput,
+		FormTextarea,
+		FormSwitch,
+		FormBase,
+		FormGroup,
+	},
+	
+	data() {
+		return {
+			[symbols.PAGE_INFO]: {
+				title: this.$ts.postToGallery,
+				icon: 'fas fa-pencil-alt'
+			},
+			files: [],
+			description: null,
+			title: null,
+			isSensitive: false,
+		}
+	},
+
+	methods: {
+		selectFile(e) {
+			selectFile(e.currentTarget || e.target, null, true).then(files => {
+				this.files = this.files.concat(files);
+			});
+		},
+
+		remove(file) {
+			this.files = this.files.filter(f => f.id !== file.id);
+		},
+
+		async publish() {
+			const post = await os.apiWithDialog('gallery/posts/create', {
+				title: this.title,
+				description: this.description,
+				fileIds: this.files.map(file => file.id),
+				isSensitive: this.isSensitive,
+			});
+
+			this.$router.push(`/gallery/${post.id}`);
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.wqugxsfx {
+	height: 200px;
+	background-size: contain;
+	background-position: center;
+	background-repeat: no-repeat;
+	position: relative;
+
+	> .name {
+		position: absolute;
+		top: 8px;
+		left: 9px;
+		padding: 8px;
+		background: var(--panel);
+	}
+
+	> .remove {
+		position: absolute;
+		top: 8px;
+		right: 9px;
+		padding: 8px;
+		background: var(--panel);
+	}
+}
+</style>
diff --git a/src/client/pages/gallery/post.vue b/src/client/pages/gallery/post.vue
new file mode 100644
index 000000000..86fae9988
--- /dev/null
+++ b/src/client/pages/gallery/post.vue
@@ -0,0 +1,271 @@
+<template>
+<div class="_root">
+	<transition name="fade" mode="out-in">
+		<div v-if="post" class="rkxwuolj">
+			<div class="files">
+				<div class="file" v-for="file in post.files" :key="file.id">
+					<img :src="file.url"/>
+				</div>
+			</div>
+			<div class="body _block">
+				<div class="title">{{ post.title }}</div>
+				<div class="description"><Mfm :text="post.description"/></div>
+				<div class="info">
+					<i class="fas fa-clock"></i> <MkTime :time="post.createdAt" mode="detail"/>
+				</div>
+				<div class="actions">
+					<div class="like">
+						<MkButton class="button" @click="unlike()" v-if="post.isLiked" v-tooltip="$ts._gallery.unlike" primary><i class="fas fa-heart"></i><span class="count" v-if="post.likedCount > 0">{{ post.likedCount }}</span></MkButton>
+						<MkButton class="button" @click="like()" v-else v-tooltip="$ts._gallery.like"><i class="far fa-heart"></i><span class="count" v-if="post.likedCount > 0">{{ post.likedCount }}</span></MkButton>
+					</div>
+					<div class="other">
+						<button class="_button" @click="createNote" v-tooltip="$ts.shareWithNote" v-click-anime><i class="fas fa-retweet fa-fw"></i></button>
+						<button class="_button" @click="share" v-tooltip="$ts.share" v-click-anime><i class="fas fa-share-alt fa-fw"></i></button>
+					</div>
+				</div>
+				<div class="user">
+					<MkAvatar :user="post.user" class="avatar"/>
+					<div class="name">
+						<MkUserName :user="post.user" style="display: block;"/>
+						<MkAcct :user="post.user"/>
+					</div>
+					<MkFollowButton v-if="!$i || $i.id != post.user.id" :user="post.user" :inline="true" :transparent="false" :full="true" large class="koudoku"/>
+				</div>
+			</div>
+			<MkContainer :max-height="300" :foldable="true" class="other">
+				<template #header><i class="fas fa-clock"></i> {{ $ts.recentPosts }}</template>
+				<MkPagination :pagination="otherPostsPagination" #default="{items}">
+					<div class="sdrarzaf">
+						<MkGalleryPostPreview v-for="post in items" :post="post" :key="post.id" class="post"/>
+					</div>
+				</MkPagination>
+			</MkContainer>
+		</div>
+		<MkError v-else-if="error" @retry="fetch()"/>
+		<MkLoading v-else/>
+	</transition>
+</div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+import MkButton from '@client/components/ui/button.vue';
+import * as os from '@client/os';
+import * as symbols from '@client/symbols';
+import MkContainer from '@client/components/ui/container.vue';
+import ImgWithBlurhash from '@client/components/img-with-blurhash.vue';
+import MkPagination from '@client/components/ui/pagination.vue';
+import MkGalleryPostPreview from '@client/components/gallery-post-preview.vue';
+import MkFollowButton from '@client/components/follow-button.vue';
+import { url } from '@client/config';
+
+export default defineComponent({
+	components: {
+		MkContainer,
+		ImgWithBlurhash,
+		MkPagination,
+		MkGalleryPostPreview,
+		MkButton,
+		MkFollowButton,
+	},
+	props: {
+		postId: {
+			type: String,
+			required: true
+		}
+	},
+	data() {
+		return {
+			[symbols.PAGE_INFO]: computed(() => this.post ? {
+				title: this.post.title,
+				avatar: this.post.user,
+				path: `/gallery/${this.post.id}`,
+				share: {
+					title: this.post.title,
+					text: this.post.description,
+				},
+			} : null),
+			otherPostsPagination: {
+				endpoint: 'users/gallery/posts',
+				limit: 6,
+				params: () => ({
+					userId: this.post.user.id
+				})
+			},
+			post: null,
+			error: null,
+		};
+	},
+
+	watch: {
+		postId: 'fetch'
+	},
+
+	created() {
+		this.fetch();
+	},
+
+	methods: {
+		fetch() {
+			this.post = null;
+			os.api('gallery/posts/show', {
+				postId: this.postId
+			}).then(post => {
+				this.post = post;
+			}).catch(e => {
+				this.error = e;
+			});
+		},
+
+		share() {
+			navigator.share({
+				title: this.post.title,
+				text: this.post.description,
+				url: `${url}/gallery/${this.post.id}`
+			});
+		},
+
+		like() {
+			os.apiWithDialog('gallery/posts/like', {
+				postId: this.postId,
+			}).then(() => {
+				this.post.isLiked = true;
+				this.post.likedCount++;
+			});
+		},
+
+		async unlike() {
+			const confirm = await os.dialog({
+				type: 'warning',
+				showCancelButton: true,
+				text: this.$ts.unlikeConfirm,
+			});
+			if (confirm.canceled) return;
+			os.apiWithDialog('gallery/posts/unlike', {
+				postId: this.postId,
+			}).then(() => {
+				this.post.isLiked = false;
+				this.post.likedCount--;
+			});
+		},
+
+		createNote() {
+			os.post({
+				initialText: `${this.post.title} ${url}/gallery/${this.post.id}`
+			});
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.fade-enter-active,
+.fade-leave-active {
+	transition: opacity 0.125s ease;
+}
+.fade-enter-from,
+.fade-leave-to {
+	opacity: 0;
+}
+
+.rkxwuolj {
+	> .files {
+		> .file {
+			> img {
+				display: block;
+				max-width: 100%;
+				max-height: 500px;
+				margin: 0 auto;
+			}
+
+			& + .file {
+				margin-top: 16px;
+			}
+		}
+	}
+
+	> .body {
+		padding: 32px;
+
+		> .title {
+			font-weight: bold;
+			font-size: 1.2em;
+			margin-bottom: 16px;
+		}
+
+		> .info {
+			margin-top: 16px;
+			font-size: 90%;
+			opacity: 0.7;
+		}
+
+		> .actions {
+			display: flex;
+			align-items: center;
+			margin-top: 16px;
+			padding: 16px 0 0 0;
+			border-top: solid 0.5px var(--divider);
+
+			> .like {
+				> .button {
+					--accent: rgb(241 97 132);
+					--X8: rgb(241 92 128);
+					--buttonBg: rgb(216 71 106 / 5%);
+					--buttonHoverBg: rgb(216 71 106 / 10%);
+					color: #ff002f;
+
+					::v-deep(.count) {
+						margin-left: 0.5em;
+					}
+				}
+			}
+
+			> .other {
+				margin-left: auto;
+
+				> button {
+					padding: 8px;
+					margin: 0 8px;
+
+					&:hover {
+						color: var(--fgHighlighted);
+					}
+				}
+			}
+		}
+
+		> .user {
+			margin-top: 16px;
+			padding: 16px 0 0 0;
+			border-top: solid 0.5px var(--divider);
+			display: flex;
+			align-items: center;
+
+			> .avatar {
+				width: 52px;
+				height: 52px;
+			}
+
+			> .name {
+				margin: 0 0 0 12px;
+				font-size: 90%;
+			}
+
+			> .koudoku {
+				margin-left: auto;
+			}
+		}
+	}
+}
+
+.sdrarzaf {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
+	grid-gap: 12px;
+	margin: var(--margin);
+
+	> .post {
+
+	}
+}
+</style>
diff --git a/src/client/pages/page.vue b/src/client/pages/page.vue
index f25ed5118..e43add7b0 100644
--- a/src/client/pages/page.vue
+++ b/src/client/pages/page.vue
@@ -166,10 +166,11 @@ export default defineComponent({
 			border-top: solid 0.5px var(--divider);
 
 			> .button {
-				--accent: rgb(216 71 106);
+				--accent: rgb(241 97 132);
 				--X8: rgb(241 92 128);
 				--buttonBg: rgb(216 71 106 / 5%);
 				--buttonHoverBg: rgb(216 71 106 / 10%);
+				color: #ff002f;
 
 				::v-deep(.count) {
 					margin-left: 0.5em;
diff --git a/src/client/pages/user/gallery.vue b/src/client/pages/user/gallery.vue
new file mode 100644
index 000000000..2a4c4e03f
--- /dev/null
+++ b/src/client/pages/user/gallery.vue
@@ -0,0 +1,63 @@
+<template>
+<div>
+	<MkPagination :pagination="pagination" #default="{items}">
+		<div class="jrnovfpt">
+			<MkGalleryPostPreview v-for="post in items" :post="post" :key="post.id" class="post"/>
+		</div>
+	</MkPagination>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import MkGalleryPostPreview from '@client/components/gallery-post-preview.vue';
+import MkPagination from '@client/components/ui/pagination.vue';
+import { userPage, acct } from '../../filters/user';
+
+export default defineComponent({
+	components: {
+		MkPagination,
+		MkGalleryPostPreview,
+	},
+
+	props: {
+		user: {
+			type: Object,
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			pagination: {
+				endpoint: 'users/gallery/posts',
+				limit: 6,
+				params: () => ({
+					userId: this.user.id
+				})
+			},
+		};
+	},
+
+	watch: {
+		user() {
+			this.$refs.list.reload();
+		}
+	},
+
+	methods: {
+		userPage,
+		
+		acct
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.jrnovfpt {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
+	grid-gap: 12px;
+	margin: var(--margin);
+}
+</style>
diff --git a/src/client/pages/user/index.vue b/src/client/pages/user/index.vue
index 207b44f63..474860e6d 100644
--- a/src/client/pages/user/index.vue
+++ b/src/client/pages/user/index.vue
@@ -191,6 +191,10 @@
 					<i class="fas fa-file-alt icon"></i>
 					<span>{{ $ts.pages }}</span>
 				</MkA>
+				<MkA :to="userPage(user, 'gallery')" :class="{ active: page === 'gallery' }" class="link">
+					<i class="fas fa-icons icon"></i>
+					<span>{{ $ts.gallery }}</span>
+				</MkA>
 			</div>
 
 			<template v-if="page === 'index'">
@@ -210,6 +214,7 @@
 			<XFollowList v-else-if="page === 'followers'" type="followers" :user="user" class="_content _gap"/>
 			<XClips v-else-if="page === 'clips'" :user="user" class="_gap"/>
 			<XPages v-else-if="page === 'pages'" :user="user" class="_gap"/>
+			<XGallery v-else-if="page === 'gallery'" :user="user" class="_gap"/>
 		</div>
 	</div>
 	<MkError v-else-if="error" @retry="fetch()"/>
@@ -250,6 +255,7 @@ export default defineComponent({
 		XFollowList: defineAsyncComponent(() => import('./follow-list.vue')),
 		XClips: defineAsyncComponent(() => import('./clips.vue')),
 		XPages: defineAsyncComponent(() => import('./pages.vue')),
+		XGallery: defineAsyncComponent(() => import('./gallery.vue')),
 		XPhotos: defineAsyncComponent(() => import('./index.photos.vue')),
 		XActivity: defineAsyncComponent(() => import('./index.activity.vue')),
 	},
diff --git a/src/client/router.ts b/src/client/router.ts
index 26a4dac49..5371bf17d 100644
--- a/src/client/router.ts
+++ b/src/client/router.ts
@@ -37,6 +37,9 @@ export const router = createRouter({
 		{ path: '/pages', name: 'pages', component: page('pages') },
 		{ path: '/pages/new', component: page('page-editor/page-editor') },
 		{ path: '/pages/edit/:pageId', component: page('page-editor/page-editor'), props: route => ({ initPageId: route.params.pageId }) },
+		{ path: '/gallery', component: page('gallery/index') },
+		{ path: '/gallery/new', component: page('gallery/new') },
+		{ path: '/gallery/:postId', component: page('gallery/post'), props: route => ({ postId: route.params.postId }) },
 		{ path: '/channels', component: page('channels') },
 		{ path: '/channels/new', component: page('channel-editor') },
 		{ path: '/channels/:channelId/edit', component: page('channel-editor'), props: true },
diff --git a/src/client/sidebar.ts b/src/client/sidebar.ts
index e5105f13b..7686da10b 100644
--- a/src/client/sidebar.ts
+++ b/src/client/sidebar.ts
@@ -97,6 +97,11 @@ export const sidebarDef = {
 		icon: 'fas fa-file-alt',
 		to: '/pages',
 	},
+	gallery: {
+		title: 'gallery',
+		icon: 'fas fa-icons',
+		to: '/gallery',
+	},
 	clips: {
 		title: 'clip',
 		icon: 'fas fa-paperclip',
diff --git a/src/db/postgre.ts b/src/db/postgre.ts
index d53d315f7..c8b012171 100644
--- a/src/db/postgre.ts
+++ b/src/db/postgre.ts
@@ -51,6 +51,8 @@ import { UserSecurityKey } from '../models/entities/user-security-key';
 import { AttestationChallenge } from '../models/entities/attestation-challenge';
 import { Page } from '../models/entities/page';
 import { PageLike } from '../models/entities/page-like';
+import { GalleryPost } from '../models/entities/gallery-post';
+import { GalleryLike } from '../models/entities/gallery-like';
 import { ModerationLog } from '../models/entities/moderation-log';
 import { UsedUsername } from '../models/entities/used-username';
 import { Announcement } from '../models/entities/announcement';
@@ -137,6 +139,8 @@ export const entities = [
 	NoteUnread,
 	Page,
 	PageLike,
+	GalleryPost,
+	GalleryLike,
 	Log,
 	DriveFile,
 	DriveFolder,
diff --git a/src/models/entities/gallery-like.ts b/src/models/entities/gallery-like.ts
new file mode 100644
index 000000000..7d084a227
--- /dev/null
+++ b/src/models/entities/gallery-like.ts
@@ -0,0 +1,33 @@
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { User } from './user';
+import { id } from '../id';
+import { GalleryPost } from './gallery-post';
+
+@Entity()
+@Index(['userId', 'postId'], { unique: true })
+export class GalleryLike {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Column('timestamp with time zone')
+	public createdAt: Date;
+
+	@Index()
+	@Column(id())
+	public userId: User['id'];
+
+	@ManyToOne(type => User, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public user: User | null;
+
+	@Column(id())
+	public postId: GalleryPost['id'];
+
+	@ManyToOne(type => GalleryPost, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public post: GalleryPost | null;
+}
diff --git a/src/models/entities/gallery-post.ts b/src/models/entities/gallery-post.ts
new file mode 100644
index 000000000..f59cd671f
--- /dev/null
+++ b/src/models/entities/gallery-post.ts
@@ -0,0 +1,79 @@
+import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
+import { User } from './user';
+import { id } from '../id';
+import { DriveFile } from './drive-file';
+
+@Entity()
+export class GalleryPost {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The created date of the GalleryPost.'
+	})
+	public createdAt: Date;
+
+	@Index()
+	@Column('timestamp with time zone', {
+		comment: 'The updated date of the GalleryPost.'
+	})
+	public updatedAt: Date;
+
+	@Column('varchar', {
+		length: 256,
+	})
+	public title: string;
+
+	@Column('varchar', {
+		length: 2048, nullable: true
+	})
+	public description: string | null;
+
+	@Index()
+	@Column({
+		...id(),
+		comment: 'The ID of author.'
+	})
+	public userId: User['id'];
+
+	@ManyToOne(type => User, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public user: User | null;
+
+	@Index()
+	@Column({
+		...id(),
+		array: true, default: '{}'
+	})
+	public fileIds: DriveFile['id'][];
+
+	@Index()
+	@Column('boolean', {
+		default: false,
+		comment: 'Whether the post is sensitive.'
+	})
+	public isSensitive: boolean;
+
+	@Index()
+	@Column('integer', {
+		default: 0
+	})
+	public likedCount: number;
+
+	@Index()
+	@Column('varchar', {
+		length: 128, array: true, default: '{}'
+	})
+	public tags: string[];
+
+	constructor(data: Partial<GalleryPost>) {
+		if (data == null) return;
+
+		for (const [k, v] of Object.entries(data)) {
+			(this as any)[k] = v;
+		}
+	}
+}
diff --git a/src/models/index.ts b/src/models/index.ts
index 213570a9c..9d08e4985 100644
--- a/src/models/index.ts
+++ b/src/models/index.ts
@@ -43,6 +43,8 @@ import { UserSecurityKey } from './entities/user-security-key';
 import { HashtagRepository } from './repositories/hashtag';
 import { PageRepository } from './repositories/page';
 import { PageLikeRepository } from './repositories/page-like';
+import { GalleryPostRepository } from './repositories/gallery-post';
+import { GalleryLikeRepository } from './repositories/gallery-like';
 import { ModerationLogRepository } from './repositories/moderation-logs';
 import { UsedUsername } from './entities/used-username';
 import { ClipRepository } from './repositories/clip';
@@ -105,6 +107,8 @@ export const ReversiMatchings = getCustomRepository(ReversiMatchingRepository);
 export const Logs = getRepository(Log);
 export const Pages = getCustomRepository(PageRepository);
 export const PageLikes = getCustomRepository(PageLikeRepository);
+export const GalleryPosts = getCustomRepository(GalleryPostRepository);
+export const GalleryLikes = getCustomRepository(GalleryLikeRepository);
 export const ModerationLogs = getCustomRepository(ModerationLogRepository);
 export const Clips = getCustomRepository(ClipRepository);
 export const ClipNotes = getRepository(ClipNote);
diff --git a/src/models/repositories/gallery-like.ts b/src/models/repositories/gallery-like.ts
new file mode 100644
index 000000000..e01c17cff
--- /dev/null
+++ b/src/models/repositories/gallery-like.ts
@@ -0,0 +1,25 @@
+import { EntityRepository, Repository } from 'typeorm';
+import { GalleryLike } from '../entities/gallery-like';
+import { GalleryPosts } from '..';
+
+@EntityRepository(GalleryLike)
+export class GalleryLikeRepository extends Repository<GalleryLike> {
+	public async pack(
+		src: GalleryLike['id'] | GalleryLike,
+		me?: any
+	) {
+		const like = typeof src === 'object' ? src : await this.findOneOrFail(src);
+
+		return {
+			id: like.id,
+			post: await GalleryPosts.pack(like.post || like.postId, me),
+		};
+	}
+
+	public packMany(
+		likes: any[],
+		me: any
+	) {
+		return Promise.all(likes.map(x => this.pack(x, me)));
+	}
+}
diff --git a/src/models/repositories/gallery-post.ts b/src/models/repositories/gallery-post.ts
new file mode 100644
index 000000000..f1d6fe632
--- /dev/null
+++ b/src/models/repositories/gallery-post.ts
@@ -0,0 +1,113 @@
+import { EntityRepository, Repository } from 'typeorm';
+import { GalleryPost } from '../entities/gallery-post';
+import { SchemaType } from '../../misc/schema';
+import { Users, DriveFiles, GalleryLikes } from '..';
+import { awaitAll } from '../../prelude/await-all';
+import { User } from '../entities/user';
+
+export type PackedGalleryPost = SchemaType<typeof packedGalleryPostSchema>;
+
+@EntityRepository(GalleryPost)
+export class GalleryPostRepository extends Repository<GalleryPost> {
+	public async pack(
+		src: GalleryPost['id'] | GalleryPost,
+		me?: { id: User['id'] } | null | undefined,
+	): Promise<PackedGalleryPost> {
+		const meId = me ? me.id : null;
+		const post = typeof src === 'object' ? src : await this.findOneOrFail(src);
+
+		return await awaitAll({
+			id: post.id,
+			createdAt: post.createdAt.toISOString(),
+			updatedAt: post.updatedAt.toISOString(),
+			userId: post.userId,
+			user: Users.pack(post.user || post.userId, me),
+			title: post.title,
+			description: post.description,
+			fileIds: post.fileIds,
+			files: DriveFiles.packMany(post.fileIds),
+			tags: post.tags.length > 0 ? post.tags : undefined,
+			isSensitive: post.isSensitive,
+			likedCount: post.likedCount,
+			isLiked: meId ? await GalleryLikes.findOne({ postId: post.id, userId: meId }).then(x => x != null) : undefined,
+		});
+	}
+
+	public packMany(
+		posts: GalleryPost[],
+		me?: { id: User['id'] } | null | undefined,
+	) {
+		return Promise.all(posts.map(x => this.pack(x, me)));
+	}
+}
+
+export const packedGalleryPostSchema = {
+	type: 'object' as const,
+	optional: false as const, nullable: false as const,
+	properties: {
+		id: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+			example: 'xxxxxxxxxx',
+		},
+		createdAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		updatedAt: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'date-time',
+		},
+		title: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+		},
+		description: {
+			type: 'string' as const,
+			optional: false as const, nullable: true as const,
+		},
+		userId: {
+			type: 'string' as const,
+			optional: false as const, nullable: false as const,
+			format: 'id',
+		},
+		user: {
+			type: 'object' as const,
+			ref: 'User',
+			optional: false as const, nullable: false as const,
+		},
+		fileIds: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+				format: 'id'
+			}
+		},
+		files: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'object' as const,
+				optional: false as const, nullable: false as const,
+				ref: 'DriveFile'
+			}
+		},
+		tags: {
+			type: 'array' as const,
+			optional: true as const, nullable: false as const,
+			items: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+			}
+		},
+		isSensitive: {
+			type: 'boolean' as const,
+			optional: false as const, nullable: false as const,
+		},
+	}
+};
diff --git a/src/server/api/endpoints/gallery/featured.ts b/src/server/api/endpoints/gallery/featured.ts
new file mode 100644
index 000000000..d09000cc7
--- /dev/null
+++ b/src/server/api/endpoints/gallery/featured.ts
@@ -0,0 +1,29 @@
+import define from '../../define';
+import { GalleryPosts } from '../../../../models';
+
+export const meta = {
+	tags: ['gallery'],
+
+	requireCredential: false as const,
+
+	res: {
+		type: 'array' as const,
+		optional: false as const, nullable: false as const,
+		items: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'GalleryPost',
+		}
+	},
+};
+
+export default define(meta, async (ps, me) => {
+	const query = GalleryPosts.createQueryBuilder('post')
+		.andWhere('post.createdAt > :date', { date: new Date(Date.now() - (1000 * 60 * 60 * 24 * 3)) })
+		.andWhere('post.likedCount > 0')
+		.orderBy('post.likedCount', 'DESC');
+
+	const posts = await query.take(10).getMany();
+
+	return await GalleryPosts.packMany(posts, me);
+});
diff --git a/src/server/api/endpoints/gallery/popular.ts b/src/server/api/endpoints/gallery/popular.ts
new file mode 100644
index 000000000..e240b14d2
--- /dev/null
+++ b/src/server/api/endpoints/gallery/popular.ts
@@ -0,0 +1,28 @@
+import define from '../../define';
+import { GalleryPosts } from '../../../../models';
+
+export const meta = {
+	tags: ['gallery'],
+
+	requireCredential: false as const,
+
+	res: {
+		type: 'array' as const,
+		optional: false as const, nullable: false as const,
+		items: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'GalleryPost',
+		}
+	},
+};
+
+export default define(meta, async (ps, me) => {
+	const query = GalleryPosts.createQueryBuilder('post')
+		.andWhere('post.likedCount > 0')
+		.orderBy('post.likedCount', 'DESC');
+
+	const posts = await query.take(10).getMany();
+
+	return await GalleryPosts.packMany(posts, me);
+});
diff --git a/src/server/api/endpoints/gallery/posts.ts b/src/server/api/endpoints/gallery/posts.ts
new file mode 100644
index 000000000..656765d80
--- /dev/null
+++ b/src/server/api/endpoints/gallery/posts.ts
@@ -0,0 +1,43 @@
+import $ from 'cafy';
+import { ID } from '@/misc/cafy-id';
+import define from '../../define';
+import { makePaginationQuery } from '../../common/make-pagination-query';
+import { GalleryPosts } from '../../../../models';
+
+export const meta = {
+	tags: ['gallery'],
+
+	params: {
+		limit: {
+			validator: $.optional.num.range(1, 100),
+			default: 10
+		},
+
+		sinceId: {
+			validator: $.optional.type(ID),
+		},
+
+		untilId: {
+			validator: $.optional.type(ID),
+		},
+	},
+
+	res: {
+		type: 'array' as const,
+		optional: false as const, nullable: false as const,
+		items: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'GalleryPost',
+		}
+	},
+};
+
+export default define(meta, async (ps, me) => {
+	const query = makePaginationQuery(GalleryPosts.createQueryBuilder('post'), ps.sinceId, ps.untilId)
+		.innerJoinAndSelect('post.user', 'user');
+
+	const posts = await query.take(ps.limit!).getMany();
+
+	return await GalleryPosts.packMany(posts, me);
+});
diff --git a/src/server/api/endpoints/gallery/posts/create.ts b/src/server/api/endpoints/gallery/posts/create.ts
new file mode 100644
index 000000000..d1ae68b12
--- /dev/null
+++ b/src/server/api/endpoints/gallery/posts/create.ts
@@ -0,0 +1,76 @@
+import $ from 'cafy';
+import * as ms from 'ms';
+import define from '../../../define';
+import { ID } from '../../../../../misc/cafy-id';
+import { DriveFiles, GalleryPosts } from '../../../../../models';
+import { genId } from '../../../../../misc/gen-id';
+import { GalleryPost } from '../../../../../models/entities/gallery-post';
+import { ApiError } from '../../../error';
+
+export const meta = {
+	tags: ['gallery'],
+
+	requireCredential: true as const,
+
+	kind: 'write:gallery',
+
+	limit: {
+		duration: ms('1hour'),
+		max: 300
+	},
+
+	params: {
+		title: {
+			validator: $.str.min(1),
+		},
+
+		description: {
+			validator: $.optional.nullable.str,
+		},
+
+		fileIds: {
+			validator: $.arr($.type(ID)).unique().range(1, 32),
+		},
+
+		isSensitive: {
+			validator: $.optional.bool,
+			default: false,
+		},
+	},
+
+	res: {
+		type: 'object' as const,
+		optional: false as const, nullable: false as const,
+		ref: 'GalleryPost',
+	},
+
+	errors: {
+
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const files = (await Promise.all(ps.fileIds.map(fileId =>
+		DriveFiles.findOne({
+			id: fileId,
+			userId: user.id
+		})
+	))).filter(file => file != null);
+
+	if (files.length === 0) {
+		throw new Error();
+	}
+
+	const post = await GalleryPosts.insert(new GalleryPost({
+		id: genId(),
+		createdAt: new Date(),
+		updatedAt: new Date(),
+		title: ps.title,
+		description: ps.description,
+		userId: user.id,
+		isSensitive: ps.isSensitive,
+		fileIds: files.map(file => file.id)
+	})).then(x => GalleryPosts.findOneOrFail(x.identifiers[0]));
+
+	return await GalleryPosts.pack(post, user);
+});
diff --git a/src/server/api/endpoints/gallery/posts/like.ts b/src/server/api/endpoints/gallery/posts/like.ts
new file mode 100644
index 000000000..3bf37c13e
--- /dev/null
+++ b/src/server/api/endpoints/gallery/posts/like.ts
@@ -0,0 +1,71 @@
+import $ from 'cafy';
+import { ID } from '@/misc/cafy-id';
+import define from '../../../define';
+import { ApiError } from '../../../error';
+import { GalleryPosts, GalleryLikes } from '../../../../../models';
+import { genId } from '@/misc/gen-id';
+
+export const meta = {
+	tags: ['gallery'],
+
+	requireCredential: true as const,
+
+	kind: 'write:gallery-likes',
+
+	params: {
+		postId: {
+			validator: $.type(ID),
+		}
+	},
+
+	errors: {
+		noSuchPost: {
+			message: 'No such post.',
+			code: 'NO_SUCH_POST',
+			id: '56c06af3-1287-442f-9701-c93f7c4a62ff'
+		},
+
+		yourPost: {
+			message: 'You cannot like your post.',
+			code: 'YOUR_POST',
+			id: 'f78f1511-5ebc-4478-a888-1198d752da68'
+		},
+
+		alreadyLiked: {
+			message: 'The post has already been liked.',
+			code: 'ALREADY_LIKED',
+			id: '40e9ed56-a59c-473a-bf3f-f289c54fb5a7'
+		},
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const post = await GalleryPosts.findOne(ps.postId);
+	if (post == null) {
+		throw new ApiError(meta.errors.noSuchPost);
+	}
+
+	if (post.userId === user.id) {
+		throw new ApiError(meta.errors.yourPost);
+	}
+
+	// if already liked
+	const exist = await GalleryLikes.findOne({
+		postId: post.id,
+		userId: user.id
+	});
+
+	if (exist != null) {
+		throw new ApiError(meta.errors.alreadyLiked);
+	}
+
+	// Create like
+	await GalleryLikes.insert({
+		id: genId(),
+		createdAt: new Date(),
+		postId: post.id,
+		userId: user.id
+	});
+
+	GalleryPosts.increment({ id: post.id }, 'likedCount', 1);
+});
diff --git a/src/server/api/endpoints/gallery/posts/show.ts b/src/server/api/endpoints/gallery/posts/show.ts
new file mode 100644
index 000000000..17628544b
--- /dev/null
+++ b/src/server/api/endpoints/gallery/posts/show.ts
@@ -0,0 +1,43 @@
+import $ from 'cafy';
+import { ID } from '@/misc/cafy-id';
+import define from '../../../define';
+import { ApiError } from '../../../error';
+import { GalleryPosts } from '@/models';
+
+export const meta = {
+	tags: ['gallery'],
+
+	requireCredential: false as const,
+
+	params: {
+		postId: {
+			validator: $.type(ID),
+		},
+	},
+
+	errors: {
+		noSuchPost: {
+			message: 'No such post.',
+			code: 'NO_SUCH_POST',
+			id: '1137bf14-c5b0-4604-85bb-5b5371b1cd45'
+		},
+	},
+
+	res: {
+		type: 'object' as const,
+		optional: false as const, nullable: false as const,
+		ref: 'GalleryPost'
+	}
+};
+
+export default define(meta, async (ps, me) => {
+	const post = await GalleryPosts.findOne({
+		id: ps.postId,
+	});
+
+	if (post == null) {
+		throw new ApiError(meta.errors.noSuchPost);
+	}
+
+	return await GalleryPosts.pack(post, me);
+});
diff --git a/src/server/api/endpoints/gallery/posts/unlike.ts b/src/server/api/endpoints/gallery/posts/unlike.ts
new file mode 100644
index 000000000..155949ae3
--- /dev/null
+++ b/src/server/api/endpoints/gallery/posts/unlike.ts
@@ -0,0 +1,54 @@
+import $ from 'cafy';
+import { ID } from '@/misc/cafy-id';
+import define from '../../../define';
+import { ApiError } from '../../../error';
+import { GalleryPosts, GalleryLikes } from '../../../../../models';
+
+export const meta = {
+	tags: ['gallery'],
+
+	requireCredential: true as const,
+
+	kind: 'write:gallery-likes',
+
+	params: {
+		postId: {
+			validator: $.type(ID),
+		}
+	},
+
+	errors: {
+		noSuchPost: {
+			message: 'No such post.',
+			code: 'NO_SUCH_POST',
+			id: 'c32e6dd0-b555-4413-925e-b3757d19ed84'
+		},
+
+		notLiked: {
+			message: 'You have not liked that post.',
+			code: 'NOT_LIKED',
+			id: 'e3e8e06e-be37-41f7-a5b4-87a8250288f0'
+		},
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const post = await GalleryPosts.findOne(ps.postId);
+	if (post == null) {
+		throw new ApiError(meta.errors.noSuchPost);
+	}
+
+	const exist = await GalleryLikes.findOne({
+		postId: post.id,
+		userId: user.id
+	});
+
+	if (exist == null) {
+		throw new ApiError(meta.errors.notLiked);
+	}
+
+	// Delete like
+	await GalleryLikes.delete(exist.id);
+
+	GalleryPosts.decrement({ id: post.id }, 'likedCount', 1);
+});
diff --git a/src/server/api/endpoints/i/gallery/likes.ts b/src/server/api/endpoints/i/gallery/likes.ts
new file mode 100644
index 000000000..e569261fa
--- /dev/null
+++ b/src/server/api/endpoints/i/gallery/likes.ts
@@ -0,0 +1,57 @@
+import $ from 'cafy';
+import { ID } from '@/misc/cafy-id';
+import define from '../../../define';
+import { GalleryLikes } from '../../../../../models';
+import { makePaginationQuery } from '../../../common/make-pagination-query';
+
+export const meta = {
+	tags: ['account', 'gallery'],
+
+	requireCredential: true as const,
+
+	kind: 'read:gallery-likes',
+
+	params: {
+		limit: {
+			validator: $.optional.num.range(1, 100),
+			default: 10
+		},
+
+		sinceId: {
+			validator: $.optional.type(ID),
+		},
+
+		untilId: {
+			validator: $.optional.type(ID),
+		},
+	},
+
+	res: {
+		type: 'object' as const,
+		optional: false as const, nullable: false as const,
+		properties: {
+			id: {
+				type: 'string' as const,
+				optional: false as const, nullable: false as const,
+				format: 'id'
+			},
+			page: {
+				type: 'object' as const,
+				optional: false as const, nullable: false as const,
+				ref: 'GalleryPost'
+			}
+		}
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const query = makePaginationQuery(GalleryLikes.createQueryBuilder('like'), ps.sinceId, ps.untilId)
+		.andWhere(`like.userId = :meId`, { meId: user.id })
+		.leftJoinAndSelect('like.post', 'post');
+
+	const likes = await query
+		.take(ps.limit!)
+		.getMany();
+
+	return await GalleryLikes.packMany(likes, user);
+});
diff --git a/src/server/api/endpoints/i/gallery/posts.ts b/src/server/api/endpoints/i/gallery/posts.ts
new file mode 100644
index 000000000..d7c2e96c1
--- /dev/null
+++ b/src/server/api/endpoints/i/gallery/posts.ts
@@ -0,0 +1,49 @@
+import $ from 'cafy';
+import { ID } from '@/misc/cafy-id';
+import define from '../../../define';
+import { GalleryPosts } from '../../../../../models';
+import { makePaginationQuery } from '../../../common/make-pagination-query';
+
+export const meta = {
+	tags: ['account', 'gallery'],
+
+	requireCredential: true as const,
+
+	kind: 'read:gallery',
+
+	params: {
+		limit: {
+			validator: $.optional.num.range(1, 100),
+			default: 10
+		},
+
+		sinceId: {
+			validator: $.optional.type(ID),
+		},
+
+		untilId: {
+			validator: $.optional.type(ID),
+		},
+	},
+
+	res: {
+		type: 'array' as const,
+		optional: false as const, nullable: false as const,
+		items: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'GalleryPost'
+		}
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const query = makePaginationQuery(GalleryPosts.createQueryBuilder('post'), ps.sinceId, ps.untilId)
+		.andWhere(`post.userId = :meId`, { meId: user.id });
+
+	const posts = await query
+		.take(ps.limit!)
+		.getMany();
+
+	return await GalleryPosts.packMany(posts, user);
+});
diff --git a/src/server/api/endpoints/users/gallery/posts.ts b/src/server/api/endpoints/users/gallery/posts.ts
new file mode 100644
index 000000000..1da6bced5
--- /dev/null
+++ b/src/server/api/endpoints/users/gallery/posts.ts
@@ -0,0 +1,39 @@
+import $ from 'cafy';
+import { ID } from '@/misc/cafy-id';
+import define from '../../../define';
+import { GalleryPosts } from '../../../../../models';
+import { makePaginationQuery } from '../../../common/make-pagination-query';
+
+export const meta = {
+	tags: ['users', 'gallery'],
+
+	params: {
+		userId: {
+			validator: $.type(ID),
+		},
+
+		limit: {
+			validator: $.optional.num.range(1, 100),
+			default: 10
+		},
+
+		sinceId: {
+			validator: $.optional.type(ID),
+		},
+
+		untilId: {
+			validator: $.optional.type(ID),
+		},
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	const query = makePaginationQuery(GalleryPosts.createQueryBuilder('post'), ps.sinceId, ps.untilId)
+		.andWhere(`post.userId = :userId`, { userId: ps.userId });
+
+	const posts = await query
+		.take(ps.limit!)
+		.getMany();
+
+	return await GalleryPosts.packMany(posts, user);
+});
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 1caab14cc..c3b184088 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -17,7 +17,7 @@ import packFeed from './feed';
 import { fetchMeta } from '@/misc/fetch-meta';
 import { genOpenapiSpec } from '../api/openapi/gen-spec';
 import config from '@/config';
-import { Users, Notes, Emojis, UserProfiles, Pages, Channels, Clips } from '../../models';
+import { Users, Notes, Emojis, UserProfiles, Pages, Channels, Clips, GalleryPosts } from '../../models';
 import parseAcct from '@/misc/acct/parse';
 import { getNoteSummary } from '@/misc/get-note-summary';
 import { getConnection } from 'typeorm';
@@ -342,6 +342,29 @@ router.get('/clips/:clip', async ctx => {
 	ctx.status = 404;
 });
 
+// Gallery post
+router.get('/gallery/:post', async ctx => {
+	const post = await GalleryPosts.findOne(ctx.params.post);
+
+	if (post) {
+		const _post = await GalleryPosts.pack(post);
+		const profile = await UserProfiles.findOneOrFail(post.userId);
+		const meta = await fetchMeta();
+		await ctx.render('gallery-post', {
+			post: _post,
+			profile,
+			instanceName: meta.name || 'Misskey',
+			icon: meta.iconUrl
+		});
+
+		ctx.set('Cache-Control', 'public, max-age=180');
+
+		return;
+	}
+
+	ctx.status = 404;
+});
+
 // Channel
 router.get('/channels/:channel', async ctx => {
 	const channel = await Channels.findOne({
diff --git a/src/server/web/views/gallery-post.pug b/src/server/web/views/gallery-post.pug
new file mode 100644
index 000000000..95bbb2437
--- /dev/null
+++ b/src/server/web/views/gallery-post.pug
@@ -0,0 +1,35 @@
+extends ./base
+
+block vars
+	- const user = post.user;
+	- const title = post.title;
+	- const url = `${config.url}/gallery/${post.id}`;
+
+block title
+	= `${title} | ${instanceName}`
+
+block desc
+	meta(name='description' content= post.description)
+
+block og
+	meta(property='og:type'        content='article')
+	meta(property='og:title'       content= title)
+	meta(property='og:description' content= post.description)
+	meta(property='og:url'         content= url)
+	meta(property='og:image'       content= post.files[0].thumbnailUrl)
+
+block meta
+	if user.host || profile.noCrawle
+		meta(name='robots' content='noindex')
+
+	meta(name='misskey:user-username' content=user.username)
+	meta(name='misskey:user-id' content=user.id)
+
+	meta(name='twitter:card' content='summary')
+
+	// todo
+	if user.twitter
+		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
+
+	if !user.host
+		link(rel='alternate' href=url type='application/activity+json')

From 7bfc41c6e1100ce6efa8b5f4dce3f9868f7a6128 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 24 Apr 2021 22:52:07 +0900
Subject: [PATCH 04/10] fix bug

---
 package.json                  | 2 +-
 src/client/pages/timeline.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 860a1e149..c3113532e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.78.0",
+	"version": "12.79.0-beta.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
diff --git a/src/client/pages/timeline.vue b/src/client/pages/timeline.vue
index 5660d0099..966146d92 100644
--- a/src/client/pages/timeline.vue
+++ b/src/client/pages/timeline.vue
@@ -18,6 +18,7 @@
 			<button class="_button tab" @click="chooseList" :class="{ active: src === 'list' }" v-tooltip="$ts.lists"><i class="fas fa-list-ul"></i></button>
 		</div>
 	</div>
+	<div class="new" v-if="queue > 0"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>
 	<XTimeline ref="tl"
 		class="_gap"
 		:key="src === 'list' ? `list:${list.id}` : src === 'antenna' ? `antenna:${antenna.id}` : src === 'channel' ? `channel:${channel.id}` : src"
@@ -30,7 +31,6 @@
 		@after="after()"
 		@queue="queueUpdated"
 	/>
-	<div class="new" v-if="queue > 0"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>
 </div>
 </template>
 

From 4e5e542fb03201c20f98f2778b422ca9b72cb66d Mon Sep 17 00:00:00 2001
From: marihachi <marihachi0620@gmail.com>
Date: Sat, 24 Apr 2021 22:52:32 +0900
Subject: [PATCH 05/10] update mfm.js (#7476)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c3113532e..853923bf4 100644
--- a/package.json
+++ b/package.json
@@ -175,7 +175,7 @@
 		"markdown-it": "12.0.5",
 		"markdown-it-anchor": "7.1.0",
 		"matter-js": "0.17.1",
-		"mfm-js": "0.16.2",
+		"mfm-js": "0.16.3",
 		"mocha": "8.3.2",
 		"moji": "0.5.1",
 		"ms": "2.1.3",

From 112c68cd0c557e04c5087adfd3c98ad767d44075 Mon Sep 17 00:00:00 2001
From: marihachi <marihachi0620@gmail.com>
Date: Sat, 24 Apr 2021 22:55:18 +0900
Subject: [PATCH 06/10] refactor init (#7464)

---
 src/boot/master.ts | 71 +++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/boot/master.ts b/src/boot/master.ts
index ef8692b30..473e215ba 100644
--- a/src/boot/master.ts
+++ b/src/boot/master.ts
@@ -45,26 +45,15 @@ function greet() {
 export async function masterMain() {
 	let config!: Config;
 
+	// initialize app
 	try {
 		greet();
-
-		// initialize app
-		config = await init();
-
-		if (config.port == null || Number.isNaN(config.port)) {
-			bootLogger.error('The port is not configured. Please configure port.', null, true);
-			process.exit(1);
-		}
-
-		if (process.platform === 'linux' && isWellKnownPort(config.port) && !isRoot()) {
-			bootLogger.error('You need root privileges to listen on well-known port on Linux', null, true);
-			process.exit(1);
-		}
-
-		if (!await isPortAvailable(config.port)) {
-			bootLogger.error(`Port ${config.port} is already in use`, null, true);
-			process.exit(1);
-		}
+		showEnvironment();
+		await showMachineInfo(bootLogger);
+		showNodejsVersion();
+		config = loadConfigBoot();
+		await connectDb();
+		await validatePort(config);
 	} catch (e) {
 		bootLogger.error('Fatal error occurred during initialization', null, true);
 		process.exit(1);
@@ -89,14 +78,6 @@ const runningNodejsVersion = process.version.slice(1).split('.').map(x => parseI
 const requiredNodejsVersion = [11, 7, 0];
 const satisfyNodejsVersion = !lessThan(runningNodejsVersion, requiredNodejsVersion);
 
-function isWellKnownPort(port: number): boolean {
-	return port < 1024;
-}
-
-async function isPortAvailable(port: number): Promise<boolean> {
-	return await portscanner.checkPortStatus(port, '127.0.0.1') === 'closed';
-}
-
 function showEnvironment(): void {
 	const env = process.env.NODE_ENV;
 	const logger = bootLogger.createSubLogger('env');
@@ -110,14 +91,7 @@ function showEnvironment(): void {
 	logger.info(`You ${isRoot() ? '' : 'do not '}have root privileges`);
 }
 
-/**
- * Init app
- */
-async function init(): Promise<Config> {
-	showEnvironment();
-
-	await showMachineInfo(bootLogger);
-
+function showNodejsVersion(): void {
 	const nodejsLogger = bootLogger.createSubLogger('nodejs');
 
 	nodejsLogger.info(`Version ${runningNodejsVersion.join('.')}`);
@@ -126,7 +100,9 @@ async function init(): Promise<Config> {
 		nodejsLogger.error(`Node.js version is less than ${requiredNodejsVersion.join('.')}. Please upgrade it.`, null, true);
 		process.exit(1);
 	}
+}
 
+function loadConfigBoot(): Config {
 	const configLogger = bootLogger.createSubLogger('config');
 	let config;
 
@@ -146,6 +122,10 @@ async function init(): Promise<Config> {
 
 	configLogger.succ('Loaded');
 
+	return config;
+}
+
+async function connectDb(): Promise<void> {
 	const dbLogger = bootLogger.createSubLogger('db');
 
 	// Try to connect to DB
@@ -159,8 +139,29 @@ async function init(): Promise<Config> {
 		dbLogger.error(e);
 		process.exit(1);
 	}
+}
 
-	return config;
+async function validatePort(config: Config): Promise<void> {
+	const isWellKnownPort = (port: number) => port < 1024;
+
+	async function isPortAvailable(port: number): Promise<boolean> {
+		return await portscanner.checkPortStatus(port, '127.0.0.1') === 'closed';
+	}
+
+	if (config.port == null || Number.isNaN(config.port)) {
+		bootLogger.error('The port is not configured. Please configure port.', null, true);
+		process.exit(1);
+	}
+
+	if (process.platform === 'linux' && isWellKnownPort(config.port) && !isRoot()) {
+		bootLogger.error('You need root privileges to listen on well-known port on Linux', null, true);
+		process.exit(1);
+	}
+
+	if (!await isPortAvailable(config.port)) {
+		bootLogger.error(`Port ${config.port} is already in use`, null, true);
+		process.exit(1);
+	}
 }
 
 async function spawnWorkers(limit: number = 1) {

From 8a5567796f43249efb42f408910434d394f787a4 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 24 Apr 2021 22:56:15 +0900
Subject: [PATCH 07/10] New Crowdin updates (#7459)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations timelines.md (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations keyboard-shortcut.md (Italian)

* New translations keyboard-shortcut.md (Italian)

* New translations keyboard-shortcut.md (Italian)

* New translations keyboard-shortcut.md (Italian)

* New translations theme.md (Italian)

* New translations theme.md (Italian)

* New translations theme.md (Italian)

* New translations theme.md (Italian)

* New translations theme.md (Italian)

* New translations theme.md (Italian)

* New translations theme.md (French)

* New translations theme.md (Italian)

* New translations deck.md (Italian)

* New translations deck.md (Italian)

* New translations deck.md (Italian)

* New translations deck.md (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Kannada)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Ukrainian)
---
 locales/ar-SA.yml                   |   4 +-
 locales/cs-CZ.yml                   |  80 +++++++++++-
 locales/de-DE.yml                   |  23 +++-
 locales/en-US.yml                   |  24 +++-
 locales/es-ES.yml                   |   8 +-
 locales/fr-FR.yml                   |  45 ++++---
 locales/id-ID.yml                   |   2 +-
 locales/it-IT.yml                   | 190 ++++++++++++++++++++++++++--
 locales/ja-KS.yml                   |  10 +-
 locales/kn-IN.yml                   |   1 +
 locales/ko-KR.yml                   |  10 +-
 locales/pl-PL.yml                   |  11 +-
 locales/ru-RU.yml                   |  39 +++++-
 locales/uk-UA.yml                   |   8 +-
 locales/zh-CN.yml                   |  23 +++-
 locales/zh-TW.yml                   | 126 +++++++++++++-----
 src/docs/fr-FR/theme.md             |   2 +-
 src/docs/it-IT/deck.md              |  20 +--
 src/docs/it-IT/keyboard-shortcut.md |  40 +++---
 src/docs/it-IT/theme.md             |  38 +++---
 src/docs/it-IT/timelines.md         |   2 +-
 21 files changed, 551 insertions(+), 155 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index ddc0dc0e8..370c4a8db 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -111,7 +111,6 @@ customEmojis: "إيموجي مخصص"
 addEmoji: "إضافة إيموجي"
 cacheRemoteFiles: "خزن مؤقتا الملفات البعيدة"
 autoAcceptFollowed: "اقبل طلبات المتابعة تلقائيا من الحسابات المتابَعة"
-addAcount: "إضافة حساب"
 loginFailed: "فشل الولوج"
 showOnRemote: "رؤيته على مثيل الخادم البُعدي"
 general: "الرئيسية"
@@ -354,7 +353,6 @@ category: "الفئات"
 tags: "الوسوم"
 docSource: "مصدر هذا المستند"
 createAccount: "أنشئ حسابًا"
-existingAcount: "الحسابات الموجودة"
 regenerate: "أعِد التوليد"
 fontSize: "حجم الخط"
 openImageInNewTab: "إفتح الصورة بصفحة جديدة"
@@ -430,6 +428,8 @@ usageAmount: "الإستخدام"
 capacity: "السعة"
 inUse: "مستخدم"
 info: "عن"
+user: "المستخدمون"
+administration: "إدارة "
 _email:
   _follow:
     title: "يتابعك"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index d6c5f2626..b7372ac47 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -72,6 +72,7 @@ error: "Chyba"
 somethingHappened: "Jejda. Něco se nepovedlo."
 retry: "Opakovat"
 pageLoadError: "Nepodařilo se načíst stránku"
+privacy: "Soukromí"
 follow: "Sledovaní"
 unfollow: "Přestat sledovat"
 renote: "Přeposlat"
@@ -116,7 +117,6 @@ flagAsBotDescription: "Pokud je tento účet kontrolován programem zaškrtněte
 flagAsCat: "Tenhle účet je kočka"
 flagAsCatDescription: "Vyberte tuto možnost aby tento účet byl označen jako kočka."
 autoAcceptFollowed: "Automaticky akceptovat následování od účtů které sledujete"
-addAcount: "Přidat účet"
 loginFailed: "Přihlášení se nezdařilo."
 general: "Obecně"
 wallpaper: "Obrázek na pozadí"
@@ -149,6 +149,7 @@ clearQueue: "Vyčistit frontu"
 clearQueueConfirmTitle: "Jste si jisti že zrušit všechny úlohy ve frontě?"
 clearCachedFiles: "Vyprázdnit mezipaměť"
 blockedInstances: "Blokované instance"
+editProfile: "Upravit můj profil"
 pinLimitExceeded: "Nemůžete připnout další poznámky."
 intro: "Instalace Misskey byla dokončena! Prosím vytvořte admina."
 done: "Hotovo"
@@ -161,6 +162,7 @@ all: "Vše"
 subscribing: "Odebíráte"
 publishing: "Publikuji"
 notResponding: "Neodpovídá"
+instanceFollowing: "Následovníci na instanci"
 instanceFollowers: "Následovníci na instanci"
 instanceUsers: "Uživatelé této instance"
 changePassword: "Změnit heslo"
@@ -170,6 +172,7 @@ newPassword: "Nové heslo"
 newPasswordRetype: "Nové heslo (znovu)"
 attachFile: "Přiložit soubor"
 more: "Více!"
+featured: "Oblíbené poznámky"
 usernameOrUserId: "Uživatelské jméno nebo uživatelské id"
 noSuchUser: "Uživatel nebyl nalezen"
 announcements: "Oznámení"
@@ -203,6 +206,8 @@ images: "Obrázky"
 birthday: "Datum narození"
 registeredDate: "Datum registrace"
 location: "Lokace"
+light: "Světlý"
+dark: "Tmavý"
 lightThemes: "Světlý vzhled"
 darkThemes: "Tmavý vzhled"
 syncDeviceDarkMode: "Synchronizovat tmavý vzhled s nastavením Vašeho systému"
@@ -217,6 +222,10 @@ folderName: "Název složky"
 createFolder: "Vytvořit složku"
 renameFolder: "Přejmenovat složku"
 deleteFolder: "Odstranit složku"
+addFile: "Přidat soubor"
+emptyFolder: "Tato složka je prázdná"
+unableToDelete: "Nelze smazat"
+inputNewFileName: "Zadejte nový název"
 copyUrl: "Kopírovat URL"
 rename: "Přejmenovat"
 avatar: "Avatar"
@@ -224,6 +233,7 @@ banner: "Baner"
 nsfw: "NSFW"
 disconnectedFromServer: "Spojení bylo přerušeno"
 reload: "Aktualizovat"
+doNothing: "Ignorovat"
 watch: "Sledovat"
 unwatch: "Přestat sledovat"
 accept: "Souhlasím"
@@ -254,6 +264,17 @@ iconUrl: "Favicon URL"
 bannerUrl: "Baner URL"
 basicInfo: "Základní informace"
 hcaptcha: "hCaptcha"
+hcaptchaSecretKey: "Tajný Klíč (Secret Key)"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "Zapnout ReCAPTCHu"
+recaptchaSecretKey: "Tajný Klíč (Secret Key)"
+antennas: "Antény"
+manageAntennas: "Spravovat Antény"
+name: "Jméno"
+antennaSource: "Zdroj Antény"
+enableServiceworker: "Povolit ServiceWorker"
+caseSensitive: "Rozlišuje malá a velká písmena"
+connectedTo: "Následující účty jsou připojeny"
 userList: "Seznamy"
 about: "Informace"
 aboutMisskey: "O Misskey"
@@ -298,15 +319,70 @@ retype: "Zadejte znovu"
 noteOf: "{user} poznámky"
 inviteToGroup: "Pozvat do skupiny"
 invitations: "Pozvat"
+tooShort: "Příliš krátké"
+tooLong: "Příliš dlouhé"
+weakPassword: "Slabé heslo"
+normalPassword: "Dobré heslo"
+strongPassword: "Silné heslo"
+passwordMatched: "Hesla se schodují"
+passwordNotMatched: "Hesla se neschodují"
+signinWith: "Přihlásit se s {x}"
+signinFailed: "Nelze se přihlásit. Zkontrolujte prosím své uživatelské jméno a heslo."
+or: "Nebo"
+language: "Jazyk"
+youHaveNoGroups: "Nemáte žádné skupiny"
+signinHistory: "Historie přihlášení"
+category: "Kategorie"
+tags: "Štítky"
+createAccount: "Vytvořit účet"
+fontSize: "Velikost písma"
+openImageInNewTab: "Otevřít obrázek v novém panelu"
+dashboard: "Přehled"
+local: "Lokální"
+total: "Celkem"
+weekOverWeekChanges: "Týdně"
+dayOverDayChanges: "Denně"
+appearance: "Vzhled"
+clientSettings: "Nastavení klienta"
+accountSettings: "Nastavení účtu"
+promotion: "Propagace"
+promote: "Propagovat"
+numberOfDays: "Počet dní"
+chooseEmoji: "Vybrat emotikon"
+unableToProcess: "Operace nebyla dokončena."
+recentUsed: "Naposledy použité"
+install: "Nainstalovat"
+uninstall: "Odinstalovat"
+installedApps: "Autorizované aplikace"
+nothing: "Nic nebylo nalezeno"
+lastUsedDate: "Poslední použití"
+state: "Stav"
+ascendingOrder: "Vzestupně"
+descendingOrder: "Sestupně"
+scratchpad: "Zápisník"
+output: "Výstup"
+script: "Skript"
+deleteAllFiles: "Smazat všechny soubory"
+deleteAllFilesConfirm: "Jste si jistí že chcete smazat všechny soubory?"
+userSuspended: "Tomuto uživateli byl pozastaven účet."
+sidebar: "Postranní panel"
+addItem: "Přidat položku"
+rooms: "Místnost"
+inboxUrl: "Inbox URL"
+deletedNote: "Odstraněné příspěvky"
+invisibleNote: "Skryté příspěvky"
 smtpUser: "Uživatelské jméno"
 smtpPass: "Heslo"
 clearCache: "Vyprázdnit mezipaměť"
 info: "Informace"
+user: "Uživatelé"
 _mfm:
   mention: "Zmínění"
   quote: "Citovat"
   emoji: "Vlastní emoji"
   search: "Vyhledávání"
+_reversi:
+  total: "Celkem"
 _sidebar:
   icon: "Avatar"
 _theme:
@@ -328,6 +404,7 @@ _visibility:
   home: "Domů"
   followers: "Sledující"
 _profile:
+  name: "Jméno"
   username: "Uživatelské jméno"
 _exportOrImport:
   followingList: "Sledovaní"
@@ -371,5 +448,6 @@ _deck:
   _columns:
     notifications: "Oznámení"
     tl: "Časová osa"
+    antenna: "Antény"
     list: "Seznamy"
     mentions: "Zmínění"
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 1ffeafcd7..f3e01e1ea 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -134,11 +134,11 @@ settingGuide: "Empfohlene Einstellung"
 cacheRemoteFiles: "Dateien von anderen Instanzen im Cache speichern"
 cacheRemoteFilesDescription: "Wenn diese Einstellung deaktiviert ist, werden Dateien anderer Instanzen direkt von dort geladen. Hierdurch wird Speicherplatz gespart, aber mehr Bandbreite verbraucht, da keine Vorschaubilder generiert werden."
 flagAsBot: "Als Bot markieren"
-flagAsBotDescription: "Wenn dieser Account durch ein Programm gesteuert wird, setze diesen Haken. Falls aktiviert, agiert es als Flag für andere Entwickler um endlose Kettenreaktionen mit anderen Bots zu verhindern und lässt Misskey's interne Systeme diesen Account als Bot behandeln."
+flagAsBotDescription: "Wenn dieses Benutzerkonto durch ein Programm gesteuert wird, setze diesen Haken. Falls aktiviert, agiert es als Flag für andere Entwickler um endlose Kettenreaktionen mit anderen Bots zu verhindern und lässt Misskey's interne Systeme dieses Benutzerkonto als Bot behandeln."
 flagAsCat: "Als Katze markieren"
 flagAsCatDescription: "Setze diese Flag um dieses Benutzerkonto als Katze zu markieren."
 autoAcceptFollowed: "Follow-Anfragen automatisch akzeptieren"
-addAcount: "Benutzerkonto hinzufügen"
+addAccount: "Benutzerkonto hinzufügen"
 loginFailed: "Login fehlgeschlagen"
 showOnRemote: "Auf Ursprungsinstanz ansehen"
 general: "Allgemein"
@@ -349,7 +349,6 @@ antennaExcludeKeywords: "Schlüsselwörter, die ignoriert werden sollen"
 antennaKeywordsDescription: "Mit Leerzeichen für eine \"UND\"-Verknüpfung trennen, durch Zeilenumbrüche für eine \"ODER\"-Verknüpfung trennen."
 notifyAntenna: "Über neue Notizen benachrichtigen"
 withFileAntenna: "Nur Notizen mit Dateien"
-serviceworker: "ServiceWorker"
 enableServiceworker: "ServiceWorker aktivieren"
 antennaUsersDescription: "Benutzernamen getrennt durch Zeilenumbrüche angeben"
 caseSensitive: "Groß-/Kleinschreibung unterscheiden"
@@ -453,7 +452,7 @@ category: "Kategorie"
 tags: "Schlagwörter"
 docSource: "Quelle dieses Dokuments"
 createAccount: "Benutzerkonto erstellen"
-existingAcount: "Bestehendes Benutzerkonto"
+existingAccount: "Bestehendes Benutzerkonto"
 regenerate: "Regenerieren"
 fontSize: "Schriftgröße"
 noFollowRequests: "Du hast keine Follow-Anfragen"
@@ -568,7 +567,7 @@ pluginTokenRequestedDescription: "Dieses Plugin wird die hier konfigurierten Ber
 notificationType: "Benachrichtigungsart"
 edit: "Bearbeiten"
 useStarForReactionFallback: "Verwende ★ falls das Reaktions-Emoji unbekannt ist"
-emailConfig: "Email-Server Konfiguration"
+emailServer: "Email-Server"
 enableEmail: "Email-Versand aktivieren"
 emailConfigInfo: "Zur Email-Bestätigung bei Registrierung und zum Zurücksetzen des Passworts verwendet"
 email: "Email"
@@ -728,6 +727,20 @@ hideOnlineStatusDescription: "Das Verbergen deines Online-Statuses reduziert die
 online: "Online"
 active: "Aktiv"
 offline: "Offline"
+notRecommended: "Nicht empfohlen"
+botProtection: "Bot-Schutz"
+selectAccount: "Benutzerkonto auswählen"
+enabled: "Aktiviert"
+disabled: "Deaktiviert"
+user: "Benutzer"
+administration: "Verwaltung"
+accounts: "Benutzerkonten"
+switch: "Wechseln"
+noMaintainerInformationWarning: "Betreiberinformationen sind nicht konfiguriert."
+noBotProtectionWarning: "Bot-Schutz ist nicht konfiguriert."
+configure: "Konfigurieren"
+_gallery:
+  unlike: "\"Gefällt mir\" entfernen"
 _email:
   _follow:
     title: "Du hast einen neuen Follower"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index b5f9ff827..4fd1b89dc 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -138,7 +138,7 @@ flagAsBotDescription: "If this account is controlled by a program, set this opti
 flagAsCat: "This account is a cat"
 flagAsCatDescription: "Toggle this flag on for this account to be marked as a cat."
 autoAcceptFollowed: "Automatically approve follow requests from users you're following"
-addAcount: "Add Account"
+addAccount: "Add account"
 loginFailed: "Failed to sign in"
 showOnRemote: "View on remote instance"
 general: "General"
@@ -349,7 +349,6 @@ antennaExcludeKeywords: "Keywords to exclude"
 antennaKeywordsDescription: "Separate with spaces for AND condition. Separate with line breaks for OR."
 notifyAntenna: "Notify for new notes"
 withFileAntenna: "Filter only notes with file(s) attached"
-serviceworker: "ServiceWorker"
 enableServiceworker: "Enable ServiceWorker"
 antennaUsersDescription: "List one username per line"
 caseSensitive: "Case sensitive"
@@ -453,7 +452,7 @@ category: "Category"
 tags: "Tags"
 docSource: "Source of this document"
 createAccount: "Create account"
-existingAcount: "Existing accounts"
+existingAccount: "Existing account"
 regenerate: "Regenerate"
 fontSize: "Font size"
 noFollowRequests: "You don't have any pending follow requests"
@@ -568,7 +567,7 @@ pluginTokenRequestedDescription: "This plugin will be able to use the permission
 notificationType: "Notification type"
 edit: "Edit"
 useStarForReactionFallback: "Use ★ as fallback if the reaction emoji is unknown"
-emailConfig: "Email server configuration"
+emailServer: "Email server"
 enableEmail: "Enable email distribution"
 emailConfigInfo: "Used to confirm your email during sign-up and if you forget your password"
 email: "Email"
@@ -679,7 +678,7 @@ onlineUsersCount: "{n} people are online"
 nUsers: "{n} Users"
 nNotes: "{n} Notes"
 sendErrorReports: "Send error reports"
-sendErrorReportsDescription: "When turned on, detailed error information will be shared with Misskey when a problem occurs, helping to improve the quality of Misskey."
+sendErrorReportsDescription: "When turned on, detailed error information will be shared with Misskey when a problem occurs, helping to improve the quality of Misskey.\nThis may include informations such as your OS and its version, the kind of browser you're using, your activity history, etc."
 myTheme: "My theme"
 backgroundColor: "Background"
 accentColor: "Accent"
@@ -728,6 +727,21 @@ hideOnlineStatusDescription: "Hiding your online status reduces the convenience
 online: "Online"
 active: "Active"
 offline: "Offline"
+notRecommended: "Not recommended"
+botProtection: "Bot Protection"
+selectAccount: "Select account"
+enabled: "Enabled"
+disabled: "Disabled"
+quickAction: "Quick action"
+user: "Users"
+administration: "Management"
+accounts: "Accounts"
+switch: "Switch"
+noMaintainerInformationWarning: "Maintainer information is not configured."
+noBotProtectionWarning: "Bot protection is not configured."
+configure: "Configure"
+_gallery:
+  unlike: "Undo like"
 _email:
   _follow:
     title: "You've got a new follower"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index e9a081427..9ad9d4666 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -137,7 +137,6 @@ flagAsBotDescription: "En caso de que esta cuenta fuera usada por un programa, a
 flagAsCat: "Esta cuenta es un gato"
 flagAsCatDescription: "En caso de que declare que esta cuenta es de un gato, active esta opción."
 autoAcceptFollowed: "Aceptar automáticamente las solicitudes de seguimiento de los usuarios que sigues"
-addAcount: "Agregar cuenta"
 loginFailed: "Error al iniciar sesión."
 showOnRemote: "Ver en una instancia remota"
 general: "General"
@@ -348,7 +347,6 @@ antennaExcludeKeywords: "Palabras clave para excluir"
 antennaKeywordsDescription: "Separar con espacios es una declaración AND, separar con una linea nueva es una declaración OR"
 notifyAntenna: "Notificar nueva nota"
 withFileAntenna: "Sólo notas con archivos adjuntados"
-serviceworker: "ServiceWorker"
 enableServiceworker: "Activar ServiceWorker"
 antennaUsersDescription: "Elegir nombres de usuarios separados por una linea nueva"
 caseSensitive: "Distinguir mayúsculas de minúsculas"
@@ -451,7 +449,6 @@ category: "Categoría"
 tags: "Etiqueta"
 docSource: "Fuente de este documento"
 createAccount: "Crear cuenta"
-existingAcount: "Cuentas existentes"
 regenerate: "Regenerar"
 fontSize: "Tamaño de la letra"
 noFollowRequests: "No hay solicitudes de seguimiento"
@@ -566,7 +563,6 @@ pluginTokenRequestedDescription: "Este plugin podrá usar los permisos descritos
 notificationType: "Tipo de notificación"
 edit: "Editar"
 useStarForReactionFallback: "En caso de que los emojis de reacciones no sean claros, usar en su lugar una estrella"
-emailConfig: "Configuración del servidor de correos"
 enableEmail: "Activar el envío de correos electrónicos"
 emailConfigInfo: "Usar en caso de validación de correo electrónico y pedido de contraseña"
 email: "Correo"
@@ -654,6 +650,10 @@ textColor: "Texto"
 value: "Valores"
 goBack: "Deseleccionar"
 info: "Información"
+user: "Usuarios"
+administration: "Administrar"
+_gallery:
+  unlike: "Quitar me gusta"
 _email:
   _follow:
     title: "te ha seguido"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 199aa983f..f8c6c0762 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -138,7 +138,6 @@ flagAsBotDescription: "Si ce compte est géré de manière automatisée , défin
 flagAsCat: "Ce compte est un chat"
 flagAsCatDescription: "Activer l'option \" Je suis un chat \" pour ce compte."
 autoAcceptFollowed: "Accepter automatiquement les demandes d’abonnement venant d’utilisateur·rice·s que vous suivez"
-addAcount: "Ajouter un compte"
 loginFailed: "Échec de la connexion"
 showOnRemote: "Voir sur l’instance distante"
 general: "Général"
@@ -349,7 +348,6 @@ antennaExcludeKeywords: "Mots clés à exclure"
 antennaKeywordsDescription: "Séparer avec des espaces pour la condition AND. Séparer avec un saut de ligne pour une condition OR."
 notifyAntenna: "Je souhaite recevoir les notifications des nouvelles notes"
 withFileAntenna: "Notes ayant des attachements uniquement"
-serviceworker: "ServiceWorker"
 enableServiceworker: "Activer ServiceWorker"
 antennaUsersDescription: "Saisissez un seul nom d’utilisateur·rice par ligne"
 caseSensitive: "Sensible à la casse"
@@ -453,7 +451,6 @@ category: "Catégorie"
 tags: "Étiquettes"
 docSource: "Source de ce document"
 createAccount: "Créer un compte"
-existingAcount: "Comptes existants"
 regenerate: "Générer à nouveau"
 fontSize: "Taille de la police"
 noFollowRequests: "Vous n’avez aucune demande d’abonnement en attente"
@@ -541,8 +538,8 @@ enableInfiniteScroll: "Activer le défilement infini"
 visibility: "Visibilité"
 poll: "Sondage"
 useCw: "Masquer le contenu"
-enablePlayer: "Activer le lecteur vidéo"
-disablePlayer: "Désactiver le lecteur vidéo"
+enablePlayer: "Ouvrir dans le lecteur vidéo"
+disablePlayer: "Fermer le lecteur vidéo"
 expandTweet: "Étendre le tweet"
 themeEditor: "Éditeur de thèmes"
 description: "Description"
@@ -568,7 +565,7 @@ pluginTokenRequestedDescription: "Ce plugin pourra utiliser les autorisations d
 notificationType: "Type de notifications"
 edit: "Editer"
 useStarForReactionFallback: "Utiliser ★ comme alternative si l’émoji de réaction est inconnu"
-emailConfig: "Configuration du serveur email"
+emailServer: "Serveur mail"
 enableEmail: "Activer la distribution de courriel"
 emailConfigInfo: "Utilisé pour confirmer votre adresse de courriel et la réinitialisation de votre mot de passe en cas d’oubli."
 email: "E-mail "
@@ -678,7 +675,7 @@ onlineUsersCount: "{n} utilisateur(s) en ligne"
 nUsers: "{n} utilisateur·rice·s"
 nNotes: "{n} Notes"
 sendErrorReports: "Envoyer les rapports d’erreur"
-sendErrorReportsDescription: "Lorsqu'il est activé, des informations détaillées sur les erreurs sont partagées avec Misskey lorsqu'un problème survient, ce qui contribue à améliorer la qualité de Misskey."
+sendErrorReportsDescription: "Si vous activez l'envoi des rapports d'erreur, vous contribuerez à améliorer la qualité de Misskey grâce au partage d'informations détaillées sur les erreurs lorsqu'un problème survient.\nCela inclut des informations telles que la version de votre système d'exploitation, le type de navigateur que vous utilisez, votre historique d'activité, etc."
 myTheme: "Mes thèmes"
 backgroundColor: "Arrière-plan"
 accentColor: "Accentuation"
@@ -722,10 +719,20 @@ info: "Informations"
 userInfo: "Informations sur l'utilisateur"
 unknown: "Inconnu"
 onlineStatus: "Statut"
-hideOnlineStatus: "Toujours apparaître hors ligne"
-hideOnlineStatusDescription: "Forcer votre statut à toujours apparaître hors ligne peut diminuer les performances de certaines fonctionnalités, telles que la Recherche."
+hideOnlineStatus: "Se rendre invisible"
+hideOnlineStatusDescription: "Rendre votre statut invisible peut diminuer les performances de certaines fonctionnalités, telles que la Recherche."
 online: "En ligne"
 offline: "Hors ligne"
+notRecommended: "Déconseillé"
+botProtection: "Protection contre les bots"
+selectAccount: "Sélectionner un compte"
+enabled: "Activé"
+disabled: "Désactivé"
+quickAction: "Actions rapides"
+user: "Utilisateur·rice·s"
+administration: "Gestion"
+_gallery:
+  unlike: "Je n’aime pas"
 _email:
   _follow:
     title: "Vous suit"
@@ -908,6 +915,8 @@ _theme:
     cwBg: "Arrière-plan du CW"
     cwFg: "Texte du bouton CW"
     cwHoverBg: "Arrière-plan du bouton CW (survolé)"
+    toastBg: "Arrière-plan de la bulle de notification"
+    toastFg: "Texte de la bulle de notification"
     buttonBg: "Arrière-plan du bouton"
     buttonHoverBg: "Arrière-plan du bouton (survolé)"
     inputBorder: "Cadre de la zone de texte"
@@ -1087,7 +1096,7 @@ _postForm:
   channelPlaceholder: "Publier vers le canal"
   _placeholders:
     a: "Quoi de neuf ?"
-    b: "Quoi de neuf ?"
+    b: "Il s'est passé quelque chose ?"
     c: "Qu’avez-vous en tête ?"
     d: "Désirez-vous publier quelques mots ?"
     e: "Écrivez ici"
@@ -1117,11 +1126,11 @@ _charts:
   usersTotal: "Nombre des utilisateur·rice·s au total"
   activeUsers: "Utilisateur·rice·s actif·ve·s"
   notesIncDec: "Variation du nombre des notes"
-  localNotesIncDec: "Variation du nombre de notes local"
-  remoteNotesIncDec: "Variation du nombre d’notes distant"
+  localNotesIncDec: "Variation du nombre de notes locales"
+  remoteNotesIncDec: "Variation du nombre de notes distantes"
   notesTotal: "Nombre total des notes"
   filesIncDec: "Variation du nombre de fichiers"
-  filesTotal: "Nombre de fichiers au total"
+  filesTotal: "Nombre total de fichiers"
   storageUsageIncDec: "Variation de l'utilisation du stockage"
   storageUsageTotal: "Utilisation totale du stockage"
 _instanceCharts:
@@ -1206,12 +1215,12 @@ _rooms:
 _pages:
   newPage: "Créer une page"
   editPage: "Modifier une page"
-  readPage: "Voir la source"
+  readPage: "Affichage de la source en cours"
   created: "La page a été créée !"
   updated: "La page a été mise à jour !"
-  deleted: "La page a bien été supprimée"
+  deleted: "La page a été supprimée"
   pageSetting: "Paramètres de la Page"
-  nameAlreadyExists: "La URL de page spécifiée existe déjà"
+  nameAlreadyExists: "L'URL de page spécifiée existe déjà"
   invalidNameTitle: "La URL de la page spécifiée n’est pas valide"
   invalidNameText: "Assurez-vous qu’il n’est pas vide"
   editThisPage: "Éditer cette page"
@@ -1227,7 +1236,7 @@ _pages:
   content: "Bloc de page"
   variables: "Variables"
   title: "Titre"
-  url: "URL de page"
+  url: "URL de la page"
   summary: "Résumé de page"
   alignCenter: "Centrée"
   hideTitleWhenPinned: "Masquer le titre de la page lorsque celle-ci est épinglée au profil"
@@ -1533,7 +1542,7 @@ _deck:
   swapUp: "Déplacer vers le haut"
   swapDown: "Déplacer vers le bas"
   stackLeft: "Empiler à gauche"
-  popRight: "Vers la droite"
+  popRight: "Extraire à droite"
   profile: "Profil"
   _columns:
     main: "Principale"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index a6c4e80ef..ae810a039 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -107,7 +107,6 @@ cacheRemoteFiles: "Tembolokkan berkas remote"
 flagAsBot: "Atur akun ini sebagai Bot"
 flagAsCat: "Atur akun ini sebagai kucing"
 autoAcceptFollowed: "Setujui otomatis permintaan mengikuti dari pengguna yang anda ikuti"
-addAcount: "Tambahkan akun"
 loginFailed: "Gagal untuk masuk"
 showOnRemote: "Lihat profil asli"
 general: "Umum"
@@ -213,6 +212,7 @@ invites: "Undang"
 invitations: "Undang"
 smtpUser: "Nama Pengguna"
 smtpPass: "Kata sandi"
+user: "Pengguna"
 _email:
   _follow:
     title: "Sedang mengikuti"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 08aac507a..61e204cce 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -47,7 +47,7 @@ deleteAndEditConfirm: "Vuoi davvero cancellare questa nota e scriverla di nuovo?
 addToList: "Aggiungi alla lista"
 sendMessage: "Invia messaggio"
 copyUsername: "Copia nome utente"
-searchUser: "Cerca Utente"
+searchUser: "Cerca utente"
 reply: "Rispondi"
 loadMore: "Mostra di più"
 showMore: "Mostra di più"
@@ -136,7 +136,6 @@ flagAsBotDescription: "Se l'account esegue principalmente operazioni automatiche
 flagAsCat: "Io sono un gatto"
 flagAsCatDescription: "Abilita l'opzione \"Io sono un gatto\" per l'account."
 autoAcceptFollowed: "Accetta automaticamente le richieste di follow da utenti che già segui"
-addAcount: "Aggiungi account"
 loginFailed: "Accesso non riuscito"
 showOnRemote: "Sfoglia sull'istanza remota"
 general: "Generali"
@@ -338,7 +337,6 @@ antennaExcludeKeywords: "Parole chiavi da escludere"
 antennaKeywordsDescription: "Separare con uno spazio indica la condizione \"E\". Separare con un'interruzzione riga indica la condizione \"O\"."
 notifyAntenna: "Invia notifiche delle nuove note"
 withFileAntenna: "Solo note con file in allegato"
-serviceworker: "ServiceWorker"
 enableServiceworker: "Abilita ServiceWorker"
 antennaUsersDescription: "Inserisci solo un nome utente per riga"
 caseSensitive: "Sensibile alla distinzione tra maiuscole e minuscole"
@@ -436,11 +434,11 @@ youHaveNoGroups: "Nessun gruppo"
 joinOrCreateGroup: "Puoi creare il tuo gruppo o essere invitat@ a gruppi che già esistono."
 noHistory: "Nessuna cronologia"
 signinHistory: "Cronologia di accesso all'account"
+doing: "In corso..."
 category: "Categoria"
 tags: "Tag"
 docSource: "Sorgente della scheda"
 createAccount: "Crea il tuo account"
-existingAcount: "Account esistente"
 regenerate: "Generare di nuovo"
 fontSize: "Dimensione carattere"
 noFollowRequests: "Non hai alcuna richiesta di follow"
@@ -508,6 +506,7 @@ sidebar: "Barra laterale"
 divider: "Linea di separazione"
 addItem: "Aggiungi elemento"
 rooms: "Camera"
+inboxUrl: "Inbox URL"
 serviceworkerInfo: "Deve essere abilitato per le notifiche push. "
 deletedNote: "Nota eliminata"
 invisibleNote: "Nota invisibile"
@@ -515,12 +514,17 @@ enableInfiniteScroll: "Abilita scorrimento infinito"
 visibility: "Visibilità"
 poll: "Sondaggio"
 useCw: "Nascondere media"
+enablePlayer: "Apri in lettore video"
+disablePlayer: "Chiudi lettore video"
 expandTweet: "Espandi tweet"
 themeEditor: "Editor di temi"
 description: "Descrizione"
 author: "Autore"
 leaveConfirm: "Ci sono delle modifiche ancora non salvate. Vuoi cancellarle?"
 manage: "Gestione"
+plugins: "Estensioni"
+deck: "Deck"
+undeck: "Esci dal deck"
 useFullReactionPicker: "Usa la totalità del pannello di reazioni"
 width: "Larghezza"
 height: "Altezza"
@@ -533,29 +537,48 @@ tokenRequested: "Autorizza accesso all'account"
 notificationType: "Tipo di notifiche"
 edit: "Modifica"
 useStarForReactionFallback: "Se è sconosciuto l'emoji di reazione, usare la ★ come alternativa."
-emailConfig: "Impostazioni server email"
+emailServer: "Server email"
+enableEmail: "Abilita consegna email"
+emailConfigInfo: "Utilizzato per verificare il tuo indirizzo di posta elettronica e per reimpostare la tua password"
 email: "Email"
+emailAddress: "Indirizzo di posta elettronica"
+smtpConfig: "Impostazioni del server SMTP"
 smtpHost: "Server remoto"
+smtpPort: "Porta"
 smtpUser: "Nome utente"
 smtpPass: "Password"
+emptyToDisableSmtpAuth: "Lasciare il nome utente e la password vuoti per disabilitare la verifica SMTP"
+smtpSecure: "Usare la porta SSL/TLS implicito per le connessioni SMTP"
+smtpSecureInfo: "Disabilitare quando è attivo STARTTLS."
+testEmail: "Testare la consegna di posta elettronica"
 wordMute: "Filtri parole"
 userSaysSomething: "{name} ha detto qualcosa"
+makeActive: "Attiva"
 display: "Visualizza"
 copy: "Copia"
+metrics: "Statistiche"
+overview: "Anteprima"
 logs: "Log"
+delayed: "Ritardo"
 database: "Base di dati"
 channel: "Canale"
 create: "Crea"
 notificationSetting: "Impostazioni notifiche"
 notificationSettingDesc: "Seleziona il tipo di notifiche da visualizzare."
+useGlobalSetting: "Usa impostazioni generali"
+useGlobalSettingDesc: "Se abilitato, le impostazioni notifiche dell'account verranno utilizzate. Se disabilitato, si possono definire diverse singole impostazioni."
 other: "Avanzate"
 fileIdOrUrl: "ID o URL del file"
+behavior: "Comportamento"
 abuseReports: "Segnala"
 reportAbuse: "Segnala"
 reportAbuseOf: "Segnala {name}"
 send: "Inviare"
 openInNewTab: "Apri in una nuova scheda"
+openInSideView: "Apri in vista laterale"
+defaultNavigationBehaviour: "Navigazione preimpostata"
 editTheseSettingsMayBreakAccount: "Modificare queste impostazioni può danneggiare l'account."
+instanceTicker: "Informazioni sull'istanza da cui vengono le note"
 waitingFor: "Aspettando {x}"
 random: "Casuale"
 system: "Sistema"
@@ -567,6 +590,7 @@ optional: "Opzionale"
 createNewClip: "Nuova clip"
 public: "Pubblica"
 i18nInfo: "Misskey è tradotto in diverse lingue da volontari. Anche tu puoi contribuire su {link}."
+accountInfo: "Informazioni account"
 notesCount: "Conteggio note"
 repliesCount: "Numero di risposte inviate"
 renotesCount: "Numero di note che hai ricondiviso"
@@ -581,54 +605,116 @@ pollVotedCount: "Numero di voti ricevuti"
 yes: "Sì"
 no: "No"
 driveFilesCount: "Numero di file nel Drive"
+driveUsage: "Utilizzazione del Drive"
+alwaysMarkSensitive: "Segnare i media come sensibili per impostazione predefinita"
+verificationEmailSent: "Una mail di verifica è stata inviata. Si prega di accedere al collegamento per compiere la verifica."
+notSet: "Non impostato"
+emailVerified: "Il tuo indirizzo email è stato verificato"
 noteFavoritesCount: "Conteggio note tra i preferiti"
 pageLikesCount: "Numero di pagine che ti piacciono"
 pageLikedCount: "Numero delle tue pagine che hanno ricevuto \"Mi piace\""
 reversiCount: "Numero di partite a Reversi"
 contact: "Contatti"
+useSystemFont: "Usa il carattere predefinito del sistema"
 clips: "Clip"
 experimentalFeatures: "Funzioni sperimentali"
 developer: "Sviluppatore"
+makeExplorable: "Account visibile sulla pagina \"Esplora\""
+makeExplorableDescription: "Se disabiliti l'opzione, il tuo account non verrà visualizzato sulla pagina \"Esplora\"."
 showGapBetweenNotesInTimeline: "Mostrare un intervallo tra le note sulla timeline"
 duplicate: "Duplica"
 left: "Sinistra"
 center: "Centro"
 wide: "Largo"
+showTitlebar: "Visualizza la barra del titolo"
 clearCache: "Svuota cache"
 onlineUsersCount: "{n} utenti online"
 nUsers: "{n} utenti"
 nNotes: "{n}Note"
+sendErrorReports: "Invia segnalazioni di errori"
+sendErrorReportsDescription: "Quando abilitato, se si verifica un problema, informazioni dettagliate sugli errori verranno condivise con Misskey in modo da aiutare a migliorare la qualità del software.\nCiò include informazioni come la versione del sistema operativo, il tipo di navigatore web che usi, la cronologia delle attività, ecc."
 myTheme: "I miei temi"
 backgroundColor: "Sfondo"
 textColor: "Testo"
+saveAs: "Salva con nome"
 value: "Valore"
+createdAt: "Data di creazione"
+updatedAt: "Aggiornato il"
 saveConfirm: "Vuoi salvare le modifiche?"
 deleteConfirm: "Rimuovere?"
 registry: "Registro"
 closeAccount: "Disattiva account"
 currentVersion: "Versione attuale"
 latestVersion: "Ultima versione"
+youAreRunningUpToDateClient: "Stai usando la versione più recente del client."
+newVersionOfClientAvailable: "Una nuova versione del tuo client è disponibile."
+usageAmount: "In utilizzo"
+capacity: "Capacità"
 editCode: "Modifica codice"
 apply: "Applica"
 emailNotification: "Eventi per notifiche via mail"
 inChannelSearch: "Cerca in canale"
 useReactionPickerForContextMenu: "Cliccare sul tasto destro per aprire il pannello di reazioni"
 typingUsers: "{users} sta(nno) scrivendo"
+jumpToSpecifiedDate: "Vai alla data "
 showingPastTimeline: "Stai visualizzando una vecchia timeline"
+clear: "Cancella"
+markAllAsRead: "Segna tutti come già letti"
+goBack: "Indietro"
+unlikeConfirm: "Non ti piace più?"
+fullView: "Schermo intero"
+quitFullView: "Esci dalla modalità a schermo intero"
+addDescription: "Aggiungi descrizione"
+userPagePinTip: "Qui puoi appuntare note, premendo \"Fissa sul profilo\" nel menù delle singole note."
+notSpecifiedMentionWarning: "Sono menzionati account che non vengono inclusi fra i destinatari"
 info: "Informazioni"
+userInfo: "Informazioni utente"
+unknown: "Sconosciuto"
+onlineStatus: "Stato di connessione"
+hideOnlineStatus: "Stato invisibile"
+hideOnlineStatusDescription: "Abilitare l'opzione di stato invisibile può guastare la praticità di singole funzioni, come la ricerca."
+online: "Online"
+offline: "Offline"
+notRecommended: "Sconsigliato"
+botProtection: "Protezione contro i bot"
+selectAccount: "Scegli account"
+enabled: "Attivo"
+disabled: "Inattivo"
+quickAction: "Azioni rapide"
+user: "Utente"
+administration: "Gestione"
+_gallery:
+  unlike: "Togli Mi piace"
 _email:
   _follow:
     title: "Ha iniziato a seguirti"
   _receiveFollowRequest:
     title: "Hai ricevuto una richiesta di follow"
+_plugin:
+  install: "Installa estensioni"
+  installWarn: "Si prega di installare soltanto estensioni che provengono da fonti affidabili."
+  manage: "Gestisci estensioni"
 _registry:
   key: "Dati"
   keys: "Dati"
+  domain: "Dominio"
   createKey: "Crea chiave"
 _aboutMisskey:
+  about: "Misskey è un software libero e open source, sviluppato da syuilo dal 2014."
+  contributors: "Principali sostenitori"
+  allContributors: "Tutti i sostenitori"
   source: "Codice sorgente"
-  morePatrons: "Ci sono molti altri che ci sostengono. Grazie 🥰"
+  translation: "Tradurre Misskey"
+  donate: "Sostieni Misskey"
+  morePatrons: "Apprezziamo sinceramente il supporto di tante altre persone. Grazie mille! 🥰"
+  patrons: "Sostenitori"
+_nsfw:
+  respect: "Nascondere i media segnati come sensibli"
+  ignore: "Visualizzare i media segnati come sensibili"
+  force: "Nascondere tutti i media"
 _mfm:
+  cheatSheet: "Bigliettino MFM"
+  dummy: "Il Fediverso si espande con Misskey"
   mention: "Menzioni"
   mentionDescription: "Si può menzionare un utente specifico digitando il suo nome utente subito dopo il segno @."
   hashtag: "Hashtag"
@@ -643,7 +729,9 @@ _mfm:
   search: "Cerca"
   blur: "Sfocatura"
   font: "Tipo di carattere"
+  fontDescription: "Puoi scegliere il tipo di carattere per il contenuto."
 _reversi:
+  reversi: "Reversi"
   gameSettings: "Impostazioni di gioco"
   botSettings: "Opzioni del bot"
   black: "Nero"
@@ -654,6 +742,10 @@ _instanceTicker:
   none: "Nascondi"
   remote: "Mostra solo per gli/le utenti remotə"
   always: "Mostra sempre"
+_serverDisconnectedBehavior:
+  reload: "Ricarica automaticamente"
+  dialog: "Apri avviso in finestra"
+  quiet: "Visualizza avviso in modo discreto"
 _channel:
   create: "Nuovo canale"
   edit: "Gerisci canale"
@@ -665,12 +757,17 @@ _channel:
   usersCount: "{n} partecipanti"
   notesCount: "{n} note"
 _sidebar:
+  full: "Intera"
   icon: "Icone"
   hide: "Nascondere"
 _wordMute:
-  muteWords: "Parole da silenziare"
+  muteWords: "Parole da filtrare"
   muteWordsDescription: "Separare con uno spazio indica la condizione \"E\". Separare con un'interruzzione riga indica la condizione \"O\"."
   muteWordsDescription2: "Metti le parole chiavi tra slash per usare espressioni regolari (regexp)."
+  softDescription: "Nascondi della timeline note che rispondono alle condizioni impostate qui."
+  hardDescription: "Impedisci alla timeline di caricare le note che rispondono alle condizioni impostate qui. Inoltre, le note scompariranno in modo irreversibile, anche se le condizioni verranno successivamente rimosse."
+  soft: "Moderato"
+  hard: "Severo"
   mutedNotes: "Note silenziate"
 _theme:
   explore: "Esplora temi"
@@ -712,8 +809,22 @@ _theme:
     mention: "Menzioni"
     renote: "Rinota"
     divider: "Interruzione di linea"
+    infoFg: "Testo di informazioni"
+    infoWarnBg: "Sfondo degli avvisi"
+    infoWarnFg: "Testo di avviso"
+    cwBg: "Sfondo del CW"
+    cwFg: "Testo del pulsante CW"
+    cwHoverBg: "Sfondo del pulsante CW (sorvolato)"
+    toastBg: "Sfondo di notifica a comparsa"
+    toastFg: "Testo di notifica a comparsa"
+    buttonBg: "Sfondo del pulsante"
+    buttonHoverBg: "Sfondo del pulsante (sorvolato)"
+    inputBorder: "Inquadra casella di testo"
+    listItemHoverBg: "Sfondo della voce di elenco (sorvolato)"
+    driveFolderBg: "Sfondo della cartella di disco"
 _sfx:
   note: "Nota"
+  noteMy: "Mia nota"
   notification: "Notifiche"
   chat: "Messaggi"
   antenna: "Ricezione dell'antenna"
@@ -748,7 +859,7 @@ _tutorial:
   step4_1: "Hai pubblicato qualcosa?"
   step4_2: "Se puoi visualizzare la tua nota sulla timeline, ce l'hai fatta!"
   step5_1: "Adesso, cerca di seguire altre persone per vivacizzare la tua timeline. "
-  step5_2: "La pagina {featured} mostra le note di tendenza su questa istanza e, sfogliandole, magari toverai degli account che ti piacciono e che vorrai seguire. Oppure, potrai trovare utenti popolari usando {explore}."
+  step5_2: "La pagina {featured} mostra le note di tendenza su questa istanza, e magari ti aiuterà a trovare account che ti piacciono e che vorrai seguire. Oppure, potrai trovare utenti popolari usando {explore}."
   step5_3: "Per seguire altrə utenti, clicca sul loro avatar per aprire la pagina di profilo dove puoi premere il pulsante \"Seguire\". "
   step5_4: "Alcunə utenti scelgono di confermare manualmente le richieste di follow che ricevono, quindi a seconda delle persone potrebbe volerci un pò prima che la tua richiesta sia accolta."
   step6_1: "Ora, se puoi visualizzare le note di altrə utenti sulla tua timeline, ce l'hai fatta!"
@@ -757,6 +868,8 @@ _tutorial:
   step7_1: "Complimenti! Sei arrivat@ alla fine dell'esercitazione di base su come usare Misskey. "
   step7_2: "Se vuoi saperne di più su Misskey, puoi dare un'occhiata alla sezione {help}."
   step7_3: "Da ultimo, buon divertimento su Misskey! 🚀"
+_2fa:
+  registerDevice: "Aggiungi dispositivo"
 _permissions:
   "read:blocks": "Visualizza gli account bloccati"
   "write:blocks": "Gestisci gli account bloccati"
@@ -775,6 +888,8 @@ _permissions:
   "write:user-groups": "Gestisci gruppi di utenti"
   "read:channels": "Visualizza canali"
   "write:channels": "Gerisci canali"
+_auth:
+  shareAccess: "Autorizzare「{name}」ad accedere al tuo account?"
 _antennaSources:
   all: "Tutte le note"
   homeTimeline: "Note dagli utenti che segui"
@@ -804,6 +919,7 @@ _widgets:
   button: "Pulsante"
   onlineUsers: "Utenti online"
   jobQueue: "Coda di lavoro"
+  serverMetric: "Statistiche server"
 _cw:
   hide: "Nascondere"
   show: "Mostra di più"
@@ -831,13 +947,24 @@ _postForm:
   replyPlaceholder: "Nota la tua risposta.."
   quotePlaceholder: "Cita Nota..."
   channelPlaceholder: "Pubblica in canale"
+  _placeholders:
+    a: "Che succede?"
+    b: "È successo qualcosa?"
+    c: "Che cos'hai in mente?"
+    d: "Vuoi dire qualcosa?"
+    e: "Scrivi qualcosa qui"
+    f: "Aspettando che scriva..."
 _profile:
   name: "Nome"
   username: "Nome utente"
   description: "Bio"
+  youCanIncludeHashtags: "Puoi anche includere hashtag."
   metadata: "Metadati"
+  metadataEdit: "Modifica informazioni aggiuntive"
+  metadataDescription: "Puoi pubblicare fino a quattro informazioni aggiuntive sul profilo."
   metadataLabel: "Etichetta"
   metadataContent: "Contenuto"
+  changeAvatar: "Modifica immagine profilo"
   changeBanner: "Cambia intestazione"
 _exportOrImport:
   allNotes: "Tutte le note"
@@ -846,19 +973,31 @@ _exportOrImport:
   blockingList: "Account bloccati"
   userLists: "Liste"
 _charts:
+  federationInstancesIncDec: "Variazione del numero di istanze federate"
+  federationInstancesTotal: "Numero totale di istanze federate"
   usersIncDec: "Variazione del numero di utenti"
   usersTotal: "Numero totale di utenti"
   activeUsers: "Numero di utenti attivi"
+  notesIncDec: "Variazione del numero di note"
+  localNotesIncDec: "Variazione del numero di note locali"
+  remoteNotesIncDec: "Variazione del numero di note distanti"
   notesTotal: "Conteggio totale di note"
+  filesIncDec: "Variazione del numero dei file"
+  filesTotal: "Numero totale di file"
+  storageUsageIncDec: "Variazione dell'utilizzo dell'immagazzinamento"
 _instanceCharts:
   users: "Variazione del numero di utenti"
   usersTotal: "Totale cumulativo di utenti"
+  notes: "Variazione del numero di note"
 _timelines:
   home: "Home"
   local: "Locale"
   social: "Sociale"
+  global: "Federata"
 _rooms:
   roomOf: "Camera di {user}"
+  remove: "Togli"
+  leaveConfirm: "Hai fatto modifiche ancora non salvate. Vuoi davvero uscire?"
   _roomType:
     default: "Predefinito"
     washitsu: "Washitsu"
@@ -876,6 +1015,9 @@ _rooms:
     eraser: "Gomma"
     pencil: "Matita"
     pudding: "Pudding"
+    cardboard-box: "Scatola di cartone"
+    cardboard-box2: "Scatola di cartone 2"
+    cardboard-box3: "Scatola di cartone 3"
     book: "Libro"
     book2: "Libro2"
     piano: "Pianoforte"
@@ -895,17 +1037,29 @@ _rooms:
     bin: "Cestino"
     cup-noodle: "Noodle istantanei"
 _pages:
+  newPage: "Crea pagina"
+  editPage: "Modifica pagina"
+  readPage: "Visualizzando fonte "
   created: "Pagina creata!"
+  updated: "Pagina aggiornata con successo!"
+  deleted: "Pagina eliminata"
   pageSetting: "Impostazioni pagina"
+  editThisPage: "Modifica questa pagina"
   viewSource: "Visualizza sorgente"
+  viewPage: "Visualizza pagina"
   like: "Mi piace"
   unlike: "Togli Mi piace"
+  my: "Le mie pagine"
+  liked: "Pagine che mi piacciono"
   featured: "Popolari"
+  contents: "Contenuto"
   content: "Blocco di pagina"
   variables: "Variabili"
   title: "Titolo"
   hideTitleWhenPinned: "Nascondere il titolo pagina quando è fissata in cima al profilo."
   font: "Tipo di carattere"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans serif"
   chooseBlock: "Aggiungi blocco"
   blocks:
     text: "Testo"
@@ -950,6 +1104,12 @@ _pages:
       _action:
         _dialog:
           content: "Contenuto"
+        pushEvent: "Inviare evento"
+        _pushEvent:
+          event: "Nome evento"
+          message: "Messaggio da visualizzare quando abilitato"
+          variable: "Variabile da inviare"
+          no-variable: "Nessun contenuto"
     _radioButton:
       name: "Nome della variabile"
       title: "Titolo"
@@ -1064,7 +1224,21 @@ _notification:
     groupInvited: "Invito a un gruppo"
     app: "Notifiche da applicazioni"
 _deck:
+  alwaysShowMainColumn: "Mostra sempre la colonna principale"
+  columnAlign: "Allineare colonne"
+  columnMargin: "Margine tra le colonne"
+  columnHeaderHeight: "Dimensioni dell'intestazione della colonna"
+  addColumn: "Aggiungi colonna"
+  swapLeft: "Sposta a sinistra"
+  swapRight: "Sposta a destra"
+  swapUp: "Sposta in alto"
+  swapDown: "Sposta in basso"
+  stackLeft: "Impila a sinistra"
+  popRight: "Estrai a destra"
+  profile: "Profilo"
   _columns:
+    main: "Principale"
+    widgets: "Widget"
     notifications: "Notifiche"
     tl: "Timeline"
     antenna: "Antenne"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index c58e51cb9..19ee30a4c 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -138,7 +138,6 @@ flagAsBotDescription: "もしこのアカウントがプログラムによって
 flagAsCat: "Catやで"
 flagAsCatDescription: "ワレ、猫ちゃんならこのフラグをつけてみ？"
 autoAcceptFollowed: "フォローしとるユーザーからのフォローリクエストを勝手に許可しとく"
-addAcount: "アカウント追加"
 loginFailed: "ログインに失敗してしもうた…"
 showOnRemote: "リモートで見る"
 general: "全般"
@@ -347,7 +346,6 @@ antennaExcludeKeywords: "除外キーワード"
 antennaKeywordsDescription: "スペースで区切ったるとAND指定で、改行で区切ったるとOR指定や"
 notifyAntenna: "新しいノートを追加すんで"
 withFileAntenna: "なんか添付されたノートだけ"
-serviceworker: "ServiceWorker"
 enableServiceworker: "ServiceWorkerをつこて"
 antennaUsersDescription: "ユーザー名を改行で区切ったってな"
 caseSensitive: "大文字と小文字は別もんや"
@@ -448,7 +446,6 @@ category: "カテゴリ"
 tags: "タグ"
 docSource: "このドキュメントのソース"
 createAccount: "アカウントを作成"
-existingAcount: "既存のアカウント"
 regenerate: "再生成"
 fontSize: "フォントサイズ"
 noFollowRequests: "フォロー申請はあらへんで"
@@ -541,7 +538,6 @@ large: "大"
 medium: "中"
 small: "小"
 edit: "編集"
-emailConfig: "メールサーバー設定"
 enableEmail: "メール配信を受け取る"
 emailConfigInfo: "メールアドレスの確認とかパスワードリセットの時に使うで"
 email: "メール"
@@ -619,6 +615,7 @@ textColor: "文字"
 saveAs: "名前を付けて保存"
 advanced: "高度"
 value: "値"
+createdAt: "作成した日"
 updatedAt: "更新日時"
 saveConfirm: "保存するで？"
 deleteConfirm: "ホンマに削除するで？"
@@ -641,8 +638,13 @@ typingUsers: "{users}が今書きよるで"
 jumpToSpecifiedDate: "特定の日付にジャンプ"
 showingPastTimeline: "過去のタイムラインを表示してるで"
 clear: "クリア"
+markAllAsRead: "もうみな読んでもうたわ"
 goBack: "戻る"
 info: "情報"
+user: "ユーザー"
+administration: "管理"
+_gallery:
+  unlike: "良くないわ"
 _email:
   _follow:
     title: "フォローされたで"
diff --git a/locales/kn-IN.yml b/locales/kn-IN.yml
index cfbb59225..fd52842b2 100644
--- a/locales/kn-IN.yml
+++ b/locales/kn-IN.yml
@@ -58,6 +58,7 @@ instances: "ನಿದರ್ಶನ"
 remove: "ಅಳಿಸು"
 smtpUser: "ಬಳಕೆಹೆಸರು"
 smtpPass: "ಗುಪ್ತಪದ"
+user: "ಬಳಕೆದಾರ"
 _email:
   _follow:
     title: "ಹಿಂಬಾಲಿಸಿದರು"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 972169c24..44e8a13cb 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -138,7 +138,6 @@ flagAsBotDescription: "이 계정을 자동화된 수단으로 운용할 경우
 flagAsCat: "나는 고양이다냥"
 flagAsCatDescription: "이 계정이 고양이라면 활성화 해주세요."
 autoAcceptFollowed: "팔로우 중인 유저로부터의 팔로우 요청을 자동 수락"
-addAcount: "계정 추가"
 loginFailed: "로그인에 실패했습니다"
 showOnRemote: "리모트에서 보기"
 general: "일반"
@@ -349,7 +348,6 @@ antennaExcludeKeywords: "제외할 키워드"
 antennaKeywordsDescription: "공백으로 구분하는 경우 AND, 줄바꿈으로 구분하는 경우 OR로 지정됩니다"
 notifyAntenna: "새로운 노트를 알림"
 withFileAntenna: "파일이 첨부된 노트만"
-serviceworker: "ServiceWorker"
 enableServiceworker: "ServiceWorker 사용"
 antennaUsersDescription: "유저명을 한 줄에 한 명씩 적습니다"
 caseSensitive: "대소문자를 구분"
@@ -453,7 +451,6 @@ category: "카테고리"
 tags: "태그"
 docSource: "이 문서의 소스"
 createAccount: "계정 만들기"
-existingAcount: "기존 계정"
 regenerate: "재생성"
 fontSize: "글자 크기"
 noFollowRequests: "처리되지 않은 팔로우 요청이 없습니다"
@@ -568,7 +565,6 @@ pluginTokenRequestedDescription: "이 플러그인은 여기서 설정한 권한
 notificationType: "알림 유형"
 edit: "편집"
 useStarForReactionFallback: "알 수 없는 리액션 이모지 대신 ★ 사용"
-emailConfig: "메일 서버 설정"
 enableEmail: "이메일 송신 기능 활성화"
 emailConfigInfo: "가입 시 메일 주소 확인이나 비밀번호 초기화 시에 사용합니다."
 email: "이메일"
@@ -726,8 +722,12 @@ onlineStatus: "온라인 상태"
 hideOnlineStatus: "온라인 상태 숨기기"
 hideOnlineStatusDescription: "온라인 상태를 숨기면, 검색과 같은 일부 기능에 영향을 미칠 수 있습니다."
 online: "온라인"
-active: "활동 중"
+active: "최근에 활동함"
 offline: "오프라인"
+user: "유저"
+administration: "관리"
+_gallery:
+  unlike: "좋아요 해제"
 _email:
   _follow:
     title: "새로운 팔로워가 있습니다"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 9acf8aaec..3b4b53bce 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1,6 +1,7 @@
 ---
 _lang_: "język polski"
 headlineMisskey: "Sieć połączona wpisami"
+introMisskey: "Misskey jest serwisem mikroblogowym typu open source.\nMisskey to opensource'owy serwis mikroblogowy, w którym możesz tworzyć \"notatki\", aby dzielić się tym, co się dzieje i opowiadać wszystkim o sobie.\nMożesz również użyć funkcji \"Reakcje\", aby szybko dodać własne reakcje do notatek innych użytkowników👍.\nOdkrywaj nowy świat🚀!"
 monthAndDay: "{month}-{day}"
 search: "Szukaj"
 notifications: "Powiadomienia"
@@ -61,7 +62,9 @@ import: "Importuj"
 export: "Eksportuj"
 files: "Pliki"
 download: "Pobierz"
+driveFileDeleteConfirm: "Czy chcesz usunąć plik \"{name}\"? Zniknie również notatka, do której dołączony jest ten plik."
 unfollowConfirm: "Czy na pewno chcesz przestać obserwować {name}?"
+exportRequested: "Zażądałeś eksportu. Może to zająć trochę czasu. Po zakończeniu eksportu zostanie on dodany do Twoich \"dysków\"."
 lists: "Listy"
 noLists: "Nie masz żadnych list"
 note: "Utwórz wpis"
@@ -133,7 +136,6 @@ flagAsBot: "To konto jest botem"
 flagAsCat: "To konto jest kotem"
 flagAsCatDescription: "Przełącz tę opcję, aby konto było oznaczone jako kot."
 autoAcceptFollowed: "Automatycznie przyjmuj prośby o możliwość obserwacji od użytkowników, których obserwujesz"
-addAcount: "Dodaj konto"
 loginFailed: "Nie udało się zalogować"
 showOnRemote: "Zobacz na zdalnej instancji"
 general: "Ogólne"
@@ -331,7 +333,6 @@ name: "Nazwa"
 antennaSource: "Źródło Anteny"
 antennaExcludeKeywords: "Wykluczone słowa kluczowe"
 withFileAntenna: "Filtruj tylko wpisy z załączonym plikiem"
-serviceworker: "ServiceWorker"
 enableServiceworker: "Włącz ServiceWorker"
 antennaUsersDescription: "Wypisz po jednej nazwie użytkownika w linii"
 caseSensitive: "Wielkość liter ma znaczenie"
@@ -431,7 +432,6 @@ category: "Kategoria"
 tags: "Tagi"
 docSource: "Źródło tego dokumentu"
 createAccount: "Utwórz konto"
-existingAcount: "Istniejące konta"
 regenerate: "Wygeneruj ponownie"
 fontSize: "Rozmiar czcionki"
 noFollowRequests: "Nie masz żadnych oczekujących próśb o możliwość obserwacji"
@@ -540,7 +540,6 @@ pluginTokenRequestedDescription: "Ta wtyczka będzie mogła korzystać z ustawio
 notificationType: "Rodzaj powiadomień"
 edit: "Edytuj"
 useStarForReactionFallback: "Użyj ★ jako zapasowego emoji, gdy emoji reakcji jest nieznane"
-emailConfig: "Konfiguracja serwera e-mail"
 enableEmail: "Włącz dostarczanie wiadomości e-mail"
 emailConfigInfo: "Wykorzystywany do potwierdzenia adresu e-mail w trakcie rejestracji, lub gdy zapomnisz hasła"
 email: "Adres e-mail"
@@ -646,6 +645,10 @@ textColor: "Tekst"
 value: "Wartość"
 goBack: "Wróć"
 info: "Informacje"
+user: "Użytkownicy"
+administration: "Zarządzanie"
+_gallery:
+  unlike: "Cofnij polubienie"
 _email:
   _follow:
     title: "Zaobserwował(a) Cię"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 57fa366f5..5620c0f92 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -138,7 +138,7 @@ flagAsBotDescription: "Включите, если этот аккаунт упр
 flagAsCat: "Аккаунт кота"
 flagAsCatDescription: "Включите, и этот аккаунт будет помечен как кошачий."
 autoAcceptFollowed: "Принимать подписчиков автоматически"
-addAcount: "Добавить аккаунт"
+addAccount: "Добавить учётную запись"
 loginFailed: "Неудачная попытка входа"
 showOnRemote: "Перейти к оригиналу на сайт"
 general: "Общее"
@@ -349,7 +349,6 @@ antennaExcludeKeywords: "Исключения"
 antennaKeywordsDescription: "Пишите слова через пробел в одной строке, чтобы ловить их появление вместе; на отдельных строках располагайте слова, или группы слов, чтобы ловить любые из них."
 notifyAntenna: "Уведомлять о новых заметках"
 withFileAntenna: "Только заметки с вложениями"
-serviceworker: "ServiceWorker"
 enableServiceworker: "Включить ServiceWorker"
 antennaUsersDescription: "Пишите каждое название аккаута на отдельной строке"
 caseSensitive: "С учётом регистра"
@@ -453,7 +452,7 @@ category: "Категория"
 tags: "Метки"
 docSource: "Источник документа"
 createAccount: "Новая учётная запись"
-existingAcount: "Уже существующий"
+existingAccount: "Существующая учётная запись"
 regenerate: "Создать повторно"
 fontSize: "Размер шрифта"
 noFollowRequests: "Нерассмотренные запросы на подписку отсутствуют"
@@ -568,7 +567,7 @@ pluginTokenRequestedDescription: "Это расширение сможет по
 notificationType: "Тип уведомления"
 edit: "Изменить"
 useStarForReactionFallback: "Ставить ★ в качестве реакции вместо неизвестного эмодзи"
-emailConfig: "Настройки почтового сервера"
+emailServer: "Сервер электронной почты"
 enableEmail: "Включить обмен электронной почтой"
 emailConfigInfo: "Используется для подтверждения адреса электронной почты и сброса пароля."
 email: "Электронная почта"
@@ -687,6 +686,7 @@ textColor: "Текст"
 saveAs: "Сохранить под названием…"
 advanced: "Для продвинутых"
 value: "Значения"
+createdAt: "Создано"
 updatedAt: "Обновлено"
 saveConfirm: "Сохранить изменения?"
 deleteConfirm: "Удалить?"
@@ -710,8 +710,39 @@ typingUsers: "Стук клавиш. Это {users}…"
 jumpToSpecifiedDate: "Перейти к заданной дате"
 showingPastTimeline: "Отображается старая лента"
 clear: "Очистить"
+markAllAsRead: "Отметить всё как прочитанное"
 goBack: "Выход"
+unlikeConfirm: "В самом деле отменить «нравится»?"
+fullView: "Полный вид"
+quitFullView: "Закрыть полный вид"
+addDescription: "Добавить описание"
+userPagePinTip: "Можно добавить сюда заметки, выбрав нужную, и включив в её меню пункт «Закрепить в профиле»."
+notSpecifiedMentionWarning: "В этой заметке есть упоминание тех, кто не включён в адресаты"
 info: "Описание"
+userInfo: "Сведения о пользователе"
+unknown: "Неизвестно"
+onlineStatus: "Присутствие в сети"
+hideOnlineStatus: "Скрыть присутствие"
+hideOnlineStatusDescription: "Сокрытие присутствия делает некоторые функции, такие как поиск, менее удобными."
+online: "В сети"
+active: "Действует"
+offline: "Не в сети"
+notRecommended: "Не рекомендуется"
+botProtection: "Ботозащита"
+instanceBlocking: "Блокировка инстансов"
+selectAccount: "Выберите учётную запись"
+enabled: "Вкл."
+disabled: "Откл."
+quickAction: "Быстрое действие"
+user: "Пользователи"
+administration: "Управление"
+accounts: "Учётные записи"
+switch: "Переключение"
+noMaintainerInformationWarning: "Не заполнены сведения об администраторах"
+noBotProtectionWarning: "Ботозащита не настроена"
+configure: "Настроить"
+_gallery:
+  unlike: "Отменить «нравится»"
 _email:
   _follow:
     title: "Новый подписчик"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 2eac306cd..c3967d74c 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -138,7 +138,6 @@ flagAsBotDescription: "Ввімкніть якщо цей обліковий з
 flagAsCat: "Акаунт кота"
 flagAsCatDescription: "Ввімкніть, щоб позначити, що обліковий запис є котиком."
 autoAcceptFollowed: "Автоматично приймати запити на підписку від користувачів, на яких ви підписані"
-addAcount: "Додати акаунт"
 loginFailed: "Не вдалося увійти"
 showOnRemote: "Переглянути в оригіналі"
 general: "Загальне"
@@ -347,7 +346,6 @@ antennaExcludeKeywords: "Винятки"
 antennaKeywordsDescription: "Розділення ключових слів пробілами для \"І\" або з нової лінійки для \"АБО\""
 notifyAntenna: "Сповіщати про нові нотатки"
 withFileAntenna: "Тільки нотатки з вкладеними файлами"
-serviceworker: "ServiceWorker"
 enableServiceworker: "Ввімкнути ServiceWorker"
 antennaUsersDescription: "Список імя користувачів в стопчик"
 caseSensitive: "З урахуванням регістру"
@@ -450,7 +448,6 @@ category: "Категорія"
 tags: "Теги"
 docSource: "Джерело цього документа"
 createAccount: "Створити акаунт"
-existingAcount: "Існуючий акаунт"
 regenerate: "Оновити"
 fontSize: "Розмір шрифту"
 noFollowRequests: "Немає запитів на підписку"
@@ -564,7 +561,6 @@ pluginTokenRequestedDescription: "Цей плагін зможе викорис
 notificationType: "Тип сповіщення"
 edit: "Редагувати"
 useStarForReactionFallback: "Використовувати ★ як запасний варіант, якщо емодзі реакції невідомий"
-emailConfig: "Налаштування email сервера"
 enableEmail: "Увімкнути функцію доставки пошти"
 emailConfigInfo: "Використовується для підтвердження електронної пошти підчас реєстрації, а також для відновлення паролю."
 email: "E-mail"
@@ -691,6 +687,10 @@ registry: "Реєстр"
 closeAccount: "Закрити обліковий запис"
 goBack: "Назад"
 info: "Інформація"
+user: "Користувачі"
+administration: "Управління"
+_gallery:
+  unlike: "Не вподобати"
 _email:
   _follow:
     title: "Новий підписник"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 04206c0a3..bf84fb6f1 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -138,7 +138,7 @@ flagAsBotDescription: "如果此帐户由程序控制，请启用此项。启用
 flagAsCat: "这个账户是Cat"
 flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。"
 autoAcceptFollowed: "自动允许关注"
-addAcount: "添加账户"
+addAccount: "添加账户"
 loginFailed: "登录失败"
 showOnRemote: "转到所在实例显示"
 general: "常规设置"
@@ -349,7 +349,6 @@ antennaExcludeKeywords: "排除关键字"
 antennaKeywordsDescription: "使用空格分隔会产生AND规范，并且使用换行符分隔会产生OR规范"
 notifyAntenna: "通知新帖子"
 withFileAntenna: "仅带有附件的帖子"
-serviceworker: "ServiceWorker"
 enableServiceworker: "启用ServiceWorker"
 antennaUsersDescription: "指定用户名，用换行符分隔"
 caseSensitive: "区分大小写"
@@ -453,7 +452,7 @@ category: "类别"
 tags: "标签"
 docSource: "文件来源"
 createAccount: "注册账户"
-existingAcount: "现有的帐户"
+existingAccount: "现有的帐户"
 regenerate: "重新生成"
 fontSize: "字体大小"
 noFollowRequests: "没有关注申请"
@@ -568,7 +567,7 @@ pluginTokenRequestedDescription: "此插件将能够拥有此处设置的权限"
 notificationType: "通知类型"
 edit: "编辑"
 useStarForReactionFallback: "如果回应的是未知表情符号，则使用★作为代替"
-emailConfig: "邮件服务器设置"
+emailServer: "邮件服务器"
 enableEmail: "启用发送邮件功能"
 emailConfigInfo: "用于确认电子邮件和密码重置"
 email: "邮箱"
@@ -728,6 +727,22 @@ hideOnlineStatusDescription: "隐藏在线状态后，可能会降低例如搜
 online: "在线"
 active: "活动"
 offline: "离线"
+notRecommended: "不推荐"
+botProtection: "Bot防御"
+instanceBlocking: "被阻拦的实例"
+selectAccount: "选择账户"
+enabled: "已启用"
+disabled: "已禁用 "
+quickAction: "快捷操作"
+user: "用户"
+administration: "管理"
+accounts: "账户"
+switch: "切换"
+noMaintainerInformationWarning: "管理人员信息未设置。"
+noBotProtectionWarning: "Bot保护未设置。"
+configure: "设置"
+_gallery:
+  unlike: "取消赞"
 _email:
   _follow:
     title: "你有新的关注者"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 7752f6613..62b48829b 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -56,7 +56,7 @@ receiveFollowRequest: "您有新的追隨請求"
 followRequestAccepted: "追隨請求已接受"
 mention: "提及"
 mentions: "提及"
-directNotes: "指定使用者發佈"
+directNotes: "私訊"
 importAndExport: "匯入與匯出"
 import: "匯入"
 export: "匯出"
@@ -94,7 +94,7 @@ renote: "轉發"
 unrenote: "取消轉發"
 renoted: "轉發成功"
 cantRenote: "無法轉發此貼文。"
-cantReRenote: "無法轉發之前已經轉發過的內容"
+cantReRenote: "無法轉發之前已經轉發過的內容。"
 quote: "引用"
 pinnedNote: "已置頂的貼文"
 pinned: "置頂"
@@ -138,7 +138,7 @@ flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。
 flagAsCat: "此使用者是貓"
 flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
 autoAcceptFollowed: "自動追隨中使用者的追隨請求"
-addAcount: "新增帳戶"
+addAccount: "添加帳戶"
 loginFailed: "登入失敗"
 showOnRemote: "轉到所在實例顯示"
 general: "一般"
@@ -149,7 +149,7 @@ searchWith: "搜尋: {q}"
 youHaveNoLists: "你沒有任何清單"
 followConfirm: "你真的要追隨{name}嗎？"
 proxyAccount: "代理帳號"
-proxyAccountDescription: "代理帳號是在某些情況下充當其他伺服器用戶的帳號。例如，當用戶將一個來自其他伺服器的帳號放在列表中時，由於沒有其他用戶關注該帳號，該指令不會傳送到該伺服器上，因此會由代理帳戶關注。"
+proxyAccountDescription: "代理帳號是在某些情況下充當其他伺服器用戶的帳號。例如，當使用者將一個來自其他伺服器的帳號放在列表中時，由於沒有其他使用者關注該帳號，該指令不會傳送到該伺服器上，因此會由代理帳戶關注。"
 host: "主機"
 selectUser: "選取使用者"
 recipient: "收件人"
@@ -180,7 +180,7 @@ instanceInfo: "實例資訊"
 statistics: "統計"
 clearQueue: "清除佇列"
 clearQueueConfirmTitle: "確定要清除佇列嗎？"
-clearQueueConfirmText: "未發佈的帖子將不會發佈。您通常不需要確認。"
+clearQueueConfirmText: "未發佈的貼文將不會發佈。您通常不需要確認。"
 clearCachedFiles: "清除快取資料"
 clearCachedFilesConfirm: "確定要清除所有遠端暫存資料嗎？"
 blockedInstances: "已封鎖的實例"
@@ -192,12 +192,12 @@ noUsers: "沒有任何使用者"
 editProfile: "編輯個人檔案"
 noteDeleteConfirm: "確定刪除此貼文嗎？"
 pinLimitExceeded: "不能置頂更多貼文了"
-intro: "Misskey 部署完成！請開設管理員帳號！"
+intro: "Misskey 部署完成！請建立管理員帳號！"
 done: "完成"
 processing: "處理中"
 preview: "預覽"
 default: "預設"
-noCustomEmojis: "沒有表情符號"
+noCustomEmojis: "沒有自訂的表情符號"
 noJobs: "沒有任務"
 federating: "整合搜索中"
 blocked: "已封鎖"
@@ -231,7 +231,7 @@ resetAreYouSure: "確定要重設嗎？"
 saved: "已儲存"
 messaging: "傳送訊息"
 upload: "上傳"
-fromDrive: "從雲端"
+fromDrive: "從雲端空間"
 fromUrl: "從URL"
 uploadFromUrl: "從網址上傳"
 uploadFromUrlDescription: "您要上傳的文件的URL"
@@ -247,7 +247,7 @@ agreeTo: "我同意{0}"
 tos: "使用條款"
 start: "開始"
 home: "首頁"
-remoteUserCaution: "由於該用戶來自遠端實例，因此資料用戶並未即時更新。"
+remoteUserCaution: "由於該使用者來自遠端實例，因此資訊可能非即時的。"
 activity: "動態"
 images: "圖片"
 birthday: "生日"
@@ -286,11 +286,11 @@ rename: "重新命名"
 avatar: "大頭貼"
 banner: "橫幅"
 nsfw: "敏感內容"
-whenServerDisconnected: "與服務器的連接中斷時"
+whenServerDisconnected: "與伺服器的連接中斷時"
 disconnectedFromServer: "與伺服器中斷連線"
-reload: "重新載入"
+reload: "重新整理"
 doNothing: "無視"
-reloadConfirm: "確定要重新嘗試嗎？"
+reloadConfirm: "確定要重新整理嗎？"
 watch: "關注"
 unwatch: "取消追隨"
 accept: "接受"
@@ -315,18 +315,18 @@ enableLocalTimeline: "開啟本地時間軸"
 enableGlobalTimeline: "啟用公開時間軸"
 disablingTimelinesInfo: "即使您關閉了時間線功能，管理員和協調人仍可以繼續使用，以方便您。"
 registration: "註冊"
-enableRegistration: "開啟新用戶註冊"
+enableRegistration: "開啟新使用者註冊"
 invite: "邀請"
 proxyRemoteFiles: "遠端代理檔案"
-proxyRemoteFilesDescription: "啟用此設置後，由於超出存儲容量而未保存或刪除的遠程文件將被本地代理，並且將生成預覽圖。這不影響服務器的存儲。"
-driveCapacityPerLocalAccount: "每個本地用戶的雲端容量"
+proxyRemoteFilesDescription: "啟用此設置後，由於超出存儲容量而未保存或刪除的遠程文件將被本地代理，並且將生成預覽圖。這不影響伺服器的存儲。"
+driveCapacityPerLocalAccount: "每個本地用戶的雲端空間大小"
 driveCapacityPerRemoteAccount: "每個非本地用戶的雲端容量"
 inMb: "以Mbps為單位"
 iconUrl: "圖像URL"
-bannerUrl: "橫幅圖片URL"
+bannerUrl: "橫幅圖像URL"
 basicInfo: "基本資訊"
 pinnedUsers: "置頂用戶"
-pinnedUsersDescription: "在「發現」頁面中使用換行標記想要置頂的用戶。"
+pinnedUsersDescription: "在「發現」頁面中使用換行標記想要置頂的使用者。"
 pinnedPages: "釘選頁面"
 pinnedPagesDescription: "輸入要固定至實例首頁的頁面路徑，以換行符分隔。"
 pinnedClipId: "置頂的摘錄ID"
@@ -339,7 +339,7 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "啟用 reCAPTCHA"
 recaptchaSiteKey: "網站金鑰"
 recaptchaSecretKey: "金鑰"
-avoidMultiCaptchaConfirm: "使用多種驗證方式可能會造成干擾，您要禁用其他驗證方式嗎？您可以按“取消”保留多種驗證方式。"
+avoidMultiCaptchaConfirm: "使用多種驗證方式可能會造成干擾，您要關閉其他驗證方式嗎？您可以按“取消”保留多種驗證方式。"
 antennas: "天線"
 manageAntennas: "管理天線"
 name: "名稱"
@@ -349,7 +349,6 @@ antennaExcludeKeywords: "排除關鍵字"
 antennaKeywordsDescription: "用空格分隔指定AND、用換行符分隔指定OR"
 notifyAntenna: "通知有新貼文"
 withFileAntenna: "僅帶有附件的貼文"
-serviceworker: "ServiceWorker"
 enableServiceworker: "開啟 ServiceWorker"
 antennaUsersDescription: "指定用換行符分隔的用戶名"
 caseSensitive: "區分大小寫"
@@ -361,11 +360,11 @@ silence: "禁言"
 silenceConfirm: "確定要禁言此用戶嗎？"
 unsilence: "解除禁言"
 unsilenceConfirm: "確定要解除禁言嗎？"
-popularUsers: "熱門用戶"
-recentlyUpdatedUsers: "最近發文的用戶"
-recentlyRegisteredUsers: "新加入用戶"
-recentlyDiscoveredUsers: "最近發現的用戶"
-exploreUsersCount: "有{count}個用戶"
+popularUsers: "熱門使用者"
+recentlyUpdatedUsers: "最近發文的使用者"
+recentlyRegisteredUsers: "新加入使用者"
+recentlyDiscoveredUsers: "最近發現的使用者"
+exploreUsersCount: "有{count}個使用者"
 exploreFediverse: "探索聯邦世界"
 popularTags: "熱門標籤"
 userList: "清單"
@@ -405,7 +404,7 @@ invites: "邀請"
 groupName: "群組名稱"
 members: "成員"
 transfer: "轉讓"
-messagingWithUser: "傳送訊息給其他用戶"
+messagingWithUser: "傳送訊息給其他使用者"
 messagingWithGroup: "發送訊息至群組"
 title: "標題"
 text: "文字"
@@ -431,11 +430,11 @@ tooShort: "過短"
 tooLong: "過長"
 weakPassword: "密碼強度過弱"
 normalPassword: "密碼強度普通"
-strongPassword: "密碼強度堅強"
+strongPassword: "密碼強度高"
 passwordMatched: "密碼一致"
 passwordNotMatched: "密碼不一致"
 signinWith: "以{x}登錄"
-signinFailed: "登入失敗。 請檢查用戶名和密碼。"
+signinFailed: "登入失敗。 請檢查使用者名稱和密碼。"
 tapSecurityKey: "點擊安全密鑰"
 or: "或者"
 language: "語言"
@@ -453,7 +452,7 @@ category: "類別"
 tags: "標籤"
 docSource: "文件來源"
 createAccount: "建立帳戶"
-existingAcount: "現有帳戶"
+existingAccount: "現有帳戶"
 regenerate: "再生"
 fontSize: "字體大小"
 noFollowRequests: "沒有要求跟隨您的申請"
@@ -477,8 +476,8 @@ useObjectStorage: "使用Object Storage"
 objectStorageBaseUrl: "Base URL"
 objectStorageBucket: "儲存空間（Bucket）"
 objectStoragePrefix: "前綴"
-objectStorageEndpoint: "訪問網域名稱（Endpoint）"
-objectStorageEndpointDesc: "如要使用AWS S3，請留空。否則請根據伺服器要求以'<host>'或 '<host>:<port>'的形式設定訪問網域名稱（Endpoint）。"
+objectStorageEndpoint: "端點（Endpoint）"
+objectStorageEndpointDesc: "如要使用AWS S3，請留空。否則請依照你使用的服務商的說明書進行設定，以'<host>'或 '<host>:<port>'的形式設定端點（Endpoint）。"
 objectStorageRegion: "地域（Region）"
 objectStorageUseSSL: "使用SSL"
 objectStorageUseProxy: "使用網路代理"
@@ -512,12 +511,12 @@ scratchpad: "暫存記憶體"
 output: "輸出"
 script: "腳本"
 disablePagesScript: "停用頁面的AiScript腳本"
-updateRemoteUser: "更新遠端用戶資料"
+updateRemoteUser: "更新遠端使用者資訊"
 deleteAllFiles: "刪除所有檔案"
 deleteAllFilesConfirm: "要删除所有檔案嗎？"
 removeAllFollowing: "解除所有追蹤"
 removeAllFollowingDescription: "解除{host}所有的追蹤。在實例不再存在時執行。"
-userSuspended: "該用戶已被凍結"
+userSuspended: "該使用者已被停用"
 userSilenced: "該用戶已被禁言。"
 sidebar: "側邊列"
 divider: "分割線"
@@ -559,7 +558,7 @@ tokenRequested: "允許存取帳號"
 notificationType: "通知形式"
 edit: "編輯"
 useStarForReactionFallback: "以★代替未知的表情符號"
-emailConfig: "電子郵件伺服器設定"
+emailServer: "電郵伺服器"
 enableEmail: "啟用發送電郵功能"
 emailConfigInfo: "用於確認電郵地址及密碼重置"
 email: "電子郵件"
@@ -586,9 +585,11 @@ create: "新增"
 notificationSetting: "通知設定"
 notificationSettingDesc: "選擇顯示通知的類型"
 useGlobalSetting: "使用全域設定"
+useGlobalSettingDesc: "啟用時，將使用帳戶通知設定。停用時，則可以單獨設定。"
 other: "其他"
 regenerateLoginToken: "重新產生登入權杖"
 regenerateLoginTokenDescription: "重新產生用於登入的內部權杖。一般情況下是不需要這樣做的。一旦重產，所有裝置將會被登出。"
+setMultipleBySeparatingWithSpace: "您可以使用空格分隔多個項目。"
 fileIdOrUrl: "檔案ID或URL"
 chatOpenBehavior: "開啟聊天窗口時的行為"
 behavior: "行為"
@@ -602,6 +603,7 @@ send: "發送"
 abuseMarkAsResolved: "處理完畢"
 openInNewTab: "在新分頁中開啟"
 openInSideView: "在側欄中開啟"
+defaultNavigationBehaviour: "默認導航"
 editTheseSettingsMayBreakAccount: "修改這些設定可能會毀損您的帳戶"
 instanceTicker: "貼文的實例來源"
 waitingFor: "等待{x}"
@@ -635,13 +637,16 @@ driveUsage: "雲端硬碟使用量"
 noCrawle: "拒絕搜尋引擎索引"
 noCrawleDescription: "要求網路搜尋引擎不要索引你的個人資料頁、貼文及頁面等。"
 lockedAccountInfo: "即使你通過了追隨者請求，除非你將貼文的可見性設定為 「追隨者」，否則任何人都能看見你的貼文。"
+alwaysMarkSensitive: "默認將圖像/影像標記為敏感內容"
 loadRawImages: "以原始圖檔顯示附件圖檔的縮圖"
 disableShowingAnimatedImages: "不播放動態圖檔"
+verificationEmailSent: "已發送驗證電子郵件。請點擊進入電子郵件中的鏈接完成驗證。"
 notSet: "未設定"
 emailVerified: "已成功驗證您的電郵"
 noteFavoritesCount: "我的最愛貼文的數目"
 pageLikesCount: "頁面被按讚次數"
 pageLikedCount: "頁面被按讚次數"
+reversiCount: "黑白棋對戰次數"
 contact: "聯絡人"
 useSystemFont: "使用系統預設的字型"
 clips: "摘錄"
@@ -670,6 +675,7 @@ textColor: "文字"
 saveAs: "另存為..."
 advanced: "進階"
 value: "數值"
+createdAt: "建立於"
 updatedAt: "最後更新"
 saveConfirm: "您要儲存變更嗎？"
 deleteConfirm: "你確定要刪除嗎？"
@@ -685,17 +691,55 @@ capacity: "容量"
 inUse: "已使用"
 editCode: "編輯代碼"
 apply: "套用"
+receiveAnnouncementFromInstance: "接收由本實例發出的電郵通知"
 emailNotification: "郵件通知"
 inChannelSearch: "頻道内搜尋"
+useReactionPickerForContextMenu: "點擊右鍵開啟回應工具欄"
 typingUsers: "{users}輸入中..."
 jumpToSpecifiedDate: "跳轉到特定日期"
+showingPastTimeline: "顯示過往的時間線"
 clear: "清除"
+markAllAsRead: "全部標示為已讀"
 goBack: "返回"
+unlikeConfirm: "要取消按讚嗎？"
+fullView: "全熒幕顯示"
+quitFullView: "退出全熒幕顯示"
+addDescription: "添加描述"
+userPagePinTip: "在貼文的選單中選擇\"置頂\"，即可置頂該貼文至您的個人檔案頁面。"
+notSpecifiedMentionWarning: "此貼文有未指定的提及"
 info: "資訊"
+userInfo: "用戶資料"
+unknown: "未知"
+onlineStatus: "在線狀態"
+hideOnlineStatus: "隱藏在線狀態"
+hideOnlineStatusDescription: "隱藏在線狀態後，可能會降低檢索等功能的便利性。"
+online: "線上"
+active: "最近活躍"
+offline: "離線"
+notRecommended: "不推薦"
+botProtection: "Bot防護"
+instanceBlocking: "已封鎖的實例"
+selectAccount: "選擇帳戶"
+enabled: "已啟用"
+disabled: "已停用"
+quickAction: "快捷操作"
+user: "使用者"
+administration: "管理"
+accounts: "帳戶"
+switch: "切換"
+noMaintainerInformationWarning: "尚未設定管理員信息。"
+noBotProtectionWarning: "尚未設定Bot防護。"
+configure: "設定"
+_gallery:
+  unlike: "收回喜歡"
 _email:
   _follow:
     title: "您有新的追隨者"
+  _receiveFollowRequest:
+    title: "收到追隨請求"
 _plugin:
+  install: "安裝外掛組件"
+  installWarn: "請不要安裝來源不明的外掛組件。"
   manage: "管理插件"
 _registry:
   scope: "範圍"
@@ -723,7 +767,9 @@ _mfm:
   mention: "提及"
   mentionDescription: "透過 @+用戶名 來標示特定使用者。"
   hashtag: "#tag"
+  hashtagDescription: "可以使用\"#\"符號後加文字表示話題標籤。"
   url: "URL"
+  urlDescription: "可以展示URL位址。"
   link: "鏈接"
   bold: "粗體"
   small: "縮小"
@@ -797,8 +843,8 @@ _serverDisconnectedBehavior:
 _channel:
   create: "建立頻道"
   edit: "編輯頻道"
-  setBanner: "設定橫幅"
-  removeBanner: "移除封面圖"
+  setBanner: "設定橫幅圖像"
+  removeBanner: "移除橫幅圖像"
   featured: "熱門貼文"
   owned: "管理中"
   following: "關注中"
@@ -839,6 +885,7 @@ _theme:
     fg: "文本"
     panel: "面板"
     shadow: "陰影"
+    navActive: "側邊欄文本 (活動)"
     navIndicator: "側邊欄指示符"
     link: "鏈接"
     hashtag: "#tag"
@@ -856,11 +903,14 @@ _theme:
     cwBg: "CW 按鈕背景"
     cwFg: "CW 按鈕文本"
     cwHoverBg: "CW 按鈕背景 (漂浮)"
+    toastBg: "通知背景"
+    toastFg: "通知文本"
     buttonBg: "按鈕背景"
     buttonHoverBg: "按鈕背景 (漂浮)"
     inputBorder: "輸入框邊框"
     listItemHoverBg: "列表物品背景 (漂浮)"
     driveFolderBg: "雲端硬碟文件夾背景"
+    wallpaperOverlay: "壁紙覆蓋層"
     badge: "獎章"
     messageBg: "私訊背景"
     accentDarken: "強調色(偏暗)"
@@ -871,6 +921,7 @@ _sfx:
   noteMy: "我的貼文"
   notification: "通知"
   chat: "傳送訊息"
+  chatBg: "聊天背景"
   antenna: "天線接收"
   channel: "頻道通知"
 _ago:
@@ -908,6 +959,7 @@ _tutorial:
   step5_4: "如果使用者的名字旁有鎖頭的圖示，代表他們需要手動核准你的追隨請求。"
   step6_1: "現在你可以在時間軸上看到其他用戶的貼文。"
   step6_2: "你也可以對別人的貼文作出「情感」，作出簡單的回覆。"
+  step6_3: "在他人的貼文按下\"+\"圖標，即可選擇喜好的表情符號進行回應。"
   step7_1: "以上為Misskey的基本操作說明，教學在此告一段落。辛苦了。"
   step7_2: "歡迎到{help}來瞭解更多Misskey相關介紹。"
   step7_3: "那麼，祝您在Misskey玩的開心~ 🚀"
@@ -925,6 +977,7 @@ _permissions:
   "write:drive": "編輯雲端硬碟的檔案"
   "read:favorites": "瀏覽我的最愛"
   "write:favorites": "編輯我的最愛列表"
+  "read:following": "查看追隨中的用戶資訊"
   "write:following": "追隨/解除追隨"
   "read:messaging": "顯示訊息"
   "write:messaging": "撰寫或刪除私人訊息"
@@ -991,6 +1044,7 @@ _poll:
   noOnlyOneChoice: "至少需要兩個選項。"
   choiceN: "選擇{n}"
   noMore: "沒辦法再添加選項了"
+  canMultipleVote: "可以多次投票"
   expiration: "期限"
   infinite: "無期限"
   at: "結束時間"
@@ -1034,6 +1088,8 @@ _profile:
   metadataEdit: "編輯進階資訊"
   metadataLabel: "標籤"
   metadataContent: "内容"
+  changeAvatar: "更換大頭貼"
+  changeBanner: "變更橫幅圖像"
 _exportOrImport:
   allNotes: "所有貼文"
   followingList: "追隨中"
diff --git a/src/docs/fr-FR/theme.md b/src/docs/fr-FR/theme.md
index cf15c921e..4d473e455 100644
--- a/src/docs/fr-FR/theme.md
+++ b/src/docs/fr-FR/theme.md
@@ -52,7 +52,7 @@ C'est dans `props` que vous définirez le style de thème. Les propriétés devi
     * Ex. : `rgb(0, 255, 0)`
 * Couleurs avec les valeurs RVBA : `rgba(r, g, b, a)`
     * Ex. : `rgba(0, 255, 0, 0.5)`
-* Faire référence aux valeurs d'autres propriétés
+* Appeler les valeurs d'autres propriétés
     * Entrer `@{keyname}` pour utiliser la valeur de la propriété citée. Remplacer alors `{keyname}` par le nom de la propriété que vous souhaitez citer.
     * Ex. : `@panel`
 * Constantes (voir ci-dessous)
diff --git a/src/docs/it-IT/deck.md b/src/docs/it-IT/deck.md
index 8057e262f..6037e4291 100644
--- a/src/docs/it-IT/deck.md
+++ b/src/docs/it-IT/deck.md
@@ -1,18 +1,18 @@
-# デッキ
+# Deck
 
-デッキは利用可能なUIのひとつです。「カラム」と呼ばれるビューを複数並べて表示させることで、カスタマイズ性が高く、情報量の多いUIが構築できることが特徴です。
+Il deck è una delle interfacce utente disponibili.「カラム」と呼ばれるビューを複数並べて表示させることで、カスタマイズ性が高く、情報量の多いUIが構築できることが特徴です。
 
-## カラムの追加
-デッキの背景を右クリックし、「カラムを追加」して任意のカラムを追加できます。
+## Aggiungere colonne
+Puoi aggiungere una colonna facendo un clic destro nello sfondo del deck, poi scegliendo "Aggiungi colonna".
 
-## カラムの移動
+## Spostare colonne
 カラムは、ドラッグアンドドロップで他のカラムと位置を入れ替えることが出来るほか、カラムメニュー(カラムのヘッダー右クリック)から位置を移動させることもできます。
 
-## カラムの水平分割
+## Dividere colonne in orizzontale
 カラムは左右だけでなく、上下に並べることもできます。 カラムメニューを開き、「左に重ねる」を選択すると、左のカラムの下に現在のカラムが移動します。 上下分割を解除するには、カラムメニューの「右に出す」を選択します。
 
-## カラムの設定
-カラムメニューの「編集」を選択するとカラムの設定を編集できます。カラムの名前を変えたり、幅を変えたりできます。
+## Impostazioni colonna
+Puoi modificare le impostazioni della singola colonna premendo "Modifica" nel menù di colonna. È possibile cambiare il nome e la larghezza della colonna.
 
-## デッキの設定
-デッキに関する設定は、[settings/deck](/settings/deck)で行えます。
+## Impostazioni deck
+Puoi trovare le opzioni d'impostazione in [settings/deck](/settings/deck).
diff --git a/src/docs/it-IT/keyboard-shortcut.md b/src/docs/it-IT/keyboard-shortcut.md
index c9bb815ba..bb5fd328f 100644
--- a/src/docs/it-IT/keyboard-shortcut.md
+++ b/src/docs/it-IT/keyboard-shortcut.md
@@ -15,25 +15,25 @@ Le scorciatoie da tastiera sotto citate si possono usare praticamente ovunque.
     </tbody>
 </table>
 
-## 投稿にフォーカスされた状態
+## Azioni riguardanti le pubblicazioni
 
 <table>
     <thead>
         <tr><th>Scorciatoia</th><th>Effetto</th><th>Accesso universale</th></tr>
     </thead>
     <tbody>
-        <tr><td><kbd class="key">↑</kbd>, <kbd class="key">K</kbd>, <kbd class="group"><kbd class="key">Shift</kbd> + <kbd class="key">Tab</kbd></kbd></td><td>上の投稿にフォーカスを移動</td><td>-</td></tr>
-        <tr><td><kbd class="key">↓</kbd>, <kbd class="key">J</kbd>, <kbd class="key">Tab</kbd></td><td>下の投稿にフォーカスを移動</td><td>-</td></tr>
-        <tr><td><kbd class="key">R</kbd></td><td>返信フォームを開く</td><td><b>R</b>eply</td></tr>
-        <tr><td><kbd class="key">Q</kbd></td><td>Renoteフォームを開く</td><td><b>Q</b>uote</td></tr>
-        <tr><td><kbd class="group"><kbd class="key">Ctrl</kbd> + <kbd class="key">Q</kbd></kbd></td><td>即刻Renoteする(フォームを開かずに)</td><td>-</td></tr>
-        <tr><td><kbd class="key">E</kbd>, <kbd class="key">A</kbd>, <kbd class="key">+</kbd></td><td>リアクションフォームを開く</td><td><b>E</b>mote, re<b>A</b>ction</td></tr>
-        <tr><td><kbd class="key">0</kbd>~<kbd class="key">9</kbd></td><td>数字に対応したリアクションをする(対応については後述)</td><td>-</td></tr>
-        <tr><td><kbd class="key">F</kbd>, <kbd class="key">B</kbd></td><td>お気に入りに登録</td><td><b>F</b>avorite, <b>B</b>ookmark</td></tr>
-        <tr><td><kbd class="key">Del</kbd>, <kbd class="group"><kbd class="key">Ctrl</kbd> + <kbd class="key">D</kbd></kbd></td><td>投稿を削除</td><td><b>D</b>elete</tr>
-        <tr><td><kbd class="key">M</kbd>, <kbd class="key">O</kbd></td><td>投稿に対するメニューを開く</td><td><b>M</b>ore, <b>O</b>ther</td></tr>
-        <tr><td><kbd class="key">S</kbd></td><td>CWで隠された部分を表示 or 隠す</td><td><b>S</b>how, <b>S</b>ee</td></tr>
-        <tr><td><kbd class="key">Esc</kbd></td><td>フォーカスを外す</td><td>-</td></tr>
+        <tr><td><kbd class="key">↑</kbd>, <kbd class="key">K</kbd>, <kbd class="group"><kbd class="key">Shift</kbd> + <kbd class="key">Tab</kbd></kbd></td><td>Sposta il focus sulla pubblicazione di sopra</td><td>-</td></tr>
+        <tr><td><kbd class="key">↓</kbd>, <kbd class="key">J</kbd>, <kbd class="key">Tab</kbd></td><td>Sposta il focus sulla pubblicazione di sotto</td><td>-</td></tr>
+        <tr><td><kbd class="key">R</kbd></td><td>Apri finestra di risposta</td><td><b>R</b>eply</td></tr>
+        <tr><td><kbd class="key">Q</kbd></td><td>Apri finestra Rinota</td><td><b>Q</b>uote</td></tr>
+        <tr><td><kbd class="group"><kbd class="key">Ctrl</kbd> + <kbd class="key">Q</kbd></kbd></td><td>Rinota immediatamente (senza aprire finestra)</td><td>-</td></tr>
+        <tr><td><kbd class="key">E</kbd>, <kbd class="key">A</kbd>, <kbd class="key">+</kbd></td><td>Apri finestra di reazioni</td><td><b>E</b>mote, re<b>A</b>ction</td></tr>
+        <tr><td><kbd class="key">0</kbd>~<kbd class="key">9</kbd></td><td>Usa reazione del numero corrispondente</td><td>-</td></tr>
+        <tr><td><kbd class="key">F</kbd>, <kbd class="key">B</kbd></td><td>Aggiungi ai preferiti</td><td><b>F</b>avorite, <b>B</b>ookmark</td></tr>
+        <tr><td><kbd class="key">Del</kbd>, <kbd class="group"><kbd class="key">Ctrl</kbd> + <kbd class="key">D</kbd></kbd></td><td>Elimina pubblicazione</td><td><b>D</b>elete</tr>
+        <tr><td><kbd class="key">M</kbd>, <kbd class="key">O</kbd></td><td>Apri menù della nota</td><td><b>M</b>ore, <b>O</b>ther</td></tr>
+        <tr><td><kbd class="key">S</kbd></td><td>Visualizza o nascondi il contenuto segnato con CW</td><td><b>S</b>how, <b>S</b>ee</td></tr>
+        <tr><td><kbd class="key">Esc</kbd></td><td>Esci dal focus</td><td>-</td></tr>
     </tbody>
 </table>
 
@@ -57,12 +57,12 @@ La reazione "👍" è impostata come reazione predefinita.
         <tr><th>Scorciatoia</th><th>Effetto</th><th>Accesso universale</th></tr>
     </thead>
     <tbody>
-        <tr><td><kbd class="key">↑</kbd>, <kbd class="key">K</kbd></td><td>上のリアクションにフォーカスを移動</td><td>-</td></tr>
-        <tr><td><kbd class="key">↓</kbd>, <kbd class="key">J</kbd></td><td>下のリアクションにフォーカスを移動</td><td>-</td></tr>
-        <tr><td><kbd class="key">←</kbd>, <kbd class="key">H</kbd>, <kbd class="group"><kbd class="key">Shift</kbd> + <kbd class="key">Tab</kbd></kbd></td><td>左のリアクションにフォーカスを移動</td><td>-</td></tr>
-        <tr><td><kbd class="key">→</kbd>, <kbd class="key">L</kbd>, <kbd class="key">Tab</kbd></td><td>右のリアクションにフォーカスを移動</td><td>-</td></tr>
-        <tr><td><kbd class="key">Enter</kbd>, <kbd class="key">Space</kbd>, <kbd class="key">+</kbd></td><td>リアクション確定</td><td>-</td></tr>
-        <tr><td><kbd class="key">0</kbd>~<kbd class="key">9</kbd></td><td>数字に対応したリアクションで確定</td><td>-</td></tr>
-        <tr><td><kbd class="key">Esc</kbd></td><td>リアクションするのをやめる</td><td>-</td></tr>
+        <tr><td><kbd class="key">↑</kbd>, <kbd class="key">K</kbd></td><td>Sposta il focus sulla reazione di sopra</td><td>-</td></tr>
+        <tr><td><kbd class="key">↓</kbd>, <kbd class="key">J</kbd></td><td>Sposta il focus sulla reazione di sotto</td><td>-</td></tr>
+        <tr><td><kbd class="key">←</kbd>, <kbd class="key">H</kbd>, <kbd class="group"><kbd class="key">Shift</kbd> + <kbd class="key">Tab</kbd></kbd></td><td>Sposta il focus sulla reazione a sinistra</td><td>-</td></tr>
+        <tr><td><kbd class="key">→</kbd>, <kbd class="key">L</kbd>, <kbd class="key">Tab</kbd></td><td>Sposta il focus sulla reazione a destra</td><td>-</td></tr>
+        <tr><td><kbd class="key">Enter</kbd>, <kbd class="key">Space</kbd>, <kbd class="key">+</kbd></td><td>Seleziona la reazione</td><td>-</td></tr>
+        <tr><td><kbd class="key">0</kbd>~<kbd class="key">9</kbd></td><td>Usa reazione del numero corrispondente </td><td>-</td></tr>
+        <tr><td><kbd class="key">Esc</kbd></td><td>Cancella reazione</td><td>-</td></tr>
     </tbody>
 </table>
diff --git a/src/docs/it-IT/theme.md b/src/docs/it-IT/theme.md
index 7467bf340..506d979d9 100644
--- a/src/docs/it-IT/theme.md
+++ b/src/docs/it-IT/theme.md
@@ -33,33 +33,33 @@ Il codice dei temi è scritto a forma di oggetti JSON5. I temi contengono gli og
 
 ```
 
-* `id` ... テーマの一意なID。UUIDをおすすめします。
-* `name` ... テーマ名
-* `author` ... テーマの作者
-* `desc` ... テーマの説明(オプション)
-* `base` ... 明るいテーマか、暗いテーマか
-    * `light`にすると明るいテーマになり、`dark`にすると暗いテーマになります。
-    * テーマはここで設定されたベーステーマを継承します。
-* `props` ... テーマのスタイル定義。これから説明します。
+* `id` ... Identificativo univoco del tema. È consigliato utilizzare un UUID.
+* `name` ... Nome tema
+* `author` ... Autore/Autrice del tema
+* `desc` ... Descrizione tema (facoltativa)
+* `base` ... Imposta tema chiaro o tema scuro
+    * Scegli `light` per impostare un tema chiaro, e `dark` per impostare un tema scuro.
+    * Il tema erediterà dalle caratteristiche del tema di base impostato qui.
+* `props` ... Imposta uno stile di tema. (Vedi spiegazioni sotto.)
 
 ### Impostare uno stile di tema
 `props`下にはテーマのスタイルを定義します。 キーがCSSの変数名になり、バリューで中身を指定します。 なお、この`props`オブジェクトはベーステーマから継承されます。 ベーステーマは、このテーマの`base`が`light`なら[_light.json5](https://github.com/misskey-dev/misskey/blob/develop/src/client/themes/_light.json5)で、`dark`なら[_dark.json5](https://github.com/misskey-dev/misskey/blob/develop/src/client/themes/_dark.json5)です。 つまり、このテーマ内の`props`に`panel`というキーが無くても、そこにはベーステーマの`panel`があると見なされます。
 
 #### Sintassi dei valori
-* 16進数で表された色
-    * 例: `#00ff00`
-* `rgb(r, g, b)`形式で表された色
-    * 例: `rgb(0, 255, 0)`
-* `rgb(r, g, b, a)`形式で表された透明度を含む色
-    * 例: `rgba(0, 255, 0, 0.5)`
+* Colori HEX
+    * Es.: `#00ff00`
+* Colori `RGB(r, g, b)`
+    * Es.: `rgb(0, 255, 0)`
+* Colori `RGBA(r, g, b, a)`
+    * Es.: `rgba(0, 255, 0, 0.5)`
 * 他のキーの値の参照
     * `@{キー名}`と書くと他のキーの値の参照になります。`{キー名}`は参照したいキーの名前に置き換えます。
-    * 例: `@panel`
-* 定数(後述)の参照
+    * Es.: `@panel`
+* Costanti (vedi sotto)
     * `${定数名}`と書くと定数の参照になります。`{定数名}`は参照したい定数の名前に置き換えます。
-    * 例: `$main`
-* 関数(後述)
-    * `:{関数名}<{引数}<{色}`
+    * Es.: `$main`
+* Funzioni (vedi sotto)
+    * `:{functionname}<{argument}<{color}`
 
 #### Costanti
 「CSS変数として出力はしたくないが、他のCSS変数の値として使いまわしたい」値があるときは、定数を使うと便利です。 キー名を`$`で始めると、そのキーはCSS変数として出力されません。
diff --git a/src/docs/it-IT/timelines.md b/src/docs/it-IT/timelines.md
index bd462541d..29981722b 100644
--- a/src/docs/it-IT/timelines.md
+++ b/src/docs/it-IT/timelines.md
@@ -11,5 +11,5 @@ Pubblicazioni degli utenti della tua istanza. Non vengono mostrate le note pubbl
 ## Sociale
 Raggruppa le timeline "home" e "locale".
 
-## グローバル
+## Federata
 Tutte le pubblicazioni ricevute dall'istanza, sia locali che altre. Non vengono mostrate le note pubblicate con lo stato "home".

From f413339e75c753861849c9f902552fbaff71445f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 24 Apr 2021 22:56:26 +0900
Subject: [PATCH 08/10] Update yarn.lock

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8d17fc1bc..42be96159 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6650,10 +6650,10 @@ methods@^1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-mfm-js@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/mfm-js/-/mfm-js-0.16.2.tgz#6dfa44a9b6ac0fd9d55d6f8c21eaa60c75bcd9fa"
-  integrity sha512-Ah/XTPsg88il3kRwXxY6QqlNGkc9ToWWFhW9BGBk6V6T108iLjS30pd79WL02Nd1tw1Jl/JduJMgpb5QzCE45w==
+mfm-js@0.16.3:
+  version "0.16.3"
+  resolved "https://registry.yarnpkg.com/mfm-js/-/mfm-js-0.16.3.tgz#5ec8f0c50f73d328d72b6a99c2651568e9a1e218"
+  integrity sha512-4/IjdUZqF2vd03gWOxpMxNtf0B9DfvzFsUER7ZcSyX1qdILLkrtDuasiGztGmqGcpi0VXdBI+5jdE5mEhNylSw==
   dependencies:
     twemoji-parser "13.0.x"
 

From 26b2a4de36fc3bf00f9e0c48f3d52c17a324391a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 24 Apr 2021 23:04:31 +0900
Subject: [PATCH 09/10] Tweak style

---
 src/client/pages/user/index.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/client/pages/user/index.vue b/src/client/pages/user/index.vue
index 474860e6d..a1fe7ec09 100644
--- a/src/client/pages/user/index.vue
+++ b/src/client/pages/user/index.vue
@@ -179,19 +179,19 @@
 
 		<div class="contents">
 			<div class="nav _gap">
-				<MkA :to="userPage(user)" :class="{ active: page === 'index' }" class="link">
+				<MkA :to="userPage(user)" :class="{ active: page === 'index' }" class="link" v-click-anime>
 					<i class="fas fa-comment-alt icon"></i>
 					<span>{{ $ts.notes }}</span>
 				</MkA>
-				<MkA :to="userPage(user, 'clips')" :class="{ active: page === 'clips' }" class="link">
+				<MkA :to="userPage(user, 'clips')" :class="{ active: page === 'clips' }" class="link" v-click-anime>
 					<i class="fas fa-paperclip icon"></i>
 					<span>{{ $ts.clips }}</span>
 				</MkA>
-				<MkA :to="userPage(user, 'pages')" :class="{ active: page === 'pages' }" class="link">
+				<MkA :to="userPage(user, 'pages')" :class="{ active: page === 'pages' }" class="link" v-click-anime>
 					<i class="fas fa-file-alt icon"></i>
 					<span>{{ $ts.pages }}</span>
 				</MkA>
-				<MkA :to="userPage(user, 'gallery')" :class="{ active: page === 'gallery' }" class="link">
+				<MkA :to="userPage(user, 'gallery')" :class="{ active: page === 'gallery' }" class="link" v-click-anime>
 					<i class="fas fa-icons icon"></i>
 					<span>{{ $ts.gallery }}</span>
 				</MkA>
@@ -776,8 +776,7 @@ export default defineComponent({
 		> .nav {
 			display: flex;
 			align-items: center;
-			//font-size: 120%;
-			font-weight: bold;
+			font-size: 90%;
 
 			> .link {
 				flex: 1;

From 6d145bc4cb39b01e53a9135f950b41974d3afe9a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 24 Apr 2021 23:04:49 +0900
Subject: [PATCH 10/10] 12.79.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 853923bf4..950404901 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.79.0-beta.1",
+	"version": "12.79.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",