8.26.0

nanka iroiro
Improve usability
2018-09-05 13:49:08 +09:00 · 2018-09-05 13:47:26 +09:00 · 2018-09-05 13:06:49 +09:00 · 2018-09-05 12:53:08 +09:00 · 2018-09-05 12:50:11 +09:00 · 2018-09-05 12:48:00 +09:00
324 changed files with 9341 additions and 3231 deletions
@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+# __MISSKEY_BEARER_TOKEN=
+# __MISSKEY_CAMPAIGN_ID=
+# __MISSKEY_GITHUB_TOKEN=
+# __MISSKEY_HEAD=acid-chicken:patch-autogen
+# __MISSKEY_REPO=syuilo/misskey
+# __MISSKEY_BRANCH=develop
+test "$(curl -LSs -w '\n' -- "https://api.github.com/repos/$REPO/pulls?access_token=$__MISSKEY_GITHUB_TOKEN" | jq -r '.[].head.label' | grep $__MISSKEY_HEAD)" && exit 1
+cd "$(dirname $0)/.." && \
+touch null.cache && \
+rm *.cache && \
+git checkout $__MISSKEY_BRANCH && \
+git pull origin $__MISSKEY_BRANCH && \
+git pull upstream $__MISSKEY_BRANCH && \
+git stash && \
+git rebase -f upstream/$__MISSKEY_BRANCH && \
+git branch patch-autogen && \
+git checkout patch-autogen && \
+git reset --hard HEAD || \
+exit 1
+touch patreon.md.cache && \
+rm patreon.md.cache && \
+echo '<!-- PATREON_START -->' > patreon.md.cache && \
+url="https://www.patreon.com/api/oauth2/v2/campaigns/$__MISSKEY_CAMPAIGN_ID/members?include=currently_entitled_tiers,user&fields%5Btier%5D=title&fields%5Buser%5D=full_name,thumb_url,url,hide_pledges"
+while :
+ do
+  touch patreon.raw.cache && \
+  rm patreon.raw.cache && \
+  curl -LSs -w '\n' -H "Authorization: Bearer $__MISSKEY_BEARER_TOKEN" -- $url > patreon.raw.cache && \
+  touch patreon.cache && \
+  rm patreon.cache && \
+  cat patreon.raw.cache | \
+  jq -r '(.data|map(select(.relationships.currently_entitled_tiers.data[]))|map(.relationships.user.data.id))as$data|.included|map(select(.attributes.hide_pledges==false))|map(select(.id as$id|$data|contains([$id])))|map(.attributes|[.full_name,.thumb_url,.url]|@tsv)|.[]|@text' >> patreon.cache && \
+  echo '<table><tr>' >> patreon.md.cache && \
+  cat patreon.cache | \
+  awk -F'\t' '{print $2,$1}' | \
+  sed -e 's/ /\\" alt=\\"/' | \
+  xargs -I% echo '<td><img src="%"></td>' >> patreon.md.cache && \
+  echo '</tr><tr>' >> patreon.md.cache && \
+  cat patreon.cache | \
+  awk -F'\t' '{print $3,$1}' | \
+  sed -e 's/ /\\">/' | \
+  xargs -I% echo '<td><a href="%</a></td>' >> patreon.md.cache && \
+  echo '</tr></table>' >> patreon.md.cache || \
+  exit 1
+  new_url="$(cat patreon.raw.cache | jq -r '.links.next')"
+  test "$new_url" = 'null' && \
+  break || \
+  URL="$url"
+done
+ignore= && \
+echo -e "\n**Last updated:** $(date -uR | sed 's/\+0000/UTC/')\n<!-- PATREON_END -->" >> patreon.md.cache && \
+touch README.md && \
+touch .autogen/README.md && \
+rm .autogen/README.md && \
+mv README.md .autogen/README.md && \
+cat .autogen/README.md | while IFS= read line;
+ do
+  if [[ -z "$ignore" ]]
+   then
+    if [[ "$line" = '<!-- PATREON_START -->' ]]
+     then
+      ignore='PATREON_INSIDE'
+     else
+      echo "$line" >> README.md
+    fi
+   else
+    if [[ "$LINE" = '<!-- PATREON_END -->' ]]
+     then
+      ignore=
+      cat patreon.md.cache >> README.md
+    fi
+  fi
+done
+cat patreon.md.cache
+touch null.cache && \
+rm *.cache && \
+diff .autogen/README.md README.md > diff.cache
+cat diff.cache && \
+test 4 -lt $(cat diff.cache | wc -l) && \
+git add README.md && \
+git commit -m 'Update README.md [AUTOGEN]' && \
+git push -f origin patch-autogen && \
+curl -LSs -w '\n' -X POST -d '{"title":"[AUTOMATED] Update README.md","body":"*This pull request was created by a tool.*","head":"'$__MISSKEY_HEAD'","base":"'$__MISSKEY_BRANCH'"}' -- "https://api.github.com/repos/$__MISSKEY_REPO/pulls?access_token=$__MISSKEY_GITHUB_TOKEN"
+git stash
+git checkout $__MISSKEY_BRANCH
+git branch -D patch-autogen
@@ -138,3 +138,6 @@ drive:

 # Clustering
 # clusterLimit: 1
+
+# Summaly proxy
+# summalyProxy: "http://example.com"
@@ -1,2 +1,2 @@
-save-exact=true
+save-exact = true
 package-lock = false
@@ -5,6 +5,25 @@ ChangeLog

 This document describes breaking changes only.

+8.0.0
+-----
+
+### Migration
+
+起動する前に、`node cli/migration/8.0.0`してください。
+
+Please run `node cli/migration/8.0.0` before launch.
+
+
+7.0.0
+-----
+
+### Migration
+
+起動する前に、`node cli/migration/7.0.0`してください。
+
+Please run `node cli/migration/7.0.0` before launch.
+
 6.0.0
 -----

@@ -28,13 +47,13 @@ Please run `node cli/migration/5.0.0` before launch.

 オセロがリバーシに変更されました。

-Othello is now Reversi.
+Othello is rename to Reversi.

 ### Migration

 MongoDBの、`othelloGames`と`othelloMatchings`コレクションをそれぞれ`reversiGames`と`reversiMatchings`にリネームしてください。

-You need to rename `othelloGames` and `othelloMatchings` MongoDB collections to `reversiGames` and `reversiMatchings`.
+Please rename `othelloGames` and `othelloMatchings` MongoDB collections to `reversiGames` and `reversiMatchings` respectively.

 3.0.0
 -----
@@ -1,27 +1,27 @@
 # Contribution guide
-:v: Misskeyへの貢献ありがとうございます。 :v:
+:v: Thanks for your contributions :v:

-## Issueの報告
-新機能の提案や不具合の報告は https://github.com/syuilo/misskey/issues で管理しています。
-Issueを作成する前に、既に同じIssueが作成されていないかご確認ください。
-もし既にIssueが作成されている場合は、既存のIssueにコメントをしたりリアクションをするようお願いします。
+## Issues
+Feature suggestions and bug reports are filed in https://github.com/syuilo/misskey/issues .
+Before creating a new issue, please search existing issues to avoid duplication.
+If you find the existing issue, please add your reaction or comment to the issue.

-## Issueの解決
-[pr-welcomeのラベルがついているIssue](https://github.com/syuilo/misskey/labels/pr-welcome)
-の解決を目的としたPull Requestを作成してくださると非常にありがたいです。
+## Internationalization (i18n)
+Please see [Translation guide](./docs/translate.en.md).

-## 翻訳の改善
-ソースコード中の `%i18n:id%` という形の文字列は、言語ファイルの対応するテキストに置換されます。
-言語ファイルは /locales ディレクトリに存在します。
+## Localization (l10n)
+Please use [Crowdin](https://crowdin.com/project/misskey) for localization.

-## ドキュメントの編集
-現在Misskeyはドキュメントが大きく不足しています。
-ドキュメントは /docs ディレクトリに存在します。
+![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)

-## テストの追加
-現在Misskeyはテストが大きく不足しています。
-テストコードは /test ディレクトリに存在します。
+## Documentation
+* Documents for contributors are located in `/docs`.
+* Documents for instance admins are located in `/docs`.
+* Documents for end users are located in `src/docs`.

-## 自動テスト及び自動リリース
-Travis CIで行っています。
-設定ファイルは /.travis に存在します。
+## Test
+* Test codes are located in `/test`.
+
+## Continuous integration
+Misskey uses Travis for automated test.
+Configuration files are located in `/.travis`.
@@ -24,7 +24,7 @@ Why don't you take a short break from the hustle and bustle of the city, and div
 * Reactions
 * User lists
 * Customizable column view (called MisskeyDeck)
-  * and widgets!
+* Customizable widgets
 * Private messages
 * ActivityPub support

@@ -32,48 +32,49 @@ and more! You can see it with your own eyes at [misskey.xyz](https://misskey.xyz

 :package: Create your own instance
 ----------------------------------------------------------------
-If you want to run your own instance of Misskey,
-please see [Setup and installation guide](./docs/setup.en.md).
+Please see [Setup and installation guide](./docs/setup.en.md).

-:wrench: Contribute
+:wrench: Contribution
 ----------------------------------------------------------------
-**[PR](https://github.com/syuilo/misskey/pulls)s welcome!**
-
-If you want to...
-* i18n ... please see [Translation guide](./docs/translate.en.md).
-* l10n ... please visit https://crowdin.com/project/misskey
+Please see [Contribution guide](./CONTRIBUTING.md).

 :heart: Backers & Sponsors
 ----------------------------------------------------------------
 <!-- PATREON_START -->
-<table>
-  <tr>
-    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=tB1e_r8RlZ5sFL0KV_e8dugapxatNBRK1Z3h67TO1g8%3D"></td>
-    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12378075/0156f769e20f412594fa6b87d85fe228/1?token-time=2145916800&token-hash=IsIJRUXszzoD6-7pDnRY8I05T9nSznc4GTaxj7C9SwU%3D"></td>
-    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=S1zP0QyLU52Dqq6dtc9qNYyWfW86XrYHiR4NMbeOrnA%3D"></td>
-    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D"></td>
-    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12959468/c249e15aebec4424b5c0f427173671b6/1?token-time=2145916800&token-hash=lubpCEdxAkxPlpR2O6bvZ7BIh8Q4nGf-U_mE1qpjVAQ%3D"></td>
-    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/1?token-time=2145916800&token-hash=f03BFb4S2FUx9YEt87TnEmifb4h33OywGBW2akQVtQY%3D"></td>
-    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/2?token-time=2145916800&token-hash=zElv7ZcPL3viGsXbNG_KWiKrbV0vvw1gk0panx8DJoo%3D"></td>
-    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=Yd60FK_SWfQO56SeiJpy1tDHOnCV4xdEywQe8gn5_Wo%3D"></td>
-    <td><img src="https://c8.patreon.com/2/100/12718187"></td>
-    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12931605/ead494101f364dffa90efe49e36fb494/1?token-time=2145916800&token-hash=NzSFPjIlodXyv41rwK61aZWVZWfI4surJaNj8vWKvqM%3D"></td>
-    <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=GgJ_NmUB6_nnRNLVGUWjV-WX91On7BOu59LKncYV9fE%3D"></td>
-  </tr>
-  <tr>
-    <td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
-    <td><a href="https://www.patreon.com/user/creators?u=12378075">39ff</a></td>
-    <td><a href="https://www.patreon.com/dansup">dansup</a></td>
-    <td><a href="https://www.patreon.com/user/creators?u=12531784">Takashi Shibuya</a></td>
-    <td><a href="https://www.patreon.com/fujishan">fujishan</a></td>
-    <td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
-    <td><a href="https://www.patreon.com/user?u=5881381">Naoki Kosaka</a></td>
-    <td><a href="https://www.patreon.com/user?u=12731202">negao</a></td>
-    <td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
-    <td><a href="https://www.patreon.com/user?u=12931605">Reiju</a></td>
-    <td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
-  </tr>
-</table>
+<table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=Yd60FK_SWfQO56SeiJpy1tDHOnCV4xdEywQe8gn5_Wo%3D" alt="negao"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13099460/43cecdbaa63a40d79bf50a96b9910b9d/1?token-time=2145916800&token-hash=d6P5MWHHsCMxUuBAEPAoVc5wLUR19mIhqAq7Ma9h9rI%3D" alt="ne_moni"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/1?token-time=2145916800&token-hash=f03BFb4S2FUx9YEt87TnEmifb4h33OywGBW2akQVtQY%3D" alt="Melilot"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12999811/5f349fafcce44dd1824a8b1ebbec4564/2?token-time=2145916800&token-hash=rwZ8qvbm_kpA4ib3kc07tVKupXeySpY5ATQFGxfL9v0%3D" alt="Axella"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/3384329/8b713330cb27404ea6e9fac50ff96efe/1?token-time=2145916800&token-hash=0eu4-m1gTWA9PhptVZt6rdKcusqcD7RB87rJT23VVFI%3D" alt="べすれい"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=GgJ_NmUB6_nnRNLVGUWjV-WX91On7BOu59LKncYV9fE%3D" alt="gutfuckllc"></td>
+<td><img src="https://c8.patreon.com/2/100/12718187" alt="Peter G."></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=zwSu01tOtn5xTUucDZHuPsCxF2HBEMVs9ROJKTlEV_o%3D" alt="nemu"></td>
+</tr><tr>
+<td><a href="https://www.patreon.com/user?u=12731202">negao</a></td>
+<td><a href="https://www.patreon.com/user?u=13099460">ne_moni</a></td>
+<td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
+<td><a href="https://www.patreon.com/AxellaMC">Axella</a></td>
+<td><a href="https://www.patreon.com/user?u=3384329">べすれい</a></td>
+<td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
+<td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
+<td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
+</tr></table>
+<table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/2?token-time=2145916800&token-hash=zElv7ZcPL3viGsXbNG_KWiKrbV0vvw1gk0panx8DJoo%3D" alt="Naoki Kosaka"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12931605/ead494101f364dffa90efe49e36fb494/1?token-time=2145916800&token-hash=NzSFPjIlodXyv41rwK61aZWVZWfI4surJaNj8vWKvqM%3D" alt="Reiju"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=UERBN4OyP7Nh5XwwdDg0N0IE5cD6_qUQMO81Z5Wizso%3D" alt="Hiratake"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=S1zP0QyLU52Dqq6dtc9qNYyWfW86XrYHiR4NMbeOrnA%3D" alt="dansup"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D" alt="Takashi Shibuya"></td>
+</tr><tr>
+<td><a href="https://www.patreon.com/user?u=5881381">Naoki Kosaka</a></td>
+<td><a href="https://www.patreon.com/user?u=12931605">Reiju</a></td>
+<td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
+<td><a href="https://www.patreon.com/dansup">dansup</a></td>
+<td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
+</tr></table>
+
+**Last updated:** Sun, 02 Sep 2018 05:30:06 UTC
 <!-- PATREON_END -->

 :four_leaf_clover: Copyright
@@ -1,101 +0,0 @@
-const chalk = require('chalk');
-const log = require('single-line-log').stdout;
-const sequential = require('promise-sequential');
-const { default: DriveFile, DriveFileChunk } = require('../built/models/drive-file');
-const { default: DriveFileThumbnail, DriveFileThumbnailChunk } = require('../built/models/drive-file-thumbnail');
-const { default: User } = require('../built/models/user');
-
-const q = {
-	'metadata._user.host': {
-		$ne: null
-	},
-	'metadata.withoutChunks': false
-};
-
-async function main() {
-	const promiseGens = [];
-
-	const count = await DriveFile.count(q);
-
-	let prev;
-
-	for (let i = 0; i < count; i++) {
-		promiseGens.push(() => {
-			const promise = new Promise(async (res, rej) => {
-				const file = await DriveFile.findOne(prev ? Object.assign({
-					_id: { $lt: prev._id }
-				}, q) : q, {
-					sort: {
-						_id: -1
-					}
-				});
-
-				prev = file;
-
-				function skip() {
-					res([i, file, false]);
-				}
-
-				if (file == null) return skip();
-
-				log(chalk`{gray ${i}} scanning {bold ${file._id}} ${file.filename} ...`);
-
-				const attachingUsersCount = await User.count({
-					$or: [{
-						avatarId: file._id
-					}, {
-						bannerId: file._id
-					}]
-				}, { limit: 1 });
-				if (attachingUsersCount !== 0) return skip();
-
-				Promise.all([
-					// チャンクをすべて削除
-					DriveFileChunk.remove({
-						files_id: file._id
-					}),
-
-					DriveFile.update({ _id: file._id }, {
-						$set: {
-							'metadata.withoutChunks': true
-						}
-					})
-				]).then(async () => {
-					res([i, file, true]);
-
-					//#region サムネイルもあれば削除
-					const thumbnail = await DriveFileThumbnail.findOne({
-						'metadata.originalId': file._id
-					});
-
-					if (thumbnail) {
-						DriveFileThumbnailChunk.remove({
-							files_id: thumbnail._id
-						});
-
-						DriveFileThumbnail.remove({ _id: thumbnail._id });
-					}
-					//#endregion
-				});
-			});
-
-			promise.then(([i, file, deleted]) => {
-				if (deleted) {
-					log(chalk`{gray ${i}} {red deleted: {bold ${file._id}} ${file.filename}}`);
-				} else {
-					log(chalk`{gray ${i}} {green skipped: {bold ${file._id}} ${file.filename}}`);
-				}
-				log.clear();
-				console.log();
-			});
-
-			return promise;
-		});
-	}
-
-	return await sequential(promiseGens);
-}
-
-main().then(() => {
-	console.log('ALL DONE');
-}).catch(console.error);
@@ -1,80 +0,0 @@
-const chalk = require('chalk');
-const log = require('single-line-log').stdout;
-const sequential = require('promise-sequential');
-const { default: DriveFile, deleteDriveFile } = require('../built/models/drive-file');
-const { default: Note } = require('../built/models/note');
-const { default: MessagingMessage } = require('../built/models/messaging-message');
-const { default: User } = require('../built/models/user');
-
-async function main() {
-	const promiseGens = [];
-
-	const count = await DriveFile.count({});
-
-	let prev;
-
-	for (let i = 0; i < count; i++) {
-		promiseGens.push(() => {
-			const promise = new Promise(async (res, rej) => {
-				const file = await DriveFile.findOne(prev ? {
-					_id: { $lt: prev._id }
-				} : {}, {
-					sort: {
-						_id: -1
-					}
-				});
-
-				prev = file;
-
-				function skip() {
-					res([i, file, false]);
-				}
-
-				if (file == null) return skip();
-
-				log(chalk`{gray ${i}} scanning {bold ${file._id}} ${file.filename} ...`);
-
-				const attachingUsersCount = await User.count({
-					$or: [{
-						avatarId: file._id
-					}, {
-						bannerId: file._id
-					}]
-				}, { limit: 1 });
-				if (attachingUsersCount !== 0) return skip();
-
-				const attachingNotesCount = await Note.count({
-					mediaIds: file._id
-				}, { limit: 1 });
-				if (attachingNotesCount !== 0) return skip();
-
-				const attachingMessagesCount = await MessagingMessage.count({
-					fileId: file._id
-				}, { limit: 1 });
-				if (attachingMessagesCount !== 0) return skip();
-
-				deleteDriveFile(file).then(() => {
-					res([i, file, true]);
-				}).catch(rej);
-			});
-
-			promise.then(([i, file, deleted]) => {
-				if (deleted) {
-					log(chalk`{gray ${i}} {red deleted: {bold ${file._id}} ${file.filename}}`);
-				} else {
-					log(chalk`{gray ${i}} {green skipped: {bold ${file._id}} ${file.filename}}`);
-				}
-				log.clear();
-				console.log();
-			});
-
-			return promise;
-		});
-	}
-
-	return await sequential(promiseGens);
-}
-
-main().then(() => {
-	console.log('done');
-}).catch(console.error);
@@ -1,40 +0,0 @@
-const { default: User, deleteUser } = require('../built/models/user');
-const { default: zip } = require('@prezzemolo/zip')
-
-const migrate = async (user) => {
-	try {
-		await deleteUser(user._id);
-		return true;
-	} catch (e) {
-		return false;
-	}
-}
-
-async function main() {
-	const count = await User.count({
-		uri: /#/
-	});
-
-	const dop = 1
-	const idop = ((count - (count % dop)) / dop) + 1
-
-	return zip(
-		1,
-		async (time) => {
-			console.log(`${time} / ${idop}`)
-			const doc = await User.find({
-				uri: /#/
-			}, {
-				limit: dop, skip: time * dop
-			})
-			return Promise.all(doc.map(migrate))
-		},
-		idop
-	).then(a => {
-		const rv = []
-		a.forEach(e => rv.push(...e))
-		return rv
-	})
-}
-
-main().then(console.dir).catch(console.error)
@@ -0,0 +1,134 @@
+const { default: Stats } = require('../../built/models/stats');
+const { default: User } = require('../../built/models/user');
+const { default: Note } = require('../../built/models/note');
+const { default: DriveFile } = require('../../built/models/drive-file');
+
+const now = new Date();
+const y = now.getFullYear();
+const m = now.getMonth();
+const d = now.getDate();
+const today = new Date(y, m, d);
+
+async function main() {
+	const localUsersCount = await User.count({
+		host: null
+	});
+
+	const remoteUsersCount = await User.count({
+		host: { $ne: null }
+	});
+
+	const localNotesCount = await Note.count({
+		'_user.host': null
+	});
+
+	const remoteNotesCount = await Note.count({
+		'_user.host': { $ne: null }
+	});
+
+	const localDriveFilesCount = await DriveFile.count({
+		'metadata._user.host': null
+	});
+
+	const remoteDriveFilesCount = await DriveFile.count({
+		'metadata._user.host': { $ne: null }
+	});
+
+	const localDriveFilesSize = await DriveFile
+		.aggregate([{
+			$match: {
+				'metadata._user.host': null,
+				'metadata.deletedAt': { $exists: false }
+			}
+		}, {
+			$project: {
+				length: true
+			}
+		}, {
+			$group: {
+				_id: null,
+				usage: { $sum: '$length' }
+			}
+		}])
+		.then(aggregates => {
+			if (aggregates.length > 0) {
+				return aggregates[0].usage;
+			}
+			return 0;
+		});
+
+	const remoteDriveFilesSize = await DriveFile
+		.aggregate([{
+			$match: {
+				'metadata._user.host': { $ne: null },
+				'metadata.deletedAt': { $exists: false }
+			}
+		}, {
+			$project: {
+				length: true
+			}
+		}, {
+			$group: {
+				_id: null,
+				usage: { $sum: '$length' }
+			}
+		}])
+		.then(aggregates => {
+			if (aggregates.length > 0) {
+				return aggregates[0].usage;
+			}
+			return 0;
+		});
+
+	await Stats.insert({
+		date: today,
+		users: {
+			local: {
+				total: localUsersCount,
+				diff: 0
+			},
+			remote: {
+				total: remoteUsersCount,
+				diff: 0
+			}
+		},
+		notes: {
+			local: {
+				total: localNotesCount,
+				diff: 0,
+				diffs: {
+					normal: 0,
+					reply: 0,
+					renote: 0
+				}
+			},
+			remote: {
+				total: remoteNotesCount,
+				diff: 0,
+				diffs: {
+					normal: 0,
+					reply: 0,
+					renote: 0
+				}
+			}
+		},
+		drive: {
+			local: {
+				totalCount: localDriveFilesCount,
+				totalSize: localDriveFilesSize,
+				diffCount: 0,
+				diffSize: 0
+			},
+			remote: {
+				totalCount: remoteDriveFilesCount,
+				totalSize: remoteDriveFilesSize,
+				diffCount: 0,
+				diffSize: 0
+			}
+		}
+	});
+
+	console.log('done');
+}
+
+main();
@@ -0,0 +1,144 @@
+const { default: Stats } = require('../../built/models/stats');
+const { default: User } = require('../../built/models/user');
+const { default: Note } = require('../../built/models/note');
+const { default: DriveFile } = require('../../built/models/drive-file');
+
+const now = new Date();
+const y = now.getFullYear();
+const m = now.getMonth();
+const d = now.getDate();
+const h = now.getHours();
+const date = new Date(y, m, d, h);
+
+async function main() {
+	await Stats.update({}, {
+		$set: {
+			span: 'day'
+		}
+	}, {
+		multi: true
+	});
+
+	const localUsersCount = await User.count({
+		host: null
+	});
+
+	const remoteUsersCount = await User.count({
+		host: { $ne: null }
+	});
+
+	const localNotesCount = await Note.count({
+		'_user.host': null
+	});
+
+	const remoteNotesCount = await Note.count({
+		'_user.host': { $ne: null }
+	});
+
+	const localDriveFilesCount = await DriveFile.count({
+		'metadata._user.host': null
+	});
+
+	const remoteDriveFilesCount = await DriveFile.count({
+		'metadata._user.host': { $ne: null }
+	});
+
+	const localDriveFilesSize = await DriveFile
+		.aggregate([{
+			$match: {
+				'metadata._user.host': null,
+				'metadata.deletedAt': { $exists: false }
+			}
+		}, {
+			$project: {
+				length: true
+			}
+		}, {
+			$group: {
+				_id: null,
+				usage: { $sum: '$length' }
+			}
+		}])
+		.then(aggregates => {
+			if (aggregates.length > 0) {
+				return aggregates[0].usage;
+			}
+			return 0;
+		});
+
+	const remoteDriveFilesSize = await DriveFile
+		.aggregate([{
+			$match: {
+				'metadata._user.host': { $ne: null },
+				'metadata.deletedAt': { $exists: false }
+			}
+		}, {
+			$project: {
+				length: true
+			}
+		}, {
+			$group: {
+				_id: null,
+				usage: { $sum: '$length' }
+			}
+		}])
+		.then(aggregates => {
+			if (aggregates.length > 0) {
+				return aggregates[0].usage;
+			}
+			return 0;
+		});
+
+	await Stats.insert({
+		date: date,
+		span: 'hour',
+		users: {
+			local: {
+				total: localUsersCount,
+				diff: 0
+			},
+			remote: {
+				total: remoteUsersCount,
+				diff: 0
+			}
+		},
+		notes: {
+			local: {
+				total: localNotesCount,
+				diff: 0,
+				diffs: {
+					normal: 0,
+					reply: 0,
+					renote: 0
+				}
+			},
+			remote: {
+				total: remoteNotesCount,
+				diff: 0,
+				diffs: {
+					normal: 0,
+					reply: 0,
+					renote: 0
+				}
+			}
+		},
+		drive: {
+			local: {
+				totalCount: localDriveFilesCount,
+				totalSize: localDriveFilesSize,
+				diffCount: 0,
+				diffSize: 0
+			},
+			remote: {
+				totalCount: remoteDriveFilesCount,
+				totalSize: remoteDriveFilesSize,
+				diffCount: 0,
+				diffSize: 0
+			}
+		}
+	});
+
+	console.log('done');
+}
+
+main();
@@ -1,3 +1,3 @@
 files:
-  - source: /locales/ja.yml
-    translation: /locales/%two_letters_code%.yml
+  - source: /locales/ja-JP.yml
+    translation: /locales/%locale%.yml
@@ -33,14 +33,3 @@ node cli/suspend @syuilo@misskey.xyz
 ``` shell
 node cli/reset-password (User-ID or Username)
 ```
-
-## Clean up cached remote files
-``` shell
-node cli/clean-cached-remote-files
-```
-
-## Clean up unused drive files
-``` shell
-node cli/clean-unused-drive-files
-```
-> We recommend that you announce a user that unused drive files will be deleted before performing this operation, as it may delete the user's important files.
@@ -33,14 +33,3 @@ node cli/suspend @syuilo@misskey.xyz
 ``` shell
 node cli/reset-password (ユーザーID または ユーザー名)
 ```
-
-## キャッシュされたリモートファイルをクリーンアップする
-``` shell
-node cli/clean-cached-remote-files
-```
-
-## 使われていないドライブのファイルをクリーンアップする
-``` shell
-node cli/clean-unused-drive-files
-```
-> ユーザーの大事なファイルを削除する可能性があるので、この操作を実行する前にユーザーに告知することをお勧めします。
@@ -54,7 +54,7 @@ Please visit https://www.google.com/recaptcha/intro/ and generate keys.

 *(optional)* Generating VAPID keys
 ----------------------------------------------------------------
-If you want to enable ServiceWroker, you need to generate VAPID keys:
+If you want to enable ServiceWorker, you need to generate VAPID keys:
 Unless you have set your global node_modules location elsewhere, you need to run this in root.

 ``` shell
@@ -131,6 +131,7 @@ You can check if the service is running with `systemctl status misskey`.
 2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
 3. `npm install`
 4. `npm run build`
+5. Check [ChangeLog](../CHANGELOG.md) for migration information

 ----------------------------------------------------------------

@@ -120,6 +120,7 @@ WantedBy=multi-user.target
 2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
 3. `npm install`
 4. `npm run build`
+5. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する

 ----------------------------------------------------------------

@@ -11,12 +11,12 @@ If you find an untranslated part on Misskey:
 	- In fact, `foo` should be a word that is appropriate for the situation and is easy to understand in English.
 	- For example, if the untranslated portion is the following "タイムライン" you must write: `%i18n:@timeline%`.

-3. Open the `locales/ja.yml`, check whether the <strong>file name (path)</strong> found in step 1 exists, if not, create it.
+3. Open the `locales/ja-JP.yml`, check whether the <strong>file name (path)</strong> found in step 1 exists, if not, create it.
 	- Do not put the beginning of the path `src/client/app/` in the locale file.
 	- For example, in this case we want to modify untranslated parts of `src/client/app/mobile/views/pages/home.vue`, so the key is `mobile/views/pages/home.vue`.

 4. Add the text property using the `foo` keyword below the path that you found or created in step 2. Make sure to type your text in quotation marks. Text should always be inside of quotes.
-	-   For example, in this case we add timeline: `timeline: "タイムライン"` to `locales/ja.yml`.
+	-   For example, in this case we add timeline: `timeline: "タイムライン"` to `locales/ja-JP.yml`.

 5. And done！

@@ -16,7 +16,7 @@ Si vous trouvez un segment non-traduit sur Misskey :
 	- Par exemple, dans ce cas de figure, nous voulons modifier le segment non-traduit de : `src/client/app/mobile/views/pages/home.vue`donc il faut juste écrire : `mobile/views/pages/home.vue` dans les fichiers linguistiques.

 4. Ajoutez la propriété du texte traduit grâce à la clef `foo`, en-dessous du chemin correspondant à votre modification que vous avez trouvé ou créé dans l'étape 2. À côté, veuillez indiquer entre "guillemets" la valeur de votre traduction.
-	- Par exemple, dans ce cas de figure, nous ajoutons la propriété et la traduction `timeline: "Timeline"` à `locales/fr.yml`, mais aussi la propriété et la version originale `timeline: "タイムライン"` à `locales/ja.yml`.
+	- Par exemple, dans ce cas de figure, nous ajoutons la propriété et la traduction `timeline: "Timeline"` à `locales/fr.yml`, mais aussi la propriété et la version originale `timeline: "タイムライン"` à `locales/ja-JP.yml`.

 5. Vous avez réussi à traduire une portion de misskey ！

@@ -11,12 +11,12 @@ Misskey内の未翻訳箇所を見つけたら
 	- `foo`は実際にはその場に適したわかりやすい(英語の)名前にしてください。
 	- 例えば未翻訳箇所が「タイムライン」というテキストだった場合、`%i18n:@timeline%`のようにします。

-3. `locales/ja.yml`を開き、1.で見つけた<strong>ファイル名(パス)</strong>のキーが存在するか確認し、無ければ作成してください。
+3. `locales/ja-JP.yml`を開き、1.で見つけた<strong>ファイル名(パス)</strong>のキーが存在するか確認し、無ければ作成してください。
 	- パスの`src/client/app/`は省略してください。
 	- 例えば、今回の例では`src/client/app/mobile/views/pages/home.vue`の未翻訳箇所を修正したいので、キーは`mobile/views/pages/home.vue`になります。

 4. そのキーの直下に2.で置換した`foo`の部分をキーとし、テキストを値とするプロパティを追加します。
-	- 例えば、今回の例で言うと`locales/ja.yml`に`timeline: "タイムライン"`を追加します。
+	- 例えば、今回の例で言うと`locales/ja-JP.yml`に`timeline: "タイムライン"`を追加します。

 5. 完了です！

@@ -23,7 +23,6 @@ const uglifyes = require('uglify-es');

 const locales = require('./locales');
 import { fa } from './src/misc/fa';
-import config from './src/config';

 const uglify = uglifyComposer(uglifyes, console);

@@ -60,7 +59,16 @@ gulp.task('build:copy:views', () =>
 	gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views'))
 );

-gulp.task('build:copy', ['build:copy:views'], () =>
+// 互換性のため
+gulp.task('build:copy:lang', () =>
+	gulp.src(['./built/client/assets/*.*-*.js'])
+		.pipe(rename(path => {
+			path.basename = path.basename.replace(/\-(.*)$/, '');
+		}))
+		.pipe(gulp.dest('./built/client/assets/'))
+);
+
+gulp.task('build:copy', ['build:copy:views', 'build:copy:lang'], () =>
 	gulp.src([
 		'./build/Release/crypto_key.node',
 		'./src/const.json',
@@ -118,7 +126,6 @@ gulp.task('build:client:script', () => {
 	const client = require('./built/client/meta.json');
 	return gulp.src(['./src/client/app/boot.js', './src/client/app/safe.js'])
 		.pipe(replace('VERSION', JSON.stringify(client.version)))
-		.pipe(replace('API', JSON.stringify(config.api_url)))
 		.pipe(replace('ENV', JSON.stringify(env)))
 		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
 		.pipe(isProduction ? uglify({
@@ -0,0 +1,3 @@
+# **DO NOT edit locale files** except `ja-JP.yml`.
+
+Please see [Contribution guide](../CONTRIBUTING.md) for more information.
@@ -58,7 +58,7 @@ common:
    friday: "金曜日"
    saturday: "土曜日"
  reactions:
-    like: "Gefällt mir"
+    like: "いいね"
    love: "Lieben"
    laugh: "Lachen"
    hmm: "Hmm...?"
@@ -84,8 +84,10 @@ common:
  my-token-regenerated: "Dein Token wurde generiert. Du wirst jetzt abgemeldet."
  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
  verified-user: "公式アカウント"
  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
+  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
  reversi:
    drawn: "引き分け"
    my-turn: "あなたのターンです"
@@ -259,6 +261,8 @@ common/views/components/nav.vue:
  develop: "Entwickler"
  feedback: "Feedback"
 common/views/components/note-menu.vue:
+  detail: "詳細"
+  copy-link: "リンクをコピー"
  favorite: "Diese Anmerkung favorisieren"
  pin: "An die Profilseite pinnen"
  delete: "Löschen"
@@ -289,6 +293,8 @@ common/views/components/signin.vue:
  signin-with-twitter: "Twitterでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
+  invitation-code: "招待コード"
+  invitation-info: "招待コードをお持ちでない方は、<a href=\"{}\">管理者</a>までご連絡ください。"
  username: "Benutzername"
  checking: "Überprüfung..."
  available: "Verfügbar"
@@ -334,6 +340,9 @@ common/views/components/visibility-chooser.vue:
  specified: "Direkt"
  specified-desc: "Poste nur für bestimmte Benutzer"
  private: "Privat"
+common/views/components/trends.vue:
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/broadcast.vue:
  fetching: "Laden"
  no-broadcasts: "Keine Broadcasts"
@@ -357,8 +366,6 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
-  count: "{}人が投稿"
-  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "Serverinformationen"
  toggle: "Sicht umschalten"
@@ -408,6 +415,7 @@ desktop:
  uploading-avatar: "新しいアバターをアップロードしています"
  avatar-updated: "アバターを更新しました"
  choose-avatar: "アバターにする画像を選択"
+  invalid-filetype: "この形式のファイルはサポートされていません"
 desktop/views/components/activity.chart.vue:
  total: "Schwarz ... komplett"
  notes: "Blau ... Hinweise"
@@ -421,6 +429,24 @@ desktop/views/components/calendar.vue:
  prev: "Vorheriger Monat"
  next: "Nächster Monat"
  go: "Klicke zur Navigation"
+desktop/views/components/charts.vue:
+  title: "チャート"
+  per-day: "1日ごと"
+  per-hour: "1時間ごと"
+  notes: "投稿"
+  users: "ユーザー"
+  drive: "ドライブ"
+  charts:
+    notes: "投稿の増減 (統合)"
+    local-notes: "投稿の増減 (ローカル)"
+    remote-notes: "投稿の増減 (リモート)"
+    notes-total: "投稿の累計"
+    users: "ユーザーの増減"
+    users-total: "ユーザーの累計"
+    drive: "ドライブ使用量の増減"
+    drive-total: "ドライブ使用量の累計"
+    drive-files: "ドライブのファイル数の増減"
+    drive-files-total: "ドライブのファイル数の累計"
 desktop/views/components/choose-file-from-drive-window.vue:
  choose-file: "Datei auswählen"
  upload: "Dateien von deinem PC hochladen"
@@ -441,6 +467,7 @@ desktop/views/components/drive-window.vue:
 desktop/views/components/drive.file.vue:
  avatar: "Avatar"
  banner: "Banner"
+  nsfw: "閲覧注意"
  contextmenu:
    rename: "Umbenennen"
    mark-as-sensitive: "閲覧注意に設定"
@@ -627,6 +654,7 @@ desktop/views/components/settings.vue:
  gradient-window-header: "Übergang in Fensterköpfen"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+  show-clock-on-header: "右上に時計を表示する"
  show-reply-target: "Zeige Antworten"
  show-my-renotes: "Zeige meine Reposts auf der Zeitleiste"
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
@@ -751,6 +779,7 @@ desktop/views/components/ui.header.account.vue:
  lists: "Listen"
  follow-requests: "フォロー申請"
  customize: "ホームのカスタマイズ"
+  admin: "管理"
  settings: "Einstellungen"
  signout: "Ausloggen"
  dark: "Verdunkeln"
@@ -796,8 +825,9 @@ desktop/views/pages/admin/admin.dashboard.vue:
  dashboard: "ダッシュボード"
  all-users: "全てのユーザー"
  original-users: "このインスタンスのユーザー"
-  all-notes: "全てのノート"
-  original-notes: "このインスタンスのノート"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
+  invite: "招待"
 desktop/views/pages/admin/admin.suspend-user.vue:
  suspend-user: "ユーザーの凍結"
  suspend: "凍結"
@@ -806,6 +836,14 @@ desktop/views/pages/admin/admin.unsuspend-user.vue:
  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
+desktop/views/pages/admin/admin.verify-user.vue:
+  verify-user: "ユーザーの公式アカウント設定"
+  verify: "公式アカウントにする"
+  verified: "公式アカウントにしました"
+desktop/views/pages/admin/admin.unverify-user.vue:
+  unverify-user: "ユーザーの公式アカウント解除"
+  unverify: "公式アカウントを解除する"
+  unverified: "公式アカウントを解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
@@ -814,6 +852,11 @@ desktop/views/pages/deck/deck.note.vue:
  reposted-by: "{}がRenote"
  private: "この投稿は非公開です"
  deleted: "この投稿は削除されました"
+desktop/views/pages/stats/stats.vue:
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
 desktop/views/pages/welcome.vue:
  about: "詳しく..."
  gotit: "わかった"
@@ -838,7 +881,7 @@ desktop/views/pages/selectdrive.vue:
  cancel: "Abbrechen"
  upload: "PCからドライブにファイルをアップロード"
 desktop/views/pages/search.vue:
-  not-available: "検索機能を利用することができません。"
+  not-available: "検索機能はインスタンスの設定で無効になっています。"
  not-found: "「{}」に関する投稿は見つかりませんでした。"
 desktop/views/pages/share.vue:
  share-with: "{}で共有"
@@ -931,12 +974,15 @@ mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
  select-folder: "フォルダーを選択"
+mobile/views/components/drive.file.vue:
+  nsfw: "閲覧注意"
 mobile/views/components/drive.file-detail.vue:
  download: "ダウンロード"
  rename: "名前を変更"
  move: "移動"
  hash: "ハッシュ (md5)"
  exif: "EXIF"
+  nsfw: "閲覧注意"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@@ -1017,6 +1063,7 @@ mobile/views/components/ui.nav.vue:
  game: "ゲーム"
  darkmode: "ダークモード"
  settings: "設定"
+  admin: "管理"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
  no-notes: "このユーザーは投稿していないようです。"
@@ -1134,6 +1181,8 @@ mobile/views/pages/settings.vue:
  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
  settings: "設定"
  signout: "サインアウト"
+  sound: "サウンド"
+  enableSounds: "サウンドを有効にする"
 mobile/views/pages/user.vue:
  follows-you: "フォローされています"
  following: "フォロー"
@@ -84,8 +84,10 @@ common:
  my-token-regenerated: "Your token has been regenerated, so you will be signed out."
  i-like-sushi: "I prefer sushi rather than pudding"
  show-reversi-board-labels: "Show row and column labels in Reversi"
+  use-contrast-reversi-stones: "Make the stone color clear in reversi"
  verified-user: "Verified account"
  disable-animated-mfm: "Disable animated texts in a post"
+  do-not-use-in-production: 'As this is for development, do not use this in production.'
  reversi:
    drawn: "Draw"
    my-turn: "Your turn"
@@ -259,6 +261,8 @@ common/views/components/nav.vue:
  develop: "Developers"
  feedback: "Feedback"
 common/views/components/note-menu.vue:
+  detail: "Details"
+  copy-link: "Copy link"
  favorite: "Favorite this note"
  pin: "Pin to your profile"
  delete: "Delete"
@@ -289,6 +293,8 @@ common/views/components/signin.vue:
  signin-with-twitter: "Log in with Twitter"
  login-failed: "Log in failed. Make sure you have entered your correct username and password."
 common/views/components/signup.vue:
+  invitation-code: "Invitation code"
+  invitation-info: "If you do not have an invitation code, please contact an <a href=\"{}\">administrator</a>."
  username: "Username"
  checking: "Confirming..."
  available: "Available"
@@ -334,6 +340,9 @@ common/views/components/visibility-chooser.vue:
  specified: "Direct"
  specified-desc: "Post to specified users only"
  private: "Private"
+common/views/components/trends.vue:
+  count: "{} users mentioned"
+  empty: "No popular hashtag trends"
 common/views/widgets/broadcast.vue:
  fetching: "Fetching"
  no-broadcasts: "No announcements"
@@ -357,8 +366,6 @@ common/views/widgets/posts-monitor.vue:
  toggle: "Toggle views"
 common/views/widgets/hashtags.vue:
  title: "Hashtags"
-  count: "{} users mentioned"
-  empty: "No popular hashtag trends"
 common/views/widgets/server.vue:
  title: "Server info"
  toggle: "Toggle views"
@@ -408,6 +415,7 @@ desktop:
  uploading-avatar: "Uploading a new avatar"
  avatar-updated: "Successfully updated the avatar"
  choose-avatar: "Select an image for the avatar"
+  invalid-filetype: "This filetype is not acceptable here"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -421,6 +429,24 @@ desktop/views/components/calendar.vue:
  prev: "Previous month"
  next: "Next month"
  go: "Click to navigate"
+desktop/views/components/charts.vue:
+  title: "Charts"
+  per-day: "per Day"
+  per-hour: "per Hour"
+  notes: "Posts"
+  users: "Users"
+  drive: "Drive"
+  charts:
+    notes: "The number of posts: increase/decrease (Combined)"
+    local-notes: "The number of posts: increase/decrease (Local)"
+    remote-notes: "The number of posts: increase/decrease (Remote)"
+    notes-total: "The number of posts: cumulative total"
+    users: "The number of users: increase/decrease"
+    users-total: "The number of users: cumulative total"
+    drive: "Capacity used as the storage: increase/decrease"
+    drive-total: "Capacity used as the storage: cumulative total"
+    drive-files: "The number of files on the storage: increase/decrease"
+    drive-files-total: "The number of files on the storage: cumulative total"
 desktop/views/components/choose-file-from-drive-window.vue:
  choose-file: "Choose files"
  upload: "Upload files from your device"
@@ -441,6 +467,7 @@ desktop/views/components/drive-window.vue:
 desktop/views/components/drive.file.vue:
  avatar: "Avatar"
  banner: "Banner"
+  nsfw: "NSFW"
  contextmenu:
    rename: "Rename"
    mark-as-sensitive: "Mark as 'sensitive'"
@@ -627,6 +654,7 @@ desktop/views/components/settings.vue:
  gradient-window-header: "Use gradients on window headers"
  post-form-on-timeline: "Display post form at the top of the timeline"
  suggest-recent-hashtags: "Show recent popular hashtags on the post form"
+  show-clock-on-header: "Show clock on upper-right"
  show-reply-target: "Display reply target"
  show-my-renotes: "Show my renotes in the timeline"
  show-renoted-my-notes: "Show renoted my posts in timelines"
@@ -751,6 +779,7 @@ desktop/views/components/ui.header.account.vue:
  lists: "Lists"
  follow-requests: "Follow requests"
  customize: "Customize home layout"
+  admin: "Admin"
  settings: "Settings"
  signout: "Sign out"
  dark: "Submerge in dark"
@@ -796,8 +825,9 @@ desktop/views/pages/admin/admin.dashboard.vue:
  dashboard: "Dashboard"
  all-users: "All Users"
  original-users: "Users on this instance"
-  all-notes: "All Posts"
+  all-notes: "All the posts"
  original-notes: "Posts on this instance"
+  invite: "Invite"
 desktop/views/pages/admin/admin.suspend-user.vue:
  suspend-user: "Suspend a user"
  suspend: "Suspend"
@@ -806,6 +836,14 @@ desktop/views/pages/admin/admin.unsuspend-user.vue:
  unsuspend-user: "Unsuspend users"
  unsuspend: "Unsuspend"
  unsuspended: "The user has successfully unsuspended."
+desktop/views/pages/admin/admin.verify-user.vue:
+  verify-user: "User account verification settings"
+  verify: "Verify account"
+  verified: "The account is now being verified"
+desktop/views/pages/admin/admin.unverify-user.vue:
+  unverify-user: "User account unverification settings"
+  unverify: "Unverify account"
+  unverified: "The account is now being unverified"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "Only media posts"
  is-media-view: "Media view"
@@ -814,6 +852,11 @@ desktop/views/pages/deck/deck.note.vue:
  reposted-by: "Reposted by {}"
  private: "This post is private"
  deleted: "This post has been deleted"
+desktop/views/pages/stats/stats.vue:
+  all-users: "All Users"
+  original-users: "Users on this instance"
+  all-notes: "All the posts"
+  original-notes: "Posts on this instance"
 desktop/views/pages/welcome.vue:
  about: "More details..."
  gotit: "Got it!"
@@ -838,7 +881,7 @@ desktop/views/pages/selectdrive.vue:
  cancel: "Cancel"
  upload: "Upload files from your device"
 desktop/views/pages/search.vue:
-  not-available: "The search feature is not available for now."
+  not-available: "Search feature is turned off in the settings for this instance."
  not-found: "No posts were found for '{}'"
 desktop/views/pages/share.vue:
  share-with: "Share with {}."
@@ -931,12 +974,15 @@ mobile/views/components/drive-file-chooser.vue:
  select-file: "Choose files"
 mobile/views/components/drive-folder-chooser.vue:
  select-folder: "Choose a folder"
+mobile/views/components/drive.file.vue:
+  nsfw: "NSFW"
 mobile/views/components/drive.file-detail.vue:
  download: "Download"
  rename: "Rename"
  move: "Move"
  hash: "Hash (md5)"
  exif: "EXIF"
+  nsfw: "NSFW"
 mobile/views/components/media-image.vue:
  sensitive: "NSFW"
  click-to-show: "Click to show"
@@ -1017,6 +1063,7 @@ mobile/views/components/ui.nav.vue:
  game: "Games"
  darkmode: "Dark theme"
  settings: "Settings"
+  admin: "Admin"
  about: "About Misskey"
 mobile/views/components/user-timeline.vue:
  no-notes: "It seems this user hasn't posted anything yet."
@@ -1030,7 +1077,7 @@ mobile/views/pages/favorites.vue:
  title: "Favorites"
 mobile/views/pages/user-lists.vue:
  title: "Lists"
-  enter-list-name: "Enter list name"
+  enter-list-name: "Enter a name of the list to make"
 mobile/views/pages/drive.vue:
  drive: "Drive"
  more: "Load more"
@@ -1134,6 +1181,8 @@ mobile/views/pages/settings.vue:
  update-available-desc: "Updates will be applied after reloading the page"
  settings: "Settings"
  signout: "Sign out"
+  sound: "Sounds"
+  enableSounds: "Enable sounds"
 mobile/views/pages/user.vue:
  follows-you: "Follows you"
  following: "Following"
@@ -11,7 +11,7 @@ common:
    warning: "<strong>Misskey no tiene anuncios publicitarios.</strong> Sin embargo, algunas características podrían no estar disponibles si el bloqueador de publicidad está habilitado."
  application-authorization: "Autorizaciones de la aplicación."
  close: "Cerrar"
-  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
+  do-not-copy-paste: "Por favor no copies código aquí. Tu cuenta puede resultar comprometida."
  got-it: "¡Listo!"
  customization-tips:
    title: "Consejos de personalización"
@@ -58,7 +58,7 @@ common:
    friday: "Viernes"
    saturday: "Sábado"
  reactions:
-    like: "me gusta"
+    like: "Me gusta"
    love: "amor"
    laugh: "risa"
    hmm: "hmm"
@@ -84,8 +84,10 @@ common:
  my-token-regenerated: "Tu token se ha regenerado vas a ser desconectado."
  i-like-sushi: "Prefiero sushi a pudín"
  show-reversi-board-labels: "Mostrar etiquetas de filas y columnas en Reversi"
-  verified-user: "公式アカウント"
+  use-contrast-reversi-stones: "Hacer el color de la piedra claro en Reversi"
+  verified-user: "Cuenta verificada"
  disable-animated-mfm: "Desactivar texto animado en una publicación"
+  do-not-use-in-production: 'Esto está en desarrollo, no usarlo para producción.'
  reversi:
    drawn: "Empatado"
    my-turn: "Mi turno"
@@ -169,9 +171,9 @@ common/views/components/games/reversi/reversi.vue:
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "Rendirse"
  surrendered: "Por rendirse"
-  is-llotheo: "石の少ない方が勝ち(ロセオ)"
-  looped-map: "ループマップ"
-  can-put-everywhere: "どこでも置けるモード"
+  is-llotheo: "El último gana (Llotheo)"
+  looped-map: "Mapa en bucle"
+  can-put-everywhere: "Puedes colocar donde quieras"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "¡Juega Reversi con tus amigos!"
@@ -259,6 +261,8 @@ common/views/components/nav.vue:
  develop: "Desarrolladores"
  feedback: "Opiniones"
 common/views/components/note-menu.vue:
+  detail: "Detalles"
+  copy-link: "Copiar enlace"
  favorite: "Me gusta esta nota"
  pin: "Fijar en el perfil"
  delete: "Borrar"
@@ -287,8 +291,10 @@ common/views/components/signin.vue:
  signin: "Entra"
  or: "O"
  signin-with-twitter: "Ingresar con Twitter"
-  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
+  login-failed: "Autenticación fallida. Asegúrate de haber usado el nombre de usuario y contraseña correctos."
 common/views/components/signup.vue:
+  invitation-code: "Código de invitación"
+  invitation-info: "Si no tienes un código de invitación, por favor contacta un <a href=\"{}\">administrador</a>."
  username: "Usuario"
  checking: "Comprobando..."
  available: "Disponible"
@@ -334,6 +340,9 @@ common/views/components/visibility-chooser.vue:
  specified: "Directo"
  specified-desc: "Publica solo para los seguidores que quieras"
  private: "Privada"
+common/views/components/trends.vue:
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/broadcast.vue:
  fetching: "Recuperando"
  no-broadcasts: "Sin emisión"
@@ -357,8 +366,6 @@ common/views/widgets/posts-monitor.vue:
  toggle: "Alternar vistas"
 common/views/widgets/hashtags.vue:
  title: "Etiquetas"
-  count: "{} usuarios mencionados"
-  empty: "Ninguna tendencia popular ahora"
 common/views/widgets/server.vue:
  title: "Información del servidor"
  toggle: "Alternar vistas"
@@ -408,6 +415,7 @@ desktop:
  uploading-avatar: "Cargando un nuevo avatar"
  avatar-updated: "Avatar actualizado"
  choose-avatar: "Escoge una imagen de avatar"
+  invalid-filetype: "Este tipo de archivo no es compatible aquí"
 desktop/views/components/activity.chart.vue:
  total: "Negro ... Total"
  notes: "Azul ... Notas"
@@ -421,6 +429,24 @@ desktop/views/components/calendar.vue:
  prev: "Mes anterior"
  next: "Próximo mes"
  go: "Click para navegar"
+desktop/views/components/charts.vue:
+  title: "Gráficos"
+  per-day: "por día"
+  per-hour: "por hora"
+  notes: "Publicaciones"
+  users: "Usuarios"
+  drive: "Unidad"
+  charts:
+    notes: "Número de publicaciones: aumentar/disminuir (Combinado)"
+    local-notes: "Número de publicaciones: aumentar/disminuir (Local)"
+    remote-notes: "Número de publicaciones: aumentar/disminuir (Remoto)"
+    notes-total: "Número de publicaciones: Acumulativo total"
+    users: "Número de usuarios: aumentar/disminuir"
+    users-total: "Número de usuarios: Acumulativo total"
+    drive: "Capacidad de almacenamiento usada: aumentar/disminuir"
+    drive-total: "Capacidad de almacenamiento usada: Acumulativa total"
+    drive-files: "Número de archivos almacenados: aumentar/disminuir"
+    drive-files-total: "Número de archivos almacenados: Acumulativo total"
 desktop/views/components/choose-file-from-drive-window.vue:
  choose-file: "Escoger archivos"
  upload: "Cargar archivos de tu dispositivo"
@@ -441,6 +467,7 @@ desktop/views/components/drive-window.vue:
 desktop/views/components/drive.file.vue:
  avatar: "Avatar"
  banner: "Banner"
+  nsfw: "Ver más"
  contextmenu:
    rename: "Renombrar"
    mark-as-sensitive: "Marcar como 'sensible'"
@@ -492,31 +519,31 @@ desktop/views/components/media-image.vue:
  sensitive: "El contenido es NSFW (no seguro para ver en el trabajo, 'not safe for work')"
  click-to-show: "Click para mostrar"
 desktop/views/components/media-video.vue:
-  sensitive: "閲覧注意"
-  click-to-show: "クリックして表示"
+  sensitive: "Este contenido no es apropiado para ver en el trabajo"
+  click-to-show: "Click para mostrar"
 desktop/views/components/follow-button.vue:
  following: "Siguiendo"
  follow: "Sigue"
  request-pending: "Pendiente de aprobación"
-  follow-request: "フォロー申請"
+  follow-request: "Solicitud de seguir"
 desktop/views/components/followers-window.vue:
-  followers: "{} のフォロワー"
+  followers: "{} seguidores"
 desktop/views/components/followers.vue:
-  empty: "フォロワーはいないようです。"
+  empty: "Parece que no tienes seguidores aún."
 desktop/views/components/following-window.vue:
-  following: "{} のフォロー"
+  following: "Siguiendo {}"
 desktop/views/components/following.vue:
-  empty: "フォロー中のユーザーはいないようです。"
+  empty: "Parece que aún no sigues a nadie."
 desktop/views/components/friends-maker.vue:
-  title: "気になるユーザーをフォロー:"
-  empty: "おすすめのユーザーは見つかりませんでした。"
-  fetching: "読み込んでいます"
-  refresh: "もっと見る"
-  close: "閉じる"
+  title: "Usuarios recomendados:"
+  empty: "No se pudieron encontrar usuarios para recomendar"
+  fetching: "Cargando"
+  refresh: "Más"
+  close: "Cerrar"
 desktop/views/components/game-window.vue:
-  game: "リバーシ"
+  game: "Reversi"
 desktop/views/components/home.vue:
-  done: "完了"
+  done: "Listo"
  add-widget: "Agregar accesorio:"
  add: "Agregar"
 desktop/views/input-dialog.vue:
@@ -542,8 +569,8 @@ desktop/views/components/notes.note.vue:
  detail: "Mostrar detalles"
  private: "Esta publicación es privada"
  deleted: "Esta publicación ha sido borrada"
-  hide: "隠す"
-  see-more: "もっと見る"
+  hide: "Esconder"
+  see-more: "Ver más"
 desktop/views/components/notes.vue:
  error: "Error al cargar."
  retry: "Reintentar"
@@ -579,7 +606,7 @@ desktop/views/components/post-form.vue:
  geolocation-alert: "Tu dispositivo no tiene soporte de geolocalización."
  error: "Error"
  enter-username: "Por favor escribe un nombre de usuario..."
-  annotations: "内容への注釈 (オプション)"
+  annotations: "Anotaciones a la publicación (opcional)"
 desktop/views/components/post-form-window.vue:
  note: "Nota nueva"
  reply: "Responder"
@@ -627,6 +654,7 @@ desktop/views/components/settings.vue:
  gradient-window-header: "Usar degradados en las cabeceras de las páginas"
  post-form-on-timeline: "Mostrar el formulario de las entradas encima de la línea de tiempo"
  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+  show-clock-on-header: "右上に時計を表示する"
  show-reply-target: "リプライ先を表示する"
  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
@@ -742,39 +770,40 @@ desktop/views/components/timeline.vue:
  global: "グローバル"
  list: "リスト"
 desktop/views/components/ui.header.vue:
-  welcome-back: "おかえりなさい、"
-  adjective: "さん"
+  welcome-back: "Bienvenido/a de vuelta,"
+  adjective: "-san"
 desktop/views/components/ui.header.account.vue:
-  profile: "プロフィール"
-  drive: "ドライブ"
-  favorites: "お気に入り"
-  lists: "リスト"
-  follow-requests: "フォロー申請"
-  customize: "ホームのカスタマイズ"
-  settings: "設定"
-  signout: "サインアウト"
-  dark: "闇に飲まれる"
+  profile: "Tu perfil"
+  drive: "Unidad"
+  favorites: "Favoritos"
+  lists: "Listas"
+  follow-requests: "Solicitudes de seguimiento"
+  customize: "Personalizar la página de inicio"
+  admin: "Admin"
+  settings: "Configuraciones"
+  signout: "Desconectarse"
+  dark: "Sumergirse en la oscuridad"
 desktop/views/components/ui.header.nav.vue:
-  home: "ホーム"
-  deck: "デッキ"
-  messaging: "メッセージ"
-  game: "ゲーム"
+  home: "Inicio"
+  deck: "Cubierta"
+  messaging: "Mensajes"
+  game: "Juegos"
 desktop/views/components/ui.header.notifications.vue:
-  title: "通知"
+  title: "Notificaciones"
 desktop/views/components/ui.header.post.vue:
-  post: "新規投稿"
+  post: "Crear una publicación"
 desktop/views/components/ui.header.search.vue:
-  placeholder: "検索"
+  placeholder: "Buscar"
 desktop/views/components/received-follow-requests-window.vue:
-  title: "フォロー申請"
-  accept: "承認"
-  reject: "拒否"
+  title: "Solicitudes de seguidores"
+  accept: "Aceptar"
+  reject: "Rechazar"
 desktop/views/components/user-lists-window.vue:
-  title: "リスト"
-  create-list: "リストを作成"
-  list-name: "リスト名"
+  title: "Listas de usuario"
+  create-list: "Crear lista"
+  list-name: "Nombre de lista"
 desktop/views/components/user-preview.vue:
-  notes: "投稿"
+  notes: "Publicaciones"
  following: "フォロー"
  followers: "フォロワー"
 desktop/views/components/users-list.vue:
@@ -796,8 +825,9 @@ desktop/views/pages/admin/admin.dashboard.vue:
  dashboard: "ダッシュボード"
  all-users: "全てのユーザー"
  original-users: "このインスタンスのユーザー"
-  all-notes: "全てのノート"
-  original-notes: "このインスタンスのノート"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
+  invite: "招待"
 desktop/views/pages/admin/admin.suspend-user.vue:
  suspend-user: "ユーザーの凍結"
  suspend: "凍結"
@@ -806,6 +836,14 @@ desktop/views/pages/admin/admin.unsuspend-user.vue:
  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
+desktop/views/pages/admin/admin.verify-user.vue:
+  verify-user: "ユーザーの公式アカウント設定"
+  verify: "公式アカウントにする"
+  verified: "公式アカウントにしました"
+desktop/views/pages/admin/admin.unverify-user.vue:
+  unverify-user: "ユーザーの公式アカウント解除"
+  unverify: "公式アカウントを解除する"
+  unverified: "公式アカウントを解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
@@ -814,6 +852,11 @@ desktop/views/pages/deck/deck.note.vue:
  reposted-by: "{}がRenote"
  private: "この投稿は非公開です"
  deleted: "この投稿は削除されました"
+desktop/views/pages/stats/stats.vue:
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
 desktop/views/pages/welcome.vue:
  about: "詳しく..."
  gotit: "わかった"
@@ -838,7 +881,7 @@ desktop/views/pages/selectdrive.vue:
  cancel: "キャンセル"
  upload: "PCからドライブにファイルをアップロード"
 desktop/views/pages/search.vue:
-  not-available: "検索機能を利用することができません。"
+  not-available: "検索機能はインスタンスの設定で無効になっています。"
  not-found: "「{}」に関する投稿は見つかりませんでした。"
 desktop/views/pages/share.vue:
  share-with: "{}で共有"
@@ -931,12 +974,15 @@ mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
  select-folder: "フォルダーを選択"
+mobile/views/components/drive.file.vue:
+  nsfw: "閲覧注意"
 mobile/views/components/drive.file-detail.vue:
  download: "ダウンロード"
  rename: "名前を変更"
  move: "移動"
  hash: "ハッシュ (md5)"
  exif: "EXIF"
+  nsfw: "閲覧注意"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@@ -1017,6 +1063,7 @@ mobile/views/components/ui.nav.vue:
  game: "ゲーム"
  darkmode: "ダークモード"
  settings: "設定"
+  admin: "管理"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
  no-notes: "このユーザーは投稿していないようです。"
@@ -1134,6 +1181,8 @@ mobile/views/pages/settings.vue:
  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
  settings: "設定"
  signout: "サインアウト"
+  sound: "サウンド"
+  enableSounds: "サウンドを有効にする"
 mobile/views/pages/user.vue:
  follows-you: "フォローされています"
  following: "フォロー"
@@ -4,10 +4,10 @@ meta:
  divider: ""
 common:
  misskey: "Une ⭐ du fédiverse"
-  about-title: "Une ⭐ du fédiverse."
-  about: "Merci d'avoir découvert Misskey. Misskey est une <b>plateforme de micro-blogging distribuée</b> née sur Terre. Parce qu'il fait partie du Fédiverse (un univers composé de diverses plateformes de réseaux sociaux organisées), il est mutuellement connecté avec d'autres plateformes de réseaux sociaux. Désirez-vous prendre une pause, pendant un instant, loin de l'agitation de la ville et plonger dans un nouvel Internet ?"
+  about-title: "Une ⭐ du fédivers."
+  about: "Merci d'avoir découvert Misskey. Misskey est une <b>plateforme de microblogage distribuée</b> née sur Terre. Parce qu'il fait partie du Fédivers (un univers composé de diverses plateformes de réseaux sociaux organisées), il est mutuellement connecté avec d'autres plateformes de réseaux sociaux. Désirez-vous prendre une pause, pendant un instant, loin de l'agitation de la ville et plonger dans un nouvel Internet ?"
  adblock:
-    detected: "Veuillez désactiver le bloqueur de publicités"
+    detected: "Veuillez désactiver votre bloqueur de publicités"
    warning: "<strong>Misskey n'utilise pas de publicités</strong>, mais quelques options peuvent être non disponibles ou fonctionneraient mal si un bloqueur de publicités est activé."
  application-authorization: "Permissions de l'application"
  close: "Fermer"
@@ -17,7 +17,7 @@ common:
    title: "Conseils de personnalisation"
    paragraph1: "La personnalisation à la maison vous permet d'ajouter / supprimer, glisser et déposer et réorganiser les widgets."
    paragraph2: "Vous pouvez changer l'affichage en <strong>cliquant droit</strong> sur certains widgets."
-    paragraph3: "Pour supprimer un widget, <strong>glissez et déposez le widget sur la zone étiquetée \"Corbeille\"</strong> dans l'en-tête."
+    paragraph3: "Pour supprimer un widget, <strong>glissez et déposez le widget sur la zone étiquetée « Corbeille »</strong> dans l'en-tête."
    paragraph4: "Pour terminer la personnalisation, cliquez sur \"Terminer\" dans le coin supérieur droit."
    gotit: "Compris!"
  notification:
@@ -30,7 +30,7 @@ common:
    quoted-by: "Cité·e par {} :"
  time:
    unknown: "inconnu"
-    future: "future"
+    future: "à l'instant"
    just_now: "à l'instant"
    seconds_ago: "Il y a {} seconde·s"
    minutes_ago: "Il y a {} minute·s"
@@ -58,10 +58,10 @@ common:
    friday: "Vendredi"
    saturday: "Samedi"
  reactions:
-    like: "Aime"
+    like: "J'aime"
    love: "Adore"
    laugh: "Rire"
-    hmm: "Hmm ... ?"
+    hmm: "Hmm … ?"
    surprise: "Wow"
    congrats: "Félicitations !"
    angry: "En colère"
@@ -69,10 +69,10 @@ common:
    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
-    a: "Que faîtes vous maintenant ?"
+    a: "Que faites-vous maintenant ?"
    b: "Quoi de neuf ?"
    c: "Qu'avez-vous en tête ?"
-    d: "Voulez-vous exprimer quelque chose ?"
+    d: "Désirez-vous publier quelques mots ?"
    e: "Écrivez ici"
    f: "En attente de vos écrits"
  search: "Recherche"
@@ -82,10 +82,12 @@ common:
  update-available-title: "Mise à jour disponible"
  update-available: "Une nouvelle version de Misskey est disponible ({newer}, version actuelle: {current}). Veuillez recharger la page pour appliquer la mise à jour."
  my-token-regenerated: "Votre token vient d'être généré, vous allez maintenant être déconnecté."
-  i-like-sushi: "Je préfère les sushis (au pudding)"
+  i-like-sushi: "Je préfère les sushis plutôt que le pudding"
  show-reversi-board-labels: "Afficher les étiquettes des lignes et colonnes dans Reversi"
-  verified-user: "公式アカウント"
+  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
+  verified-user: "Compte vérifié"
  disable-animated-mfm: "Désactiver les textes animés dans les publications"
+  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
  reversi:
    drawn: "Partie nulle"
    my-turn: "C’est votre tour"
@@ -101,18 +103,18 @@ common:
    analog-clock: "Horloge analogique"
    profile: "Profil"
    calendar: "Calendrier"
-    timemachine: "Calendrier (Machine de temps)"
+    timemachine: "Calendrier (Machine temporelle)"
    activity: "Activité"
    rss: "Lecteur de flux RSS"
    memo: "Pense-bête"
    trends: "Tendances"
    photo-stream: "Flux de photos"
-    posts-monitor: "Graph des publications"
+    posts-monitor: "Graphe des publications"
    slideshow: "Diaporama"
    version: "Version"
    broadcast: "Diffusion"
    notifications: "Notifications"
-    users: "Utilisateurs"
+    users: "Utilisateur·rice·s"
    polls: "Sondages"
    post-form: "Formulaire de publication"
    messaging: "Messagerie"
@@ -174,16 +176,16 @@ common/views/components/games/reversi/reversi.game.vue:
  can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
-  sub-title: "Jouer à Reversi avec vos amis·es !"
+  sub-title: "Jouer à Reversi avec vos ami·e·s !"
  invite: "Inviter"
-  rule: "Comment Jouer ?"
+  rule: "Comment jouer ?"
  rule-desc: "リバーシは、相手と交互に石をボードに置いて、相手の石を挟んで自分の色に変えてゆき、最終的に残った石が多い方が勝ちというボードゲームです。"
  mode-invite: "Inviter"
-  mode-invite-desc: "Inviter un joueur."
+  mode-invite-desc: "Inviter un·e joueur·se."
  invitations: "Vous avez reçu une invitation !"
  my-games: "Mes jeux"
  all-games: "Tous les jeux"
-  enter-username: "Saisir un nom d'utilisateur"
+  enter-username: "Saisir un nom d'utilisateur·rice"
  game-state:
    ended: "Terminée"
    playing: "En cours"
@@ -204,7 +206,7 @@ common/views/components/games/reversi/reversi.room.vue:
  waiting-for-both: "En attente que vous soyez prêt"
  cancel: "Annuler"
  ready: "Prêt"
-  cancel-ready: "Annuler \"Je suis prêt\""
+  cancel-ready: "Annuler « Prêt »"
 common/views/components/connect-failed.vue:
  title: "Échec de connexion au serveur"
  description: "Il y a soit un problème avec votre connexion internet, soit le serveur est hors-ligne ou en maintenance. Veuillez {ressayer} plus tard."
@@ -230,20 +232,20 @@ common/views/components/connect-failed.troubleshooter.vue:
  flush: "Vider le cache"
  set-version: "Choisissez une version"
 common/views/components/messaging.vue:
-  search-user: "Trouver un utilisateur"
+  search-user: "Trouver un·e utilisateur·trice"
  you: "Vous"
  no-history: "Pas d'historique"
 common/views/components/messaging-room.vue:
  empty: "Pas de conversations"
-  more: "Voir Plus"
+  more: "Voir plus"
  no-history: "Il n'y a pas plus d'historique"
  resize-form: "Faites glisser pour redimensionner"
  new-message: "Nouveau message"
-  only-one-file-attached: "Un seul fichier uniquement peut être joint au message"
+  only-one-file-attached: "Un seul fichier peut être joint au message"
 common/views/components/messaging-room.form.vue:
  input-message-here: "Tapez ici votre message"
  send: "Envoyer"
-  attach-from-local: "Joindre un fichier depuis votre PC"
+  attach-from-local: "Joindre un fichier depuis votre ordinateur"
  attach-from-drive: "Joindre un fichier depuis votre Drive"
  only-one-file-attached: "Un seul fichier uniquement peut être joint au message"
 common/views/components/messaging-room.message.vue:
@@ -251,23 +253,25 @@ common/views/components/messaging-room.message.vue:
  deleted: "Ce message a été supprimé"
 common/views/components/nav.vue:
  about: "À propos"
-  stats: "Stats"
-  status: "Status"
+  stats: "Statistiques"
+  status: "Statut"
  wiki: "Wiki"
-  donors: "Donateurs"
-  repository: "Repo"
-  develop: "Développeurs"
+  donors: "Donateur·rice·s"
+  repository: "Dépôt"
+  develop: "Développeur·se·s"
  feedback: "Remarques"
 common/views/components/note-menu.vue:
-  favorite: "Favorite this note"
-  pin: "Épingler sur votre profile"
+  detail: "詳細"
+  copy-link: "リンクをコピー"
+  favorite: "Mettre cette note en favoris"
+  pin: "Épingler sur votre profil"
  delete: "Supprimer"
  delete-confirm: "Supprimer cette publication ?"
-  remote: "Afficher les note originale"
+  remote: "Afficher la note originale"
 common/views/components/poll.vue:
  vote-to: "Voter pour '{}'"
  vote-count: "{} votes"
-  total-users: "{} utilisateurs ont voté"
+  total-users: "{} utilisateur·rice·s ont voté·e·s"
  vote: "Vote"
  show-result: "Montrer les résultats"
  voted: "Voté"
@@ -280,32 +284,34 @@ common/views/components/poll-editor.vue:
 common/views/components/reaction-picker.vue:
  choose-reaction: "Choisissez votre réaction"
 common/views/components/signin.vue:
-  username: "Nom d'utilisateur"
+  username: "Nom d'utilisateur·rice"
  password: "Mot de passe"
  token: "Token"
-  signing-in: "Connexion...."
+  signing-in: "Connexion…"
  signin: "Se connecter"
  or: "Ou"
  signin-with-twitter: "Se connecter via Twitter"
-  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
+  login-failed: "Échec d'authentification. Veuillez vérifier que votre nom d'utilisateur et mot de passe sont corrects."
 common/views/components/signup.vue:
-  username: "Nom d'utilisateur"
-  checking: "Vérification"
+  invitation-code: "Code d’invitation"
+  invitation-info: "Si vous n’avez pas de code d’invitation, contactez un·e <a href=\"{}\">administrateur·rice</a>."
+  username: "Nom d'utilisateur·rice"
+  checking: "Vérification…"
  available: "Disponible"
  unavailable: "Non disponible"
-  error: "Erreur de réseau"
-  invalid-format: "Utilisez seulement des lettres, nombres et/ou -."
+  error: "Erreur du réseau"
+  invalid-format: "Vous pouvez utiliser des lettres, des nombres et _."
  too-short: "Veuillez saisir au moins un caractère !"
  too-long: "Veuillez entrer au maximum 20 caractères."
-  password: "Mot de Passe"
-  password-placeholder: "Nous recommendons au moins 8 caractères."
+  password: "Mot de passe"
+  password-placeholder: "Nous recommandons au moins 8 caractères."
  weak-password: "Faible"
  normal-password: "Moyen"
  strong-password: "Fort"
  retype: "Retapez"
  retype-placeholder: "Confirmez votre mot de passe"
  password-matched: "OK"
-  password-not-matched: "Les mots de passes ne correspondent pas."
+  password-not-matched: "Les mots de passe ne correspondent pas."
  recaptcha: "Vérifier"
  create: "Créer un compte"
  some-error: "La création du compte a échoué. Veuillez réessayer."
@@ -317,14 +323,14 @@ common/views/components/stream-indicator.vue:
  reconnecting: "Reconnexion en cours"
  connected: "Connecté"
 common/views/components/twitter-setting.vue:
-  description: "Si vous liez votre compte Twitter à votre compte Misskey, vous verrez ensuite votre compte Twitter s'afficher sur votre profile, vous aurez aussi la possibilité de vous connecter à Misskey en utilisant votre compte Twitter."
+  description: "Si vous liez votre compte Twitter à votre compte Misskey, vous verrez ensuite votre compte Twitter s'afficher sur votre profil, vous aurez aussi la possibilité de vous connecter à Misskey en utilisant votre compte Twitter."
  connected-to: "Vous êtes connecté à ce compte Twitter"
-  detail: "Détails …"
-  reconnect: "Reconnecter"
+  detail: "Détails…"
+  reconnect: "Reconnexion"
  connect: "Lier votre compte Twitter"
-  disconnect: "Déconnecter"
+  disconnect: "Déconnexion"
 common/views/components/uploader.vue:
-  waiting: "En attente"
+  waiting: "Veuillez patienter"
 common/views/components/visibility-chooser.vue:
  public: "Public"
  home: "Accueil"
@@ -332,42 +338,43 @@ common/views/components/visibility-chooser.vue:
  followers: "Abonné·e·s"
  followers-desc: "Publier à vos abonné·e·s uniquement"
  specified: "Direct"
-  specified-desc: "Publier aux utilisateurs·trices mentionné·es"
+  specified-desc: "Publier aux utilisateur·rice·s mentionné·e·s"
  private: "Privé"
+common/views/components/trends.vue:
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/broadcast.vue:
-  fetching: "Récuperation"
+  fetching: "Récupération"
  no-broadcasts: "Aucune annonce"
  have-a-nice-day: "Passez une bonne journée !"
  next: "Suivant"
 common/views/widgets/calendar.vue:
-  year: "{} année"
-  month: "{} mois"
-  day: "{} jour"
+  year: "Année {}"
+  month: "Mois {}"
+  day: "Jour {}"
  today: "Aujourd'hui :"
  this-month: "Ce mois-ci :"
  this-year: "Cette année :"
 common/views/widgets/donation.vue:
-  title: "Dons"
+  title: "Faire un don"
  text: "Les frais pour faire fonctionner Misskey sortent directement de notre poche. Nous ne recevons pas d'argent issu de la publicité, si vous pouvez nous faire des dons, on vous serait éternellement reconnaissants. Si vous êtes intéressé·es veuillez contacter {}. Merci pour votre contribution !"
 common/views/widgets/photo-stream.vue:
-  title: "Flux de photo"
-  no-photos: "Pas de photos"
+  title: "Flux de photos"
+  no-photos: "Pas de photo"
 common/views/widgets/posts-monitor.vue:
-  title: "Graph des publications"
+  title: "Graphe des publications"
  toggle: "Basculer entre les vues"
 common/views/widgets/hashtags.vue:
  title: "Étiquettes"
-  count: "{} utilisateurs mentionnés"
-  empty: "Aucune tendance"
 common/views/widgets/server.vue:
-  title: "Info sur le serveur"
+  title: "Informations sur le serveur"
  toggle: "Afficher les vues"
 common/views/widgets/memo.vue:
  title: "Pense-bête"
  memo: "Écrivez ici !"
  save: "Enregistrer"
 common/views/widgets/slideshow.vue:
-  folder-customize-mode: "Veuillez quitter le mode personnalisé pour pouvour spécifier un dossier"
+  folder-customize-mode: "Pour pouvoir spécifier un dossier, veuillez quitter le mode de personnalisation"
  folder: "Veuillez cliquer pour spécifier le dossier"
  no-image: "Il n'y a aucune image dans ce dossier"
 common/views/widgets/tips.vue:
@@ -375,13 +382,13 @@ common/views/widgets/tips.vue:
  tips-line2: "<kbd>p</kbd>または<kbd>n</kbd>で投稿フォームを開きます"
  tips-line3: "Vous pouvez glisser et déposer des fichiers sur la fenêtre de la note"
  tips-line4: "Vous pouvez coller des images à partir du presse-papier sur la fenêtre de la note"
-  tips-line5: "Vous pouvez téléverser des fichiers sur le Drive en faisant un glisser/déplacer"
-  tips-line6: "ドライブでファイルをドラッグしてフォルダ移動できます"
+  tips-line5: "Vous pouvez téléverser des fichiers sur le Drive en faisant un glisser-déposer"
+  tips-line6: "Vous pouvez déplacer un dossier en le glissant dans le Drive"
  tips-line7: "ドライブでフォルダをドラッグしてフォルダ移動できます"
  tips-line8: "Vous pouvez personnaliser l'Accueil via les paramètres"
  tips-line9: "Misskey est sous licence AGPLv3"
  tips-line10: "タイムマシンウィジェットを利用すると、簡単に過去のタイムラインに遡れます"
-  tips-line11: "Vous pouvez épingler des notes sur votre page en appuyant sur \"…\""
+  tips-line11: "Vous pouvez épingler des notes sur votre page en cliquant sur « … »"
  tips-line13: "Tous les fichiers attachés à cette publication sont sauvegardés dans le Drive"
  tips-line14: "ホームのカスタマイズ中、ウィジェットを右クリックしてデザインを変更できます"
  tips-line17: "Vous pouvez mettre un texte en surbrillance en le mettant entre ** **"
@@ -392,38 +399,57 @@ common/views/widgets/tips.vue:
  tips-line24: "Misskey a vu le jour en 2014"
  tips-line25: "対応ブラウザではMisskeyを開いていなくても通知を受け取れます"
 common/views/pages/follow.vue:
-  signed-in-as: "Connecté·é en tant que {}"
+  signed-in-as: "Connecté·e en tant que {}"
  following: "Suit"
  follow: "Suivre"
  request-pending: "Demande d'abonnement en attente"
  follow-request: "Demande d'abonnement"
 desktop:
-  banner-crop-title: "Découpez la partie qui apparaîtra comme une bannière"
+  banner-crop-title: "Découpez la partie qui apparaitra comme bannière"
  banner: "Bannière"
  uploading-banner: "Téléversement d'une nouvelle bannière"
  banner-updated: "La bannière est mise à jour"
  choose-banner: "Choisir une bannière"
-  avatar-crop-title: "Découpez la partie qui apparaîtra dans l'avatar"
+  avatar-crop-title: "Découpez la partie qui apparaitra comme avatar"
  avatar: "Avatar"
  uploading-avatar: "Téléversement du nouvel avatar"
  avatar-updated: "L'avatar est mis à jour"
  choose-avatar: "Choisir un avatar"
+  invalid-filetype: "この形式のファイルはサポートされていません"
 desktop/views/components/activity.chart.vue:
  total: "Noirs ... Total"
  notes: "Bleu ... Notes"
  replies: "Rouge ... Réponses"
  renotes: "Vert ... Partages"
 desktop/views/components/activity.vue:
-  title: "Activitié"
+  title: "Activité"
  toggle: "Afficher les vues"
 desktop/views/components/calendar.vue:
  title: "{1} / {2}"
  prev: "Mois dernier"
  next: "Mois prochain"
-  go: "Cliquer pour naviguer"
+  go: "Cliquez pour naviguer"
+desktop/views/components/charts.vue:
+  title: "Graphiques"
+  per-day: "par jour"
+  per-hour: "par heure"
+  notes: "Publications"
+  users: "Utilisateurs"
+  drive: "Drive"
+  charts:
+    notes: "投稿の増減 (統合)"
+    local-notes: "投稿の増減 (ローカル)"
+    remote-notes: "投稿の増減 (リモート)"
+    notes-total: "投稿の累計"
+    users: "ユーザーの増減"
+    users-total: "ユーザーの累計"
+    drive: "ドライブ使用量の増減"
+    drive-total: "ドライブ使用量の累計"
+    drive-files: "ドライブのファイル数の増減"
+    drive-files-total: "ドライブのファイル数の累計"
 desktop/views/components/choose-file-from-drive-window.vue:
  choose-file: "Sélection de fichiers"
-  upload: "Téléverser des fichiers à partir de votre PC"
+  upload: "Téléverser des fichiers à partir de votre ordinateur"
  cancel: "Annuler"
  ok: "OK"
  choose-prompt: "Choisir un fichier"
@@ -441,6 +467,7 @@ desktop/views/components/drive-window.vue:
 desktop/views/components/drive.file.vue:
  avatar: "Avatar"
  banner: "Bannière"
+  nsfw: "CW"
  contextmenu:
    rename: "Renommer"
    mark-as-sensitive: "Marquer comme sensible"
@@ -454,14 +481,14 @@ desktop/views/components/drive.file.vue:
    add-app: "Ajouter une application"
    rename-file: "Renommer le ficher"
    input-new-file-name: "Entrer un nouveau nom"
-    copied: "Copied"
-    copied-url-to-clipboard: "L'URL a été copié dans le presse-papier"
+    copied: "Copié"
+    copied-url-to-clipboard: "L'URL a été copiée dans le presse-papier"
 desktop/views/components/drive.folder.vue:
  unable-to-process: "L'opération n'a pas pu être complétée"
  circular-reference-detected: "Le dossier de destination est un sous-dossier du dossier que vous souhaitez déplacer."
  unhandled-error: "Erreur inconnue"
  contextmenu:
-    move-to-this-folder: "Bouger dans ce dossier"
+    move-to-this-folder: "Déplacer dans ce dossier"
    show-in-new-window: "Ouvrir dans une nouvelle fenêtre"
    rename: "Renommer"
    rename-folder: "Renommer le dossier"
@@ -509,7 +536,7 @@ desktop/views/components/following.vue:
  empty: "Vous ne suivez aucun compte."
 desktop/views/components/friends-maker.vue:
  title: "Utilisateurs recommandés :"
-  empty: "Impossible de trouver des utilisateurs à recommander."
+  empty: "Impossible de trouver des utilisateurs·trices à recommander."
  fetching: "Chargement"
  refresh: "Plus"
  close: "Fermer"
@@ -626,7 +653,8 @@ desktop/views/components/settings.vue:
  circle-icons: "Utiliser des icônes circulaires"
  gradient-window-header: "Utiliser les dégradés sur la barre de titre de la fenêtre"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
-  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+  suggest-recent-hashtags: "Afficher les hashtags populaires dans le champs de saisie"
+  show-clock-on-header: "Afficher l'horloge à droite sur le coté supérieur"
  show-reply-target: "Afficher les réponses"
  show-my-renotes: "Afficher mes republications dans le fil"
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
@@ -635,7 +663,7 @@ desktop/views/components/settings.vue:
  show-maps-desc: "位置情報が添付された投稿のマップを自動的に展開します。"
  sound: "Son"
  enable-sounds: "Activer le son"
-  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
+  enable-sounds-desc: "Jouer un son lorsque vous recevez un message. Ce paramètre est sauvegardé dans le navigateur."
  volume: "Volume"
  test: "Test"
  mobile: "Mobile"
@@ -696,7 +724,7 @@ desktop/views/components/settings.2fa.vue:
 desktop/views/components/settings.api.vue:
  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
-  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
+  regeneration-of-token: "Si votre jeton est compromis, vous pouvez le régénérer."
  regenerate-token: "Regenerer le token"
  token: "Jeton :"
  enter-password: "Veuillez entrer le mot de passe"
@@ -751,6 +779,7 @@ desktop/views/components/ui.header.account.vue:
  lists: "Listes"
  follow-requests: "Demandes de suivi"
  customize: "Personnaliser l'Accueil"
+  admin: "Admin"
  settings: "Réglages"
  signout: "Déconnexion"
  dark: "Fall in dark"
@@ -788,24 +817,33 @@ desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "Fermer"
 desktop/views/pages/admin/admin.vue:
-  dashboard: "ダッシュボード"
-  drive: "ドライブ"
-  users: "ユーザー"
-  update: "更新"
+  dashboard: "Tableau de bord"
+  drive: "Drive"
+  users: "Utilisateur·rice·s"
+  update: "Mises à jour"
 desktop/views/pages/admin/admin.dashboard.vue:
-  dashboard: "ダッシュボード"
-  all-users: "全てのユーザー"
-  original-users: "このインスタンスのユーザー"
-  all-notes: "全てのノート"
-  original-notes: "このインスタンスのノート"
+  dashboard: "Tableau de bord"
+  all-users: "Toutes les utilisateurrices"
+  original-users: "Utilisateurrices sur cette instance"
+  all-notes: "Toutes les publications"
+  original-notes: "Publication sur cette instance"
+  invite: "Invitation"
 desktop/views/pages/admin/admin.suspend-user.vue:
-  suspend-user: "ユーザーの凍結"
-  suspend: "凍結"
-  suspended: "凍結しました"
+  suspend-user: "Suspendre un·e utilisateur·rice"
+  suspend: "Suspendre"
+  suspended: "Suspendu avec succès"
 desktop/views/pages/admin/admin.unsuspend-user.vue:
-  unsuspend-user: "ユーザーの凍結の解除"
-  unsuspend: "凍結の解除"
-  unsuspended: "凍結を解除しました"
+  unsuspend-user: "Lever la suspension d’utilisateur·rice·s"
+  unsuspend: "Suspension levée"
+  unsuspended: "La suspension de l’utilisateur·rice a été levée avec succès"
+desktop/views/pages/admin/admin.verify-user.vue:
+  verify-user: "Paramètres de vérification du compte utilisateur"
+  verify: "Vérification du compte"
+  verified: "Le compte a été vérifié"
+desktop/views/pages/admin/admin.unverify-user.vue:
+  unverify-user: "ユーザーの公式アカウント解除"
+  unverify: "Ôter la vérification du compte"
+  unverified: "Ce compte n'est pas vérifié"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "Les publications médias uniquement"
  is-media-view: "Vue média"
@@ -814,6 +852,11 @@ desktop/views/pages/deck/deck.note.vue:
  reposted-by: "Reposté par {}"
  private: "cette publication est privée"
  deleted: "cette publication a été supprimée"
+desktop/views/pages/stats/stats.vue:
+  all-users: "Toutes les utilisateurrices"
+  original-users: "Utilisateurrices sur cette instance"
+  all-notes: "Toutes les publications"
+  original-notes: "Publication sur cette instance"
 desktop/views/pages/welcome.vue:
  about: "à propos"
  gotit: "J'ai compris !"
@@ -838,7 +881,7 @@ desktop/views/pages/selectdrive.vue:
  cancel: "Annuler"
  upload: "Uploader un ou plusieurs fichier(s) depuis votre PC"
 desktop/views/pages/search.vue:
-  not-available: "Vous ne pouvez pas utiliser la fonctionnalité de recherche."
+  not-available: "検索機能はインスタンスの設定で無効になっています。"
  not-found: "Aucun message trouvé pour '{}'"
 desktop/views/pages/share.vue:
  share-with: "Partager avec {}"
@@ -931,12 +974,15 @@ mobile/views/components/drive-file-chooser.vue:
  select-file: "Choisissez un fichier"
 mobile/views/components/drive-folder-chooser.vue:
  select-folder: "Choisissez un dossier"
+mobile/views/components/drive.file.vue:
+  nsfw: "閲覧注意"
 mobile/views/components/drive.file-detail.vue:
  download: "Télécharger"
  rename: "Renommer"
  move: "Déplacer"
  hash: "Hash (md5)"
  exif: "EXIF"
+  nsfw: "閲覧注意"
 mobile/views/components/media-image.vue:
  sensitive: "Le contenu est NSFW"
  click-to-show: "Cliquer pour afficher"
@@ -950,7 +996,7 @@ mobile/views/components/follow-button.vue:
  follow-request: "Demande d'abonnement"
 mobile/views/components/friends-maker.vue:
  title: "Abonnez-vous aux utilisateurs"
-  empty: "Impossible de trouver des utilisateurs à recommander."
+  empty: "Impossible de trouver des utilisateurs·trices à recommander."
  fetching: "Chargement"
  refresh: "Voir plus"
  close: "Fermer"
@@ -1017,6 +1063,7 @@ mobile/views/components/ui.nav.vue:
  game: "Jeux"
  darkmode: "Mode nuit"
  settings: "Réglages"
+  admin: "Admin"
  about: "À propose de Misskey"
 mobile/views/components/user-timeline.vue:
  no-notes: "Cette utilisateur semble n'avoir rien poster pour le moment"
@@ -1134,6 +1181,8 @@ mobile/views/pages/settings.vue:
  update-available-desc: "Les mises à jour seront appliquées une fois la page est rechargée."
  settings: "Réglages"
  signout: "Déconnexion"
+  sound: "Sons"
+  enableSounds: "Activer le son"
 mobile/views/pages/user.vue:
  follows-you: "vous suit"
  following: "Abonnements"
@@ -1176,14 +1225,14 @@ docs:
      params: "Paramètres"
      no-params: "Aucun paramètre"
      res: "Réponse"
-      require-credential: "このエンドポイントは認証情報が必須です。"
-      require-permission: "このエンドポイントは{permission}の権限を必要とします。"
+      require-credential: "Ce point de communication nécessite une authentification."
+      require-permission: "Ce point de communication nécessite la permission {permission}."
      has-limit: "レートリミットがあります。"
      duration-limit: "直近{duration}ミリ秒の間のこのエンドポイントへのリクエスト数の合計が{max}を超える場合はリクエストできません。"
      min-interval-limit: "前回のリクエストから{interval}ミリ秒経っていない場合はリクエストできません。"
-      show-src: "このエンドポイントのソースコードも閲覧できます。"
+      show-src: "Vous pouvez voir le code source ce point de communication."
      show-src-link: "Consulter le code sur GitHub"
-      generated: "このドキュメントはAPI定義に基づき自動生成されています。"
+      generated: "Ce document est généré à partir de la définition de l’API."
    props:
      name: "Nom"
      type: "Type"
@@ -5,23 +5,9 @@
 const fs = require('fs');
 const yaml = require('js-yaml');

-const loadLang = lang => yaml.safeLoad(
-	fs.readFileSync(`${__dirname}/${lang}.yml`, 'utf-8'));
+const langs = ['de-DE', 'en-US', 'fr-FR', 'ja-JP', 'ja-KS', 'pl-PL', 'es-ES', 'nl-NL'];

-const native = loadLang('ja');
+const loadLocale = lang => yaml.safeLoad(fs.readFileSync(`${__dirname}/${lang}.yml`, 'utf-8'));
+const locales = langs.map(lang => ({ [lang]: loadLocale(lang) }));

-const langs = {
-	'de': loadLang('de'),
-	'en': loadLang('en'),
-	'fr': loadLang('fr'),
-	'ja': native,
-	'pl': loadLang('pl'),
-	'es': loadLang('es')
-};
-
-Object.values(langs).forEach(locale => {
-	// Extend native language (Japanese)
-	locale = Object.assign({}, native, locale);
-});
-
-module.exports = langs;
+module.exports = locales.reduce((a, b) => ({ ...a, ...b }));
@@ -84,8 +84,10 @@ common:
  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
  verified-user: "公式アカウント"
  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
+  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
  reversi:
    drawn: "引き分け"
    my-turn: "あなたのターンです"
@@ -259,6 +261,8 @@ common/views/components/nav.vue:
  develop: "開発者"
  feedback: "フィードバック"
 common/views/components/note-menu.vue:
+  detail: "詳細"
+  copy-link: "リンクをコピー"
  favorite: "お気に入り"
  pin: "ピン留め"
  delete: "削除"
@@ -289,6 +293,8 @@ common/views/components/signin.vue:
  signin-with-twitter: "Twitterでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
+  invitation-code: "招待コード"
+  invitation-info: "招待コードをお持ちでない方は、<a href=\"{}\">管理者</a>までご連絡ください。"
  username: "ユーザー名"
  checking: "確認しています..."
  available: "利用できます"
@@ -334,6 +340,9 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
+common/views/components/trends.vue:
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@@ -357,8 +366,6 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
-  count: "{}人が投稿"
-  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
@@ -408,6 +415,7 @@ desktop:
  uploading-avatar: "新しいアバターをアップロードしています"
  avatar-updated: "アバターを更新しました"
  choose-avatar: "アバターにする画像を選択"
+  invalid-filetype: "この形式のファイルはサポートされていません"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -421,6 +429,24 @@ desktop/views/components/calendar.vue:
  prev: "前の月"
  next: "次の月"
  go: "クリックして時間遡行"
+desktop/views/components/charts.vue:
+  title: "チャート"
+  per-day: "1日ごと"
+  per-hour: "1時間ごと"
+  notes: "投稿"
+  users: "ユーザー"
+  drive: "ドライブ"
+  charts:
+    notes: "投稿の増減 (統合)"
+    local-notes: "投稿の増減 (ローカル)"
+    remote-notes: "投稿の増減 (リモート)"
+    notes-total: "投稿の累計"
+    users: "ユーザーの増減"
+    users-total: "ユーザーの累計"
+    drive: "ドライブ使用量の増減"
+    drive-total: "ドライブ使用量の累計"
+    drive-files: "ドライブのファイル数の増減"
+    drive-files-total: "ドライブのファイル数の累計"
 desktop/views/components/choose-file-from-drive-window.vue:
  choose-file: "ファイル選択中"
  upload: "PCからドライブにファイルをアップロード"
@@ -441,6 +467,7 @@ desktop/views/components/drive-window.vue:
 desktop/views/components/drive.file.vue:
  avatar: "アイコン"
  banner: "バナー"
+  nsfw: "閲覧注意"
  contextmenu:
    rename: "名前を変更"
    mark-as-sensitive: "閲覧注意に設定"
@@ -627,6 +654,7 @@ desktop/views/components/settings.vue:
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+  show-clock-on-header: "右上に時計を表示する"
  show-reply-target: "リプライ先を表示する"
  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
@@ -751,6 +779,7 @@ desktop/views/components/ui.header.account.vue:
  lists: "リスト"
  follow-requests: "フォロー申請"
  customize: "ホームのカスタマイズ"
+  admin: "管理"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"
@@ -796,8 +825,9 @@ desktop/views/pages/admin/admin.dashboard.vue:
  dashboard: "ダッシュボード"
  all-users: "全てのユーザー"
  original-users: "このインスタンスのユーザー"
-  all-notes: "全てのノート"
-  original-notes: "このインスタンスのノート"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
+  invite: "招待"
 desktop/views/pages/admin/admin.suspend-user.vue:
  suspend-user: "ユーザーの凍結"
  suspend: "凍結"
@@ -806,6 +836,14 @@ desktop/views/pages/admin/admin.unsuspend-user.vue:
  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
+desktop/views/pages/admin/admin.verify-user.vue:
+  verify-user: "ユーザーの公式アカウント設定"
+  verify: "公式アカウントにする"
+  verified: "公式アカウントにしました"
+desktop/views/pages/admin/admin.unverify-user.vue:
+  unverify-user: "ユーザーの公式アカウント解除"
+  unverify: "公式アカウントを解除する"
+  unverified: "公式アカウントを解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
@@ -814,6 +852,11 @@ desktop/views/pages/deck/deck.note.vue:
  reposted-by: "{}がRenote"
  private: "この投稿は非公開です"
  deleted: "この投稿は削除されました"
+desktop/views/pages/stats/stats.vue:
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
 desktop/views/pages/welcome.vue:
  about: "詳しく..."
  gotit: "わかった"
@@ -838,7 +881,7 @@ desktop/views/pages/selectdrive.vue:
  cancel: "キャンセル"
  upload: "PCからドライブにファイルをアップロード"
 desktop/views/pages/search.vue:
-  not-available: "検索機能を利用することができません。"
+  not-available: "検索機能はインスタンスの設定で無効になっています。"
  not-found: "「{}」に関する投稿は見つかりませんでした。"
 desktop/views/pages/share.vue:
  share-with: "{}で共有"
@@ -931,12 +974,15 @@ mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
  select-folder: "フォルダーを選択"
+mobile/views/components/drive.file.vue:
+  nsfw: "閲覧注意"
 mobile/views/components/drive.file-detail.vue:
  download: "ダウンロード"
  rename: "名前を変更"
  move: "移動"
  hash: "ハッシュ (md5)"
  exif: "EXIF"
+  nsfw: "閲覧注意"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@@ -1017,6 +1063,7 @@ mobile/views/components/ui.nav.vue:
  game: "ゲーム"
  darkmode: "ダークモード"
  settings: "設定"
+  admin: "管理"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
  no-notes: "このユーザーは投稿していないようです。"
@@ -1134,6 +1181,8 @@ mobile/views/pages/settings.vue:
  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
  settings: "設定"
  signout: "サインアウト"
+  sound: "サウンド"
+  enableSounds: "サウンドを有効にする"
 mobile/views/pages/user.vue:
  follows-you: "フォローされています"
  following: "フォロー"
@@ -58,7 +58,7 @@ common:
    friday: "금요일"
    saturday: "토요일"
  reactions:
-    like: "좋네"
+    like: "いいね"
    love: "좋아"
    laugh: "크크"
    hmm: "음..."
@@ -84,8 +84,10 @@ common:
  my-token-regenerated: "당신의 토큰이 업데이트되어 있기 때문에 로그 아웃합니다."
  i-like-sushi: "나는(푸딩보다 오히려)스시가 좋아"
  show-reversi-board-labels: "리버시 보드의 행과 열 레이블을 표시"
+  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
  verified-user: "公式アカウント"
  disable-animated-mfm: "게시물의 문자 애니메이션을 비활성화 할"
+  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
  reversi:
    drawn: "무승부"
    my-turn: "당신의 차례입니다"
@@ -259,6 +261,8 @@ common/views/components/nav.vue:
  develop: "開発者"
  feedback: "フィードバック"
 common/views/components/note-menu.vue:
+  detail: "詳細"
+  copy-link: "リンクをコピー"
  favorite: "お気に入り"
  pin: "ピン留め"
  delete: "削除"
@@ -289,6 +293,8 @@ common/views/components/signin.vue:
  signin-with-twitter: "Twitterでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
+  invitation-code: "招待コード"
+  invitation-info: "招待コードをお持ちでない方は、<a href=\"{}\">管理者</a>までご連絡ください。"
  username: "ユーザー名"
  checking: "確認しています..."
  available: "利用できます"
@@ -334,6 +340,9 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
+common/views/components/trends.vue:
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@@ -357,8 +366,6 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
-  count: "{}人が投稿"
-  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
@@ -408,6 +415,7 @@ desktop:
  uploading-avatar: "新しいアバターをアップロードしています"
  avatar-updated: "アバターを更新しました"
  choose-avatar: "アバターにする画像を選択"
+  invalid-filetype: "この形式のファイルはサポートされていません"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -421,6 +429,24 @@ desktop/views/components/calendar.vue:
  prev: "前の月"
  next: "次の月"
  go: "クリックして時間遡行"
+desktop/views/components/charts.vue:
+  title: "チャート"
+  per-day: "1日ごと"
+  per-hour: "1時間ごと"
+  notes: "投稿"
+  users: "ユーザー"
+  drive: "ドライブ"
+  charts:
+    notes: "投稿の増減 (統合)"
+    local-notes: "投稿の増減 (ローカル)"
+    remote-notes: "投稿の増減 (リモート)"
+    notes-total: "投稿の累計"
+    users: "ユーザーの増減"
+    users-total: "ユーザーの累計"
+    drive: "ドライブ使用量の増減"
+    drive-total: "ドライブ使用量の累計"
+    drive-files: "ドライブのファイル数の増減"
+    drive-files-total: "ドライブのファイル数の累計"
 desktop/views/components/choose-file-from-drive-window.vue:
  choose-file: "ファイル選択中"
  upload: "PCからドライブにファイルをアップロード"
@@ -441,6 +467,7 @@ desktop/views/components/drive-window.vue:
 desktop/views/components/drive.file.vue:
  avatar: "アイコン"
  banner: "バナー"
+  nsfw: "閲覧注意"
  contextmenu:
    rename: "名前を変更"
    mark-as-sensitive: "閲覧注意に設定"
@@ -627,6 +654,7 @@ desktop/views/components/settings.vue:
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+  show-clock-on-header: "右上に時計を表示する"
  show-reply-target: "リプライ先を表示する"
  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
@@ -751,6 +779,7 @@ desktop/views/components/ui.header.account.vue:
  lists: "リスト"
  follow-requests: "フォロー申請"
  customize: "ホームのカスタマイズ"
+  admin: "管理"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"
@@ -796,8 +825,9 @@ desktop/views/pages/admin/admin.dashboard.vue:
  dashboard: "ダッシュボード"
  all-users: "全てのユーザー"
  original-users: "このインスタンスのユーザー"
-  all-notes: "全てのノート"
-  original-notes: "このインスタンスのノート"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
+  invite: "招待"
 desktop/views/pages/admin/admin.suspend-user.vue:
  suspend-user: "ユーザーの凍結"
  suspend: "凍結"
@@ -806,6 +836,14 @@ desktop/views/pages/admin/admin.unsuspend-user.vue:
  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
+desktop/views/pages/admin/admin.verify-user.vue:
+  verify-user: "ユーザーの公式アカウント設定"
+  verify: "公式アカウントにする"
+  verified: "公式アカウントにしました"
+desktop/views/pages/admin/admin.unverify-user.vue:
+  unverify-user: "ユーザーの公式アカウント解除"
+  unverify: "公式アカウントを解除する"
+  unverified: "公式アカウントを解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
@@ -814,6 +852,11 @@ desktop/views/pages/deck/deck.note.vue:
  reposted-by: "{}がRenote"
  private: "この投稿は非公開です"
  deleted: "この投稿は削除されました"
+desktop/views/pages/stats/stats.vue:
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
 desktop/views/pages/welcome.vue:
  about: "詳しく..."
  gotit: "わかった"
@@ -838,7 +881,7 @@ desktop/views/pages/selectdrive.vue:
  cancel: "キャンセル"
  upload: "PCからドライブにファイルをアップロード"
 desktop/views/pages/search.vue:
-  not-available: "検索機能を利用することができません。"
+  not-available: "検索機能はインスタンスの設定で無効になっています。"
  not-found: "「{}」に関する投稿は見つかりませんでした。"
 desktop/views/pages/share.vue:
  share-with: "{}で共有"
@@ -931,12 +974,15 @@ mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
  select-folder: "フォルダーを選択"
+mobile/views/components/drive.file.vue:
+  nsfw: "閲覧注意"
 mobile/views/components/drive.file-detail.vue:
  download: "ダウンロード"
  rename: "名前を変更"
  move: "移動"
  hash: "ハッシュ (md5)"
  exif: "EXIF"
+  nsfw: "閲覧注意"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@@ -1017,6 +1063,7 @@ mobile/views/components/ui.nav.vue:
  game: "ゲーム"
  darkmode: "ダークモード"
  settings: "設定"
+  admin: "管理"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
  no-notes: "このユーザーは投稿していないようです。"
@@ -1134,6 +1181,8 @@ mobile/views/pages/settings.vue:
  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
  settings: "設定"
  signout: "サインアウト"
+  sound: "サウンド"
+  enableSounds: "サウンドを有効にする"
 mobile/views/pages/user.vue:
  follows-you: "フォローされています"
  following: "フォロー"
@@ -1,6 +1,6 @@
 ---
 meta:
-  lang: "Português"
+  lang: "norsk"
  divider: ""
 common:
  misskey: "A ⭐ of fediverse"
@@ -29,26 +29,26 @@ common:
    reply-from: "{}さんから返信:"
    quoted-by: "{}さんが引用:"
  time:
-    unknown: "なぞのじかん"
-    future: "未来"
-    just_now: "たった今"
-    seconds_ago: "{}秒前"
-    minutes_ago: "{}分前"
-    hours_ago: "{}時間前"
-    days_ago: "{}日前"
-    weeks_ago: "{}週間前"
-    months_ago: "{}ヶ月前"
-    years_ago: "{}年前"
+    unknown: "ukjent"
+    future: "fremtidig"
+    just_now: "akkurat nå"
+    seconds_ago: "{} sekunder siden"
+    minutes_ago: "{} minutter siden"
+    hours_ago: "{} time siden"
+    days_ago: "{} dag siden"
+    weeks_ago: "{} uke(r) siden"
+    months_ago: "{} måned(er) siden"
+    years_ago: "{} år siden"
  month-and-day: "{month}月 {day}日"
  trash: "ゴミ箱"
  weekday-short:
-    sunday: "日"
-    monday: "月"
-    tuesday: "火"
-    wednesday: "水"
-    thursday: "木"
-    friday: "金"
-    saturday: "土"
+    sunday: "S"
+    monday: "M"
+    tuesday: "T"
+    wednesday: "O"
+    thursday: "T"
+    friday: "F"
+    saturday: "L"
  weekday:
    sunday: "日曜日"
    monday: "月曜日"
@@ -58,14 +58,14 @@ common:
    friday: "金曜日"
    saturday: "土曜日"
  reactions:
-    like: "いいね"
-    love: "しゅき"
-    laugh: "笑"
-    hmm: "ふぅ～む"
-    surprise: "わお"
-    congrats: "おめでとう"
-    angry: "おこ"
-    confused: "こまこまのこまり"
+    like: "Lik"
+    love: "Elsk"
+    laugh: "Le"
+    hmm: "Hmm…?"
+    surprise: "Wow"
+    congrats: "Gratulerer!"
+    angry: "Sint"
+    confused: "Forvirret"
    rip: "RIP"
    pudding: "Pudding"
  note-placeholders:
@@ -80,12 +80,14 @@ common:
  loading: "読み込み中"
  ok: "わかった"
  update-available-title: "更新があります"
-  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
-  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  update-available: "En ny versjon av Misskey er nå tilgjengelig ({newer}, nåværende versjon er {current}). Last inn siden igjen for at oppdateringen skal tre i kraft."
+  my-token-regenerated: "Ditt synbol har blitt generert. Du vil nå bli utlogget."
  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
  verified-user: "公式アカウント"
  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
+  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
  reversi:
    drawn: "引き分け"
    my-turn: "あなたのターンです"
@@ -206,8 +208,8 @@ common/views/components/games/reversi/reversi.room.vue:
  ready: "準備完了"
  cancel-ready: "準備続行"
 common/views/components/connect-failed.vue:
-  title: "サーバーに接続できません"
-  description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
+  title: "Kunne ikke koble til tjeneren."
+  description: "Det er enten et problem med internettilknytningen din, eller så har tjeneren blitt tatt ned for vedlikehold. {Prøv igjen} senere."
  thanks: "いつもMisskeyをご利用いただきありがとうございます。"
  troubleshoot: "トラブルシュート"
 common/views/components/connect-failed.troubleshooter.vue:
@@ -259,6 +261,8 @@ common/views/components/nav.vue:
  develop: "開発者"
  feedback: "フィードバック"
 common/views/components/note-menu.vue:
+  detail: "詳細"
+  copy-link: "リンクをコピー"
  favorite: "お気に入り"
  pin: "ピン留め"
  delete: "削除"
@@ -289,6 +293,8 @@ common/views/components/signin.vue:
  signin-with-twitter: "Twitterでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
+  invitation-code: "招待コード"
+  invitation-info: "招待コードをお持ちでない方は、<a href=\"{}\">管理者</a>までご連絡ください。"
  username: "ユーザー名"
  checking: "確認しています..."
  available: "利用できます"
@@ -334,6 +340,9 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
+common/views/components/trends.vue:
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@@ -357,8 +366,6 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
-  count: "{}人が投稿"
-  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
@@ -408,6 +415,7 @@ desktop:
  uploading-avatar: "新しいアバターをアップロードしています"
  avatar-updated: "アバターを更新しました"
  choose-avatar: "アバターにする画像を選択"
+  invalid-filetype: "この形式のファイルはサポートされていません"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -421,6 +429,24 @@ desktop/views/components/calendar.vue:
  prev: "前の月"
  next: "次の月"
  go: "クリックして時間遡行"
+desktop/views/components/charts.vue:
+  title: "チャート"
+  per-day: "1日ごと"
+  per-hour: "1時間ごと"
+  notes: "投稿"
+  users: "ユーザー"
+  drive: "ドライブ"
+  charts:
+    notes: "投稿の増減 (統合)"
+    local-notes: "投稿の増減 (ローカル)"
+    remote-notes: "投稿の増減 (リモート)"
+    notes-total: "投稿の累計"
+    users: "ユーザーの増減"
+    users-total: "ユーザーの累計"
+    drive: "ドライブ使用量の増減"
+    drive-total: "ドライブ使用量の累計"
+    drive-files: "ドライブのファイル数の増減"
+    drive-files-total: "ドライブのファイル数の累計"
 desktop/views/components/choose-file-from-drive-window.vue:
  choose-file: "ファイル選択中"
  upload: "PCからドライブにファイルをアップロード"
@@ -441,6 +467,7 @@ desktop/views/components/drive-window.vue:
 desktop/views/components/drive.file.vue:
  avatar: "アイコン"
  banner: "バナー"
+  nsfw: "閲覧注意"
  contextmenu:
    rename: "名前を変更"
    mark-as-sensitive: "閲覧注意に設定"
@@ -627,6 +654,7 @@ desktop/views/components/settings.vue:
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+  show-clock-on-header: "右上に時計を表示する"
  show-reply-target: "リプライ先を表示する"
  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
@@ -751,6 +779,7 @@ desktop/views/components/ui.header.account.vue:
  lists: "リスト"
  follow-requests: "フォロー申請"
  customize: "ホームのカスタマイズ"
+  admin: "管理"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"
@@ -796,8 +825,9 @@ desktop/views/pages/admin/admin.dashboard.vue:
  dashboard: "ダッシュボード"
  all-users: "全てのユーザー"
  original-users: "このインスタンスのユーザー"
-  all-notes: "全てのノート"
-  original-notes: "このインスタンスのノート"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
+  invite: "招待"
 desktop/views/pages/admin/admin.suspend-user.vue:
  suspend-user: "ユーザーの凍結"
  suspend: "凍結"
@@ -806,6 +836,14 @@ desktop/views/pages/admin/admin.unsuspend-user.vue:
  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
+desktop/views/pages/admin/admin.verify-user.vue:
+  verify-user: "ユーザーの公式アカウント設定"
+  verify: "公式アカウントにする"
+  verified: "公式アカウントにしました"
+desktop/views/pages/admin/admin.unverify-user.vue:
+  unverify-user: "ユーザーの公式アカウント解除"
+  unverify: "公式アカウントを解除する"
+  unverified: "公式アカウントを解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
@@ -814,6 +852,11 @@ desktop/views/pages/deck/deck.note.vue:
  reposted-by: "{}がRenote"
  private: "この投稿は非公開です"
  deleted: "この投稿は削除されました"
+desktop/views/pages/stats/stats.vue:
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
 desktop/views/pages/welcome.vue:
  about: "詳しく..."
  gotit: "わかった"
@@ -838,7 +881,7 @@ desktop/views/pages/selectdrive.vue:
  cancel: "キャンセル"
  upload: "PCからドライブにファイルをアップロード"
 desktop/views/pages/search.vue:
-  not-available: "検索機能を利用することができません。"
+  not-available: "検索機能はインスタンスの設定で無効になっています。"
  not-found: "「{}」に関する投稿は見つかりませんでした。"
 desktop/views/pages/share.vue:
  share-with: "{}で共有"
@@ -931,12 +974,15 @@ mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
  select-folder: "フォルダーを選択"
+mobile/views/components/drive.file.vue:
+  nsfw: "閲覧注意"
 mobile/views/components/drive.file-detail.vue:
  download: "ダウンロード"
  rename: "名前を変更"
  move: "移動"
  hash: "ハッシュ (md5)"
  exif: "EXIF"
+  nsfw: "閲覧注意"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@@ -1017,6 +1063,7 @@ mobile/views/components/ui.nav.vue:
  game: "ゲーム"
  darkmode: "ダークモード"
  settings: "設定"
+  admin: "管理"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
  no-notes: "このユーザーは投稿していないようです。"
@@ -1134,6 +1181,8 @@ mobile/views/pages/settings.vue:
  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
  settings: "設定"
  signout: "サインアウト"
+  sound: "サウンド"
+  enableSounds: "サウンドを有効にする"
 mobile/views/pages/user.vue:
  follows-you: "フォローされています"
  following: "フォロー"
@@ -58,7 +58,7 @@ common:
    friday: "Piątek"
    saturday: "Sobota"
  reactions:
-    like: "Lubię"
+    like: "いいね"
    love: "Kocham"
    laugh: "Śmieszne"
    hmm: "Hmm…?"
@@ -84,8 +84,10 @@ common:
  my-token-regenerated: "Twój token został wygenerowany. Zostaniesz wylogowany."
  i-like-sushi: "Wolę sushi od puddingu"
  show-reversi-board-labels: "Pokazuj podpisy wierszy i kolumn w Reversi"
+  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
  verified-user: "公式アカウント"
  disable-animated-mfm: "Wyłącz animowany tekst we wpisach"
+  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
  reversi:
    drawn: "Remis"
    my-turn: "Twoja kolej"
@@ -259,6 +261,8 @@ common/views/components/nav.vue:
  develop: "Autorzy"
  feedback: "Podziel się opinią"
 common/views/components/note-menu.vue:
+  detail: "詳細"
+  copy-link: "リンクをコピー"
  favorite: "Dodaj do ulubionych"
  pin: "Przypnij do profilu"
  delete: "Usuń"
@@ -289,6 +293,8 @@ common/views/components/signin.vue:
  signin-with-twitter: "Zaloguj się za pomocą Twittera"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
+  invitation-code: "招待コード"
+  invitation-info: "招待コードをお持ちでない方は、<a href=\"{}\">管理者</a>までご連絡ください。"
  username: "Nazwa użytkownika"
  checking: "Sprawdzanie…"
  available: "Dostępna"
@@ -334,6 +340,9 @@ common/views/components/visibility-chooser.vue:
  specified: "Bezpośredni"
  specified-desc: "Tylko dla określonych użytkowników"
  private: "Prywatny"
+common/views/components/trends.vue:
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/broadcast.vue:
  fetching: "Sprawdzanie"
  no-broadcasts: "Brak transmisji"
@@ -357,8 +366,6 @@ common/views/widgets/posts-monitor.vue:
  toggle: "Przełącz widok"
 common/views/widgets/hashtags.vue:
  title: "Hashtagi"
-  count: "Wspomniany przez {} użytkowników"
-  empty: "Brak popularnych hashtagów"
 common/views/widgets/server.vue:
  title: "Informacje o serwerze"
  toggle: "Przełącz widok"
@@ -408,6 +415,7 @@ desktop:
  uploading-avatar: "Wysyłanie awatara"
  avatar-updated: "Wysłano awatar"
  choose-avatar: "Wybierz awatar"
+  invalid-filetype: "この形式のファイルはサポートされていません"
 desktop/views/components/activity.chart.vue:
  total: "Czarny … Łącznie"
  notes: "Niebieski … Wpisy"
@@ -421,6 +429,24 @@ desktop/views/components/calendar.vue:
  prev: "Poprzedni miesiąc"
  next: "Następny miesiąc"
  go: "Naciśnij, aby przejść"
+desktop/views/components/charts.vue:
+  title: "チャート"
+  per-day: "1日ごと"
+  per-hour: "1時間ごと"
+  notes: "投稿"
+  users: "ユーザー"
+  drive: "ドライブ"
+  charts:
+    notes: "投稿の増減 (統合)"
+    local-notes: "投稿の増減 (ローカル)"
+    remote-notes: "投稿の増減 (リモート)"
+    notes-total: "投稿の累計"
+    users: "ユーザーの増減"
+    users-total: "ユーザーの累計"
+    drive: "ドライブ使用量の増減"
+    drive-total: "ドライブ使用量の累計"
+    drive-files: "ドライブのファイル数の増減"
+    drive-files-total: "ドライブのファイル数の累計"
 desktop/views/components/choose-file-from-drive-window.vue:
  choose-file: "Wybierz plik"
  upload: "Wyślij pliki z Twojego komputera"
@@ -441,6 +467,7 @@ desktop/views/components/drive-window.vue:
 desktop/views/components/drive.file.vue:
  avatar: "Awatar"
  banner: "Baner"
+  nsfw: "閲覧注意"
  contextmenu:
    rename: "Zmień nazwę"
    mark-as-sensitive: "Oznacz jako zawartość wrażliwą"
@@ -627,6 +654,7 @@ desktop/views/components/settings.vue:
  gradient-window-header: "Używaj gradientów na pasku tytułu okna"
  post-form-on-timeline: "Wyświetlaj formularz tworzenia wpisu w górnej części osi czasu"
  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+  show-clock-on-header: "右上に時計を表示する"
  show-reply-target: "Pokazuj cel odpowiedzi"
  show-my-renotes: "Pokazuj moje udostępnienia na osi czasu"
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
@@ -751,6 +779,7 @@ desktop/views/components/ui.header.account.vue:
  lists: "Listy"
  follow-requests: "Prośby o śledzenie"
  customize: "Dostosuj stronę główną"
+  admin: "管理"
  settings: "Ustawienia"
  signout: "Wyloguj się"
  dark: "Sprowadź ciemność"
@@ -796,8 +825,9 @@ desktop/views/pages/admin/admin.dashboard.vue:
  dashboard: "ダッシュボード"
  all-users: "全てのユーザー"
  original-users: "このインスタンスのユーザー"
-  all-notes: "全てのノート"
-  original-notes: "このインスタンスのノート"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
+  invite: "招待"
 desktop/views/pages/admin/admin.suspend-user.vue:
  suspend-user: "ユーザーの凍結"
  suspend: "凍結"
@@ -806,6 +836,14 @@ desktop/views/pages/admin/admin.unsuspend-user.vue:
  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
+desktop/views/pages/admin/admin.verify-user.vue:
+  verify-user: "ユーザーの公式アカウント設定"
+  verify: "公式アカウントにする"
+  verified: "公式アカウントにしました"
+desktop/views/pages/admin/admin.unverify-user.vue:
+  unverify-user: "ユーザーの公式アカウント解除"
+  unverify: "公式アカウントを解除する"
+  unverified: "公式アカウントを解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "Tylko wpisy z zawartością multimedialną"
  is-media-view: "Widok multimediów"
@@ -814,6 +852,11 @@ desktop/views/pages/deck/deck.note.vue:
  reposted-by: "Udostępniono przez {}"
  private: "ten wpis jest prywatny"
  deleted: "ten wpis został usunięty"
+desktop/views/pages/stats/stats.vue:
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
 desktop/views/pages/welcome.vue:
  about: "O Misskey"
  gotit: "Rozumiem!"
@@ -838,7 +881,7 @@ desktop/views/pages/selectdrive.vue:
  cancel: "Anuluj"
  upload: "Wyślij pliki z Twojego komputera"
 desktop/views/pages/search.vue:
-  not-available: "Funkcja wyszukiwania nie może zostać wykorzystywana."
+  not-available: "検索機能はインスタンスの設定で無効になっています。"
  not-found: "Nie znaleziono wpisów zawierających „{}”"
 desktop/views/pages/share.vue:
  share-with: "Udostępnij z {}."
@@ -931,12 +974,15 @@ mobile/views/components/drive-file-chooser.vue:
  select-file: "Wybierz plik"
 mobile/views/components/drive-folder-chooser.vue:
  select-folder: "Wybierz katalog"
+mobile/views/components/drive.file.vue:
+  nsfw: "閲覧注意"
 mobile/views/components/drive.file-detail.vue:
  download: "Pobierz"
  rename: "Zmień nazwę"
  move: "Przenieś"
  hash: "Hash (md5)"
  exif: "EXIF"
+  nsfw: "閲覧注意"
 mobile/views/components/media-image.vue:
  sensitive: "To jest zawartość NSFW"
  click-to-show: "Naciśnij aby wyświetlić"
@@ -1017,6 +1063,7 @@ mobile/views/components/ui.nav.vue:
  game: "Gry"
  darkmode: "Tryb ciemny"
  settings: "Ustawienia"
+  admin: "管理"
  about: "O Misskey"
 mobile/views/components/user-timeline.vue:
  no-notes: "Wygląda na to, że ten użytkownik nie opublikował jeszcze niczego"
@@ -1134,6 +1181,8 @@ mobile/views/pages/settings.vue:
  update-available-desc: "Odśwież stronę, aby zastosować aktualizację."
  settings: "Ustawienia"
  signout: "Wyloguj"
+  sound: "サウンド"
+  enableSounds: "サウンドを有効にする"
 mobile/views/pages/user.vue:
  follows-you: "Śledzi Cię"
  following: "Śledzeni"
@@ -84,8 +84,10 @@ common:
  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
  verified-user: "公式アカウント"
  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
+  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
  reversi:
    drawn: "引き分け"
    my-turn: "あなたのターンです"
@@ -259,6 +261,8 @@ common/views/components/nav.vue:
  develop: "開発者"
  feedback: "フィードバック"
 common/views/components/note-menu.vue:
+  detail: "詳細"
+  copy-link: "リンクをコピー"
  favorite: "お気に入り"
  pin: "ピン留め"
  delete: "削除"
@@ -289,6 +293,8 @@ common/views/components/signin.vue:
  signin-with-twitter: "Twitterでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
+  invitation-code: "招待コード"
+  invitation-info: "招待コードをお持ちでない方は、<a href=\"{}\">管理者</a>までご連絡ください。"
  username: "ユーザー名"
  checking: "確認しています..."
  available: "利用できます"
@@ -334,6 +340,9 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
+common/views/components/trends.vue:
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@@ -357,8 +366,6 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
-  count: "{}人が投稿"
-  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
@@ -408,6 +415,7 @@ desktop:
  uploading-avatar: "新しいアバターをアップロードしています"
  avatar-updated: "アバターを更新しました"
  choose-avatar: "アバターにする画像を選択"
+  invalid-filetype: "この形式のファイルはサポートされていません"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -421,6 +429,24 @@ desktop/views/components/calendar.vue:
  prev: "前の月"
  next: "次の月"
  go: "クリックして時間遡行"
+desktop/views/components/charts.vue:
+  title: "チャート"
+  per-day: "1日ごと"
+  per-hour: "1時間ごと"
+  notes: "投稿"
+  users: "ユーザー"
+  drive: "ドライブ"
+  charts:
+    notes: "投稿の増減 (統合)"
+    local-notes: "投稿の増減 (ローカル)"
+    remote-notes: "投稿の増減 (リモート)"
+    notes-total: "投稿の累計"
+    users: "ユーザーの増減"
+    users-total: "ユーザーの累計"
+    drive: "ドライブ使用量の増減"
+    drive-total: "ドライブ使用量の累計"
+    drive-files: "ドライブのファイル数の増減"
+    drive-files-total: "ドライブのファイル数の累計"
 desktop/views/components/choose-file-from-drive-window.vue:
  choose-file: "ファイル選択中"
  upload: "PCからドライブにファイルをアップロード"
@@ -441,6 +467,7 @@ desktop/views/components/drive-window.vue:
 desktop/views/components/drive.file.vue:
  avatar: "アイコン"
  banner: "バナー"
+  nsfw: "閲覧注意"
  contextmenu:
    rename: "名前を変更"
    mark-as-sensitive: "閲覧注意に設定"
@@ -627,6 +654,7 @@ desktop/views/components/settings.vue:
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+  show-clock-on-header: "右上に時計を表示する"
  show-reply-target: "リプライ先を表示する"
  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
@@ -751,6 +779,7 @@ desktop/views/components/ui.header.account.vue:
  lists: "リスト"
  follow-requests: "フォロー申請"
  customize: "ホームのカスタマイズ"
+  admin: "管理"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"
@@ -796,8 +825,9 @@ desktop/views/pages/admin/admin.dashboard.vue:
  dashboard: "ダッシュボード"
  all-users: "全てのユーザー"
  original-users: "このインスタンスのユーザー"
-  all-notes: "全てのノート"
-  original-notes: "このインスタンスのノート"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
+  invite: "招待"
 desktop/views/pages/admin/admin.suspend-user.vue:
  suspend-user: "ユーザーの凍結"
  suspend: "凍結"
@@ -806,6 +836,14 @@ desktop/views/pages/admin/admin.unsuspend-user.vue:
  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
+desktop/views/pages/admin/admin.verify-user.vue:
+  verify-user: "ユーザーの公式アカウント設定"
+  verify: "公式アカウントにする"
+  verified: "公式アカウントにしました"
+desktop/views/pages/admin/admin.unverify-user.vue:
+  unverify-user: "ユーザーの公式アカウント解除"
+  unverify: "公式アカウントを解除する"
+  unverified: "公式アカウントを解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
@@ -814,6 +852,11 @@ desktop/views/pages/deck/deck.note.vue:
  reposted-by: "{}がRenote"
  private: "この投稿は非公開です"
  deleted: "この投稿は削除されました"
+desktop/views/pages/stats/stats.vue:
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
 desktop/views/pages/welcome.vue:
  about: "詳しく..."
  gotit: "わかった"
@@ -838,7 +881,7 @@ desktop/views/pages/selectdrive.vue:
  cancel: "キャンセル"
  upload: "PCからドライブにファイルをアップロード"
 desktop/views/pages/search.vue:
-  not-available: "検索機能を利用することができません。"
+  not-available: "検索機能はインスタンスの設定で無効になっています。"
  not-found: "「{}」に関する投稿は見つかりませんでした。"
 desktop/views/pages/share.vue:
  share-with: "{}で共有"
@@ -931,12 +974,15 @@ mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
  select-folder: "フォルダーを選択"
+mobile/views/components/drive.file.vue:
+  nsfw: "閲覧注意"
 mobile/views/components/drive.file-detail.vue:
  download: "ダウンロード"
  rename: "名前を変更"
  move: "移動"
  hash: "ハッシュ (md5)"
  exif: "EXIF"
+  nsfw: "閲覧注意"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@@ -1017,6 +1063,7 @@ mobile/views/components/ui.nav.vue:
  game: "ゲーム"
  darkmode: "ダークモード"
  settings: "設定"
+  admin: "管理"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
  no-notes: "このユーザーは投稿していないようです。"
@@ -1134,6 +1181,8 @@ mobile/views/pages/settings.vue:
  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
  settings: "設定"
  signout: "サインアウト"
+  sound: "サウンド"
+  enableSounds: "サウンドを有効にする"
 mobile/views/pages/user.vue:
  follows-you: "フォローされています"
  following: "フォロー"
@@ -84,8 +84,10 @@ common:
  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
  verified-user: "公式アカウント"
  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
+  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
  reversi:
    drawn: "引き分け"
    my-turn: "あなたのターンです"
@@ -259,6 +261,8 @@ common/views/components/nav.vue:
  develop: "開発者"
  feedback: "フィードバック"
 common/views/components/note-menu.vue:
+  detail: "詳細"
+  copy-link: "リンクをコピー"
  favorite: "お気に入り"
  pin: "ピン留め"
  delete: "削除"
@@ -289,6 +293,8 @@ common/views/components/signin.vue:
  signin-with-twitter: "Twitterでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
+  invitation-code: "招待コード"
+  invitation-info: "招待コードをお持ちでない方は、<a href=\"{}\">管理者</a>までご連絡ください。"
  username: "ユーザー名"
  checking: "確認しています..."
  available: "利用できます"
@@ -334,6 +340,9 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
+common/views/components/trends.vue:
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@@ -357,8 +366,6 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
-  count: "{}人が投稿"
-  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
@@ -408,6 +415,7 @@ desktop:
  uploading-avatar: "新しいアバターをアップロードしています"
  avatar-updated: "アバターを更新しました"
  choose-avatar: "アバターにする画像を選択"
+  invalid-filetype: "この形式のファイルはサポートされていません"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -421,6 +429,24 @@ desktop/views/components/calendar.vue:
  prev: "前の月"
  next: "次の月"
  go: "クリックして時間遡行"
+desktop/views/components/charts.vue:
+  title: "チャート"
+  per-day: "1日ごと"
+  per-hour: "1時間ごと"
+  notes: "投稿"
+  users: "ユーザー"
+  drive: "ドライブ"
+  charts:
+    notes: "投稿の増減 (統合)"
+    local-notes: "投稿の増減 (ローカル)"
+    remote-notes: "投稿の増減 (リモート)"
+    notes-total: "投稿の累計"
+    users: "ユーザーの増減"
+    users-total: "ユーザーの累計"
+    drive: "ドライブ使用量の増減"
+    drive-total: "ドライブ使用量の累計"
+    drive-files: "ドライブのファイル数の増減"
+    drive-files-total: "ドライブのファイル数の累計"
 desktop/views/components/choose-file-from-drive-window.vue:
  choose-file: "ファイル選択中"
  upload: "PCからドライブにファイルをアップロード"
@@ -441,6 +467,7 @@ desktop/views/components/drive-window.vue:
 desktop/views/components/drive.file.vue:
  avatar: "アイコン"
  banner: "バナー"
+  nsfw: "閲覧注意"
  contextmenu:
    rename: "名前を変更"
    mark-as-sensitive: "閲覧注意に設定"
@@ -627,6 +654,7 @@ desktop/views/components/settings.vue:
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+  show-clock-on-header: "右上に時計を表示する"
  show-reply-target: "リプライ先を表示する"
  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
@@ -751,6 +779,7 @@ desktop/views/components/ui.header.account.vue:
  lists: "リスト"
  follow-requests: "フォロー申請"
  customize: "ホームのカスタマイズ"
+  admin: "管理"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"
@@ -796,8 +825,9 @@ desktop/views/pages/admin/admin.dashboard.vue:
  dashboard: "ダッシュボード"
  all-users: "全てのユーザー"
  original-users: "このインスタンスのユーザー"
-  all-notes: "全てのノート"
-  original-notes: "このインスタンスのノート"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
+  invite: "招待"
 desktop/views/pages/admin/admin.suspend-user.vue:
  suspend-user: "ユーザーの凍結"
  suspend: "凍結"
@@ -806,6 +836,14 @@ desktop/views/pages/admin/admin.unsuspend-user.vue:
  unsuspend-user: "ユーザーの凍結の解除"
  unsuspend: "凍結の解除"
  unsuspended: "凍結を解除しました"
+desktop/views/pages/admin/admin.verify-user.vue:
+  verify-user: "ユーザーの公式アカウント設定"
+  verify: "公式アカウントにする"
+  verified: "公式アカウントにしました"
+desktop/views/pages/admin/admin.unverify-user.vue:
+  unverify-user: "ユーザーの公式アカウント解除"
+  unverify: "公式アカウントを解除する"
+  unverified: "公式アカウントを解除しました"
 desktop/views/pages/deck/deck.tl-column.vue:
  is-media-only: "メディア投稿のみ"
  is-media-view: "メディアビュー"
@@ -814,6 +852,11 @@ desktop/views/pages/deck/deck.note.vue:
  reposted-by: "{}がRenote"
  private: "この投稿は非公開です"
  deleted: "この投稿は削除されました"
+desktop/views/pages/stats/stats.vue:
+  all-users: "全てのユーザー"
+  original-users: "このインスタンスのユーザー"
+  all-notes: "全ての投稿"
+  original-notes: "このインスタンスの投稿"
 desktop/views/pages/welcome.vue:
  about: "詳しく..."
  gotit: "わかった"
@@ -838,7 +881,7 @@ desktop/views/pages/selectdrive.vue:
  cancel: "キャンセル"
  upload: "PCからドライブにファイルをアップロード"
 desktop/views/pages/search.vue:
-  not-available: "検索機能を利用することができません。"
+  not-available: "検索機能はインスタンスの設定で無効になっています。"
  not-found: "「{}」に関する投稿は見つかりませんでした。"
 desktop/views/pages/share.vue:
  share-with: "{}で共有"
@@ -931,12 +974,15 @@ mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
  select-folder: "フォルダーを選択"
+mobile/views/components/drive.file.vue:
+  nsfw: "閲覧注意"
 mobile/views/components/drive.file-detail.vue:
  download: "ダウンロード"
  rename: "名前を変更"
  move: "移動"
  hash: "ハッシュ (md5)"
  exif: "EXIF"
+  nsfw: "閲覧注意"
 mobile/views/components/media-image.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
@@ -1017,6 +1063,7 @@ mobile/views/components/ui.nav.vue:
  game: "ゲーム"
  darkmode: "ダークモード"
  settings: "設定"
+  admin: "管理"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
  no-notes: "このユーザーは投稿していないようです。"
@@ -1134,6 +1181,8 @@ mobile/views/pages/settings.vue:
  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
  settings: "設定"
  signout: "サインアウト"
+  sound: "サウンド"
+  enableSounds: "サウンドを有効にする"
 mobile/views/pages/user.vue:
  follows-you: "フォローされています"
  following: "フォロー"
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "6.4.0",
-	"clientVersion": "1.0.8520",
+	"version": "8.26.0",
+	"clientVersion": "1.0.9358",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -32,7 +32,7 @@
 		"@types/debug": "0.0.30",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/elasticsearch": "5.0.25",
+		"@types/elasticsearch": "5.0.26",
 		"@types/file-type": "5.2.1",
 		"@types/gulp": "3.8.36",
 		"@types/gulp-htmlmin": "1.3.32",
@@ -60,7 +60,7 @@
 		"@types/mocha": "5.2.3",
 		"@types/mongodb": "3.1.4",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.7.1",
+		"@types/node": "10.9.4",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.2.0",
@@ -70,16 +70,16 @@
 		"@types/request-promise-native": "1.0.15",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
-		"@types/sharp": "0.17.9",
+		"@types/sharp": "0.17.10",
 		"@types/showdown": "1.7.5",
 		"@types/single-line-log": "1.1.0",
 		"@types/speakeasy": "2.0.2",
 		"@types/systeminformation": "3.23.0",
 		"@types/tmp": "0.0.33",
-		"@types/uuid": "3.4.3",
-		"@types/webpack": "4.4.10",
+		"@types/uuid": "3.4.4",
+		"@types/webpack": "4.4.11",
 		"@types/webpack-stream": "3.2.10",
-		"@types/websocket": "0.0.39",
+		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.0",
 		"animejs": "2.2.0",
 		"autosize": "4.0.2",
@@ -89,6 +89,7 @@
 		"bootstrap-vue": "2.0.0-rc.11",
 		"cafy": "11.3.0",
 		"chalk": "2.4.1",
+		"chart.js": "2.7.2",
 		"commander": "2.17.1",
 		"crc-32": "1.2.0",
 		"css-loader": "1.0.0",
@@ -126,7 +127,7 @@
 		"gulp-util": "3.0.8",
 		"hard-source-webpack-plugin": "0.12.0",
 		"highlight.js": "9.12.0",
-		"html-minifier": "3.5.19",
+		"html-minifier": "3.5.20",
 		"http-signature": "1.2.0",
 		"insert-text-at-cursor": "0.1.1",
 		"is-root": "2.0.0",
@@ -149,6 +150,7 @@
 		"loader-utils": "1.1.0",
 		"lodash.assign": "4.2.0",
 		"mecab-async": "0.1.2",
+		"merge-options": "1.0.1",
 		"minio": "7.0.0",
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",
@@ -156,9 +158,10 @@
 		"mongodb": "3.1.1",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
-		"nan": "2.10.0",
+		"nan": "2.11.0",
+		"nested-property": "0.0.7",
 		"node-sass": "4.9.3",
-		"node-sass-json-importer": "3.3.1",
+		"node-sass-json-importer": "4.0.0",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"on-build-webpack": "0.1.0",
@@ -181,17 +184,17 @@
 		"s-age": "1.1.2",
 		"sass-loader": "7.1.0",
 		"seedrandom": "2.4.4",
-		"sharp": "0.20.5",
+		"sharp": "0.20.7",
 		"showdown": "1.8.6",
 		"showdown-highlightjs-extension": "0.1.2",
 		"single-line-log": "1.1.2",
 		"speakeasy": "2.0.0",
 		"stringz": "1.0.0",
-		"style-loader": "0.22.1",
+		"style-loader": "0.23.0",
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
-		"summaly": "2.1.3",
-		"systeminformation": "3.42.9",
+		"summaly": "2.2.0",
+		"systeminformation": "3.45.0",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"tmp": "0.0.33",
@@ -205,10 +208,11 @@
 		"uuid": "3.3.2",
 		"v-animate-css": "0.0.2",
 		"vue": "2.5.17",
+		"vue-chartjs": "3.4.0",
 		"vue-cropperjs": "2.2.1",
-		"vue-js-modal": "1.3.17",
+		"vue-js-modal": "1.3.26",
 		"vue-json-tree-view": "2.1.4",
-		"vue-loader": "15.3.0",
+		"vue-loader": "15.4.1",
 		"vue-router": "3.0.1",
 		"vue-style-loader": "4.1.2",
 		"vue-template-compiler": "2.5.17",
@@ -217,7 +221,7 @@
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.2",
 		"webfinger.js": "2.6.6",
-		"webpack": "4.16.5",
+		"webpack": "4.17.2",
 		"webpack-cli": "3.1.0",
 		"websocket": "1.0.26",
 		"ws": "6.0.0",
@@ -6,6 +6,10 @@ html
 		&, *
 			cursor progress !important

+html
+	// iOSのため
+	overflow auto
+
 body
 	overflow-wrap break-word

@@ -7,7 +7,7 @@
 	<div class="app">
 		<section>
 			<h2>{{ app.name }}</h2>
-			<p class="nid">{{ app.nameId }}</p>
+			<p class="id">{{ app.id }}</p>
 			<p class="description">{{ app.description }}</p>
 		</section>
 		<section>
@@ -80,7 +80,7 @@ export default Vue.extend({
 		accepted() {
 			this.state = 'accepted';
 			if (this.session.app.callbackUrl) {
-				location.href = this.session.app.callbackUrl + '?token=' + this.session.token;
+				location.href = `${this.session.app.callbackUrl}?token=${this.session.token}`;
 			}
 		}
 	}
@@ -32,19 +32,28 @@
 	//#region Detect app name
 	let app = null;

-	if (url.pathname == '/docs' || url.pathname.startsWith('/docs/')) app = 'docs';
-	if (url.pathname == '/dev' || url.pathname.startsWith('/dev/')) app = 'dev';
-	if (url.pathname == '/auth' || url.pathname.startsWith('/auth/')) app = 'auth';
+	if (`${url.pathname}/`.startsWith('/docs/')) app = 'docs';
+	if (`${url.pathname}/`.startsWith('/dev/')) app = 'dev';
+	if (`${url.pathname}/`.startsWith('/auth/')) app = 'auth';
 	//#endregion

 	//#region Detect the user language
-	let lang = navigator.language.split('-')[0];
+	let lang = null;

-	// The default language is English
-	if (!LANGS.includes(lang)) lang = 'en';
+	if (LANGS.includes(navigator.language)) {
+		lang = navigator.language;
+	} else {
+		lang = LANGS.find(x => x.split('-')[0] == navigator.language);

-	if (settings) {
-		if (settings.device.lang) lang = settings.device.lang;
+		if (lang == null) {
+			// Fallback
+			lang = 'en-US';
+		}
+	}
+
+	if (settings && settings.device.lang &&
+		LANGS.includes(settings.device.lang)) {
+		lang = settings.device.lang;
 	}
 	//#endregion

@@ -85,7 +94,7 @@

 	// Get salt query
 	const salt = localStorage.getItem('salt')
-		? '?salt=' + localStorage.getItem('salt')
+		? `?salt=${localStorage.getItem('salt')}`
 		: '';

 	// Load an app script
@@ -104,7 +113,7 @@
 	// グローバルにタイマーIDを代入しておく
 	window.mkBootTimer = window.setTimeout(async () => {
 		// Fetch meta
-		const res = await fetch(API + '/meta', {
+		const res = await fetch('/api/meta', {
 			method: 'POST',
 			cache: 'no-cache'
 		});
@@ -3,8 +3,10 @@ import MiOS from '../../../../../mios';

 export class ReversiGameStream extends Stream {
 	constructor(os: MiOS, me, game) {
-		super(os, 'games/reversi-game', {
-			i: me ? me.token : null,
+		super(os, 'games/reversi-game', me ? {
+			i: me.token,
+			game: game.id
+		} : {
 			game: game.id
 		});
 	}
@@ -7,9 +7,9 @@ import MiOS from '../../../mios';
 */
 export class LocalTimelineStream extends Stream {
 	constructor(os: MiOS, me) {
-		super(os, 'local-timeline', {
+		super(os, 'local-timeline', me ? {
 			i: me.token
-		});
+		} : {});
 	}
 }

@@ -44,11 +44,11 @@ export default class Connection extends EventEmitter {

 		const query = params
 			? Object.keys(params)
-				.map(k => encodeURIComponent(k) + '=' + encodeURIComponent(params[k]))
+				.map(k => `${encodeURIComponent(k)}=${encodeURIComponent(params[k])}`)
 				.join('&')
 			: null;

-		this.socket = new ReconnectingWebsocket(`${wsUrl}/${endpoint}${query ? '?' + query : ''}`);
+		this.socket = new ReconnectingWebsocket(`${wsUrl}/${endpoint}${query ? `?${query}` : ''}`);
 		this.socket.addEventListener('open', this.onOpen);
 		this.socket.addEventListener('close', this.onClose);
 		this.socket.addEventListener('message', this.onMessage);
@@ -125,7 +125,7 @@ export default Vue.extend({
 			}

 			if (this.type == 'user') {
-				const cacheKey = 'autocomplete:user:' + this.q;
+				const cacheKey = `autocomplete:user:${this.q}`;
 				const cache = sessionStorage.getItem(cacheKey);
 				if (cache) {
 					const users = JSON.parse(cache);
@@ -148,7 +148,7 @@ export default Vue.extend({
 					this.hashtags = JSON.parse(localStorage.getItem('hashtags') || '[]');
 					this.fetching = false;
 				} else {
-					const cacheKey = 'autocomplete:hashtag:' + this.q;
+					const cacheKey = `autocomplete:hashtag:${this.q}`;
 					const cache = sessionStorage.getItem(cacheKey);
 					if (cache) {
 						const hashtags = JSON.parse(cache);
@@ -57,7 +57,7 @@ export default Vue.extend({
 		}

 		// Check internet connection
-		fetch('https://google.com?rand=' + Math.random(), {
+		fetch(`https://google.com?rand=${Math.random()}`, {
 			mode: 'no-cors'
 		}).then(() => {
 			this.internet = true;
@@ -18,11 +18,11 @@
 	</div>

 	<div class="board">
-		<div class="labels-x" v-if="this.$store.state.settings.reversiBoardLabels">
+		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
 			<span v-for="i in game.settings.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 		<div class="flex">
-			<div class="labels-y" v-if="this.$store.state.settings.reversiBoardLabels">
+			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
 				<div v-for="i in game.settings.map.length">{{ i }}</div>
 			</div>
 			<div class="cells" :style="cellsStyle">
@@ -30,15 +30,15 @@
 						:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
 						@click="set(i)"
 						:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
-					<img v-if="stone === true" :src="blackUser.avatarUrl" alt="">
-					<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="">
+					<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
+					<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
 				</div>
 			</div>
-			<div class="labels-y" v-if="this.$store.state.settings.reversiBoardLabels">
+			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
 				<div v-for="i in game.settings.map.length">{{ i }}</div>
 			</div>
 		</div>
-		<div class="labels-x" v-if="this.$store.state.settings.reversiBoardLabels">
+		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
 			<span v-for="i in game.settings.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 	</div>
@@ -159,11 +159,9 @@ export default Vue.extend({
 				canPutEverywhere: this.game.settings.canPutEverywhere,
 				loopedBoard: this.game.settings.loopedBoard
 			});
-			this.logs.forEach((log, i) => {
-				if (i < v) {
-					this.o.put(log.color, log.pos);
-				}
-			});
+			for (const log of this.logs.slice(0, v)) {
+				this.o.put(log.color, log.pos);
+			}
 			this.$forceUpdate();
 		}
 	},
@@ -421,6 +419,13 @@ root(isDark)
 						width 100%
 						height 100%

+						&.contrast
+							&[alt="black"]
+								filter brightness(.5)
+
+							&[alt="white"]
+								filter brightness(2)
+
 	> .graph
 		display grid
 		grid-template-columns repeat(61, 1fr)
@@ -32,6 +32,7 @@
 			<mk-avatar class="avatar" :user="g.user2"/>
 			<span><b>{{ g.user1 | userName }}</b> vs <b>{{ g.user2 | userName }}</b></span>
 			<span class="state">{{ g.isEnded ? '%i18n:@game-state.ended%' : '%i18n:@game-state.playing%' }}</span>
+			<mk-time :time="g.createdAt" />
 		</a>
 	</section>
 	<section v-if="games.length > 0">
@@ -41,6 +42,7 @@
 			<mk-avatar class="avatar" :user="g.user2"/>
 			<span><b>{{ g.user1 | userName }}</b> vs <b>{{ g.user2 | userName }}</b></span>
 			<span class="state">{{ g.isEnded ? '%i18n:@game-state.ended%' : '%i18n:@game-state.playing%' }}</span>
+			<mk-time :time="g.createdAt" />
 		</a>
 	</section>
 </div>
@@ -1,5 +1,6 @@
 import Vue from 'vue';

+import trends from './trends.vue';
 import analogClock from './analog-clock.vue';
 import menu from './menu.vue';
 import noteHeader from './note-header.vue';
@@ -40,6 +41,7 @@ import uiSelect from './ui/select.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';

+Vue.component('mk-trends', trends);
 Vue.component('mk-analog-clock', analogClock);
 Vue.component('mk-menu', menu);
 Vue.component('mk-note-header', noteHeader);
@@ -1,5 +1,5 @@
 <template>
-<div class="mk-menu">
+<div class="onchrpzrvnoruiaenfcqvccjfuupzzwv">
 	<div class="backdrop" ref="backdrop" @click="close"></div>
 	<div class="popover" :class="{ hukidasi }" ref="popover">
 		<template v-for="item in items">
@@ -119,9 +119,10 @@ export default Vue.extend({
 <style lang="stylus" scoped>
@import '~const.styl'

-$border-color = rgba(27, 31, 35, 0.15)
+root(isDark)
+	$bg-color = isDark ? #2c303c : #fff
+	$border-color = rgba(27, 31, 35, 0.15)

-.mk-menu
 	position initial

 	> .backdrop
@@ -131,14 +132,14 @@ $border-color = rgba(27, 31, 35, 0.15)
 		z-index 10000
 		width 100%
 		height 100%
-		background rgba(#000, 0.1)
+		background rgba(#000, isDark ? 0.5 : 0.1)
 		opacity 0

 	> .popover
 		position absolute
 		z-index 10001
 		padding 8px 0
-		background #fff
+		background $bg-color
 		border 1px solid $border-color
 		border-radius 4px
 		box-shadow 0 3px 12px rgba(27, 31, 35, 0.15)
@@ -172,12 +173,13 @@ $border-color = rgba(27, 31, 35, 0.15)
 				border-top solid $balloon-size transparent
 				border-left solid $balloon-size transparent
 				border-right solid $balloon-size transparent
-				border-bottom solid $balloon-size #fff
+				border-bottom solid $balloon-size $bg-color

 		> button
 			display block
 			padding 8px 16px
 			width 100%
+			color isDark ? #d6dce2 : #111

 			&:hover
 				color $theme-color-foreground
@@ -191,6 +193,12 @@ $border-color = rgba(27, 31, 35, 0.15)
 		> div
 			margin 8px 0
 			height 1px
-			background #eee
+			background isDark ? #1c2023 : #eee
+
+.onchrpzrvnoruiaenfcqvccjfuupzzwv[data-darkmode]
+	root(true)
+
+.onchrpzrvnoruiaenfcqvccjfuupzzwv:not([data-darkmode])
+	root(false)

 </style>
@@ -3,7 +3,7 @@
 	@dragover.prevent.stop="onDragover"
 	@drop.prevent.stop="onDrop"
 >
-	<div class="stream">
+	<div class="body">
 		<p class="init" v-if="init">%fa:spinner .spin%%i18n:common.loading%</p>
 		<p class="empty" v-if="!init && messages.length == 0">%fa:info-circle%%i18n:@empty%</p>
 		<p class="no-history" v-if="!init && messages.length > 0 && !existMoreMessages">%fa:flag%%i18n:@no-history%</p>
@@ -77,6 +77,12 @@ export default Vue.extend({
 		this.connection.on('message', this.onMessage);
 		this.connection.on('read', this.onRead);

+		if (this.isNaked) {
+			window.addEventListener('scroll', this.onScroll, { passive: true });
+		} else {
+			this.$el.addEventListener('scroll', this.onScroll, { passive: true });
+		}
+
 		document.addEventListener('visibilitychange', this.onVisibilitychange);

 		this.fetchMessages().then(() => {
@@ -90,6 +96,12 @@ export default Vue.extend({
 		this.connection.off('read', this.onRead);
 		this.connection.close();

+		if (this.isNaked) {
+			window.removeEventListener('scroll', this.onScroll);
+		} else {
+			this.$el.removeEventListener('scroll', this.onScroll);
+		}
+
 		document.removeEventListener('visibilitychange', this.onVisibilitychange);
 	},

@@ -226,6 +238,14 @@ export default Vue.extend({
 			}, 4000);
 		},

+		onScroll() {
+			const el = this.isNaked ? window.document.documentElement : this.$el;
+			const current = el.scrollTop + el.clientHeight;
+			if (current > el.scrollHeight - 1) {
+				this.showIndicator = false;
+			}
+		},
+
 		onVisibilitychange() {
 			if (document.hidden) return;
 			this.messages.forEach(message => {
@@ -251,7 +271,7 @@ root(isDark)
 	height 100%
 	background isDark ? #191b22 : #fff

-	> .stream
+	> .body
 		width 100%
 		max-width 600px
 		margin 0 auto
@@ -205,17 +205,8 @@ export default Vue.component('misskey-flavored-markdown', {
 			}
 		}));

-		const _els = [];
-		els.forEach((el, i) => {
-			if (el.tag == 'br') {
-				if (!['div', 'pre'].includes(els[i - 1].tag)) {
-					_els.push(el);
-				}
-			} else {
-				_els.push(el);
-			}
-		});
-
+		// el.tag === 'br' のとき i !== 0 が保証されるため、短絡評価により els[i - 1] は配列外参照しない
+		const _els = els.filter((el, i) => !(el.tag === 'br' && ['div', 'pre'].includes(els[i - 1].tag)));
 		return createElement('span', _els);
 	}
 });
@@ -6,7 +6,7 @@
 	<i>・</i>
 	<a :href="feedbackUrl" target="_blank">%i18n:@feedback%</a>
 	<i>・</i>
-	<a :href="devUrl">%i18n:@develop%</a>
+	<a href="/dev">%i18n:@develop%</a>
 	<i>・</i>
 	<a href="https://twitter.com/misskey_xyz" target="_blank">Follow us on %fa:B twitter%</a>
 </span>
@@ -14,18 +14,21 @@

 <script lang="ts">
 import Vue from 'vue';
-import { docsUrl, statsUrl, statusUrl, devUrl, repositoryUrl, feedbackUrl, lang } from '../../../config';
+import { lang } from '../../../config';

 export default Vue.extend({
 	data() {
 		return {
-			aboutUrl: `${docsUrl}/${lang}/about`,
-			statsUrl,
-			statusUrl,
-			devUrl,
-			repositoryUrl: repositoryUrl || `https://github.com/syuilo/misskey`,
-			feedbackUrl: feedbackUrl || `https://github.com/syuilo/misskey/issues/new`
+			aboutUrl: `/docs/${lang}/about`,
+			repositoryUrl: 'https://github.com/syuilo/misskey',
+			feedbackUrl: 'https://github.com/syuilo/misskey/issues/new'
 		}
+	},
+	created() {
+		(this as any).os.getMeta().then(meta => {
+			if (meta.maintainer.repository_url) this.repositoryUrl = meta.maintainer.repository_url;
+			if (meta.maintainer.feedback_url) this.feedbackUrl = meta.maintainer.feedback_url;
+		});
 	}
 });
 </script>
@@ -6,17 +6,27 @@

 <script lang="ts">
 import Vue from 'vue';
+import { url } from '../../../config';
+import copyToClipboard from '../../../common/scripts/copy-to-clipboard';

 export default Vue.extend({
 	props: ['note', 'source', 'compact'],
 	computed: {
 		items() {
-			const items = [];
-			items.push({
+			const items = [{
+				icon: '%fa:info-circle%',
+				text: '%i18n:@detail%',
+				action: this.detail
+			}, {
+				icon: '%fa:link%',
+				text: '%i18n:@copy-link%',
+				action: this.copyLink
+			}, null, {
 				icon: '%fa:star%',
 				text: '%i18n:@favorite%',
 				action: this.favorite
-			});
+			}];
+
 			if (this.note.userId == this.$store.state.i.id) {
 				items.push({
 					icon: '%fa:thumbtack%',
@@ -42,6 +52,14 @@ export default Vue.extend({
 		}
 	},
 	methods: {
+		detail() {
+			this.$router.push(`/notes/${ this.note.id }`);
+		},
+
+		copyLink() {
+			copyToClipboard(`${url}/notes/${ this.note.id }`);
+		},
+
 		pin() {
 			(this as any).api('i/pin', {
 				noteId: this.note.id
@@ -12,13 +12,13 @@
 	</ui-input>
 	<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required/>
 	<ui-button type="submit" :disabled="signing">{{ signing ? '%i18n:@signing-in%' : '%i18n:@signin%' }}</ui-button>
-	<p style="margin: 8px 0;" v-if="twitterIntegration">%i18n:@or% <a :href="`${apiUrl}/signin/twitter`">%i18n:@signin-with-twitter%</a></p>
+	<p style="margin: 8px 0;">%i18n:@or% <a :href="`${apiUrl}/signin/twitter`">%i18n:@signin-with-twitter%</a></p>
 </form>
 </template>

 <script lang="ts">
 import Vue from 'vue';
-import { apiUrl, host, twitterIntegration } from '../../../config';
+import { apiUrl, host } from '../../../config';

 export default Vue.extend({
 	props: {
@@ -36,8 +36,7 @@ export default Vue.extend({
 			password: '',
 			token: '',
 			apiUrl,
-			host,
-			twitterIntegration
+			host
 		};
 	},
 	methods: {
@@ -79,7 +78,7 @@ export default Vue.extend({
 			cursor wait !important

 	> .avatar
-		margin 16px auto 0 auto
+		margin 0 auto 0 auto
 		width 64px
 		height 64px
 		background #ddd
@@ -1,48 +1,50 @@
 <template>
 <form class="mk-signup" @submit.prevent="onSubmit" :autocomplete="Math.random()">
-	<ui-input v-if="meta.disableRegistration" v-model="invitationCode" type="text" :autocomplete="Math.random()" spellcheck="false" required>
-		<span>%i18n:@invitation-code%</span>
-		<span slot="prefix">%fa:id-card-alt%</span>
-		<p slot="text" v-html="'%i18n:@invitation-info%'.replace('{}', meta.maintainer.url)"></p>
-	</ui-input>
-	<ui-input v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @input="onChangeUsername">
-		<span>%i18n:@username%</span>
-		<span slot="prefix">@</span>
-		<span slot="suffix">@{{ host }}</span>
-		<p slot="text" v-if="usernameState == 'wait'" style="color:#999">%fa:spinner .pulse .fw% %i18n:@checking%</p>
-		<p slot="text" v-if="usernameState == 'ok'" style="color:#3CB7B5">%fa:check .fw% %i18n:@available%</p>
-		<p slot="text" v-if="usernameState == 'unavailable'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@unavailable%</p>
-		<p slot="text" v-if="usernameState == 'error'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@error%</p>
-		<p slot="text" v-if="usernameState == 'invalid-format'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@invalid-format%</p>
-		<p slot="text" v-if="usernameState == 'min-range'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@too-short%</p>
-		<p slot="text" v-if="usernameState == 'max-range'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@too-long%</p>
-	</ui-input>
-	<ui-input v-model="password" type="password" :autocomplete="Math.random()" required @input="onChangePassword" :with-password-meter="true">
-		<span>%i18n:@password%</span>
-		<span slot="prefix">%fa:lock%</span>
-		<div slot="text">
-			<p slot="text" v-if="passwordStrength == 'low'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@weak-password%</p>
-			<p slot="text" v-if="passwordStrength == 'medium'" style="color:#3CB7B5">%fa:check .fw% %i18n:@normal-password%</p>
-			<p slot="text" v-if="passwordStrength == 'high'" style="color:#3CB7B5">%fa:check .fw% %i18n:@strong-password%</p>
-		</div>
-	</ui-input>
-	<ui-input v-model="retypedPassword" type="password" :autocomplete="Math.random()" required @input="onChangePasswordRetype">
-		<span>%i18n:@password% (%i18n:@retype%)</span>
-		<span slot="prefix">%fa:lock%</span>
-		<div slot="text">
-			<p slot="text" v-if="passwordRetypeState == 'match'" style="color:#3CB7B5">%fa:check .fw% %i18n:@password-matched%</p>
-			<p slot="text" v-if="passwordRetypeState == 'not-match'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@password-not-matched%</p>
-		</div>
-	</ui-input>
-	<div v-if="recaptchaSitekey != null" class="g-recaptcha" :data-sitekey="recaptchaSitekey" style="margin: 16px 0;"></div>
-	<ui-button type="submit">%i18n:@create%</ui-button>
+	<template v-if="meta">
+		<ui-input v-if="meta.disableRegistration" v-model="invitationCode" type="text" :autocomplete="Math.random()" spellcheck="false" required>
+			<span>%i18n:@invitation-code%</span>
+			<span slot="prefix">%fa:id-card-alt%</span>
+			<p slot="text" v-html="'%i18n:@invitation-info%'.replace('{}', meta.maintainer.url)"></p>
+		</ui-input>
+		<ui-input v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @input="onChangeUsername">
+			<span>%i18n:@username%</span>
+			<span slot="prefix">@</span>
+			<span slot="suffix">@{{ host }}</span>
+			<p slot="text" v-if="usernameState == 'wait'" style="color:#999">%fa:spinner .pulse .fw% %i18n:@checking%</p>
+			<p slot="text" v-if="usernameState == 'ok'" style="color:#3CB7B5">%fa:check .fw% %i18n:@available%</p>
+			<p slot="text" v-if="usernameState == 'unavailable'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@unavailable%</p>
+			<p slot="text" v-if="usernameState == 'error'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@error%</p>
+			<p slot="text" v-if="usernameState == 'invalid-format'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@invalid-format%</p>
+			<p slot="text" v-if="usernameState == 'min-range'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@too-short%</p>
+			<p slot="text" v-if="usernameState == 'max-range'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@too-long%</p>
+		</ui-input>
+		<ui-input v-model="password" type="password" :autocomplete="Math.random()" required @input="onChangePassword" :with-password-meter="true">
+			<span>%i18n:@password%</span>
+			<span slot="prefix">%fa:lock%</span>
+			<div slot="text">
+				<p slot="text" v-if="passwordStrength == 'low'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@weak-password%</p>
+				<p slot="text" v-if="passwordStrength == 'medium'" style="color:#3CB7B5">%fa:check .fw% %i18n:@normal-password%</p>
+				<p slot="text" v-if="passwordStrength == 'high'" style="color:#3CB7B5">%fa:check .fw% %i18n:@strong-password%</p>
+			</div>
+		</ui-input>
+		<ui-input v-model="retypedPassword" type="password" :autocomplete="Math.random()" required @input="onChangePasswordRetype">
+			<span>%i18n:@password% (%i18n:@retype%)</span>
+			<span slot="prefix">%fa:lock%</span>
+			<div slot="text">
+				<p slot="text" v-if="passwordRetypeState == 'match'" style="color:#3CB7B5">%fa:check .fw% %i18n:@password-matched%</p>
+				<p slot="text" v-if="passwordRetypeState == 'not-match'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@password-not-matched%</p>
+			</div>
+		</ui-input>
+		<div v-if="meta.recaptchaSitekey != null" class="g-recaptcha" :data-sitekey="meta.recaptchaSitekey" style="margin: 16px 0;"></div>
+		<ui-button type="submit">%i18n:@create%</ui-button>
+	</template>
 </form>
 </template>

 <script lang="ts">
 import Vue from 'vue';
 const getPasswordStrength = require('syuilo-password-strength');
-import { host, url, recaptchaSitekey } from '../../../config';
+import { host, url } from '../../../config';

 export default Vue.extend({
 	data() {
@@ -53,7 +55,6 @@ export default Vue.extend({
 			retypedPassword: '',
 			invitationCode: '',
 			url,
-			recaptchaSitekey,
 			usernameState: null,
 			passwordStrength: '',
 			passwordRetypeState: null,
@@ -73,6 +74,12 @@ export default Vue.extend({
 			this.meta = meta;
 		});
 	},
+	mounted() {
+		const head = document.getElementsByTagName('head')[0];
+		const script = document.createElement('script');
+		script.setAttribute('src', 'https://www.google.com/recaptcha/api.js');
+		head.appendChild(script);
+	},
 	methods: {
 		onChangeUsername() {
 			if (this.username == '') {
@@ -123,7 +130,7 @@ export default Vue.extend({
 				username: this.username,
 				password: this.password,
 				invitationCode: this.invitationCode,
-				'g-recaptcha-response': recaptchaSitekey != null ? (window as any).grecaptcha.getResponse() : null
+				'g-recaptcha-response': this.meta.recaptchaSitekey != null ? (window as any).grecaptcha.getResponse() : null
 			}).then(() => {
 				(this as any).api('signin', {
 					username: this.username,
@@ -134,19 +141,11 @@ export default Vue.extend({
 			}).catch(() => {
 				alert('%i18n:@some-error%');

-				if (recaptchaSitekey != null) {
+				if (this.meta.recaptchaSitekey != null) {
 					(window as any).grecaptcha.reset();
 				}
 			});
 		}
-	},
-	mounted() {
-		if (recaptchaSitekey != null) {
-			const head = document.getElementsByTagName('head')[0];
-			const script = document.createElement('script');
-			script.setAttribute('src', 'https://www.google.com/recaptcha/api.js');
-			head.appendChild(script);
-		}
 	}
 });
 </script>
@@ -0,0 +1,105 @@
+<template>
+<div class="csqvmxybqbycalfhkxvyfrgbrdalkaoc">
+	<p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
+	<p class="empty" v-else-if="stats.length == 0">%fa:exclamation-circle%%i18n:@empty%</p>
+	<!-- トランジションを有効にするとなぜかメモリリークする -->
+	<!-- <transition-group v-else tag="div" name="chart"> -->
+	<div>
+		<div v-for="stat in stats" :key="stat.tag">
+			<div class="tag">
+				<router-link :to="`/tags/${ encodeURIComponent(stat.tag) }`" :title="stat.tag">#{{ stat.tag }}</router-link>
+				<p>{{ '%i18n:@count%'.replace('{}', stat.usersCount) }}</p>
+			</div>
+			<x-chart class="chart" :src="stat.chart"/>
+		</div>
+	</div>
+	<!-- </transition-group> -->
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import XChart from './trends.chart.vue';
+
+export default Vue.extend({
+	components: {
+		XChart
+	},
+	data() {
+		return {
+			stats: [],
+			fetching: true,
+			clock: null
+		};
+	},
+	mounted() {
+		this.fetch();
+		this.clock = setInterval(this.fetch, 1000 * 60);
+	},
+	beforeDestroy() {
+		clearInterval(this.clock);
+	},
+	methods: {
+		fetch() {
+			(this as any).api('hashtags/trend').then(stats => {
+				this.stats = stats;
+				this.fetching = false;
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+root(isDark)
+	> .fetching
+	> .empty
+		margin 0
+		padding 16px
+		text-align center
+		color #aaa
+
+		> [data-fa]
+			margin-right 4px
+
+	> div
+		.chart-move
+			transition transform 1s ease
+
+		> div
+			display flex
+			align-items center
+			padding 14px 16px
+
+			&:not(:last-child)
+				border-bottom solid 1px isDark ? #393f4f : #eee
+
+			> .tag
+				flex 1
+				overflow hidden
+				font-size 14px
+				color isDark ? #9baec8 : #65727b
+
+				> a
+					display block
+					width 100%
+					white-space nowrap
+					overflow hidden
+					text-overflow ellipsis
+					color inherit
+
+				> p
+					margin 0
+					font-size 75%
+					opacity 0.7
+
+			> .chart
+				height 30px
+
+.csqvmxybqbycalfhkxvyfrgbrdalkaoc[data-darkmode]
+	root(true)
+
+.csqvmxybqbycalfhkxvyfrgbrdalkaoc:not([data-darkmode])
+	root(false)
+
+</style>
@@ -24,19 +24,34 @@ export default Vue.extend({

 root(isDark)
 	margin 16px
-	padding 16px
 	color isDark ? #fff : #000
 	background isDark ? #282C37 : #fff
 	box-shadow 0 3px 1px -2px rgba(#000, 0.2), 0 2px 2px 0 rgba(#000, 0.14), 0 1px 5px 0 rgba(#000, 0.12)

-	@media (min-width 500px)
-		padding 32px
-
 	> header
-		font-weight normal
-		font-size 24px
+		padding 16px
+		font-weight bold
+		font-size 20px
 		color isDark ? #fff : #444

+		@media (min-width 500px)
+			padding 24px 32px
+
+	> section
+		padding 20px 16px
+		border-top solid 1px isDark ? rgba(#000, 0.3) : rgba(#000, 0.1)
+
+		@media (min-width 500px)
+			padding 32px
+
+		&.fit-top
+			padding-top 0
+
+		> header
+			margin-bottom 16px
+			font-weight bold
+			color isDark ? #fff : #444
+
 .ui-card[data-darkmode]
 	root(true)

@@ -55,7 +55,7 @@ export default Vue.extend({

 root(isDark)
 	display inline-block
-	margin 32px 32px 32px 0
+	margin 0 32px 0 0
 	cursor pointer
 	transition all 0.3s

@@ -64,6 +64,12 @@ root(isDark)
 	cursor pointer
 	transition all 0.3s

+	&:first-child
+		margin-top 0
+
+	&:last-child
+		margin-bottom 0
+
 	> *
 		user-select none

@@ -89,6 +95,7 @@ root(isDark)

 	> .button
 		display inline-block
+		flex-shrink 0
 		margin 3px 0 0 0
 		width 34px
 		height 14px
@@ -1,12 +1,14 @@
 <template>
-<iframe v-if="player" :src="player" heigth="250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen />
+<div v-if="player.url" class="player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`">
+	<iframe :src="player.url" :width="player.width || '100%'" :heigth="player.height || 250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen />
+</div>
 <div v-else-if="tweetUrl && detail" class="twitter">
 	<blockquote ref="tweet" class="twitter-tweet" :data-theme="$store.state.device.darkmode ? 'dark' : null">
 		<a :href="url"></a>
 	</blockquote>
 </div>
 <div v-else class="mk-url-preview">
-	<a :href="url" target="_blank" :title="url" v-if="!fetching">
+	<a :class="{ mini }" :href="url" target="_blank" :title="url" v-if="!fetching">
 		<div class="thumbnail" v-if="thumbnail" :style="`background-image: url(${thumbnail})`"></div>
 		<article>
 			<header>
@@ -26,18 +28,105 @@
 import Vue from 'vue';
 import { url as misskeyUrl } from '../../../config';

+// THIS IS THE WHITELIST FOR THE EMBED PLAYER
+const whiteList = [
+	'afreecatv.com',
+	'aparat.com',
+	'applemusic.com',
+	'amazon.com',
+	'awa.fm',
+	'bandcamp.com',
+	'bbc.co.uk',
+	'beatport.com',
+	'bilibili.com',
+	'boomstream.com',
+	'breakers.tv',
+	'cam4.com',
+	'cavelis.net',
+	'chaturbate.com',
+	'cnn.com',
+	'cybergame.tv',
+	'dailymotion.com',
+	'deezer.com',
+	'djlive.pl',
+	'e-onkyo.com',
+	'eventials.com',
+	'facebook.com',
+	'fc2.com',
+	'gameplank.tv',
+	'goodgame.ru',
+	'google.com',
+	'hardtunes.com',
+	'instagram.com',
+	'johnnylooch.com',
+	'kexp.org',
+	'lahzenegar.com',
+	'liveedu.tv',
+	'livetube.cc',
+	'livestream.com',
+	'meridix.com',
+	'mixcloud.com',
+	'mixer.com',
+	'mobcrush.com',
+	'mylive.in.th',
+	'myspace.com',
+	'netflix.com',
+	'newretrowave.com',
+	'nhk.or.jp',
+	'nicovideo.jp',
+	'nico.ms',
+	'noisetrade.com',
+	'nood.tv',
+	'npr.org',
+	'openrec.tv',
+	'pandora.com',
+	'pandora.tv',
+	'picarto.tv',
+	'pscp.tv',
+	'restream.io',
+	'reverbnation.com',
+	'sermonaudio.com',
+	'smashcast.tv',
+	'songkick.com',
+	'soundcloud.com',
+	'spinninrecords.com',
+	'spotify.com',
+	'stitcher.com',
+	'stream.me',
+	'switchboard.live',
+	'tunein.com',
+	'twitcasting.tv',
+	'twitch.tv',
+	'twitter.com',
+	'vaughnlive.tv',
+	'veoh.com',
+	'vimeo.com',
+	'watchpeoplecode.com',
+	'web.tv',
+	'youtube.com',
+	'youtu.be'
+];
+
 export default Vue.extend({
 	props: {
 		url: {
 			type: String,
 			require: true
 		},
+
 		detail: {
 			type: Boolean,
 			required: false,
 			default: false
+		},
+
+		mini: {
+			type: Boolean,
+			required: false,
+			default: false
 		}
 	},
+
 	data() {
 		return {
 			fetching: true,
@@ -46,11 +135,16 @@ export default Vue.extend({
 			thumbnail: null,
 			icon: null,
 			sitename: null,
-			player: null,
+			player: {
+				url: null,
+				width: null,
+				height: null
+			},
 			tweetUrl: null,
 			misskeyUrl
 		};
 	},
+
 	created() {
 		const url = new URL(this.url);

@@ -75,104 +169,37 @@ export default Vue.extend({
 			}
 			return;
 		}
-		fetch('/url?url=' + encodeURIComponent(this.url)).then(res => {
+
+		fetch(`/url?url=${encodeURIComponent(this.url)}`).then(res => {
 			res.json().then(info => {
-				if (info.url != null) {
-					this.title = info.title;
-					this.description = info.description;
-					this.thumbnail = info.thumbnail;
-					this.icon = info.icon;
-					this.sitename = info.sitename;
-					this.fetching = false;
-					if ([ // THIS IS THE WHITELIST FOR THE EMBED PLAYER
-						'afreecatv.com',
-						'aparat.com',
-						'applemusic.com',
-						'amazon.com',
-						'awa.fm',
-						'bandcamp.com',
-						'bbc.co.uk',
-						'beatport.com',
-						'bilibili.com',
-						'boomstream.com',
-						'breakers.tv',
-						'cam4.com',
-						'cavelis.net',
-						'chaturbate.com',
-						'cnn.com',
-						'cybergame.tv',
-						'dailymotion.com',
-						'deezer.com',
-						'djlive.pl',
-						'e-onkyo.com',
-						'eventials.com',
-						'facebook.com',
-						'fc2.com',
-						'gameplank.tv',
-						'goodgame.ru',
-						'google.com',
-						'hardtunes.com',
-						'instagram.com',
-						'johnnylooch.com',
-						'kexp.org',
-						'lahzenegar.com',
-						'liveedu.tv',
-						'livetube.cc',
-						'livestream.com',
-						'meridix.com',
-						'mixcloud.com',
-						'mixer.com',
-						'mobcrush.com',
-						'mylive.in.th',
-						'myspace.com',
-						'netflix.com',
-						'newretrowave.com',
-						'nhk.or.jp',
-						'nicovideo.jp',
-						'nico.ms',
-						'noisetrade.com',
-						'nood.tv',
-						'npr.org',
-						'openrec.tv',
-						'pandora.com',
-						'pandora.tv',
-						'picarto.tv',
-						'pscp.tv',
-						'restream.io',
-						'reverbnation.com',
-						'sermonaudio.com',
-						'smashcast.tv',
-						'songkick.com',
-						'soundcloud.com',
-						'spinninrecords.com',
-						'spotify.com',
-						'stitcher.com',
-						'stream.me',
-						'switchboard.live',
-						'tunein.com',
-						'twitcasting.tv',
-						'twitch.tv',
-						'twitter.com',
-						'vaughnlive.tv',
-						'veoh.com',
-						'vimeo.com',
-						'watchpeoplecode.com',
-						'web.tv',
-						'youtube.com',
-						'youtu.be'
-					].some(x => x == url.hostname || url.hostname.endsWith(`.${x}`)))
-						this.player = info.player;
-				}	// info.url
-			})	// json
-		});	// fetch
-	}	// created
+				if (info.url == null) return;
+				this.title = info.title;
+				this.description = info.description;
+				this.thumbnail = info.thumbnail;
+				this.icon = info.icon;
+				this.sitename = info.sitename;
+				this.fetching = false;
+				if (whiteList.some(x => x == url.hostname || url.hostname.endsWith(`.${x}`))) {
+					this.player = info.player;
+				}
+			})
+		});
+	}
 });
 </script>

 <style lang="stylus" scoped>
-iframe
+.player
+	position relative
 	width 100%

+	> iframe
+		height 100%
+		left 0
+		position absolute
+		top 0
+		width 100%
+
 root(isDark)
 	> a
 		display block
@@ -272,6 +299,29 @@ root(isDark)
 						width 12px
 						height 12px

+		&.mini
+			font-size 10px
+
+			> .thumbnail
+				position relative
+				width 100%
+				height 60px
+
+			> article
+				left 0
+				width 100%
+				padding 8px
+
+				> header
+					margin-bottom 4px
+
+				> footer
+					margin-top 4px
+
+					> img
+						width 12px
+						height 12px
+
 .mk-url-preview[data-darkmode]
 	root(true)

@@ -12,6 +12,7 @@

 <script lang="ts">
 import Vue from 'vue';
+import { toUnicode as decodePunycode } from 'punycode';
 export default Vue.extend({
 	props: ['url', 'target'],
 	data() {
@@ -27,11 +28,11 @@ export default Vue.extend({
 	created() {
 		const url = new URL(this.url);
 		this.schema = url.protocol;
-		this.hostname = url.hostname;
+		this.hostname = decodePunycode(url.hostname);
 		this.port = url.port;
-		this.pathname = url.pathname;
-		this.query = url.search;
-		this.hash = url.hash;
+		this.pathname = decodeURIComponent(url.pathname);
+		this.query = decodeURIComponent(url.search);
+		this.hash = decodeURIComponent(url.hash);
 	}
 });
 </script>
@@ -31,15 +31,30 @@ export default Vue.extend({
 			default: undefined
 		}
 	},
+
 	data() {
 		return {
 			fetching: true,
-			notes: []
+			notes: [],
+			connection: null,
+			connectionId: null
 		};
 	},
+
 	mounted() {
 		this.fetch();
+
+		this.connection = (this as any).os.streams.localTimelineStream.getConnection();
+		this.connectionId = (this as any).os.streams.localTimelineStream.use();
+
+		this.connection.on('note', this.onNote);
 	},
+
+	beforeDestroy() {
+		this.connection.off('note', this.onNote);
+		(this as any).os.streams.localTimelineStream.dispose(this.connectionId);
+	},
+
 	methods: {
 		fetch(cb?) {
 			this.fetching = true;
@@ -49,13 +64,20 @@ export default Vue.extend({
 				reply: false,
 				renote: false,
 				media: false,
-				poll: false,
-				bot: false
+				poll: false
 			}).then(notes => {
 				this.notes = notes;
 				this.fetching = false;
 			});
-		}
+		},
+
+		onNote(note) {
+			if (note.replyId != null) return;
+			if (note.renoteId != null) return;
+			if (note.poll != null) return;
+
+			this.notes.unshift(note);
+		},
 	}
 });
 </script>
@@ -191,7 +191,7 @@ class Autocomplete {
 			const acct = renderAcct(value);

 			// 挿入
-			this.text = trimmedBefore + '@' + acct + ' ' + after;
+			this.text = `${trimmedBefore}@${acct} ${after}`;

 			// キャレットを戻す
 			this.vm.$nextTick(() => {
@@ -207,7 +207,7 @@ class Autocomplete {
 			const after = source.substr(caret);

 			// 挿入
-			this.text = trimmedBefore + '#' + value + ' ' + after;
+			this.text = `${trimmedBefore}#${value} ${after}`;

 			// キャレットを戻す
 			this.vm.$nextTick(() => {
@@ -1,8 +1,10 @@
 import Vue from 'vue';

 Vue.filter('bytes', (v, digits = 0) => {
-	const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-	if (v == 0) return '0Byte';
+	const sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
+	if (v == 0) return '0';
+	const isMinus = v < 0;
+	if (isMinus) v = -v;
 	const i = Math.floor(Math.log(v) / Math.log(1024));
-	return (v / Math.pow(1024, i)).toFixed(digits).replace(/\.0+$/, '') + sizes[i];
+	return (isMinus ? '-' : '') + (v / Math.pow(1024, i)).toFixed(digits).replace(/\.0+$/, '') + sizes[i];
 });
@@ -1,5 +1,5 @@
 import Vue from 'vue';

 Vue.filter('notePage', note => {
-	return '/notes/' + note.id;
+	return `/notes/${note.id}`;
 });
@@ -11,5 +11,5 @@ Vue.filter('userName', user => {
 });

 Vue.filter('userPage', (user, path?) => {
-	return '/@' + Vue.filter('acct')(user) + (path ? '/' + path : '');
+	return `/@${Vue.filter('acct')(user)}${(path ? `/${path}` : '')}`;
 });
@@ -1,6 +1,6 @@
 <template>
 <div class="syxhndwprovvuqhmyvveewmbqayniwkv" v-if="!fetching" :data-darkmode="$store.state.device.darkmode">
-	<div class="signed-in-as" v-html="'%i18n:@signed-in-as%'.replace('{}', '<b>' + myName + '</b>')"></div>
+	<div class="signed-in-as" v-html="'%i18n:@signed-in-as%'.replace('{}', `<b>${myName}`)"></div>

 	<main>
 		<div class="banner" :style="bannerStyle"></div>
@@ -83,7 +83,7 @@ export default Vue.extend({
 						userId: this.user.id
 					});
 				} else {
-					if (this.user.isLocked && this.user.hasPendingFollowRequestFromYou) {
+					if (this.user.hasPendingFollowRequestFromYou) {
 						this.user = await (this as any).api('following/requests/cancel', {
 							userId: this.user.id
 						});
@@ -1,5 +1,5 @@
 <template>
-<div class="mkw-broadcast"
+<div class="anltbovirfeutcigvwgmgxipejaeozxi"
 	:data-found="broadcasts.length != 0"
 	:data-melt="props.design == 1"
 	:data-mobile="platform == 'mobile'"
@@ -25,7 +25,6 @@

 <script lang="ts">
 import define from '../../../common/define-widget';
-import { lang } from '../../../config';

 export default define({
 	name: 'broadcast',
@@ -42,15 +41,7 @@ export default define({
 	},
 	mounted() {
 		(this as any).os.getMeta().then(meta => {
-			let broadcasts = [];
-			if (meta.broadcasts) {
-				meta.broadcasts.forEach(broadcast => {
-					if (broadcast[lang]) {
-						broadcasts.push(broadcast[lang]);
-					}
-				});
-			}
-			this.broadcasts = broadcasts;
+			this.broadcasts = meta.broadcasts;
 			this.fetching = false;
 		});
 	},
@@ -75,7 +66,7 @@ export default define({
 </script>

 <style lang="stylus" scoped>
-.mkw-broadcast
+root(isDark)
 	padding 10px
 	border solid 1px #4078c0
 	border-radius 6px
@@ -142,15 +133,11 @@ export default define({
 		z-index 1
 		margin 0
 		font-size 0.7em
-		color #555
+		color isDark ? #fff : #555

 		&.fetching
 			text-align center

-		a
-			color #555
-			text-decoration underline
-
 	> a
 		display block
 		font-size 0.7em
@@ -159,4 +146,10 @@ export default define({
 		> p
 			color #fff

+.anltbovirfeutcigvwgmgxipejaeozxi[data-darkmode]
+	root(true)
+
+.anltbovirfeutcigvwgmgxipejaeozxi:not([data-darkmode])
+	root(false)
+
 </style>
@@ -2,9 +2,9 @@
 <div class="mkw-donation" :data-mobile="platform == 'mobile'">
 	<article>
 		<h1>%fa:heart%%i18n:@title%</h1>
-		<p>
+		<p v-if="meta">
 			{{ '%i18n:@text%'.substr(0, '%i18n:@text%'.indexOf('{')) }}
-			<a href="https://syuilo.com">@syuilo</a>
+			<a :href="meta.maintainer.url">{{ meta.maintainer.name }}</a>
 			{{ '%i18n:@text%'.substr('%i18n:@text%'.indexOf('}') + 1) }}
 		</p>
 	</article>
@@ -15,6 +15,17 @@
 import define from '../../../common/define-widget';
 export default define({
 	name: 'donation'
+}).extend({
+	data() {
+		return {
+			meta: null
+		};
+	},
+	created() {
+		(this as any).os.getMeta().then(meta => {
+			this.meta = meta;
+		});
+	}
 });
 </script>

@@ -4,20 +4,7 @@
 		<template slot="header">%fa:hashtag%%i18n:@title%</template>

 		<div class="mkw-hashtags--body" :data-mobile="platform == 'mobile'">
-			<p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
-			<p class="empty" v-else-if="stats.length == 0">%fa:exclamation-circle%%i18n:@empty%</p>
-			<!-- トランジションを有効にするとなぜかメモリリークする -->
-			<!-- <transition-group v-else tag="div" name="chart"> -->
-			<div>
-				<div v-for="stat in stats" :key="stat.tag">
-					<div class="tag">
-						<router-link :to="`/tags/${ encodeURIComponent(stat.tag) }`" :title="stat.tag">#{{ stat.tag }}</router-link>
-						<p>{{ '%i18n:@count%'.replace('{}', stat.usersCount) }}</p>
-					</div>
-					<x-chart class="chart" :src="stat.chart"/>
-				</div>
-			</div>
-			<!-- </transition-group> -->
+			<mk-trends/>
 		</div>
 	</mk-widget-container>
 </div>
@@ -25,7 +12,6 @@

 <script lang="ts">
 import define from '../../../common/define-widget';
-import XChart from './hashtags.chart.vue';

 export default define({
 	name: 'hashtags',
@@ -33,89 +19,11 @@ export default define({
 		compact: false
 	})
 }).extend({
-	components: {
-		XChart
-	},
-	data() {
-		return {
-			stats: [],
-			fetching: true,
-			clock: null
-		};
-	},
-	mounted() {
-		this.fetch();
-		this.clock = setInterval(this.fetch, 1000 * 60);
-	},
-	beforeDestroy() {
-		clearInterval(this.clock);
-	},
 	methods: {
 		func() {
 			this.props.compact = !this.props.compact;
 			this.save();
-		},
-		fetch() {
-			(this as any).api('hashtags/trend').then(stats => {
-				this.stats = stats;
-				this.fetching = false;
-			});
 		}
 	}
 });
 </script>
-
-<style lang="stylus" scoped>
-root(isDark)
-	.mkw-hashtags--body
-		> .fetching
-		> .empty
-			margin 0
-			padding 16px
-			text-align center
-			color #aaa
-
-			> [data-fa]
-				margin-right 4px
-
-		> div
-			.chart-move
-				transition transform 1s ease
-
-			> div
-				display flex
-				align-items center
-				padding 14px 16px
-
-				&:not(:last-child)
-					border-bottom solid 1px isDark ? #393f4f : #eee
-
-				> .tag
-					flex 1
-					overflow hidden
-					font-size 14px
-					color isDark ? #9baec8 : #65727b
-
-					> a
-						display block
-						width 100%
-						white-space nowrap
-						overflow hidden
-						text-overflow ellipsis
-						color inherit
-
-					> p
-						margin 0
-						font-size 75%
-						opacity 0.7
-
-				> .chart
-					height 30px
-
-.mkw-hashtags[data-darkmode]
-	root(true)
-
-.mkw-hashtags:not([data-darkmode])
-	root(false)
-
-</style>
@@ -122,7 +122,7 @@ export default Vue.extend({
 			this.memP = (stats.mem.used / stats.mem.total * 100).toFixed(0);
 		},
 		onStatsLog(statsLog) {
-			statsLog.forEach(stats => this.onStats(stats));
+			statsLog.reverse().forEach(stats => this.onStats(stats));
 		}
 	}
 });
@@ -1,51 +1,22 @@
-declare const _HOST_: string;
-declare const _HOSTNAME_: string;
-declare const _URL_: string;
-declare const _NAME_: string;
-declare const _DESCRIPTION_: string;
-declare const _API_URL_: string;
-declare const _WS_URL_: string;
-declare const _DOCS_URL_: string;
-declare const _STATS_URL_: string;
-declare const _STATUS_URL_: string;
-declare const _DEV_URL_: string;
-declare const _REPOSITORY_URL_: string;
-declare const _FEEDBACK_URL_: string;
 declare const _LANG_: string;
 declare const _LANGS_: string;
-declare const _RECAPTCHA_SITEKEY_: string;
-declare const _SW_PUBLICKEY_: string;
 declare const _THEME_COLOR_: string;
 declare const _COPYRIGHT_: string;
 declare const _VERSION_: string;
 declare const _CODENAME_: string;
-declare const _LICENSE_: string;
-declare const _GOOGLE_MAPS_API_KEY_: string;
-declare const _WELCOME_BG_URL_: string;
-declare const _TWITTER_INTEGRATION_: boolean;
+declare const _ENV_: string;

-export const host = _HOST_;
-export const hostname = _HOSTNAME_;
-export const url = _URL_;
-export const name = _NAME_;
-export const description = _DESCRIPTION_;
-export const apiUrl = _API_URL_;
-export const wsUrl = _WS_URL_;
-export const docsUrl = _DOCS_URL_;
-export const statsUrl = _STATS_URL_;
-export const statusUrl = _STATUS_URL_;
-export const devUrl = _DEV_URL_;
-export const repositoryUrl = _REPOSITORY_URL_;
-export const feedbackUrl = _FEEDBACK_URL_;
+const address = new URL(location.href);
+
+export const host = address.host;
+export const hostname = address.hostname;
+export const url = address.origin;
+export const apiUrl = url + '/api';
+export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://');
 export const lang = _LANG_;
 export const langs = _LANGS_;
-export const recaptchaSitekey = _RECAPTCHA_SITEKEY_;
-export const swPublickey = _SW_PUBLICKEY_;
 export const themeColor = _THEME_COLOR_;
 export const copyright = _COPYRIGHT_;
 export const version = _VERSION_;
 export const codename = _CODENAME_;
-export const license = _LICENSE_;
-export const googleMapsApiKey = _GOOGLE_MAPS_API_KEY_;
-export const welcomeBgUrl = _WELCOME_BG_URL_;
-export const twitterIntegration = _TWITTER_INTEGRATION_;
+export const env = _ENV_;
@@ -3,8 +3,21 @@ import { apiUrl } from '../../config';
 import CropWindow from '../views/components/crop-window.vue';
 import ProgressDialog from '../views/components/progress-dialog.vue';

-export default (os: OS) => (cb, file = null) => {
-	const fileSelected = file => {
+export default (os: OS) => {
+
+	const cropImage = file => new Promise((resolve, reject) => {
+
+		const regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$');
+		if (!regex.test(file.name) ) {
+			os.apis.dialog({
+				title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
+				text: null,
+				actions: [{
+					text: '%i18n:common.got-it%'
+				}]
+			});
+			return reject('invalid-filetype');
+		}

 		const w = os.new(CropWindow, {
 			image: file,
@@ -19,27 +32,29 @@ export default (os: OS) => (cb, file = null) => {

 			os.api('drive/folders/find', {
 				name: '%i18n:desktop.avatar%'
-			}).then(iconFolder => {
-				if (iconFolder.length === 0) {
+			}).then(avatarFolder => {
+				if (avatarFolder.length === 0) {
 					os.api('drive/folders/create', {
 						name: '%i18n:desktop.avatar%'
 					}).then(iconFolder => {
-						upload(data, iconFolder);
+						resolve(upload(data, iconFolder));
 					});
 				} else {
-					upload(data, iconFolder[0]);
+					resolve(upload(data, avatarFolder[0]));
 				}
 			});
 		});

 		w.$once('skipped', () => {
-			set(file);
+			resolve(file);
 		});

-		document.body.appendChild(w.$el);
-	};
+		w.$once('cancelled', reject);

-	const upload = (data, folder) => {
+		document.body.appendChild(w.$el);
+	});
+
+	const upload = (data, folder) => new Promise((resolve, reject) => {
 		const dialog = os.new(ProgressDialog, {
 			title: '%i18n:desktop.uploading-avatar%'
 		});
@@ -52,18 +67,19 @@ export default (os: OS) => (cb, file = null) => {
 		xhr.onload = e => {
 			const file = JSON.parse((e.target as any).response);
 			(dialog as any).close();
-			set(file);
+			resolve(file);
 		};
+		xhr.onerror = reject;

 		xhr.upload.onprogress = e => {
 			if (e.lengthComputable) (dialog as any).update(e.loaded, e.total);
 		};

 		xhr.send(data);
-	};
+	});

-	const set = file => {
-		os.api('i/update', {
+	const setAvatar = file => {
+		return os.api('i/update', {
 			avatarId: file.id
 		}).then(i => {
 			os.store.commit('updateIKeyValue', {
@@ -83,18 +99,21 @@ export default (os: OS) => (cb, file = null) => {
 				}]
 			});

-			if (cb) cb(i);
+			return i;
 		});
 	};

-	if (file) {
-		fileSelected(file);
-	} else {
-		os.apis.chooseDriveFile({
-			multiple: false,
-			title: '%fa:image% %i18n:desktop.choose-avatar%'
-		}).then(file => {
-			fileSelected(file);
-		});
-	}
+	return (file = null) => {
+		const selectedFile = file
+			? Promise.resolve(file)
+			: os.apis.chooseDriveFile({
+				multiple: false,
+				title: '%fa:image% %i18n:desktop.choose-avatar%'
+			});
+
+		return selectedFile
+			.then(cropImage)
+			.then(setAvatar)
+			.catch(err => err && console.warn(err));
+	};
 };
@@ -6,6 +6,19 @@ import ProgressDialog from '../views/components/progress-dialog.vue';
 export default (os: OS) => {

 	const cropImage = file => new Promise((resolve, reject) => {
+
+		const regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$');
+		if (!regex.test(file.name) ) {
+			os.apis.dialog({
+				title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
+				text: null,
+				actions: [{
+					text: '%i18n:common.got-it%'
+				}]
+			});
+			return reject('invalid-filetype');
+		}
+
 		const w = os.new(CropWindow, {
 			image: file,
 			title: '%i18n:desktop.banner-crop-title%',
@@ -25,6 +25,7 @@ import updateBanner from './api/update-banner';
 import MkIndex from './views/pages/index.vue';
 import MkDeck from './views/pages/deck/deck.vue';
 import MkAdmin from './views/pages/admin/admin.vue';
+import MkStats from './views/pages/stats/stats.vue';
 import MkUser from './views/pages/user/user.vue';
 import MkFavorites from './views/pages/favorites.vue';
 import MkSelectDrive from './views/pages/selectdrive.vue';
@@ -57,6 +58,7 @@ init(async (launch) => {
 			{ path: '/', name: 'index', component: MkIndex },
 			{ path: '/deck', name: 'deck', component: MkDeck },
 			{ path: '/admin', name: 'admin', component: MkAdmin },
+			{ path: '/stats', name: 'stats', component: MkStats },
 			{ path: '/i/customize-home', component: MkHomeCustomize },
 			{ path: '/i/favorites', component: MkFavorites },
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },
@@ -94,7 +96,7 @@ init(async (launch) => {
 	/**
 	 * Init Notification
 	 */
-	if ('Notification' in window) {
+	if ('Notification' in window && os.store.getters.isSignedIn) {
 		// 許可を得ていなかったらリクエスト
 		if ((Notification as any).permission == 'default') {
 			await Notification.requestPermission();
@@ -0,0 +1,42 @@
+import Vue from 'vue';
+import { Line } from 'vue-chartjs';
+import * as mergeOptions from 'merge-options';
+
+export default Vue.extend({
+	extends: Line,
+	props: {
+		data: {
+			required: true
+		},
+		opts: {
+			required: false
+		}
+	},
+	watch: {
+		data() {
+			this.render();
+		}
+	},
+	mounted() {
+		this.render();
+	},
+	methods: {
+		render() {
+			this.renderChart(this.data, mergeOptions({
+				responsive: true,
+				maintainAspectRatio: false,
+				scales: {
+					xAxes: [{
+						type: 'time',
+						distribution: 'series'
+					}]
+				},
+				tooltips: {
+					intersect: false,
+					mode: 'x',
+					position: 'nearest'
+				}
+			}, this.opts || {}));
+		}
+	}
+});
@@ -0,0 +1,587 @@
+<template>
+<div class="gkgckalzgidaygcxnugepioremxvxvpt">
+	<header>
+		<b>%i18n:@title%:</b>
+		<select v-model="chartType">
+			<optgroup label="%i18n:@users%">
+				<option value="users">%i18n:@charts.users%</option>
+				<option value="users-total">%i18n:@charts.users-total%</option>
+			</optgroup>
+			<optgroup label="%i18n:@notes%">
+				<option value="notes">%i18n:@charts.notes%</option>
+				<option value="local-notes">%i18n:@charts.local-notes%</option>
+				<option value="remote-notes">%i18n:@charts.remote-notes%</option>
+				<option value="notes-total">%i18n:@charts.notes-total%</option>
+			</optgroup>
+			<optgroup label="%i18n:@drive%">
+				<option value="drive-files">%i18n:@charts.drive-files%</option>
+				<option value="drive-files-total">%i18n:@charts.drive-files-total%</option>
+				<option value="drive">%i18n:@charts.drive%</option>
+				<option value="drive-total">%i18n:@charts.drive-total%</option>
+			</optgroup>
+		</select>
+		<div>
+			<span @click="span = 'day'" :class="{ active: span == 'day' }">%i18n:@per-day%</span> | <span @click="span = 'hour'" :class="{ active: span == 'hour' }">%i18n:@per-hour%</span>
+		</div>
+	</header>
+	<div>
+		<x-chart v-if="chart" :data="data[0]" :opts="data[1]"/>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import XChart from './charts.chart.ts';
+
+const colors = {
+	local: 'rgb(246, 88, 79)',
+	remote: 'rgb(65, 221, 222)',
+
+	localPlus: 'rgb(52, 178, 118)',
+	remotePlus: 'rgb(158, 255, 209)',
+	localMinus: 'rgb(255, 97, 74)',
+	remoteMinus: 'rgb(255, 149, 134)'
+};
+
+const rgba = (color: string): string => {
+	return color.replace('rgb', 'rgba').replace(')', ', 0.1)');
+};
+
+export default Vue.extend({
+	components: {
+		XChart
+	},
+
+	data() {
+		return {
+			chart: null,
+			chartType: 'notes',
+			span: 'hour'
+		};
+	},
+
+	computed: {
+		data(): any {
+			if (this.chart == null) return null;
+			switch (this.chartType) {
+				case 'users': return this.usersChart(false);
+				case 'users-total': return this.usersChart(true);
+				case 'notes': return this.notesChart('combined');
+				case 'local-notes': return this.notesChart('local');
+				case 'remote-notes': return this.notesChart('remote');
+				case 'notes-total': return this.notesTotalChart();
+				case 'drive': return this.driveChart();
+				case 'drive-total': return this.driveTotalChart();
+				case 'drive-files': return this.driveFilesChart();
+				case 'drive-files-total': return this.driveFilesTotalChart();
+			}
+		},
+
+		stats(): any[] {
+			return (
+				this.span == 'day' ? this.chart.perDay :
+				this.span == 'hour' ? this.chart.perHour :
+				null
+			);
+		}
+	},
+
+	created() {
+		(this as any).api('chart', {
+			limit: 32
+		}).then(chart => {
+			this.chart = chart;
+		});
+	},
+
+	methods: {
+		notesChart(type: string): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				normal: type == 'local' ? x.notes.local.diffs.normal : type == 'remote' ? x.notes.remote.diffs.normal : x.notes.local.diffs.normal + x.notes.remote.diffs.normal,
+				reply: type == 'local' ? x.notes.local.diffs.reply : type == 'remote' ? x.notes.remote.diffs.reply : x.notes.local.diffs.reply + x.notes.remote.diffs.reply,
+				renote: type == 'local' ? x.notes.local.diffs.renote : type == 'remote' ? x.notes.remote.diffs.renote : x.notes.local.diffs.renote + x.notes.remote.diffs.renote,
+				all: type == 'local' ? (x.notes.local.inc + -x.notes.local.dec) : type == 'remote' ? (x.notes.remote.inc + -x.notes.remote.dec) : (x.notes.local.inc + -x.notes.local.dec) + (x.notes.remote.inc + -x.notes.remote.dec)
+			}));
+
+			return [{
+				datasets: [{
+					label: 'All',
+					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					borderDash: [4, 4],
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.all }))
+				}, {
+					label: 'Renotes',
+					fill: true,
+					backgroundColor: 'rgba(161, 222, 65, 0.1)',
+					borderColor: '#a1de41',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.renote }))
+				}, {
+					label: 'Replies',
+					fill: true,
+					backgroundColor: 'rgba(247, 121, 108, 0.1)',
+					borderColor: '#f7796c',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.reply }))
+				}, {
+					label: 'Normal',
+					fill: true,
+					backgroundColor: 'rgba(65, 221, 222, 0.1)',
+					borderColor: '#41ddde',
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.normal }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('number')(value);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('number')(tooltipItem.yLabel)}`;
+						}
+					}
+				}
+			}];
+		},
+
+		notesTotalChart(): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				localCount: x.notes.local.total,
+				remoteCount: x.notes.remote.total
+			}));
+
+			return [{
+				datasets: [{
+					label: 'Combined',
+					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					borderDash: [4, 4],
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteCount + x.localCount }))
+				}, {
+					label: 'Local',
+					fill: true,
+					backgroundColor: rgba(colors.local),
+					borderColor: colors.local,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.localCount }))
+				}, {
+					label: 'Remote',
+					fill: true,
+					backgroundColor: rgba(colors.remote),
+					borderColor: colors.remote,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteCount }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('number')(value);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('number')(tooltipItem.yLabel)}`;
+						}
+					}
+				}
+			}];
+		},
+
+		usersChart(total: boolean): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				localCount: total ? x.users.local.total : (x.users.local.inc + -x.users.local.dec),
+				remoteCount: total ? x.users.remote.total : (x.users.remote.inc + -x.users.remote.dec)
+			}));
+
+			return [{
+				datasets: [{
+					label: 'Combined',
+					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					borderDash: [4, 4],
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteCount + x.localCount }))
+				}, {
+					label: 'Local',
+					fill: true,
+					backgroundColor: rgba(colors.local),
+					borderColor: colors.local,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.localCount }))
+				}, {
+					label: 'Remote',
+					fill: true,
+					backgroundColor: rgba(colors.remote),
+					borderColor: colors.remote,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteCount }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('number')(value);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('number')(tooltipItem.yLabel)}`;
+						}
+					}
+				}
+			}];
+		},
+
+		driveChart(): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				localInc: x.drive.local.incSize,
+				localDec: -x.drive.local.decSize,
+				remoteInc: x.drive.remote.incSize,
+				remoteDec: -x.drive.remote.decSize,
+			}));
+
+			return [{
+				datasets: [{
+					label: 'All',
+					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					borderDash: [4, 4],
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.localInc + x.localDec + x.remoteInc + x.remoteDec }))
+				}, {
+					label: 'Local +',
+					fill: true,
+					backgroundColor: rgba(colors.localPlus),
+					borderColor: colors.localPlus,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.localInc }))
+				}, {
+					label: 'Local -',
+					fill: true,
+					backgroundColor: rgba(colors.localMinus),
+					borderColor: colors.localMinus,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.localDec }))
+				}, {
+					label: 'Remote +',
+					fill: true,
+					backgroundColor: rgba(colors.remotePlus),
+					borderColor: colors.remotePlus,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteInc }))
+				}, {
+					label: 'Remote -',
+					fill: true,
+					backgroundColor: rgba(colors.remoteMinus),
+					borderColor: colors.remoteMinus,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteDec }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('bytes')(value, 1);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('bytes')(tooltipItem.yLabel, 1)}`;
+						}
+					}
+				}
+			}];
+		},
+
+		driveTotalChart(): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				localSize: x.drive.local.totalSize,
+				remoteSize: x.drive.remote.totalSize
+			}));
+
+			return [{
+				datasets: [{
+					label: 'Combined',
+					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					borderDash: [4, 4],
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteSize + x.localSize }))
+				}, {
+					label: 'Local',
+					fill: true,
+					backgroundColor: rgba(colors.local),
+					borderColor: colors.local,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.localSize }))
+				}, {
+					label: 'Remote',
+					fill: true,
+					backgroundColor: rgba(colors.remote),
+					borderColor: colors.remote,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteSize }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('bytes')(value, 1);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('bytes')(tooltipItem.yLabel, 1)}`;
+						}
+					}
+				}
+			}];
+		},
+
+		driveFilesChart(): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				localInc: x.drive.local.incCount,
+				localDec: -x.drive.local.decCount,
+				remoteInc: x.drive.remote.incCount,
+				remoteDec: -x.drive.remote.decCount
+			}));
+
+			return [{
+				datasets: [{
+					label: 'All',
+					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					borderDash: [4, 4],
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.localInc + x.localDec + x.remoteInc + x.remoteDec }))
+				}, {
+					label: 'Local +',
+					fill: true,
+					backgroundColor: rgba(colors.localPlus),
+					borderColor: colors.localPlus,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.localInc }))
+				}, {
+					label: 'Local -',
+					fill: true,
+					backgroundColor: rgba(colors.localMinus),
+					borderColor: colors.localMinus,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.localDec }))
+				}, {
+					label: 'Remote +',
+					fill: true,
+					backgroundColor: rgba(colors.remotePlus),
+					borderColor: colors.remotePlus,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteInc }))
+				}, {
+					label: 'Remote -',
+					fill: true,
+					backgroundColor: rgba(colors.remoteMinus),
+					borderColor: colors.remoteMinus,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteDec }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('number')(value);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('number')(tooltipItem.yLabel)}`;
+						}
+					}
+				}
+			}];
+		},
+
+		driveFilesTotalChart(): any {
+			const data = this.stats.slice().reverse().map(x => ({
+				date: new Date(x.date),
+				localCount: x.drive.local.totalCount,
+				remoteCount: x.drive.remote.totalCount,
+			}));
+
+			return [{
+				datasets: [{
+					label: 'Combined',
+					fill: false,
+					borderColor: '#555',
+					borderWidth: 2,
+					borderDash: [4, 4],
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.localCount + x.remoteCount }))
+				}, {
+					label: 'Local',
+					fill: true,
+					backgroundColor: rgba(colors.local),
+					borderColor: colors.local,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.localCount }))
+				}, {
+					label: 'Remote',
+					fill: true,
+					backgroundColor: rgba(colors.remote),
+					borderColor: colors.remote,
+					borderWidth: 2,
+					pointBackgroundColor: '#fff',
+					lineTension: 0,
+					data: data.map(x => ({ t: x.date, y: x.remoteCount }))
+				}]
+			}, {
+				scales: {
+					yAxes: [{
+						ticks: {
+							callback: value => {
+								return Vue.filter('number')(value);
+							}
+						}
+					}]
+				},
+				tooltips: {
+					callbacks: {
+						label: (tooltipItem, data) => {
+							const label = data.datasets[tooltipItem.datasetIndex].label || '';
+							return `${label}: ${Vue.filter('number')(tooltipItem.yLabel)}`;
+						}
+					}
+				}
+			}];
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+.gkgckalzgidaygcxnugepioremxvxvpt
+	padding 32px
+	background #fff
+	box-shadow 0 2px 8px rgba(#000, 0.1)
+
+	*
+		user-select none
+
+	> header
+		display flex
+		margin 0 0 1em 0
+		padding 0 0 8px 0
+		font-size 1em
+		color #555
+		border-bottom solid 1px #eee
+
+		> b
+			margin-right 8px
+
+		> *:last-child
+			margin-left auto
+
+			*
+				&:not(.active)
+					color $theme-color
+					cursor pointer
+
+	> div
+		> *
+			display block
+			height 320px
+
+</style>
@@ -9,12 +9,18 @@
 	@contextmenu.prevent.stop="onContextmenu"
 	:title="title"
 >
-	<div class="label" v-if="$store.state.i.avatarId == file.id"><img src="/assets/label.svg"/>
+	<div class="label" v-if="$store.state.i.avatarId == file.id">
+		<img src="/assets/label.svg"/>
 		<p>%i18n:@avatar%</p>
 	</div>
-	<div class="label" v-if="$store.state.i.bannerId == file.id"><img src="/assets/label.svg"/>
+	<div class="label" v-if="$store.state.i.bannerId == file.id">
+		<img src="/assets/label.svg"/>
 		<p>%i18n:@banner%</p>
 	</div>
+	<div class="label red" v-if="file.isSensitive">
+		<img src="/assets/label-red.svg"/>
+		<p>%i18n:@nsfw%</p>
+	</div>
 	<div class="thumbnail" ref="thumbnail" :style="`background-color: ${ background }`">
 		<img :src="file.thumbnailUrl" alt="" @load="onThumbnailLoaded"/>
 	</div>
@@ -212,6 +218,11 @@ root(isDark)
 			&:after
 				background #0b65a5

+			&.red
+				&:before
+				&:after
+					background #c12113
+
 	&:active
 		background rgba(#000, 0.1)

@@ -220,6 +231,11 @@ root(isDark)
 			&:after
 				background #0b588c

+			&.red
+				&:before
+				&:after
+					background #ce2212
+
 	&[data-is-selected]
 		background $theme-color

@@ -256,26 +272,29 @@ root(isDark)
 		pointer-events none

 		&:before
-			content ""
-			display block
-			position absolute
-			z-index 1
-			top 0
-			left 57px
-			width 28px
-			height 8px
-			background #0c7ac9
-
 		&:after
 			content ""
 			display block
 			position absolute
 			z-index 1
+			background #0c7ac9
+
+		&:before
+			top 0
+			left 57px
+			width 28px
+			height 8px
+
+		&:after
 			top 57px
 			left 0
 			width 8px
 			height 28px
-			background #0c7ac9
+
+		&.red
+			&:before
+			&:after
+				background #c12113

 		> img
 			position absolute
@@ -163,7 +163,7 @@ export default Vue.extend({
 							});
 							break;
 						default:
-							alert('%i18n:@unhandled-error% ' + err);
+							alert(`%i18n:@unhandled-error% ${err}`);
 					}
 				});
 			}
@@ -323,7 +323,7 @@ export default Vue.extend({
 							});
 							break;
 						default:
-							alert('%i18n:@unhandled-error% ' + err);
+							alert(`%i18n:@unhandled-error% ${err}`);
 					}
 				});
 			}
@@ -404,7 +404,7 @@ export default Vue.extend({
 					folder: folder
 				});
 			} else {
-				window.open(url + '/i/drive/folder/' + folder.id,
+				window.open(`${url}/i/drive/folder/${folder.id}`,
 					'drive_window',
 					'height=500, width=800');
 			}
@@ -55,13 +55,15 @@ export default Vue.extend({
 	methods: {
 		onFollow(user) {
 			if (user.id == this.u.id) {
-				this.user.isFollowing = user.isFollowing;
+				this.u.isFollowing = user.isFollowing;
+				this.u.hasPendingFollowRequestFromYou = user.hasPendingFollowRequestFromYou;
 			}
 		},

 		onUnfollow(user) {
 			if (user.id == this.u.id) {
-				this.user.isFollowing = user.isFollowing;
+				this.u.isFollowing = user.isFollowing;
+				this.u.hasPendingFollowRequestFromYou = user.hasPendingFollowRequestFromYou;
 			}
 		},

@@ -74,7 +76,7 @@ export default Vue.extend({
 						userId: this.u.id
 					});
 				} else {
-					if (this.u.isLocked && this.u.hasPendingFollowRequestFromYou) {
+					if (this.u.hasPendingFollowRequestFromYou) {
 						this.u = await (this as any).api('following/requests/cancel', {
 							userId: this.u.id
 						});
@@ -48,7 +48,7 @@ export default Vue.extend({
 			const mouseY = e.clientY - rect.top;
 			const xp = mouseX / this.$el.offsetWidth * 100;
 			const yp = mouseY / this.$el.offsetHeight * 100;
-			this.$el.style.backgroundPosition = xp + '% ' + yp + '%';
+			this.$el.style.backgroundPosition = `${xp}% ${yp}%`;
 			this.$el.style.backgroundImage = `url("${this.image.url}")`;
 		},

@@ -47,7 +47,7 @@
 			</div>
 			<mk-poll v-if="p.poll" :note="p"/>
 			<mk-url-preview v-for="url in urls" :url="url" :key="url" :detail="true"/>
-			<a class="location" v-if="p.geo" :href="`http://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% %i18n:@location%</a>
+			<a class="location" v-if="p.geo" :href="`https://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% %i18n:@location%</a>
 			<div class="map" v-if="p.geo" ref="map"></div>
 			<div class="renote" v-if="p.renote">
 				<mk-note-preview :note="p.renote"/>
@@ -32,7 +32,7 @@
 						<mk-media-list :media-list="p.media"/>
 					</div>
 					<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
-					<a class="location" v-if="p.geo" :href="`http://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% 位置情報</a>
+					<a class="location" v-if="p.geo" :href="`https://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% 位置情報</a>
 					<div class="map" v-if="p.geo" ref="map"></div>
 					<div class="renote" v-if="p.renote">
 						<mk-note-preview :note="p.renote"/>
@@ -193,7 +193,7 @@ export default Vue.extend({

 		clearNotification() {
 			this.unreadCount = 0;
-			document.title = config.name;
+			document.title = (this as any).os.instanceName;
 		},

 		onVisibilitychange() {
@@ -35,7 +35,7 @@
 	<button class="upload" title="%i18n:@attach-media-from-local%" @click="chooseFile">%fa:upload%</button>
 	<button class="drive" title="%i18n:@attach-media-from-drive%" @click="chooseFileFromDrive">%fa:cloud%</button>
 	<button class="kao" title="%i18n:@insert-a-kao%" @click="kao">%fa:R smile%</button>
-	<button class="poll" title="%i18n:@create-poll%" @click="poll = true">%fa:chart-pie%</button>
+	<button class="poll" title="%i18n:@create-poll%" @click="poll = !poll">%fa:chart-pie%</button>
 	<button class="poll" title="%i18n:@hide-contents%" @click="useCw = !useCw">%fa:eye-slash%</button>
 	<button class="geo" title="%i18n:@attach-location-information%" @click="geo ? removeGeo() : setGeo()">%fa:map-marker-alt%</button>
 	<button class="visibility" title="%i18n:@visibility%" @click="setVisibility" ref="visibilityButton">
@@ -110,9 +110,9 @@ export default Vue.extend({
 	computed: {
 		draftId(): string {
 			return this.renote
-				? 'renote:' + this.renote.id
+				? `renote:${this.renote.id}`
 				: this.reply
-					? 'reply:' + this.reply.id
+					? `reply:${this.reply.id}`
 					: 'note';
 		},

@@ -313,7 +313,7 @@ export default Vue.extend({
 				this.geo = pos.coords;
 				this.$emit('geo-attached', this.geo);
 			}, err => {
-				alert('%i18n:@error%: ' + err.message);
+				alert(`%i18n:@error%: ${err.message}`);
 			}, {
 					enableHighAccuracy: true
 				});
@@ -49,6 +49,7 @@
 			</div>
 			<mk-switch v-model="$store.state.settings.showPostFormOnTopOfTl" @change="onChangeShowPostFormOnTopOfTl" text="%i18n:@post-form-on-timeline%"/>
 			<mk-switch v-model="$store.state.settings.suggestRecentHashtags" @change="onChangeSuggestRecentHashtags" text="%i18n:@suggest-recent-hashtags%"/>
+			<mk-switch v-model="$store.state.settings.showClockOnHeader" @change="onChangeShowClockOnHeader" text="%i18n:@show-clock-on-header%"/>
 			<mk-switch v-model="$store.state.settings.showReplyTarget" @change="onChangeShowReplyTarget" text="%i18n:@show-reply-target%"/>
 			<mk-switch v-model="$store.state.settings.showMyRenotes" @change="onChangeShowMyRenotes" text="%i18n:@show-my-renotes%"/>
 			<mk-switch v-model="$store.state.settings.showRenotedMyNotes" @change="onChangeShowRenotedMyNotes" text="%i18n:@show-renoted-my-notes%"/>
@@ -56,8 +57,9 @@
 			<mk-switch v-model="$store.state.settings.showMaps" @change="onChangeShowMaps" text="%i18n:@show-maps%">
 				<span>%i18n:@show-maps-desc%</span>
 			</mk-switch>
-			<mk-switch v-model="$store.state.settings.reversiBoardLabels" @change="onChangeReversiBoardLabels" text="%i18n:common.show-reversi-board-labels%"/>
 			<mk-switch v-model="$store.state.settings.disableAnimatedMfm" @change="onChangeDisableAnimatedMfm" text="%i18n:common.disable-animated-mfm%"/>
+			<mk-switch v-model="$store.state.settings.games.reversi.showBoardLabels" @change="onChangeReversiBoardLabels" text="%i18n:common.show-reversi-board-labels%"/>
+			<mk-switch v-model="$store.state.settings.games.reversi.useContrastStones" @change="onChangeUseContrastReversiStones" text="%i18n:common.use-contrast-reversi-stones%"/>
 		</section>

 		<section class="web" v-show="page == 'web'">
@@ -191,12 +193,6 @@
 				<button class="ui button block" @click="taskmngr">%i18n:@task-manager%</button>
 			</details>
 		</section>
-
-		<section class="other" v-show="page == 'other'">
-			<h1>%i18n:@license%</h1>
-			<div v-html="license"></div>
-			<a :href="licenseUrl" target="_blank">%i18n:@third-parties%</a>
-		</section>
 	</div>
 </div>
 </template>
@@ -211,7 +207,7 @@ import XApi from './settings.api.vue';
 import XApps from './settings.apps.vue';
 import XSignins from './settings.signins.vue';
 import XDrive from './settings.drive.vue';
-import { url, docsUrl, license, lang, langs, version } from '../../../config';
+import { url, langs, version } from '../../../config';
 import checkForUpdate from '../../../common/scripts/check-for-update';
 import MkTaskManager from './taskmanager.vue';

@@ -230,7 +226,6 @@ export default Vue.extend({
 		return {
 			page: 'profile',
 			meta: null,
-			license,
 			version,
 			langs,
 			latestVersion: undefined,
@@ -238,10 +233,6 @@ export default Vue.extend({
 		};
 	},
 	computed: {
-		licenseUrl(): string {
-			return `${docsUrl}/${lang}/license`;
-		},
-
 		apiViaStream: {
 			get() { return this.$store.state.device.apiViaStream; },
 			set(value) { this.$store.commit('device/set', { key: 'apiViaStream', value }); }
@@ -343,6 +334,12 @@ export default Vue.extend({
 				value: v
 			});
 		},
+		onChangeShowClockOnHeader(v) {
+			this.$store.dispatch('settings/set', {
+				key: 'showClockOnHeader',
+				value: v
+			});
+		},
 		onChangeShowReplyTarget(v) {
 			this.$store.dispatch('settings/set', {
 				key: 'showReplyTarget',
@@ -387,7 +384,13 @@ export default Vue.extend({
 		},
 		onChangeReversiBoardLabels(v) {
 			this.$store.dispatch('settings/set', {
-				key: 'reversiBoardLabels',
+				key: 'games.reversi.showBoardLabels',
+				value: v
+			});
+		},
+		onChangeUseContrastReversiStones(v) {
+			this.$store.dispatch('settings/set', {
+				key: 'games.reversi.useContrastStones',
 				value: v
 			});
 		},
@@ -30,10 +30,8 @@
 				<li @click="settings">
 					<p>%fa:cog%<span>%i18n:@settings%</span>%fa:angle-right%</p>
 				</li>
-			</ul>
-			<ul>
-				<li @click="signout">
-					<p class="signout">%fa:power-off%<span>%i18n:@signout%</span></p>
+				<li v-if="$store.state.i.isAdmin">
+					<router-link to="/admin">%fa:terminal%<span>%i18n:@admin%</span>%fa:angle-right%</router-link>
 				</li>
 			</ul>
 			<ul>
@@ -41,6 +39,11 @@
 					<p><span>%i18n:@dark%</span><template v-if="$store.state.device.darkmode">%fa:moon%</template><template v-else>%fa:R moon%</template></p>
 				</li>
 			</ul>
+			<ul>
+				<li @click="signout">
+					<p class="signout">%fa:power-off%<span>%i18n:@signout%</span></p>
+				</li>
+			</ul>
 		</div>
 	</transition>
 </div>
@@ -11,7 +11,7 @@
 			<li class="deck" :class="{ active: $route.name == 'deck' }" @click="goToTop">
 				<router-link to="/deck">
 					%fa:columns%
-					<p>%i18n:@deck% <small>(beta)</small></p>
+					<p>%i18n:@deck%</p>
 				</router-link>
 			</li>
 			<li class="messaging">
@@ -1,5 +1,6 @@
 <template>
 <div class="header">
+	<p class="warn" v-if="env != 'production'">%i18n:common.do-not-use-in-production%</p>
 	<mk-special-message/>
 	<div class="main" ref="main">
 		<div class="backdrop"></div>
@@ -17,7 +18,7 @@
 					<x-account v-if="$store.getters.isSignedIn"/>
 					<x-notifications v-if="$store.getters.isSignedIn"/>
 					<x-post v-if="$store.getters.isSignedIn"/>
-					<x-clock/>
+					<x-clock v-if="$store.state.settings.showClockOnHeader"/>
 				</div>
 			</div>
 		</div>
@@ -28,6 +29,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import * as anime from 'animejs';
+import { env } from '../../../config';

 import XNav from './ui.header.nav.vue';
 import XSearch from './ui.header.search.vue';
@@ -43,7 +45,13 @@ export default Vue.extend({
 		XAccount,
 		XNotifications,
 		XPost,
-		XClock,
+		XClock
+	},
+
+	data() {
+		return {
+			env: env
+		};
 	},

 	mounted() {
@@ -119,6 +127,15 @@ root(isDark)
 	width 100%
 	box-shadow 0 1px 1px rgba(#000, 0.075)

+	> .warn
+		display block
+		margin 0
+		padding 4px
+		text-align center
+		font-size 12px
+		background #f00
+		color #fff
+
 	> .main
 		height 48px

@@ -48,7 +48,7 @@ export default Vue.extend({
 				this.open();
 			});
 		} else {
-			const query = this.user[0] == '@' ?
+			const query = this.user.startsWith('@') ?
 				parseAcct(this.user.substr(1)) :
 				{ userId: this.user };

@@ -0,0 +1,41 @@
+<template>
+<div class="qldxjjsrseehkusjuoooapmsprvfrxyl mk-admin-card">
+	<header>%i18n:@announcements%</header>
+	<textarea v-model="broadcasts"></textarea>
+	<button class="ui" @click="save">%i18n:@save%</button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from "vue";
+
+export default Vue.extend({
+	data() {
+		return {
+			broadcasts: '',
+		};
+	},
+	created() {
+		(this as any).os.getMeta().then(meta => {
+			this.broadcasts = JSON.stringify(meta.broadcasts, null, '  ');
+		});
+	},
+	methods: {
+		save() {
+			(this as any).api('admin/update-meta', {
+				broadcasts: JSON.parse(this.broadcasts)
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+.qldxjjsrseehkusjuoooapmsprvfrxyl
+	textarea
+		width 100%
+		min-height 300px
+
+</style>
@@ -15,14 +15,14 @@
 					:points="cpuPolylinePoints"
 					fill="none"
 					stroke="#fff"
-					stroke-width="0.3"/>
+					stroke-width="1"/>
 			</mask>
 		</defs>
 		<rect
 			x="0" y="0"
 			:width="viewBoxX" :height="viewBoxY"
 			:style="`stroke: none; fill: url(#${ cpuGradientId }); mask: url(#${ cpuMaskId })`"/>
-		<text x="1" y="5">CPU <tspan>{{ cpuP }}%</tspan></text>
+		<text x="1" y="12">CPU <tspan>{{ cpuP }}%</tspan></text>
 	</svg>
 	<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
 		<defs>
@@ -39,14 +39,14 @@
 					:points="memPolylinePoints"
 					fill="none"
 					stroke="#fff"
-					stroke-width="0.3"/>
+					stroke-width="1"/>
 			</mask>
 		</defs>
 		<rect
 			x="0" y="0"
 			:width="viewBoxX" :height="viewBoxY"
 			:style="`stroke: none; fill: url(#${ memGradientId }); mask: url(#${ memMaskId })`"/>
-		<text x="1" y="5">MEM <tspan>{{ memP }}%</tspan></text>
+		<text x="1" y="12">MEM <tspan>{{ memP }}%</tspan></text>
 	</svg>
 </div>
 </template>
@@ -59,8 +59,8 @@ export default Vue.extend({
 	props: ['connection'],
 	data() {
 		return {
-			viewBoxX: 50,
-			viewBoxY: 20,
+			viewBoxX: 200,
+			viewBoxY: 70,
 			stats: [],
 			cpuGradientId: uuid(),
 			cpuMaskId: uuid(),
@@ -79,7 +79,8 @@ export default Vue.extend({
 		this.connection.on('statsLog', this.onStatsLog);
 		this.connection.send({
 			type: 'requestLog',
-			id: Math.random().toString()
+			id: Math.random().toString(),
+			length: 200
 		});
 	},
 	beforeDestroy() {
@@ -89,7 +90,7 @@ export default Vue.extend({
 	methods: {
 		onStats(stats) {
 			this.stats.push(stats);
-			if (this.stats.length > 50) this.stats.shift();
+			if (this.stats.length > 200) this.stats.shift();

 			const cpuPolylinePoints = this.stats.map((s, i) => [this.viewBoxX - ((this.stats.length - 1) - i), (1 - s.cpu_usage) * this.viewBoxY]);
 			const memPolylinePoints = this.stats.map((s, i) => [this.viewBoxX - ((this.stats.length - 1) - i), (1 - (s.mem.used / s.mem.total)) * this.viewBoxY]);
@@ -103,7 +104,7 @@ export default Vue.extend({
 			this.memP = (stats.mem.used / stats.mem.total * 100).toFixed(0);
 		},
 		onStatsLog(statsLog) {
-			statsLog.forEach(stats => this.onStats(stats));
+			statsLog.reverse().forEach(stats => this.onStats(stats));
 		}
 	}
 });
@@ -111,8 +112,6 @@ export default Vue.extend({

 <style lang="stylus" scoped>
 root(isDark)
-	margin-bottom 16px
-
 	> svg
 		display block
 		width 50%
@@ -125,7 +124,7 @@ root(isDark)
 			padding-left 5px

 		> text
-			font-size 2px
+			font-size 10px
 			fill isDark ? rgba(#fff, 0.55) : rgba(#000, 0.55)

 			> tspan
@@ -1,16 +1,20 @@
 <template>
-<div class="obdskegsannmntldydackcpzezagxqfy card">
+<div class="obdskegsannmntldydackcpzezagxqfy mk-admin-card">
 	<header>%i18n:@dashboard%</header>
 	<div v-if="stats" class="stats">
 		<div><b>%fa:user% {{ stats.originalUsersCount | number }}</b><span>%i18n:@original-users%</span></div>
 		<div><span>%fa:user% {{ stats.usersCount | number }}</span><span>%i18n:@all-users%</span></div>
-		<div><b>%fa:pen% {{ stats.originalNotesCount | number }}</b><span>%i18n:@original-notes%</span></div>
-		<div><span>%fa:pen% {{ stats.notesCount | number }}</span><span>%i18n:@all-notes%</span></div>
+		<div><b>%fa:pencil-alt% {{ stats.originalNotesCount | number }}</b><span>%i18n:@original-notes%</span></div>
+		<div><span>%fa:pencil-alt% {{ stats.notesCount | number }}</span><span>%i18n:@all-notes%</span></div>
 	</div>
 	<div class="cpu-memory">
 		<x-cpu-memory :connection="connection"/>
 	</div>
 	<div>
+		<label>
+			<input type="checkbox" v-model="disableRegistration" @change="updateMeta">
+			<span>disableRegistration</span>
+		</label>
 		<button class="ui" @click="invite">%i18n:@invite%</button>
 		<p v-if="inviteCode">Code: <code>{{ inviteCode }}</code></p>
 	</div>
@@ -28,6 +32,7 @@ export default Vue.extend({
 	data() {
 		return {
 			stats: null,
+			disableRegistration: false,
 			inviteCode: null,
 			connection: null,
 			connectionId: null
@@ -37,6 +42,10 @@ export default Vue.extend({
 		this.connection = (this as any).os.streams.serverStatsStream.getConnection();
 		this.connectionId = (this as any).os.streams.serverStatsStream.use();

+		(this as any).os.getMeta().then(meta => {
+			this.disableRegistration = meta.disableRegistration;
+		});
+
 		(this as any).api('stats').then(stats => {
 			this.stats = stats;
 		});
@@ -49,6 +58,11 @@ export default Vue.extend({
 			(this as any).api('admin/invite').then(x => {
 				this.inviteCode = x.code;
 			});
+		},
+		updateMeta() {
+			(this as any).api('admin/update-meta', {
+				disableRegistration: this.disableRegistration
+			});
 		}
 	}
 });
@@ -77,4 +91,10 @@ export default Vue.extend({
 			> *:last-child
 				font-size 70%

+	> .cpu-memory
+		margin-bottom 16px
+		padding 16px
+		border solid 1px #eee
+		border-radius: 8px
+
 </style>
@@ -1,81 +0,0 @@
-<template>
-<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`">
-	<polyline
-		:points="pointsNote"
-		fill="none"
-		stroke-width="1"
-		stroke="#41ddde"/>
-	<polyline
-		:points="pointsReply"
-		fill="none"
-		stroke-width="1"
-		stroke="#f7796c"/>
-	<polyline
-		:points="pointsRenote"
-		fill="none"
-		stroke-width="1"
-		stroke="#a1de41"/>
-	<polyline
-		:points="pointsTotal"
-		fill="none"
-		stroke-width="1"
-		stroke="#555"
-		stroke-dasharray="2 2"/>
-</svg>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		data: {
-			required: true
-		},
-		type: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			chart: this.data,
-			viewBoxX: 365,
-			viewBoxY: 70,
-			pointsNote: null,
-			pointsReply: null,
-			pointsRenote: null,
-			pointsTotal: null
-		};
-	},
-	created() {
-		this.chart.forEach(d => {
-			d.notes = this.type == 'local' ? d.localNotes : d.remoteNotes;
-			d.replies = this.type == 'local' ? d.localReplies : d.remoteReplies;
-			d.renotes = this.type == 'local' ? d.localRenotes : d.remoteRenotes;
-		});
-
-		this.chart.forEach(d => {
-			d.total = d.notes + d.replies + d.renotes;
-		});
-
-		const peak = Math.max.apply(null, this.chart.map(d => d.total));
-
-		if (peak != 0) {
-			const data = this.chart.slice().reverse();
-			this.pointsNote = data.map((d, i) => `${i},${(1 - (d.notes / peak)) * this.viewBoxY}`).join(' ');
-			this.pointsReply = data.map((d, i) => `${i},${(1 - (d.replies / peak)) * this.viewBoxY}`).join(' ');
-			this.pointsRenote = data.map((d, i) => `${i},${(1 - (d.renotes / peak)) * this.viewBoxY}`).join(' ');
-			this.pointsTotal = data.map((d, i) => `${i},${(1 - (d.total / peak)) * this.viewBoxY}`).join(' ');
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-svg
-	display block
-	padding 10px
-	width 100%
-
-</style>
@@ -1,39 +0,0 @@
-<template>
-<div class="card">
-	<header>%i18n:@title%</header>
-	<div class="card">
-		<header>%i18n:@local%</header>
-		<x-chart v-if="data" :data="data" type="local"/>
-	</div>
-	<div class="card">
-		<header>%i18n:@remote%</header>
-		<x-chart v-if="data" :data="data" type="remote"/>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from "vue";
-import XChart from "./admin.notes-chart.chart.vue";
-
-export default Vue.extend({
-	components: {
-		XChart
-	},
-	data() {
-		return {
-			data: null
-		};
-	},
-	created() {
-		(this as any).api('aggregation/notes').then(res => {
-			this.data = res;
-		});
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-@import '~const.styl'
-
-</style>
@@ -1,5 +1,5 @@
 <template>
-<div class="card">
+<div class="mk-admin-card">
 	<header>%i18n:@suspend-user%</header>
 	<input v-model="username" type="text" class="ui"/>
 	<button class="ui" @click="suspendUser" :disabled="suspending">%i18n:@suspend%</button>
--- a/Show More
+++ b/Show More