10.78.5

Merge pull request #3959 from syuilo/l10n_develop
New Crowdin translations
2019-01-23 05:37:37 +09:00 · 2019-01-23 05:33:51 +09:00 · 2019-01-23 05:30:12 +09:00 · 2019-01-23 05:30:02 +09:00 · 2019-01-23 05:25:46 +09:00 · 2019-01-23 05:24:23 +09:00
215 changed files with 3721 additions and 1581 deletions
--- a/.autogen/update_readme_patreon.sh
+++ b/.autogen/update_readme_patreon.sh
@@ -35,7 +35,7 @@ while :
  cat patreon.cache | \
  awk -F'\t' '{print $2,$1}' | \
  sed -e 's/ /\\" alt=\\"/' | \
-  xargs -I% echo '<td><img src="%"></td>' >> patreon.md.cache && \
+  xargs -I% echo '<td><img src="%" width="100"></td>' >> patreon.md.cache && \
  echo '</tr><tr>' >> patreon.md.cache && \
  cat patreon.cache | \
  awk -F'\t' '{print $3,$1}' | \
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,6 +54,8 @@ jobs:
      - run:
          name: Build
          command: |
+            node-gyp configure
+            node-gyp build
            npm run build || (echo -e '\033[0;34mRebuild modules\033[0;39m' && ls -1A node_modules | grep '^[^@]' | xargs npm rebuild && ls -1A node_modules | grep '^@' | xargs -I%1 sh -c 'ls -1A node_modules/'%1' | xargs -P0 -I%2 npm rebuild node_modules/'%1'/%2' && npm run build)
            ls -1ARl node_modules > ls
      - save_cache:
@@ -88,7 +90,7 @@ jobs:
      - run:
          name: Test
          command: |
-            npm run test || (npm rebuild && npm run test) || ((node-gyp configure && node-gyp build && npm run build || (echo -e '\033[0;34mRebuild modules\033[0;39m' && ls -1A node_modules | grep '^[^@]' | xargs npm rebuild && ls -1A node_modules | grep '^@' | xargs -I%1 sh -c 'ls -1A node_modules/'%1' | xargs -P0 -I%2 npm rebuild node_modules/'%1'/%2' && npm run build)) && npm run test)
+            npm run test
            ls -1ARl node_modules > ls
      - save_cache:
          name: Cache npm packages
--- a/.eslintrc
+++ b/.eslintrc
@@ -15,6 +15,9 @@
 		"vue/attributes-order": false,
 		"vue/require-prop-types": false,
 		"vue/require-default-prop": false,
+		"vue/html-closing-bracket-spacing": false,
+		"vue/singleline-html-element-content-newline": false,
+		"vue/no-v-html": false,
 		"no-console": 0,
 		"no-unused-vars": 0,
 		"no-empty": 0
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1,39 @@
+# PATH                                          OWNERS
+/.autogen/                                      @acid-chicken
+/.circleci/                                     @syuilo @acid-chicken
+/.config/                                       @syuilo @AyaMorisawa @mei23 @acid-chicken
+# /.config/mongo_initdb_example.js              @khws4v1
+/.github/                                       @syuilo @AyaMorisawa @acid-chicken
+/.vscode/                                       @acid-chicken
+/assets/                                        @syuilo # @tamaina
+/cli/                                           @syuilo
+/docs/                                          @syuilo
+/docs/*.en.md                                   @AyaMorisawa # @skid9000
+# /docs/*.fr.md                                 @BoFFire
+# /docs/docker.*.md                             @khws4v1
+/locales/                                       @syuilo
+/src/                                           @syuilo @AyaMorisawa @mei23 @acid-chicken
+# /src/crypto_key.cc                            @akihikodaki
+# /src/crypto_key.d.ts                          @akihikodaki
+/.dockerignore                                  @syuilo # @khws4v1
+/.editorconfig                                  @syuilo @AyaMorisawa
+/.eslintrc                                      @syuilo
+/.gitattributes                                 @syuilo
+/.gitignore                                     @syuilo
+/.npmrc                                         @syuilo
+/.vsls.json                                     @AyaMorisawa
+/CHANGELOG.md                                   @syuilo
+/CODE_OF_CONDUCT.md                             @syuilo
+/CONTRIBUTING.md                                @syuilo
+/Dockerfile                                     @syuilo @AyaMorisawa @acid-chicken # @khws4v1
+/LICENSE                                        @syuilo
+/README.md                                      @syuilo @AyaMorisawa @acid-chicken # @nikhiljha
+# /binding.gyp                                  @akihikodaki
+/crowdin.yml                                    @syuilo
+# /docker-compose.yml                           @khws4v1
+/gulpfile.ts                                    @syuilo @AyaMorisawa
+/jsconfig.json                                  @syuilo @AyaMorisawa
+/package.json                                   @syuilo @AyaMorisawa
+/tsconfig.json                                  @syuilo @AyaMorisawa
+/tslint.json                                    @syuilo @AyaMorisawa
+/webpack.config.ts                              @syuilo @AyaMorisawa
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ api-docs.json
 /elasticsearch
 *.code-workspace
 yarn.lock
+.DS_Store
--- a/.node-version
+++ b/.node-version
@@ -0,0 +1 @@
+v11.7.0
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,98 @@
 ChangeLog
 =========

+10.78.5
+----------
+* アンケートの選択肢にカスタム絵文字を使えるように
+* 投稿の返信を取得したときにミュートが適用されていない問題を修正
+* ユーザビリティの強化
+
+10.78.4
+----------
+* フォロワー限定投稿がユーザータイムラインに含まれていない問題を修正
+* データベースのインデックス設定を修正
+* UIの修正
+* など
+
+10.78.3
+----------
+* 投票未対応インスタンス向けメッセージをわかりやすく
+* リバーシが404になる問題を修正
+* デザインの修正
+
+10.78.2
+----------
+* リバーシが404になる問題を修正
+* ストリームで流れてくる投稿とAPIでタイムラインを取得したときとの不一致を修正
+
+10.78.1
+----------
+* 「関係のない返信がタイムラインに流れる問題を修正」を取り消し
+* デザインの修正
+
+10.78.0
+----------
+* 他のインスタンスからアンケートに投票できるように
+* スパムアカウントを報告できるように
+* アクティブユーザー数のチャートを追加
+* 管理画面でドライブのファイルをURLやIDから操作できるように
+* リアクション解除を他のサーバーと送受信するように
+* ログイン時に二段階認証が分かりにくいのを改善
+* 投稿のツールチップを出すのは時間の上だけに変更
+* `*`や`_`でもイタリック構文を使えるように(アルファベットのみ)
+* `__`でも太字構文を使えるように(アルファベットのみ)
+* ハッシュタグ判定の強化
+* ストーク機能の廃止
+* ソーシャルタイムラインにフォロワー限定投稿が含まれていない問題を修正
+* リストタイムラインでフォロワー限定投稿が含まれていない問題を修正
+* リストタイムラインに自分宛てでないダイレクト投稿が非公開扱いで表示される問題を修正
+* 自分宛てのダイレクト投稿がホーム/ソーシャルタイムラインにストリームで流れない問題を修正
+* ストリームで投稿が流れてきたとき、返信先が「この投稿は非公開です」となる問題を修正
+* 関係のない返信がタイムラインに流れる問題を修正
+* 常にメディアを閲覧注意として投稿するオプションが機能していなかった問題を修正
+* リモートユーザーのアイコンが消えることがある問題を修正
+* ドライブのファイルメニューからアバターやバナーに設定することができない問題を修正
+* クライアントのAPIリクエストをストリーム経由で行うオプションを廃止
+* 一部箇所でカスタム絵文字が適用されていないのを修正
+
+10.77.0
+----------
+* ローカルタイムライン無効オプションをグローバルタイムライン無効オプションと分離
+* モデレータはLTL無効時でもUIからLTLを消さない
+* インスタンス情報ページに各種タイムラインの有効/無効を表示
+
+10.76.0
+----------
+* disableLocalTimeline機能を強化
+* インスタンス情報ページの強化
+* ハッシュタグ判定の強化
+* SVGサムネイルを表示するように
+* CWの引き継ぎ機能を無効化
+
+10.75.0
+----------
+* ダイレクトを非公開のように使えるように
+* モデレーターを凍結できないように
+* モデレーター登録を解除できるように
+* NSFWなメディアをユーザーページなどで表示しないように
+* 管理画面でユーザーを状態でフィルタできるように
+* 管理者がサインイン履歴を参照できるツール
+* Renote数を再度表示するように
+* インスタンス情報ページの追加
+* テーマの調整
+* UIの改善
+
+10.74.0
+----------
+* Pleromaとのフェデレーションを修正
+* インスタンスのキャラクター画像を設定できるように
+* Catモードの朝鮮語対応
+* CWが付いた投稿に返信する際、そのCWを引き継ぐように
+* 投稿のソースをクリップボードにコピーできるように
+* i/notifications API で取得する通知の種別を配列で指定できるように
+* パフォーマンスの改善
+* バグ修正
+
 10.73.0
 -------
 * テーマの強化
--- a/README.md
+++ b/README.md
@@ -7,13 +7,13 @@
 [![Dependencies](https://img.shields.io/david/syuilo/misskey.svg?style=for-the-badge)](https://david-dm.org/syuilo/misskey)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge)](http://makeapullrequest.com)

-**Sophisticated microblogging platform, evolving forever.**
+**A forever evolving, sophisticated microblogging platform.**

 <p align="justify">
 <a href="https://misskey.xyz">Misskey</a> is a decentralized microblogging platform born on Earth.
 Since it exists within the Fediverse (a universe where various social media platforms are organized),
 it is mutually linked with other social media platforms.
-Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://joinmisskey.github.io/">Find instance!</a>
+Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://joinmisskey.github.io/">Find an instance!</a>
 </p>

 <a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
@@ -27,7 +27,7 @@ Why don't you take a short break from the hustle and bustle of the city, and div

 <h3 align="left">Posting</h3>
 <p align="justify">
-Just post your idea, hot topics and anything you want to share. You may decorate your words, attach your favorite pictures or movies, and create a poll - those are all supported in Misskey!
+Post your ideas, discussion topics, fun moments, or anything else you want to share! Misskey supports text, emoji, pictures, videos, and polls!
 </p>

 ---
@@ -36,7 +36,7 @@ Just post your idea, hot topics and anything you want to share. You may decorate

 <h3 align="right">Reactions</h3>
 <p align="justify">
-The simplest way to tell your emotions to the posts. You can choose the best reaction from various reactions. Reactions on Misskey has much more expressive than other social media which only allows pushing “likes”.
+Reactions are the simplest way to respond to others' posts. Simply pick a reaction emote from the list! Reactions on Misskey are much more expressive than other social media services which only allow “liking”.
 </p>

 ---
@@ -45,7 +45,7 @@ The simplest way to tell your emotions to the posts. You can choose the best rea

 <h3 align="left">Interface</h3>
 <p align="justify">
-Highly customizable UI for your taste. We understand no UI fits for everyone. Make your graceful home by editing, adjusting layouts of timeline, and placing widgets.
+Customize the UI to your own tastes! No UI will work for everyone, so Misskey is completely customizable. Make Misskey *yours* by editing the style, adjusting timeline layouts, and placing widgets.
 </p>

 ---
@@ -54,35 +54,51 @@ Highly customizable UI for your taste. We understand no UI fits for everyone. Ma

 <h3 align="right">Misskey Drive</h3>
 <p align="justify">
-Organized uploaded files. Wanna post a picture you have already uploaded? Wish to create a folder for your files? Misskey Drive is the best solution for you.
+Organize and store your files! Want to post a picture you have already uploaded? Wish you could organize your files into folders? Misskey Drive is a solution!
 </p>

 ---

-and more! Now it's time to experience the world with your own eyes at [misskey.xyz](https://misskey.xyz) or [other instances](https://joinmisskey.github.io/).
+...and more! Experience Misskey with your own eyes at [misskey.xyz](https://misskey.xyz) or join one of the [other instances](https://joinmisskey.github.io/) that are available.

 :package: Create your own instance
 ----------------------------------------------------------------
-Please see [Setup and installation guide](./docs/setup.en.md).
+Please see the [Setup and Installation Guide](./docs/setup.en.md).

 :wrench: Contribution
 ----------------------------------------------------------------
-Please see [Contribution guide](./CONTRIBUTING.md).
+Please see the [Contribution Guide](./CONTRIBUTING.md).
+
+### Collaborators
+<table>
+	<tr>
+		<td><img src="https://avatars3.githubusercontent.com/u/4439005?s=460&v=4" alt="syuilo" width="100"></td>
+		<td><img src="https://avatars0.githubusercontent.com/u/10798641?s=460&v=4" alt="AyaMorisawa" width="100"></td>
+		<td><img src="https://avatars1.githubusercontent.com/u/30769358?s=460&v=4" alt="mei23" width="100"></td>
+		<td><img src="https://avatars2.githubusercontent.com/u/20679825?s=460&v=4" alt="acid-chicken" width="100"></td>
+	</tr>
+	<tr>
+		<td align="center"><a href="https://github.com/syuilo">@syuilo</a></td>
+		<td align="center"><a href="https://github.com/AyaMorisawa">@AyaMorisawa</a></td>
+		<td align="center"><a href="https://github.com/mei23">@mei23</a></td>
+		<td align="center"><a href="https://github.com/acid-chicken">@acid-chicken</a></td>
+	</tr>
+</table>

 :heart: Backers & Sponsors
 ----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/1?token-time=2145916800&token-hash=Zeh1u6l_Vmgoy8A1eT1Sltea-_SZSq8t8uOWDRZRh94%3D" alt="weep"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13376668/71f3cf87ec6c4393a44b1b9df5ee3d12/1?token-time=2145916800&token-hash=7pSmWqgMfMSJHVIEcNsuuQoKeU3TRluew5p0EGTzWA4%3D" alt="Arctic"></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" alt="negao"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/2?token-time=2145916800&token-hash=mgPdX9TqZxEg4TTPuc477dxhIgYk9246qafjWZEqZ7g%3D" alt="Melilot"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12999811/5f349fafcce44dd1824a8b1ebbec4564/3?token-time=2145916800&token-hash=ybYtxfpte1b-rGg6Zecpys2ZdZDtwR_UNJHQjt-3eoU%3D" alt="Xeltica"></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://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/1?token-time=2145916800&token-hash=WeuDzzz24cRXJogyIkU-mxARqkdyms-rcZKbO-GpGjw%3D" alt="weep" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/12059069" alt="naga_rus" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=prtYqPOiSHBulhM7NU0VzMaWx39-9ntdq25b6kafDNA%3D" alt="negao" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/3?token-time=2145916800&token-hash=c8HeVqLtmdgH-gSBJg8i10gmOcwllM87MDHeznl3el0%3D" alt="Melilot" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12999811/5f349fafcce44dd1824a8b1ebbec4564/3?token-time=2145916800&token-hash=LtV2lRi3L2jOWMLwccr9qWYfPrFlzIo2jYZHKzHEb6k%3D" alt="Xeltica" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/3384329/8b713330cb27404ea6e9fac50ff96efe/1?token-time=2145916800&token-hash=Ch3iF81ZGP0LMo894Y9ajpLisgtE91SnxtZE7fxsgrM%3D" alt="べすれい" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=1FlxS9MEgmNGH_RHUVHbO5hIXB5I1z0lvA33CTvYvjA%3D" alt="gutfuckllc" width="100"></td>
 </tr><tr>
 <td><a href="https://www.patreon.com/weepjp">weep</a></td>
-<td><a href="https://www.patreon.com/user?u=13376668">Arctic</a></td>
+<td><a href="https://www.patreon.com/user?u=12059069">naga_rus</a></td>
 <td><a href="https://www.patreon.com/negao">negao</a></td>
 <td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
 <td><a href="https://www.patreon.com/Xeltica">Xeltica</a></td>
@@ -90,27 +106,31 @@ Please see [Contribution guide](./CONTRIBUTING.md).
 <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/11357794/923ce94cd8c44ba788ee931907881839/1?token-time=2145916800&token-hash=I8lJVM8LeW6TSo5W6uIIRZ42cw83zp1wK_FsbzY0mcQ%3D" alt="mydarkstar"></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>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3?token-time=2145916800&token-hash=qsdn0-e6yLaLI6hUX9JAkyTR6a5UdnSp7T1foniBvGQ%3D" alt="YUKIMOCHI"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/8241184/39e18850e87a449e9c9a71acb3310ebd/2?token-time=2145916800&token-hash=iUXOQzRyJDv3PJxwS7Mjwg1459dzh2trOq6NFtXu_OM%3D" alt="Acid Chicken"></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/10789744/97175095d8f04c0f86225ff47cb98d40/1?token-time=2145916800&token-hash=P4BIzCX2I1CkEP66ottfhsC8Wr6BUSamjA-vq3pLqFI%3D" alt="Naoki Hirayama"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1?token-time=2145916800&token-hash=0xgcpqvFDqRcV_YIEhcPNVH7gs9sLg_BBnTJXCkN4ao%3D" alt="mydarkstar" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/12718187" alt="Peter G." width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/16542964" alt="Takumi Sugita" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=2PsbFNw0tnubZzgSXD01R6hIgncfiElG7H7HX2Y3dyo%3D" alt="nemu" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3?token-time=2145916800&token-hash=9JtETp0X8gI280Ne1E8bxn6j4Lw5o2k4mJkICx97V_k%3D" alt="YUKIMOCHI" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/8241184/39e18850e87a449e9c9a71acb3310ebd/3?token-time=2145916800&token-hash=gMq30aylxu5v3G8pRhWR5jeRBbYWEoRKjGbNeiCQz5g%3D" alt="Acid Chicken" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/2?token-time=2145916800&token-hash=zcwFxb2zopzWwksKVU1YpfAEjsl4yKT02aQ6yiAFRiQ%3D" alt="natalie" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=5T8XcaAf9Zyzfg3QubR06s_kJZkArVEM2dwObrBVAU4%3D" alt="Hiratake" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/10789744/97175095d8f04c0f86225ff47cb98d40/1?token-time=2145916800&token-hash=ubVARikVOg3v7NW6LDhtG-ClE1LTU3I2TJ3js2-5xDs%3D" alt="Naoki Hirayama" width="100"></td>
 </tr><tr>
 <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</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=16542964">Takumi Sugita</a></td>
 <td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
 <td><a href="https://www.patreon.com/acid_chicken">Acid Chicken</a></td>
+<td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
 <td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
 <td><a href="https://www.patreon.com/spinlock">Naoki Hirayama</a></td>
 </tr></table>
 <table><tr>
-<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/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=tB1e_r8RlZ5sFL0KV_e8dugapxatNBRK1Z3h67TO1g8%3D" alt="Gargron"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1?token-time=2145916800&token-hash=VZUtwrjQa8Jml4twCjHYQQZ64wHEY4oIlGl7Kc-VYUQ%3D" alt="Nokotaro Takeda"></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>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=Ksk_2l3gjPDbnzMUOCSW1E-hdPJsNs2tSR4_RAakRK8%3D" alt="dansup" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=CXe9AqlZy9AsYfiWd3OBYVOzvODoN47Litz0Tu4BFpU%3D" alt="Gargron" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1?token-time=2145916800&token-hash=xhR1n6NAAyEb-IUXLD6_dshkFa3mefU5ZZuk1L8qKTs%3D" alt="Nokotaro Takeda" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=uR-48MQ0A4j0irQSrCAQZJ-sJUSs_Fkihlg3-l59b7c%3D" alt="Takashi Shibuya" width="100"></td>
 </tr><tr>
 <td><a href="https://www.patreon.com/dansup">dansup</a></td>
 <td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
@@ -118,14 +138,14 @@ Please see [Contribution guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>

-**Last updated:** Tue, 25 Dec 2018 04:58:06 UTC
+**Last updated:** Mon, 21 Jan 2019 06:45:06 UTC
 <!-- PATREON_END -->

 :four_leaf_clover: Copyright
 ----------------------------------------------------------------
-> Copyright (c) 2014-2018 syuilo
+> Copyright (c) 2014-2019 syuilo

-Misskey is an open-source software licensed under the [GNU AGPLv3](LICENSE).
+Misskey is open-source software licensed under the [GNU AGPLv3](LICENSE).

 [![][agpl-3.0-badge]][AGPL-3.0]

--- a/docs/docker.en.md
+++ b/docs/docker.en.md
@@ -17,7 +17,7 @@ This guide describes how to install and setup Misskey with Docker.
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
 2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` Copy the `.config/mongo_initdb_example.js` and rename it to `mongo_initdb.js`.
-2. Edit `default.yml` and `mongo_initdb.js`.
+3. Edit `default.yml` and `mongo_initdb.js`.

 *3.* Configure Docker
 ----------------------------------------------------------------
--- a/docs/docker.fr.md
+++ b/docs/docker.fr.md
@@ -0,0 +1,67 @@
+Guide Docker
+================================================================
+
+Ce guide explique comment installer et configurer Misskey avec Docker.
+
+[Version japonaise également disponible - Japanese version also available - 日本語版もあります](./docker.ja.md)  
+[Version anglaise également disponible - English version also available - 英語版もあります](./docker.en.md)
+
+----------------------------------------------------------------
+
+*1.* Télécharger Misskey
+----------------------------------------------------------------
+1. `git clone -b master git://github.com/syuilo/misskey.git` Clone le dépôt de Misskey sur la branche master.
+2. `cd misskey` Naviguez dans le dossier du dépôt.
+3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout sur le tag de la [dernière version](https://github.com/syuilo/misskey/releases/latest).
+
+*2.* Configuration de Misskey
+----------------------------------------------------------------
+1. `cp .config/example.yml .config/default.yml` Copiez le fichier `.config/example.yml` et renommez-le `default.yml`.
+2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` Copie le fichier `.config/mongo_initdb_example.js` et le renomme en `mongo_initdb.js`.
+3. Editez `default.yml` et `mongo_initdb.js`.
+
+*3.* Configurer Docker
+----------------------------------------------------------------
+Editez `docker-compose.yml`.
+
+*4.* Contruire Misskey
+----------------------------------------------------------------
+Contruire l'image Docker avec:
+
+`docker-compose build`
+
+*5.* C'est tout !
+----------------------------------------------------------------
+Parfait, Vous avez un environnement prêt pour démarrer Misskey.
+
+### Lancer normalement
+Utilisez la commande `docker-compose up -d`. GLHF!
+
+### How to update your Misskey server to the latest version
+1. `git fetch`
+2. `git stash`
+3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+4. `git stash pop`
+5. `docker-compose build`
+6. Consultez le [ChangeLog](../CHANGELOG.md) pour avoir les éventuelles informations de migration
+7. `docker-compose stop && docker-compose up -d`
+
+### Comment exécuter des [commandes](manage.fr.md)
+`docker-compose run --rm web node cli/mark-admin @example`
+
+### Configuration d'ElasticSearch (pour la fonction de recherche)
+*1.* Préparation de l'environnement
+----------------------------------------------------------------
+1. `mkdir elasticsearch && chown 1000:1000 elasticsearch` Permet de créer le dossier d'accueil de la base ElasticSearch aves les bons droits
+2. `sysctl -w vm.max_map_count=262144` Augmente la valeur max du paramètre map_count du système (valeur minimum pour pouvoir lancer ES)
+
+*2.* Après lancement du docker-compose, initialisation de la base ElasticSearch
+----------------------------------------------------------------
+1. `docker-compose -it web /bin/sh` Connexion dans le conteneur web
+2. `apk add curl` Ajout du paquet curl
+3. `curl -X PUT "es:9200/misskey" -H 'Content-Type: application/json' -d'{ "settings" : { "index" : { } }}'` Création de la base ES
+4. `exit`
+
+----------------------------------------------------------------
+
+Si vous avez des questions ou des problèmes, n'hésitez pas à nous contacter !
--- a/docs/manage.fr.md
+++ b/docs/manage.fr.md
@@ -0,0 +1,18 @@
+# Guide d'administration
+
+## Vérifier le status de la file d'attente des taches
+coming soon
+
+## Marquer un utilisateur en tant que 'admin'
+``` shell
+node cli/mark-admin (ID utilisateur ou nom d'utilisateur)
+```
+
+Exemple :
+``` shell
+# Par id
+node cli/mark-admin 57d01a501fdf2d07be417afe
+
+# Par nom d'utilisateur
+node cli/suspend @syuilo
+```
--- a/docs/setup.en.md
+++ b/docs/setup.en.md
@@ -110,6 +110,8 @@ You can check if the service is running with `systemctl status misskey`.
 3. `npm install`
 4. `npm run build`
 5. Check [ChangeLog](../CHANGELOG.md) for migration information
+6. Restart your Misskey process to apply changes
+7. Enjoy

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

--- a/docs/setup.fr.md
+++ b/docs/setup.fr.md
@@ -10,8 +10,8 @@ Ce guide décrit les étapes à suivre afin d'installer et de configurer une ins

 *1.* Création de l'utilisateur Misskey
 ----------------------------------------------------------------
-Lancer misskey en tant qu'utilisateur est une mauvaise idée, nous avons besoin de créer un utilisateur dédié.
-Sur Debian, à titre d'exemple :
+Executer misskey en tant que super-utilisateur étant une mauvaise idée, nous allons créer un utilisateur dédié.
+Sous Debian, par exemple :

 ```
 adduser --disabled-password --disabled-login misskey
@@ -32,10 +32,10 @@ Installez les paquets suivants :

 *3.* Paramètrage de MongoDB
 ----------------------------------------------------------------
-En mode root :
-1. `mongo` Accédez au shell de mango
+En root :
+1. `mongo` Ouvrez le shell mongo
 2. `use misskey` Utilisez la base de données misskey
-3. `db.users.save( {dummy:"dummy"} )` Write dummy data to initialize the db.
+3. `db.users.save( {dummy:"dummy"} )` Écrivez une donnée factice pour initialiser la base de données.
 4. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` Créez l'utilisateur misskey.
 5. `exit` Vous avez terminé !

@@ -44,12 +44,12 @@ En mode root :
 1. `su - misskey` Basculez vers l'utilisateur misskey.
 2. `git clone -b master git://github.com/syuilo/misskey.git` Clonez la branche master du dépôt misskey.
 3. `cd misskey` Accédez au dossier misskey.
-4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Télécharge la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
+4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
 5. `npm install` Installez les dépendances de misskey.

 *5.* Création du fichier de configuration
 ----------------------------------------------------------------
-1. `cp .config/example.yml .config/default.yml` Copiez le fichier `.config/example.yml` et renommez-le `default.yml`.
+1. `cp .config/example.yml .config/default.yml` Copiez le fichier `.config/example.yml` et renommez-le`default.yml`.
 2. Editez le fichier `default.yml`

 *6.* Construction de Misskey
@@ -59,7 +59,7 @@ Construisez Misskey comme ceci :

 `npm run build`

-Si vous êtes sous Debian, vous serez amené à installer les paquets `build-essential`, `python`.
+Si vous êtes sous Debian, vous serez amené à installer les paquets `build-essential` et `python`.

 Si vous rencontrez des erreurs concernant certains modules, utilisez node-gyp:

@@ -77,7 +77,7 @@ Lancez tout simplement `npm start`. Bonne chance et amusez-vous bien !

 ### Démarrage avec systemd

-1. Créez une service systemd sur : `/etc/systemd/system/misskey.service`
+1. Créez un service systemd sur : `/etc/systemd/system/misskey.service`
 2. Editez-le puis copiez et coller ceci dans le fichier :

 ```
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
  load-more: "もっと読み込む"
  enter-password: "パスワードを入力してください"
+  2fa: "二段階認証"
  got-it: "わかった"
  customization-tips:
    title: "カスタマイズのヒント"
@@ -120,6 +121,12 @@ common:
  reduce-motion: "UIの動きを減らす"
  this-setting-is-this-device-only: "このデバイスのみ"
  use-os-default-emojis: "OS標準の絵文字を使用"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
+  hide-password: "パスワードを隠す"
+  show-password: "パスワードを表示する"
  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
  user-suspended: "このユーザーは凍結されています。"
  is-remote-user: "このユーザー情報はコピーです。"
@@ -333,6 +340,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "メンション"
  detail: "詳細"
+  copy-content: "内容をコピー"
  copy-link: "リンクをコピー"
  favorite: "お気に入り"
  unfavorite: "お気に入り解除"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "削除"
  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"
+common/views/components/user-menu.vue:
+  mention: "メンション"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  report-abuse: "スパムを報告"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
  vote-to: "「{}」に投票する"
  vote-count: "{}票"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "セキュリティ"
  signin: "サインイン履歴"
  password: "パスワード"
-  2fa: "二段階認証"
  other: "その他"
  license: "ライセンス"
  theme: "テーマ"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
  auto-popout: "ウィンドウの自動ポップアウト"
  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  advanced: "詳細設定"
-  api-via-stream: "ストリームを経由したAPIリクエスト"
-  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
  deck-default: "デッキをデフォルトのUIにする"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "ダークモード"
  use-shadow: "UIに影を使用"
  rounded-corners: "UIの角を丸める"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "円形のアイコンを使用"
  contrasted-acct: "ユーザー名にコントラストを付ける"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
+  abuse: "スパム報告"
  back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
  dashboard: "ダッシュボード"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "インスタンス"
  this-instance: "このインスタンス"
  federated: "連合"
+admin/views/abuse.vue:
+  title: "スパム報告"
+  target: "対象"
+  reporter: "報告者"
+  details: "詳細"
+  remove-report: "削除"
 admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "投稿の最大文字数"
  disable-registration: "ユーザー登録の受付を停止する"
  disable-local-timeline: "ローカルタイムラインを無効にする"
+  disable-global-timeline: "グローバルタイムラインを無効にする"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "招待"
  save: "保存"
  saved: "保存しました"
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "投稿の積算"
    users: "ユーザーの増減"
    users-total: "ユーザーの積算"
+    active-users: "アクティブユーザー数"
    drive: "ドライブ使用量の増減"
    drive-total: "ドライブ使用量の積算"
    drive-files: "ドライブのファイル数の増減"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "ファイルIDまたはファイルURL"
+  file-not-found: "ファイルが見つかりません"
+  lookup: "照会"
  sort:
    title: "ソート"
    createdAtAsc: "アップロード日時が古い順"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "削除しました"
  mark-as-sensitive: "閲覧注意に設定"
  unmark-as-sensitive: "閲覧注意を解除"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
  operation: "操作"
  username-or-userid: "ユーザー名またはユーザーID"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "登録日時が新しい順"
      updatedAtAsc: "更新日時が古い順"
      updatedAtDesc: "更新日時が新しい順"
+    state:
+      title: "状態"
+      all: "すべて"
+      admin: "管理者"
+      moderator: "モデレーター"
+      adminOrModerator: "管理者+モデレーター"
+      verified: "公式アカウント"
+      suspended: "凍結済み"
    origin:
      title: "オリジン"
      combined: "ローカル+リモート"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
+    remove: "解除"
+    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "写真はありません"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "フォローされています"
-  stalk: "ストークする"
-  stalking: "ストーキングしています"
-  unstalk: "ストーク解除"
-  mute: "ミュートする"
-  muted: "ミュートしています"
-  unmute: "ミュート解除"
-  block: "ブロックする"
-  unblock: "ブロック解除"
-  block-confirm: "このユーザーをブロックしますか？"
-  push-to-a-list: "リストに追加"
-  list-pushed: "{user}を{list}に追加しました。"
+  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  is-bot: "このアカウントはBotです"
  years-old: "{age}歳"
  year: "年"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "概要"
  timeline: "タイムライン"
  media: "メディア"
-  mute: "ミュート"
-  unmute: "ミュート解除"
-  block: "ブロック"
-  unblock: "ブロック解除"
  years-old: "{age}歳"
-  push-to-list: "リストに追加"
-  select-list: "リストを選択してください"
-  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  images: "画像"
  activity: "アクティビティ"
  timeline: "タイムライン"
  pinned-notes: "ピン留めされた投稿"
-  push-to-a-list: "リストに追加"
 docs:
  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
  edit-this-page-on-github-link: "このページをGitHubで編集"
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
  load-more: "もっと読み込む"
  enter-password: "パスワードを入力してください"
+  2fa: "二段階認証"
  got-it: "Verstanden!"
  customization-tips:
    title: "Anpassung-Tipps"
@@ -120,6 +121,12 @@ common:
  reduce-motion: "Animationen der Benutzeroberfläche reduzieren"
  this-setting-is-this-device-only: "Nur auf diesem Gerät"
  use-os-default-emojis: "OS標準の絵文字を使用"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
+  hide-password: "パスワードを隠す"
+  show-password: "パスワードを表示する"
  do-not-use-in-production: "Dies ist eine Entwicklungsversion. Nicht in einer Produktionsumgebung verwenden."
  user-suspended: "このユーザーは凍結されています。"
  is-remote-user: "このユーザー情報はコピーです。"
@@ -333,6 +340,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "メンション"
  detail: "詳細"
+  copy-content: "内容をコピー"
  copy-link: "リンクをコピー"
  favorite: "Diese Notiz favorisieren"
  unfavorite: "Aus Favoriten entfernen"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "Löschen"
  delete-confirm: "Diesen Post löschen?"
  remote: "Auf Quelle anzeigen"
+common/views/components/user-menu.vue:
+  mention: "メンション"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  report-abuse: "スパムを報告"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
  vote-to: "Stimme für '{}'"
  vote-count: "{} Stimmen"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "Sicherheit"
  signin: "サインイン履歴"
  password: "Passwort"
-  2fa: "Zwei-Faktor-Authentifizierung"
  other: "Anderes"
  license: "Lizenz"
  theme: "テーマ"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
  auto-popout: "Automatische Pop-out Fenster"
  auto-popout-desc: "Pop-out ein offenes Fenster wenn möglich. Diese Einstellung wird im Browser gespeichert."
-  advanced: "Erweiterte Einstellungen"
-  api-via-stream: "API-Anfrage via stream"
-  api-via-stream-desc: "API-Anfrage über WebSocket statt native Aktualisierungs-API (für bessere Leistung). Diese Einstellung wird im Browser gespeichert."
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
  deck-default: "デッキをデフォルトのUIにする"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "Nacht Modus"
  use-shadow: "UIに影を使用"
  rounded-corners: "Abgerundete Ecken"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "Kreisförmige Icons"
  contrasted-acct: "ユーザー名にコントラストを付ける"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
+  abuse: "スパム報告"
  back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
  dashboard: "ダッシュボード"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "インスタンス"
  this-instance: "このインスタンス"
  federated: "連合"
+admin/views/abuse.vue:
+  title: "スパム報告"
+  target: "対象"
+  reporter: "報告者"
+  details: "詳細"
+  remove-report: "削除"
 admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "投稿の最大文字数"
  disable-registration: "ユーザー登録の受付を停止する"
  disable-local-timeline: "ローカルタイムラインを無効にする"
+  disable-global-timeline: "グローバルタイムラインを無効にする"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "招待"
  save: "保存"
  saved: "保存しました"
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "投稿の積算"
    users: "ユーザーの増減"
    users-total: "ユーザーの積算"
+    active-users: "アクティブユーザー数"
    drive: "ドライブ使用量の増減"
    drive-total: "ドライブ使用量の積算"
    drive-files: "ドライブのファイル数の増減"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "ファイルIDまたはファイルURL"
+  file-not-found: "ファイルが見つかりません"
+  lookup: "照会"
  sort:
    title: "ソート"
    createdAtAsc: "アップロード日時が古い順"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "削除しました"
  mark-as-sensitive: "閲覧注意に設定"
  unmark-as-sensitive: "閲覧注意を解除"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
  operation: "操作"
  username-or-userid: "ユーザー名またはユーザーID"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "登録日時が新しい順"
      updatedAtAsc: "更新日時が古い順"
      updatedAtDesc: "更新日時が新しい順"
+    state:
+      title: "状態"
+      all: "すべて"
+      admin: "管理者"
+      moderator: "モデレーター"
+      adminOrModerator: "管理者+モデレーター"
+      verified: "公式アカウント"
+      suspended: "凍結済み"
    origin:
      title: "オリジン"
      combined: "ローカル+リモート"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
+    remove: "解除"
+    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "写真はありません"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "フォローされています"
-  stalk: "ストークする"
-  stalking: "ストーキングしています"
-  unstalk: "ストーク解除"
-  mute: "ミュートする"
-  muted: "ミュートしています"
-  unmute: "ミュート解除"
-  block: "ブロックする"
-  unblock: "ブロック解除"
-  block-confirm: "このユーザーをブロックしますか？"
-  push-to-a-list: "リストに追加"
-  list-pushed: "{user}を{list}に追加しました。"
+  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  is-bot: "このアカウントはBotです"
  years-old: "{age}歳"
  year: "年"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "概要"
  timeline: "タイムライン"
  media: "メディア"
-  mute: "ミュート"
-  unmute: "ミュート解除"
-  block: "ブロック"
-  unblock: "ブロック解除"
  years-old: "{age}歳"
-  push-to-list: "リストに追加"
-  select-list: "リストを選択してください"
-  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  images: "画像"
  activity: "アクティビティ"
  timeline: "タイムライン"
  pinned-notes: "ピン留めされた投稿"
-  push-to-a-list: "リストに追加"
 docs:
  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
  edit-this-page-on-github-link: "このページをGitHubで編集"
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "Please do not enter or paste the code here. Account may be compromised."
  load-more: "Load more"
  enter-password: "Please enter the Password"
+  2fa: "Two-factor authentication"
  got-it: "Got it!"
  customization-tips:
    title: "Customization tips"
@@ -120,11 +121,17 @@ common:
  reduce-motion: "Reduce motion in UI"
  this-setting-is-this-device-only: "Only for this device"
  use-os-default-emojis: "Use the OS default Emojis"
+  line-width: "Line thickness"
+  line-width-thin: "Thin"
+  line-width-normal: "Regular"
+  line-width-thick: "Thick"
+  hide-password: "Hide Password"
+  show-password: "Show Password"
  do-not-use-in-production: "This is a development build. Do not use in production."
  user-suspended: "This user has been suspended."
-  is-remote-user: "This user information is copied."
-  is-remote-post: "This post information is a copy."
-  view-on-remote: "View it on remote"
+  is-remote-user: "This user's information is mirrored."
+  is-remote-post: "These post contents are mirrored."
+  view-on-remote: "For completion, view it remotely."
  renoted-by: "Renoted by {user}"
  error:
    title: "Something happened :("
@@ -333,6 +340,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "Mention"
  detail: "Details"
+  copy-content: "Copy the contents"
  copy-link: "Copy link"
  favorite: "Favorite this note"
  unfavorite: "Unfavorite"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "Delete"
  delete-confirm: "Are you sure you want to delete this post?"
  remote: "Show original note"
+common/views/components/user-menu.vue:
+  mention: "Mention"
+  mute: "Mute"
+  unmute: "Unmute"
+  block: "Block"
+  unblock: "Unblock"
+  push-to-list: "Add to list"
+  select-list: "Select a list"
+  report-abuse: "Report abuse"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
  vote-to: "Vote for '{}'"
  vote-count: "{} votes"
@@ -602,8 +621,8 @@ desktop/views/components/drive.file.vue:
    copy-url: "Copy URL"
    download: "Download"
    else-files: "Others"
-    set-as-avatar: "Set as avatar"
-    set-as-banner: "Set as banner"
+    set-as-avatar: "Set as an avatar"
+    set-as-banner: "Set as a banner"
    open-in-app: "Open in app"
    add-app: "Add app"
    rename-file: "Rename file"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "Security"
  signin: "Sign in history"
  password: "Password"
-  2fa: "Two-factor authentication"
  other: "Other"
  license: "License"
  theme: "Theme"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "Example: https://www.google.com/?#q={{query}}"
  auto-popout: "Auto pop-out window"
  auto-popout-desc: "If it's possible, pop-out display will be used instead of opening a new window. This setting is stored in your browser."
-  advanced: "Advanced settings"
-  api-via-stream: "API request via stream"
-  api-via-stream-desc: "API request is performed via the WebSocket connection instead of native fetch API (for better performance). This setting is stored in the browser."
  deck-nav: "Transitionless deck navigation"
  deck-nav-desc: "You get a temporary column without page transitions during navigation when using the deck."
  deck-default: "Use Deck as default UI"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "Dark Mode"
  use-shadow: "Use shadows in the UI"
  rounded-corners: "Round corners of UI"
-  line-width: "Line thickness"
-  line-width-thin: "Thin"
-  line-width-normal: "Regular"
-  line-width-thick: "Thick"
  circle-icons: "Use circle icons"
  contrasted-acct: "Add contrast to username"
  post-form-on-timeline: "Display post form at the top of the timeline"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "Federation"
  announcements: "Announcements"
  hashtags: "Hashtags"
+  abuse: "Abuse"
  back-to-misskey: "Back to Misskey"
 admin/views/dashboard.vue:
  dashboard: "Dashboard"
@@ -987,11 +999,18 @@ admin/views/dashboard.vue:
  instances: "Instances"
  this-instance: "This instance"
  federated: "Federated"
+admin/views/abuse.vue:
+  title: "Abuse"
+  target: "Target"
+  reporter: "Reporter"
+  details: "Details"
+  remove-report: "Remove"
 admin/views/instance.vue:
  instance: "Instance"
  instance-name: "Instance name"
  instance-description: "Instance description"
  host: "Host"
+  logo-url: "Logo image URL"
  banner-url: "Banner image URL"
  error-image-url: "Error image URL"
  languages: "Language of this instance"
@@ -1033,6 +1052,8 @@ admin/views/instance.vue:
  max-note-text-length: "Maximum numbers of post characters"
  disable-registration: "Disable new user registration"
  disable-local-timeline: "Disable the Local Timeline"
+  disable-global-timeline: "Disable global timeline"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "Invite"
  save: "Save"
  saved: "Saved"
@@ -1065,7 +1086,7 @@ admin/views/charts.vue:
  federation: "Federation"
  notes: "Posts"
  users: "Users"
-  drive: "Drive"
+  drive: "Media storage"
  network: "Network"
  charts:
    federation-instances: "The number of instances: increase/decrease"
@@ -1076,6 +1097,7 @@ admin/views/charts.vue:
    notes-total: "Total posts"
    users: "The number of users: increase/decrease"
    users-total: "Total users"
+    active-users: "Active users"
    drive: "Capacity used as the storage: increase/decrease"
    drive-total: "Total usage of Drive"
    drive-files: "The number of files on the storage: increase/decrease"
@@ -1084,6 +1106,10 @@ admin/views/charts.vue:
    network-time: "Response time"
    network-usage: "Traffic"
 admin/views/drive.vue:
+  operation: "Operations"
+  fileid-or-url: "File ID or URL"
+  file-not-found: "File not found"
+  lookup: "Look up"
  sort:
    title: "Sort"
    createdAtAsc: "Age - Oldest First"
@@ -1099,6 +1125,8 @@ admin/views/drive.vue:
  deleted: "Deleted successfully"
  mark-as-sensitive: "Mark as 'sensitive'"
  unmark-as-sensitive: "Unmark as 'sensitive'"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
  operation: "Operations"
  username-or-userid: "Username or user ID"
@@ -1122,6 +1150,14 @@ admin/views/users.vue:
      createdAtDesc: "Date Registered (Descending)"
      updatedAtAsc: "Last Updated (Ascending)"
      updatedAtDesc: "Last Updated (Descending)"
+    state:
+      title: "Status"
+      all: "All"
+      admin: "Administrator"
+      moderator: "Moderator"
+      adminOrModerator: "Admin/Moderator"
+      verified: "Verified account"
+      suspended: "Suspended"
    origin:
      title: "Origin"
      combined: "Local + Remote"
@@ -1134,6 +1170,8 @@ admin/views/moderators.vue:
    title: "Register Moderator"
    add: "Register"
    added: "Registered a Moderator."
+    remove: "Discharge"
+    removed: "The moderator has been discharged"
 admin/views/emoji.vue:
  add-emoji:
    title: "Add emoji"
@@ -1215,22 +1253,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "No photos"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "Follows you"
-  stalk: "Stalk"
-  stalking: "Stalking"
-  unstalk: "Unstalk"
-  mute: "Mute"
-  muted: "Muting"
-  unmute: "Unmute"
-  block: "Block"
-  unblock: "Unblock"
-  block-confirm: "Are you sure block this user?"
-  push-to-a-list: "Add to list"
-  list-pushed: "Successfully added {user} to {list}."
+  menu: "Menu"
 desktop/views/pages/user/user.header.vue:
  posts: "Notes"
  following: "Following"
  followers: "Followers"
-  mention: "Mentions"
  is-bot: "This account is a Bot"
  years-old: "{age} years old"
  year: "/"
@@ -1471,14 +1498,7 @@ mobile/views/pages/user.vue:
  overview: "Overview"
  timeline: "Timeline"
  media: "Media"
-  mute: "Mute"
-  unmute: "Unmute"
-  block: "Block"
-  unblock: "Unblock"
  years-old: "{age} years old"
-  push-to-list: "Add to list"
-  select-list: "Select a list"
-  list-pushed: "Successfully added {user} to {list}."
 mobile/views/pages/user/home.vue:
  recent-notes: "Recent notes"
  images: "Images"
@@ -1524,12 +1544,10 @@ deck/deck.user-column.vue:
  posts: "Posts"
  following: "Following"
  followers: "Followers"
-  mention: "Mentions"
  images: "Images"
  activity: "Activity"
  timeline: "Timeline"
  pinned-notes: "Pinned posts"
-  push-to-a-list: "Add to list"
 docs:
  edit-this-page-on-github: "Found an error, or do you want to contribute to the documentation?"
  edit-this-page-on-github-link: "Edit this page at GitHub!"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "Por favor no copies código aquí. Tu cuenta puede resultar comprometida."
  load-more: "もっと読み込む"
  enter-password: "パスワードを入力してください"
+  2fa: "二段階認証"
  got-it: "¡Listo!"
  customization-tips:
    title: "Consejos de personalización"
@@ -120,6 +121,12 @@ common:
  reduce-motion: "UIの動きを減らす"
  this-setting-is-this-device-only: "このデバイスのみ"
  use-os-default-emojis: "OS標準の絵文字を使用"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
+  hide-password: "パスワードを隠す"
+  show-password: "パスワードを表示する"
  do-not-use-in-production: "Esto está en desarrollo, no usarlo para producción."
  user-suspended: "このユーザーは凍結されています。"
  is-remote-user: "このユーザー情報はコピーです。"
@@ -333,6 +340,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "メンション"
  detail: "Detalles"
+  copy-content: "内容をコピー"
  copy-link: "Copiar enlace"
  favorite: "Me gusta esta nota"
  unfavorite: "お気に入り解除"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "Borrar"
  delete-confirm: "¿Seguro que quieres borrar la publicación?"
  remote: "Ver el original"
+common/views/components/user-menu.vue:
+  mention: "メンション"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  report-abuse: "スパムを報告"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
  vote-to: "'{}' para votar"
  vote-count: "{} votos"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "Seguridad"
  signin: "Historial de inicios de sesión"
  password: "Contraseña"
-  2fa: "Autenticación de Doble-Factor"
  other: "Otros"
  license: "Licencia"
  theme: "テーマ"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
  auto-popout: "Ventana emergente automática"
  auto-popout-desc: "Muestra una ventana emergente si es posible. Esta configuración depende del navegador."
-  advanced: "Configuración avanzada"
-  api-via-stream: "Solicitar API por medio de un stream"
-  api-via-stream-desc: "Las peticiones de las API se realizan por conexiones WebSocket en lugar de las tradicionales (para una mejora en el rendimiento). Esta función depende del navegador."
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
  deck-default: "デッキをデフォルトのUIにする"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "Modo Nocturno"
  use-shadow: "UIに影を使用"
  rounded-corners: "UIの角を丸める"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "Usar iconos circulares"
  contrasted-acct: "ユーザー名にコントラストを付ける"
  post-form-on-timeline: "Mostrar el formulario de las entradas encima de la línea de tiempo"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
+  abuse: "スパム報告"
  back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
  dashboard: "ダッシュボード"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "インスタンス"
  this-instance: "このインスタンス"
  federated: "連合"
+admin/views/abuse.vue:
+  title: "スパム報告"
+  target: "対象"
+  reporter: "報告者"
+  details: "詳細"
+  remove-report: "削除"
 admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "投稿の最大文字数"
  disable-registration: "ユーザー登録の受付を停止する"
  disable-local-timeline: "ローカルタイムラインを無効にする"
+  disable-global-timeline: "グローバルタイムラインを無効にする"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "招待"
  save: "保存"
  saved: "保存しました"
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "投稿の積算"
    users: "ユーザーの増減"
    users-total: "ユーザーの積算"
+    active-users: "アクティブユーザー数"
    drive: "ドライブ使用量の増減"
    drive-total: "ドライブ使用量の積算"
    drive-files: "ドライブのファイル数の増減"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "ファイルIDまたはファイルURL"
+  file-not-found: "ファイルが見つかりません"
+  lookup: "照会"
  sort:
    title: "ソート"
    createdAtAsc: "アップロード日時が古い順"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "削除しました"
  mark-as-sensitive: "閲覧注意に設定"
  unmark-as-sensitive: "閲覧注意を解除"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
  operation: "操作"
  username-or-userid: "ユーザー名またはユーザーID"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "登録日時が新しい順"
      updatedAtAsc: "更新日時が古い順"
      updatedAtDesc: "更新日時が新しい順"
+    state:
+      title: "状態"
+      all: "すべて"
+      admin: "管理者"
+      moderator: "モデレーター"
+      adminOrModerator: "管理者+モデレーター"
+      verified: "公式アカウント"
+      suspended: "凍結済み"
    origin:
      title: "オリジン"
      combined: "ローカル+リモート"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
+    remove: "解除"
+    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "写真はありません"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "フォローされています"
-  stalk: "ストークする"
-  stalking: "ストーキングしています"
-  unstalk: "ストーク解除"
-  mute: "ミュートする"
-  muted: "ミュートしています"
-  unmute: "ミュート解除"
-  block: "ブロックする"
-  unblock: "ブロック解除"
-  block-confirm: "このユーザーをブロックしますか？"
-  push-to-a-list: "リストに追加"
-  list-pushed: "{user}を{list}に追加しました。"
+  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  is-bot: "このアカウントはBotです"
  years-old: "{age}歳"
  year: "年"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "概要"
  timeline: "タイムライン"
  media: "メディア"
-  mute: "ミュート"
-  unmute: "ミュート解除"
-  block: "ブロック"
-  unblock: "ブロック解除"
  years-old: "{age}歳"
-  push-to-list: "リストに追加"
-  select-list: "リストを選択してください"
-  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  images: "画像"
  activity: "アクティビティ"
  timeline: "タイムライン"
  pinned-notes: "ピン留めされた投稿"
-  push-to-a-list: "リストに追加"
 docs:
  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
  edit-this-page-on-github-link: "このページをGitHubで編集"
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "Veuillez ne pas entrer ou coller le code ici. Le compte pourrait être compromis."
  load-more: "Charger plus"
  enter-password: "Veuillez entrer le mot de passe"
+  2fa: "Authentification à deux facteurs"
  got-it: "J’ai compris !"
  customization-tips:
    title: "Conseils de personnalisation"
@@ -109,10 +110,10 @@ common:
  my-token-regenerated: "Votre jeton vient d’être généré, vous allez maintenant être déconnecté."
  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"
-  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
+  use-avatar-reversi-stones: "Utiliser l’avatar comme pion dans Reversi"
  verified-user: "Compte vérifié"
  disable-animated-mfm: "Désactiver les textes animés dans les publications"
-  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
+  suggest-recent-hashtags: "Suggérer les hashtags récemment utilisés dans le champs de saisie"
  always-show-nsfw: "Toujours afficher les contenus sensibles"
  always-mark-nsfw: "Toujours marquer les notes ayant des attachements comme sensibles"
  show-full-acct: "Afficher l’adresse complète de l’utilisateur"
@@ -120,8 +121,14 @@ common:
  reduce-motion: "Réduire les animations dans l’interface utilisateur"
  this-setting-is-this-device-only: "Uniquement sur cet appareil"
  use-os-default-emojis: "Utiliser les émojis standards du système"
+  line-width: "Epaisseur du trait"
+  line-width-thin: "Fine"
+  line-width-normal: "Normale"
+  line-width-thick: "Épaisse"
+  hide-password: "Masquer le mot de passe"
+  show-password: "Afficher le mot de passe"
  do-not-use-in-production: "Il s’agit d’une version de développement. Ne pas utiliser dans un environnement de production."
-  user-suspended: "このユーザーは凍結されています。"
+  user-suspended: "Cet·te utilisateur·trice a été suspendu·e"
  is-remote-user: "Ces informations appartiennent à un utilisateur distant."
  is-remote-post: "Ceci est une publication distante."
  view-on-remote: " Consulter le profil complet"
@@ -260,7 +267,7 @@ common/views/components/media-banner.vue:
  sensitive: "Contenu sensible"
  click-to-show: "Cliquer pour afficher"
 common/views/components/theme.vue:
-  theme: "テーマ"
+  theme: "Thème"
  light-theme: "Thème en mode jour"
  dark-theme: "Thème en mode nuit"
  light-themes: "Thème clair"
@@ -277,7 +284,7 @@ common/views/components/theme.vue:
  base-theme: "Thème de base"
  base-theme-light: "Clair"
  base-theme-dark: "Sombre"
-  find-more-theme: "その他のテーマを入手"
+  find-more-theme: "Obtenir d’autres thèmes"
  theme-name: "Nom du Thème"
  preview-created-theme: "Prévisualisation"
  invalid-theme: "Thème n’est pas valide."
@@ -301,7 +308,7 @@ common/views/components/cw-button.vue:
  show: "Voir plus"
  chars: "{count} caractères"
  files: "{count} fichiers"
-  poll: "アンケート"
+  poll: "Sondage"
 common/views/components/messaging.vue:
  search-user: "Trouver un utilisateur"
  you: "Vous"
@@ -331,8 +338,9 @@ common/views/components/nav.vue:
  develop: "Développeurs"
  feedback: "Suggestions"
 common/views/components/note-menu.vue:
-  mention: "メンション"
+  mention: "Mention"
  detail: "Détails"
+  copy-content: "Copier le contenu"
  copy-link: "Copier le lien"
  favorite: "Mettre cette note en favoris"
  unfavorite: "Retirer des favoris"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "Supprimer"
  delete-confirm: "Supprimer cette publication ?"
  remote: "Afficher la note originale"
+common/views/components/user-menu.vue:
+  mention: "Mention"
+  mute: "Silencier"
+  unmute: "Enlever la sourdine"
+  block: "Bloquer"
+  unblock: "Débloquer"
+  push-to-list: "Ajouter à une liste"
+  select-list: "Sélectionnez une liste"
+  report-abuse: "Signaler un abus"
+  report-abuse-detail: "Détail du signalement"
+  report-abuse-reported: "Transmit à l’administrateur. Merci de votre collaboration."
 common/views/components/poll.vue:
  vote-to: "Voter pour '{}'"
  vote-count: "{} votes"
@@ -408,10 +427,10 @@ common/views/components/stream-indicator.vue:
  reconnecting: "Reconnexion en cours"
  connected: "Connecté"
 common/views/components/notification-settings.vue:
-  title: "通知"
-  mark-as-read-all-notifications: "すべての通知を既読にする"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
-  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  title: "Notifications"
+  mark-as-read-all-notifications: "Marquer toutes les notifications comme lues"
+  mark-as-read-all-unread-notes: "Marquer toutes les notes comme lues"
+  mark-as-read-all-talk-messages: "Marquer toutes les conversations comme lues"
  auto-watch: "投稿の自動ウォッチ"
  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
@@ -438,7 +457,7 @@ common/views/components/uploader.vue:
 common/views/components/visibility-chooser.vue:
  public: "Public"
  home: "Accueil"
-  home-desc: "Publier sur le fil d'Accueil uniquement"
+  home-desc: "Publier sur le fil d’Accueil uniquement"
  followers: "Abonnés"
  followers-desc: "Publier à vos abonnés uniquement"
  specified: "Direct"
@@ -471,12 +490,12 @@ common/views/components/profile-editor.vue:
  is-bot: "Ce compte est un Bot"
  is-locked: "Demandes d’abonnements requièrent l’approbation"
  careful-bot: "Les demandes d’abonnements venant de Bots requièrent l’approbation"
-  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
+  auto-accept-followed: "Accepter automatiquement les demandes d’abonnement venant des gens que vous suivez"
  advanced: "Avancé"
  privacy: "Vie privée"
  save: "Mettre à jour le profil"
  saved: "Profil mis à jour avec succès"
-  uploading: "En cours d'envoi…"
+  uploading: "En cours d’envoi …"
  upload-failed: "Échec de l'envoi"
  email: "Paramètres de messagerie"
  email-address: "Adresse de courrier électronique"
@@ -542,7 +561,7 @@ common/views/widgets/tips.vue:
  tips-line24: "Misskey est fonctionnel depuis 2014"
  tips-line25: "Vous pouvez recevoir les notifications de Misskey dans un navigateur web compatible"
 common/views/pages/not-found.vue:
-  page-not-found: "ページが見つかりませんでした"
+  page-not-found: "La page demandée est introuvable !"
 common/views/pages/follow.vue:
  signed-in-as: "Connecté en tant que {}"
  following: "Suit"
@@ -678,12 +697,12 @@ desktop/views/components/note-detail.vue:
  location: "Géolocalisation"
  renote: "Republier"
  add-reaction: "Ajouter votre reaction"
-  undo-reaction: "リアクション解除"
+  undo-reaction: "Inverser la réaction"
 desktop/views/components/note.vue:
  reply: "Répondre"
  renote: "Partager"
  add-reaction: "Ajouter votre réaction"
-  undo-reaction: "リアクション解除"
+  undo-reaction: "Inverser la réaction"
  detail: "Détails"
  private: "Cette publication est privée"
  deleted: "Cette publication a été supprimée"
@@ -733,7 +752,7 @@ desktop/views/components/renote-form.vue:
  quote: "Citer..."
  cancel: "Annuler"
  renote: "Republier"
-  renote-home: "Renote (Home)"
+  renote-home: "Renote (accueil)"
  reposting: "Republication en cours…"
  success: "Republié !"
  failure: "La renote a échoué"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "Sécurité"
  signin: "Historique de connexion"
  password: "Mot de Passe"
-  2fa: "Vérification en deux étapes"
  other: "Autres"
  license: "Licence"
  theme: "Thèmes"
@@ -768,11 +786,8 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "Exemple : https://www.google.com/?#q={{query}}"
  auto-popout: "Fenêtre contextuelle automatique"
  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  advanced: "Paramètres avancés"
-  api-via-stream: "Requête API via le flux"
-  api-via-stream-desc: "Lorsque ce paramètre est activé, une demande d'API est effectuée via une connexion WebSocket (pour une meilleure performance). Lorsqu'il est désactivé, l'API de récupération native est utilisée. Ce paramètre n'est valide que sur cet appareil."
-  deck-nav: "デッキ内ナビゲーション"
-  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
+  deck-nav: "Deck sans tansitions"
+  deck-nav-desc: "Vous obtenez une colonne temporaire sans transitions dans la page pendant la navigation, lors de l’utilisation du Deck."
  deck-default: "Utiliser le Deck comme IU par défaut"
  display: "Affichage et design"
  customize: "Personnaliser l'Accueil"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "Mode nuit"
  use-shadow: "Utiliser les ombres dans l'interface utilisateur"
  rounded-corners: "Coins arrondis"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "Utiliser des icônes circulaires"
  contrasted-acct: "Nom d’utilisateur contrasté"
  post-form-on-timeline: "Afficher le formulaire en haut du fil"
@@ -855,7 +866,7 @@ desktop/views/components/settings.2fa.vue:
  enter-password: "Entrez un mot de passe"
  authenticator: "Vous devez au préalable installer Google Authenticator sur votre appareil :"
  howtoinstall: "Comment installer"
-  token: "トークン"
+  token: "Jeton"
  scan: "Ensuite, scannez le code QR affiché sur votre écran :"
  done: "Veuillez entrer le token qui s'affiche sur votre appareil :"
  submit: "Envoyer"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "Fédération"
  announcements: "Annonces"
  hashtags: "Hashtags"
+  abuse: "Abus"
  back-to-misskey: "Retour vers Misskey"
 admin/views/dashboard.vue:
  dashboard: "Tableau de bord"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "Instances"
  this-instance: "Cette instance"
  federated: "Fédérées"
+admin/views/abuse.vue:
+  title: "Abus"
+  target: "Cible"
+  reporter: "Signalé par"
+  details: "Détails"
+  remove-report: "Supprimer"
 admin/views/instance.vue:
  instance: "Instance"
  instance-name: "Nom de l’instance"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "Nombre maximal de caractères pour les messages"
  disable-registration: "Désactiver les inscriptions"
  disable-local-timeline: "Désactiver le fil local"
+  disable-global-timeline: "Désactiver le fil global"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "Inviter"
  save: "Sauvegarder"
  saved: "Enregistré"
@@ -1057,7 +1077,7 @@ admin/views/instance.vue:
  serviceworker-info: "Devrait être activé pour les notifications push."
  vapid-publickey: "Clé Publique VAPID"
  vapid-privatekey: "Clé privée VAPID"
-  vapid-info: "ServiceWorkerを有効にする場合、VAPIDキーペアを生成する必要があります。シェルで次のようにします:"
+  vapid-info: "Vous devez activer ServiceWorker pour pouvoir générer les clés VAPID. Vous devez lancer ceci en mode root :"
 admin/views/charts.vue:
  title: "Graphe"
  per-day: "par jour"
@@ -1073,9 +1093,10 @@ admin/views/charts.vue:
    notes: "Nombre de publications : augmentation/diminution (combinés)"
    local-notes: "Nombre des publications : augmentation/diminution (Local)"
    remote-notes: "Nombre de publications : augmentation/diminution (distants)"
-    notes-total: "Total des publications"
+    notes-total: "Total des notes"
    users: "Nombre d’utilisateurs : augmentation/diminution"
    users-total: "Nombre total des utilisateurs"
+    active-users: "Utilisateur·rice·s actif·ve·s"
    drive: "Capacité utilisée comme stockage : augmentation/diminution"
    drive-total: "Utilisation totale du lecteur"
    drive-files: "Le nombre de fichiers sur l'espace de stockage : augmentation/diminution"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "Temps de réponse"
    network-usage: "Traffic"
 admin/views/drive.vue:
+  operation: "Actions"
+  fileid-or-url: "ID du fichier ou URL"
+  file-not-found: "Fichier non trouvé"
+  lookup: "Recherche"
  sort:
    title: "Tri"
    createdAtAsc: "Âge - Du plus ancien"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "Supprimé"
  mark-as-sensitive: "Marquer comme sensible"
  unmark-as-sensitive: "Ne pas marquer comme sensible"
+  marked-as-sensitive: "Marqué comme sensible"
+  unmarked-as-sensitive: "Marqué comme non sensible"
 admin/views/users.vue:
  operation: "Actions"
  username-or-userid: "Nom d’utilisateur·rice ou ID utilisateur"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "Date d’inscription (Descendant)"
      updatedAtAsc: "Mis à jour récemment (Ascendant)"
      updatedAtDesc: "Mis à jour récemment (descendant)"
+    state:
+      title: "État"
+      all: "Tout"
+      admin: "Admin"
+      moderator: "Modérateur"
+      adminOrModerator: "Administrateur/Modérateur"
+      verified: "Compte vérifié"
+      suspended: "Suspendu"
    origin:
      title: "Origine"
      combined: "Locaux + distants"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "Ajout d’un modérateur"
    add: "Ajouter"
    added: "Ajouté en tant que modérateur"
+    remove: "Révoquer"
+    removed: "Le modérateur a été révoqué"
 admin/views/emoji.vue:
  add-emoji:
    title: "Ajouter un émoji"
@@ -1173,7 +1210,7 @@ desktop/views/pages/welcome.vue:
  signup: "S'enregistrer"
  signin-button: "Se connecter"
  signup-button: "S'inscrire"
-  timeline: "Fil d'actualité"
+  timeline: "Fil d’actualité"
  announcements: "Notices"
  photos: "Images récentes"
  powered-by-misskey: "Propulsé par <b>Misskey</b>."
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "Pas de photos"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "Vous suit"
-  stalk: "Traquer"
-  stalking: "Entrain de poursuivre"
-  unstalk: "Cesser la poursuite"
-  mute: "Mettre en sourdine"
-  muted: "Muting"
-  unmute: "Enlever la sourdine"
-  block: "Bloquer"
-  unblock: "Débloquer"
-  block-confirm: "Bloquer cet utilisateur ?"
-  push-to-a-list: "Ajouter à la liste"
-  list-pushed: "Vous avez ajouté {user} à la liste {list}."
+  menu: "Menu"
 desktop/views/pages/user/user.header.vue:
  posts: "Notes"
  following: "Suit"
  followers: "Abonnés"
-  mention: "メンション"
  is-bot: "Ce compte est un Bot"
  years-old: "{age} ans"
  year: "/"
@@ -1354,7 +1380,7 @@ mobile/views/components/ui.header.vue:
  welcome-back: "Content de vous revoir ! "
  adjective: "M."
 mobile/views/components/ui.nav.vue:
-  timeline: "Fil d'actualité"
+  timeline: "Fil d’actualité"
  notifications: "Notifications"
  follow-requests: "Demandes d’abonnement"
  search: "Rechercher"
@@ -1368,7 +1394,7 @@ mobile/views/components/ui.nav.vue:
  about: "À propos de Misskey"
 mobile/views/components/user-timeline.vue:
  no-notes: "Il semble que cet utilisateur n’a rien publié pour le moment."
-  no-notes-with-media: "Aucune notes avec des médias"
+  no-notes-with-media: "Aucune note comprenant des médias"
 mobile/views/components/users-list.vue:
  all: "Tout"
  known: "Vous connaissez"
@@ -1428,11 +1454,11 @@ mobile/views/pages/settings.vue:
  i-am-under-limited-internet: "J'ai un accès Internet limité"
  circle-icons: "Utiliser des icônes circulaires"
  contrasted-acct: "Nom d’utilisateur contrasté"
-  timeline: "Fil d'actualité"
+  timeline: "Fil d’actualité"
  show-reply-target: "Afficher les réponses"
  show-my-renotes: "Afficher mes partages"
-  show-renoted-my-notes: "Afficher mes publications partagées"
-  show-local-renotes: "Afficher les publications partagées localement"
+  show-renoted-my-notes: "Afficher mes notes partagées"
+  show-local-renotes: "Afficher les notes partagées localement"
  post-style: "Style de la publication"
  post-style-standard: "Standard"
  post-style-smart: "Intelligent"
@@ -1469,16 +1495,9 @@ mobile/views/pages/user.vue:
  followers: "Abonnés"
  notes: "Notes"
  overview: "Aperçu"
-  timeline: "Fil d'actualité"
+  timeline: "Fil d’actualité"
  media: "Média"
-  mute: "Mettre en sourdine"
-  unmute: "Enlever la sourdine"
-  block: "Bloquer"
-  unblock: "Débloquer"
  years-old: "{age} ans"
-  push-to-list: "Ajouter à la liste"
-  select-list: "Sélectionnez une liste"
-  list-pushed: "Vous avez ajouté {user} à la liste {list} avec succès."
 mobile/views/pages/user/home.vue:
  recent-notes: "Notes récentes"
  images: "Images"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "Notes"
  following: "Suit"
  followers: "Abonnés"
-  mention: "メンション"
  images: "Images"
  activity: "Activité"
  timeline: "Fil d’actualité"
  pinned-notes: "Notes épinglées"
-  push-to-a-list: "Ajouter à une liste"
 docs:
  edit-this-page-on-github: "Vous avez trouvé une erreur ou vous voulez contribuer à la documentation ?"
  edit-this-page-on-github-link: "Éditez cette page sur GitHub !"
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
  load-more: "もっと読み込む"
  enter-password: "パスワードを入力してください"
+  2fa: "二段階認証"
  got-it: "わかった"
  customization-tips:
    title: "カスタマイズのヒント"
@@ -120,6 +121,12 @@ common:
  reduce-motion: "UIの動きを減らす"
  this-setting-is-this-device-only: "このデバイスのみ"
  use-os-default-emojis: "OS標準の絵文字を使用"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
+  hide-password: "パスワードを隠す"
+  show-password: "パスワードを表示する"
  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
  user-suspended: "このユーザーは凍結されています。"
  is-remote-user: "このユーザー情報はコピーです。"
@@ -333,6 +340,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "メンション"
  detail: "詳細"
+  copy-content: "内容をコピー"
  copy-link: "リンクをコピー"
  favorite: "お気に入り"
  unfavorite: "お気に入り解除"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "削除"
  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"
+common/views/components/user-menu.vue:
+  mention: "メンション"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  report-abuse: "スパムを報告"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
  vote-to: "「{}」に投票する"
  vote-count: "{}票"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "セキュリティ"
  signin: "サインイン履歴"
  password: "パスワード"
-  2fa: "二段階認証"
  other: "その他"
  license: "ライセンス"
  theme: "テーマ"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
  auto-popout: "ウィンドウの自動ポップアウト"
  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  advanced: "詳細設定"
-  api-via-stream: "ストリームを経由したAPIリクエスト"
-  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
  deck-default: "デッキをデフォルトのUIにする"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "ダークモード"
  use-shadow: "UIに影を使用"
  rounded-corners: "UIの角を丸める"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "円形のアイコンを使用"
  contrasted-acct: "ユーザー名にコントラストを付ける"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
+  abuse: "スパム報告"
  back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
  dashboard: "ダッシュボード"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "インスタンス"
  this-instance: "このインスタンス"
  federated: "連合"
+admin/views/abuse.vue:
+  title: "スパム報告"
+  target: "対象"
+  reporter: "報告者"
+  details: "詳細"
+  remove-report: "削除"
 admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "投稿の最大文字数"
  disable-registration: "ユーザー登録の受付を停止する"
  disable-local-timeline: "ローカルタイムラインを無効にする"
+  disable-global-timeline: "グローバルタイムラインを無効にする"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "招待"
  save: "保存"
  saved: "保存しました"
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "投稿の積算"
    users: "ユーザーの増減"
    users-total: "ユーザーの積算"
+    active-users: "アクティブユーザー数"
    drive: "ドライブ使用量の増減"
    drive-total: "ドライブ使用量の積算"
    drive-files: "ドライブのファイル数の増減"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "ファイルIDまたはファイルURL"
+  file-not-found: "ファイルが見つかりません"
+  lookup: "照会"
  sort:
    title: "ソート"
    createdAtAsc: "アップロード日時が古い順"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "削除しました"
  mark-as-sensitive: "閲覧注意に設定"
  unmark-as-sensitive: "閲覧注意を解除"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
  operation: "操作"
  username-or-userid: "ユーザー名またはユーザーID"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "登録日時が新しい順"
      updatedAtAsc: "更新日時が古い順"
      updatedAtDesc: "更新日時が新しい順"
+    state:
+      title: "状態"
+      all: "すべて"
+      admin: "管理者"
+      moderator: "モデレーター"
+      adminOrModerator: "管理者+モデレーター"
+      verified: "公式アカウント"
+      suspended: "凍結済み"
    origin:
      title: "オリジン"
      combined: "ローカル+リモート"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
+    remove: "解除"
+    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "写真はありません"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "フォローされています"
-  stalk: "ストークする"
-  stalking: "ストーキングしています"
-  unstalk: "ストーク解除"
-  mute: "ミュートする"
-  muted: "ミュートしています"
-  unmute: "ミュート解除"
-  block: "ブロックする"
-  unblock: "ブロック解除"
-  block-confirm: "このユーザーをブロックしますか？"
-  push-to-a-list: "リストに追加"
-  list-pushed: "{user}を{list}に追加しました。"
+  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  is-bot: "このアカウントはBotです"
  years-old: "{age}歳"
  year: "年"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "概要"
  timeline: "タイムライン"
  media: "メディア"
-  mute: "ミュート"
-  unmute: "ミュート解除"
-  block: "ブロック"
-  unblock: "ブロック解除"
  years-old: "{age}歳"
-  push-to-list: "リストに追加"
-  select-list: "リストを選択してください"
-  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  images: "画像"
  activity: "アクティビティ"
  timeline: "タイムライン"
  pinned-notes: "ピン留めされた投稿"
-  push-to-a-list: "リストに追加"
 docs:
  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
  edit-this-page-on-github-link: "このページをGitHubで編集"
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
  load-more: "もっと読み込む"
  enter-password: "パスワードを入力してください"
+  2fa: "二段階認証"

  got-it: "わかった"
  customization-tips:
@@ -132,6 +133,8 @@ common:
  line-width-thin: "細い"
  line-width-normal: "普通"
  line-width-thick: "太い"
+  hide-password: "パスワードを隠す"
+  show-password: "パスワードを表示する"

  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
  user-suspended: "このユーザーは凍結されています。"
@@ -367,6 +370,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "メンション"
  detail: "詳細"
+  copy-content: "内容をコピー"
  copy-link: "リンクをコピー"
  favorite: "お気に入り"
  unfavorite: "お気に入り解除"
@@ -376,6 +380,18 @@ common/views/components/note-menu.vue:
  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"

+common/views/components/user-menu.vue:
+  mention: "メンション"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  report-abuse: "スパムを報告"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
+
 common/views/components/poll.vue:
  vote-to: "「{}」に投票する"
  vote-count: "{}票"
@@ -852,7 +868,6 @@ desktop/views/components/settings.vue:
  security: "セキュリティ"
  signin: "サインイン履歴"
  password: "パスワード"
-  2fa: "二段階認証"
  other: "その他"
  license: "ライセンス"
  theme: "テーマ"
@@ -867,9 +882,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
  auto-popout: "ウィンドウの自動ポップアウト"
  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  advanced: "詳細設定"
-  api-via-stream: "ストリームを経由したAPIリクエスト"
-  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
  deck-default: "デッキをデフォルトのUIにする"
@@ -1103,6 +1115,7 @@ admin/views/index.vue:
  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
+  abuse: "スパム報告"
  back-to-misskey: "Misskeyに戻る"

 admin/views/dashboard.vue:
@@ -1114,6 +1127,13 @@ admin/views/dashboard.vue:
  this-instance: "このインスタンス"
  federated: "連合"

+admin/views/abuse.vue:
+  title: "スパム報告"
+  target: "対象"
+  reporter: "報告者"
+  details: "詳細"
+  remove-report: "削除"
+
 admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
@@ -1160,6 +1180,8 @@ admin/views/instance.vue:
  max-note-text-length: "投稿の最大文字数"
  disable-registration: "ユーザー登録の受付を停止する"
  disable-local-timeline: "ローカルタイムラインを無効にする"
+  disable-global-timeline: "グローバルタイムラインを無効にする"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "招待"
  save: "保存"
  saved: "保存しました"
@@ -1204,6 +1226,7 @@ admin/views/charts.vue:
    notes-total: "投稿の積算"
    users: "ユーザーの増減"
    users-total: "ユーザーの積算"
+    active-users: "アクティブユーザー数"
    drive: "ドライブ使用量の増減"
    drive-total: "ドライブ使用量の積算"
    drive-files: "ドライブのファイル数の増減"
@@ -1213,6 +1236,10 @@ admin/views/charts.vue:
    network-usage: "通信量"

 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "ファイルIDまたはファイルURL"
+  file-not-found: "ファイルが見つかりません"
+  lookup: "照会"
  sort:
    title: "ソート"
    createdAtAsc: "アップロード日時が古い順"
@@ -1228,6 +1255,8 @@ admin/views/drive.vue:
  deleted: "削除しました"
  mark-as-sensitive: "閲覧注意に設定"
  unmark-as-sensitive: "閲覧注意を解除"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"

 admin/views/users.vue:
  operation: "操作"
@@ -1252,6 +1281,14 @@ admin/views/users.vue:
      createdAtDesc: "登録日時が新しい順"
      updatedAtAsc: "更新日時が古い順"
      updatedAtDesc: "更新日時が新しい順"
+    state:
+      title: "状態"
+      all: "すべて"
+      admin: "管理者"
+      moderator: "モデレーター"
+      adminOrModerator: "管理者+モデレーター"
+      verified: "公式アカウント"
+      suspended: "凍結済み"
    origin:
      title: "オリジン"
      combined: "ローカル+リモート"
@@ -1265,6 +1302,8 @@ admin/views/moderators.vue:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
+    remove: "解除"
+    removed: "モデレーター登録を解除しました"

 admin/views/emoji.vue:
  add-emoji:
@@ -1362,23 +1401,12 @@ desktop/views/pages/user/user.photos.vue:

 desktop/views/pages/user/user.profile.vue:
  follows-you: "フォローされています"
-  stalk: "ストークする"
-  stalking: "ストーキングしています"
-  unstalk: "ストーク解除"
-  mute: "ミュートする"
-  muted: "ミュートしています"
-  unmute: "ミュート解除"
-  block: "ブロックする"
-  unblock: "ブロック解除"
-  block-confirm: "このユーザーをブロックしますか？"
-  push-to-a-list: "リストに追加"
-  list-pushed: "{user}を{list}に追加しました。"
+  menu: "メニュー"

 desktop/views/pages/user/user.header.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  is-bot: "このアカウントはBotです"
  years-old: "{age}歳"
  year: "年"
@@ -1667,14 +1695,7 @@ mobile/views/pages/user.vue:
  overview: "概要"
  timeline: "タイムライン"
  media: "メディア"
-  mute: "ミュート"
-  unmute: "ミュート解除"
-  block: "ブロック"
-  unblock: "ブロック解除"
  years-old: "{age}歳"
-  push-to-list: "リストに追加"
-  select-list: "リストを選択してください"
-  list-pushed: "{user}を{list}に追加しました"

 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
@@ -1728,12 +1749,10 @@ deck/deck.user-column.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  images: "画像"
  activity: "アクティビティ"
  timeline: "タイムライン"
  pinned-notes: "ピン留めされた投稿"
-  push-to-a-list: "リストに追加"

 docs:
  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "ここにコードを入力したり張り付けたりせんといてください。アカウントが不正利用されるかも分からん。知らんけど。"
  load-more: "もっとあらへんのか！"
  enter-password: "パスワードを入れてや"
+  2fa: "二段階認証"
  got-it: "ほい"
  customization-tips:
    title: "カスタマイズのヒント"
@@ -120,6 +121,12 @@ common:
  reduce-motion: "UI、動き過ぎや、静かにしてや"
  this-setting-is-this-device-only: "このデバイスのみ"
  use-os-default-emojis: "OSにもとから入っとる絵文字使う"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
+  hide-password: "パスワードを隠す"
+  show-password: "パスワードを表示する"
  do-not-use-in-production: "開発ビルドや。本番環境で使わんといて！知らんで！"
  user-suspended: "このユーザーは凍結されています。"
  is-remote-user: "このユーザー情報はコピーです。"
@@ -333,6 +340,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "メンション"
  detail: "もっと"
+  copy-content: "内容をコピー"
  copy-link: "リンクをコピー"
  favorite: "お気に入り"
  unfavorite: "お気に入りやめる"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "ほかす"
  delete-confirm: "この投稿を削除してもええか？"
  remote: "投稿元に行ってみよか"
+common/views/components/user-menu.vue:
+  mention: "メンション"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  report-abuse: "スパムを報告"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
  vote-to: "「{}」に投票や！"
  vote-count: "{}票"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "セキュリティ"
  signin: "こんな感じでサインインしたらしいで"
  password: "パスワード"
-  2fa: "二段階認証"
  other: "その他"
  license: "ライセンス"
  theme: "テーマ"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "例: https://www.google.com/?#q?{{query}}"
  auto-popout: "ウィンドウの自動ポップアウト"
  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトすんで。この設定はブラウザに記憶されんで。"
-  advanced: "もっと設定"
-  api-via-stream: "ストリームを経由したAPIリクエスト"
-  api-via-stream-desc: "この設定をオンにすると、WebSocket接続を経由してAPIリクエストが行われんで(パフォーマンス向上するかも、知らんけど)。オフにすると、ネイティブの fetch API が利用されるで。この設定はこのデバイスのみ有効やで。"
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使うとるとき、ナビゲーションが発生するときにページ移動せんで、一時的なカラムで受けれるようにするで"
  deck-default: "デッキをデフォルトのUIにする"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "夜にすんで"
  use-shadow: "UIに影付けたる"
  rounded-corners: "みんなまぁるくUI変更"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "アイコンもタコ焼きも丸いやんな？"
  contrasted-acct: "ユーザー名ようわからんし見やすしといて"
  post-form-on-timeline: "タイムラインの上の方で投稿できるようにせえへん？"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "連合"
  announcements: "知っといてや"
  hashtags: "ハッシュタグ"
+  abuse: "スパム報告"
  back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
  dashboard: "ダッシュボード"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "インスタンス"
  this-instance: "ワイのインスタンス"
  federated: "連合"
+admin/views/abuse.vue:
+  title: "スパム報告"
+  target: "対象"
+  reporter: "報告者"
+  details: "詳細"
+  remove-report: "削除"
 admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "投稿の最大文字数"
  disable-registration: "ユーザー登録の受付を止める"
  disable-local-timeline: "ローカルタイムラインを使えんようにする"
+  disable-global-timeline: "グローバルタイムラインを無効にする"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "来てや"
  save: "保存"
  saved: "保存したで！"
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "投稿の積算"
    users: "ユーザーの増減"
    users-total: "ユーザーの積算"
+    active-users: "アクティブユーザー数"
    drive: "ドライブ使用量の増減"
    drive-total: "ドライブ使用量の積算"
    drive-files: "ドライブのファイル数の増減"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "ファイルIDまたはファイルURL"
+  file-not-found: "ファイルが見つかりません"
+  lookup: "照会"
  sort:
    title: "ソート"
    createdAtAsc: "アップロード日時が古い順"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "削除しました"
  mark-as-sensitive: "閲覧注意に設定"
  unmark-as-sensitive: "閲覧注意を解除"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
  operation: "操作"
  username-or-userid: "ユーザー名またはユーザーID"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "登録日時が新しい順"
      updatedAtAsc: "更新日時が古い順"
      updatedAtDesc: "更新日時が新しい順"
+    state:
+      title: "状態"
+      all: "すべて"
+      admin: "管理者"
+      moderator: "モデレーター"
+      adminOrModerator: "管理者+モデレーター"
+      verified: "公式アカウント"
+      suspended: "凍結済み"
    origin:
      title: "オリジン"
      combined: "ローカル+リモート"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
+    remove: "解除"
+    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "写真はあらへんで"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "フォローされとるで"
-  stalk: "ストークする"
-  stalking: "ストーキングしとるで"
-  unstalk: "ストーク解除"
-  mute: "ミュートする"
-  muted: "ミュートしとるで"
-  unmute: "ミュート解除"
-  block: "ブロックする"
-  unblock: "ブロックやめたる"
-  block-confirm: "このユーザーをブロックしてええか？"
-  push-to-a-list: "リストに追加"
-  list-pushed: "{user}を{list}に追加したで。"
+  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  is-bot: "このアカウントはBotや"
  years-old: "{age}歳"
  year: "年"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "こんなやつ"
  timeline: "タイムライン"
  media: "メディア"
-  mute: "ミュート"
-  unmute: "ミュートやめたる"
-  block: "ブロック"
-  unblock: "ブロックやめたる"
  years-old: "{age}歳"
-  push-to-list: "リストに入れたる"
-  select-list: "リスト選んでや"
-  list-pushed: "{user}を{list}に追加したで"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近儲かりまっか？"
  images: "画像"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  images: "画像"
  activity: "アクティビティ"
  timeline: "タイムライン"
  pinned-notes: "ピン留めしはった投稿"
-  push-to-a-list: "リストに入れたる"
 docs:
  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
  edit-this-page-on-github-link: "このページをGitHubで編集"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "여기에 코드를 입력하거나 붙여넣지 마십시오. 계정이 무단으로 사용될 수 있습니다."
  load-more: "더보기"
  enter-password: "비밀번호를 입력하여 주십시오"
+  2fa: "2단계 인증"
  got-it: "알겠습니다"
  customization-tips:
    title: "커스터마이징 도움말"
@@ -109,7 +110,7 @@ common:
  my-token-regenerated: "당신의 토큰이 업데이트되었으므로 로그아웃합니다."
  i-like-sushi: "저는 (푸딩보다 차라리) 초밥이 좋아요"
  show-reversi-board-labels: "리버시 보드의 행과 열 레이블을 표시"
-  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
+  use-avatar-reversi-stones: "리버시의 돌로 아바타를 사용"
  verified-user: "공식 계정"
  disable-animated-mfm: "글의 문자 애니메이션을 비활성화"
  suggest-recent-hashtags: "최근 해시태그를 글 작성란에 표시"
@@ -120,6 +121,12 @@ common:
  reduce-motion: "UI의 애니메이션 줄이기"
  this-setting-is-this-device-only: "이 장치만"
  use-os-default-emojis: "운영체제의 기본 이모지 사용"
+  line-width: "선 두께"
+  line-width-thin: "얇음"
+  line-width-normal: "보통"
+  line-width-thick: "두꺼움"
+  hide-password: "비밀번호 숨기기"
+  show-password: "비밀번호 표시"
  do-not-use-in-production: "이것은 개발 빌드입니다. 프로덕션 환경에서 사용하지 마십시오."
  user-suspended: "이 사용자는 정지된 상태입니다."
  is-remote-user: "이 유저 정보는 복사본입니다."
@@ -260,7 +267,7 @@ common/views/components/media-banner.vue:
  sensitive: "열람주의"
  click-to-show: "클릭하여 표시"
 common/views/components/theme.vue:
-  theme: "テーマ"
+  theme: "테마"
  light-theme: "다크 모드가 아닐 때 사용하는 테마"
  dark-theme: "다크 모드일 때 사용하는 테마"
  light-themes: "밝은 테마"
@@ -277,7 +284,7 @@ common/views/components/theme.vue:
  base-theme: "기본 테마"
  base-theme-light: "밝음"
  base-theme-dark: "어두움"
-  find-more-theme: "その他のテーマを入手"
+  find-more-theme: "그 외 테마 찾아보기"
  theme-name: "테마명"
  preview-created-theme: "미리보기"
  invalid-theme: "테마가 올바르지 않습니다."
@@ -333,6 +340,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "멘션"
  detail: "상세"
+  copy-content: "내용 복사"
  copy-link: "링크 복사"
  favorite: "이 노트 즐겨찾기"
  unfavorite: "즐겨찾기에서 제거"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "삭제"
  delete-confirm: "이 글을 삭제하시겠습니까?"
  remote: "글 원본 보기"
+common/views/components/user-menu.vue:
+  mention: "멘션"
+  mute: "뮤트"
+  unmute: "뮤트 해제"
+  block: "차단"
+  unblock: "차단 해제"
+  push-to-list: "리스트에 추가"
+  select-list: "리스트를 선택하여 주십시오"
+  report-abuse: "스팸 신고"
+  report-abuse-detail: "어떤 스팸 행위를 하고 있습니까?"
+  report-abuse-reported: "관리자에게 보고되었습니다. 협조해주셔서 감사합니다."
 common/views/components/poll.vue:
  vote-to: "\"{}\"에 투표하기"
  vote-count: "{}표"
@@ -471,7 +490,7 @@ common/views/components/profile-editor.vue:
  is-bot: "이 계정은 Bot입니다"
  is-locked: "팔로우를 수동으로 승인"
  careful-bot: "Bot의 팔로우만 수동으로 승인"
-  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
+  auto-accept-followed: "팔로우중인 사용자로부터의 팔로우를 자동으로 승인"
  advanced: "기타"
  privacy: "프라이버시"
  save: "저장"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "보안"
  signin: "로그인 기록"
  password: "비밀번호"
-  2fa: "2단계 인증"
  other: "기타"
  license: "라이선스"
  theme: "테마"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "예: https://www.google.com/?#q={{query}}"
  auto-popout: "창 자동 팝아웃"
  auto-popout-desc: "창이 열릴 때 팝아웃 (브라우저 밖으로 분리) 이 가능한 경우 자동으로 팝아웃합니다. 이 설정은 브라우저에 저장됩니다."
-  advanced: "고급 설정"
-  api-via-stream: "스트리밍을 사용한 API 요청"
-  api-via-stream-desc: "이 설정을 ON으로 하면 websocket 연결을 통하여 API 요청을 합니다 (성능 향상을 기대할 수 있습니다). OFF로 두는 경우 네이티브 fetch API가 사용됩니다. 이 설정은 이 장치에만 유효합니다."
  deck-nav: "덱 내 탐색"
  deck-nav-desc: "덱을 사용중일 때, 내비게이션이 발생하였을 경우 페이지를 이동하지 않고 일시적으로 임시 칼럼을 생성하도록 합니다."
  deck-default: "덱을 기본 UI로 설정"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "다크 모드"
  use-shadow: "UI에 그림자 효과 적용"
  rounded-corners: "UI의 모서리를 둥글게 설정"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "원형 아이콘 사용"
  contrasted-acct: "사용자명에 대비 추가"
  post-form-on-timeline: "타임라인 상단에 글 작성란을 표시"
@@ -855,7 +866,7 @@ desktop/views/components/settings.2fa.vue:
  enter-password: "비밀번호를 입력하여 주십시오"
  authenticator: "먼저, 가지고 계신 장치에 Google Authenticator를 설치해야 합니다:"
  howtoinstall: "설치 방법은 여기에 있습니다"
-  token: "トークン"
+  token: "토큰"
  scan: "다음으로 표시되어 있는 QR 코드를 스캔합니다:"
  done: "사용중이신 장치에 표시된 토큰을 입력해주시면 마무리됩니다:"
  submit: "완료"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "연합"
  announcements: "공지사항"
  hashtags: "해시태그"
+  abuse: "스팸 신고"
  back-to-misskey: "Misskey로 돌아가기"
 admin/views/dashboard.vue:
  dashboard: "대시보드"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "인스턴스"
  this-instance: "이 인스턴스"
  federated: "연합"
+admin/views/abuse.vue:
+  title: "스팸 신고"
+  target: "대상"
+  reporter: "신고자"
+  details: "상세"
+  remove-report: "삭제"
 admin/views/instance.vue:
  instance: "인스턴스"
  instance-name: "인스턴스 이름"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "글의 최대 문자수"
  disable-registration: "사용자 등록 비활성화"
  disable-local-timeline: "로컬 타임라인 비활성화"
+  disable-global-timeline: "글로벌 타임라인 비활성화"
+  disabling-timelines-info: "이 타임라인들을 비활성화해도 관리자 및 모더레이터는 계속 사용할 수 있습니다."
  invite: "초대"
  save: "저장"
  saved: "저장하였습니다"
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "글 누적 수"
    users: "사용자 증감"
    users-total: "사용자 누적"
+    active-users: "활성 사용자 수"
    drive: "드라이브 사용량 증감"
    drive-total: "드라이브 사용량 누적"
    drive-files: "드라이브 파일 수 증감"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "응답시간"
    network-usage: "통신량"
 admin/views/drive.vue:
+  operation: "작업"
+  fileid-or-url: "파일 ID 또는 파일 URL"
+  file-not-found: "파일을 찾을 수 없습니다"
+  lookup: "조회"
  sort:
    title: "정렬"
    createdAtAsc: "업로드 날짜 오랜 순"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "삭제하였습니다"
  mark-as-sensitive: "열람주의로 설정"
  unmark-as-sensitive: "열람주의 해제"
+  marked-as-sensitive: "열람주의로 설정하였습니다"
+  unmarked-as-sensitive: "열람주의를 제거하였습니다"
 admin/views/users.vue:
  operation: "작업"
  username-or-userid: "사용자명 혹은 사용자 ID"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "등록일이 최신인 순"
      updatedAtAsc: "수정일이 오래된 순"
      updatedAtDesc: "수정일이 최신인 순"
+    state:
+      title: "상태"
+      all: "모두"
+      admin: "관리자"
+      moderator: "모더레이터"
+      adminOrModerator: "관리자+모더레이터"
+      verified: "공식 계정"
+      suspended: "정지됨"
    origin:
      title: "위치 (오리진)"
      combined: "로컬 + 원격"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "모더레이터 등록"
    add: "등록"
    added: "모더레이터를 등록하였습니다"
+    remove: "해제"
+    removed: "모더레이터 등록을 해제했습니다"
 admin/views/emoji.vue:
  add-emoji:
    title: "이모지 등록"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "사진이 없습니다"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "당신을 팔로우합니다"
-  stalk: "스토킹"
-  stalking: "스토킹하고 있습니다"
-  unstalk: "스토킹 중단"
-  mute: "뮤트"
-  muted: "뮤트하였습니다"
-  unmute: "뮤트 해제"
-  block: "차단"
-  unblock: "차단 해제"
-  block-confirm: "이 사용자를 차단하시겠습니까?"
-  push-to-a-list: "리스트에 추가"
-  list-pushed: "{user}을(를) {list}에 추가하였습니다."
+  menu: "메뉴"
 desktop/views/pages/user/user.header.vue:
  posts: "글"
  following: "팔로잉"
  followers: "팔로워"
-  mention: "멘션"
  is-bot: "이 계정은 Bot입니다"
  years-old: "{age}세"
  year: "년"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "요약"
  timeline: "타임라인"
  media: "미디어"
-  mute: "뮤트"
-  unmute: "뮤트 해제"
-  block: "차단"
-  unblock: "차단 해제"
  years-old: "{age}세"
-  push-to-list: "리스트에 추가"
-  select-list: "목록을 선택하여 주십시오"
-  list-pushed: "{user}을(를) {list}에 추가하였습니다"
 mobile/views/pages/user/home.vue:
  recent-notes: "최근 글"
  images: "이미지"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "글"
  following: "팔로잉"
  followers: "팔로워"
-  mention: "멘션"
  images: "이미지"
  activity: "활동"
  timeline: "타임라인"
  pinned-notes: "고정해놓은 글"
-  push-to-a-list: "리스트에 추가"
 docs:
  edit-this-page-on-github: "틀린 점이나 개선할 점을 찾으셨나요?"
  edit-this-page-on-github-link: "이 페이지를 GitHub에서 편집"
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
  load-more: "もっと読み込む"
  enter-password: "パスワードを入力してください"
+  2fa: "二段階認証"
  got-it: "わかった"
  customization-tips:
    title: "カスタマイズのヒント"
@@ -120,6 +121,12 @@ common:
  reduce-motion: "UIの動きを減らす"
  this-setting-is-this-device-only: "このデバイスのみ"
  use-os-default-emojis: "OS標準の絵文字を使用"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
+  hide-password: "パスワードを隠す"
+  show-password: "パスワードを表示する"
  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
  user-suspended: "このユーザーは凍結されています。"
  is-remote-user: "このユーザー情報はコピーです。"
@@ -333,6 +340,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "メンション"
  detail: "詳細"
+  copy-content: "内容をコピー"
  copy-link: "リンクをコピー"
  favorite: "Deze notitie toevoegen aan favorieten"
  unfavorite: "お気に入り解除"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "削除"
  delete-confirm: "この投稿を削除しますか？"
  remote: "Origineel tonen"
+common/views/components/user-menu.vue:
+  mention: "メンション"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  report-abuse: "スパムを報告"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
  vote-to: "Stemmen op '{}'"
  vote-count: "{} stemmen"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "Beveiliging"
  signin: "Inloggeschiedenis"
  password: "Wachtwoord"
-  2fa: "Authenticatie in twee stappen"
  other: "Overig"
  license: "Licentie"
  theme: "テーマ"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
  auto-popout: "Venster automatisch uitvouwen"
  auto-popout-desc: "Venster uitvouwen, indien mogelijk. Deze instelling wordt opgeslagen in je browser."
-  advanced: "Geavanceerde instellingen"
-  api-via-stream: "API-verzoek via stream"
-  api-via-stream-desc: "API-verzoek wordt uitgevoerd via de WebSocket-verbinding i.p.v. de ingebouwde ophaal-API (voor verbeterde prestaties). Deze instelling wordt opgeslagen in je browser."
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
  deck-default: "デッキをデフォルトのUIにする"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "Donkere modus"
  use-shadow: "UIに影を使用"
  rounded-corners: "UIの角を丸める"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "Ronde pictogrammen gebruiken"
  contrasted-acct: "ユーザー名にコントラストを付ける"
  post-form-on-timeline: "Berichtformulier boven de tijdlijn tonen"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
+  abuse: "スパム報告"
  back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
  dashboard: "ダッシュボード"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "インスタンス"
  this-instance: "このインスタンス"
  federated: "連合"
+admin/views/abuse.vue:
+  title: "スパム報告"
+  target: "対象"
+  reporter: "報告者"
+  details: "詳細"
+  remove-report: "削除"
 admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "投稿の最大文字数"
  disable-registration: "ユーザー登録の受付を停止する"
  disable-local-timeline: "ローカルタイムラインを無効にする"
+  disable-global-timeline: "グローバルタイムラインを無効にする"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "招待"
  save: "保存"
  saved: "保存しました"
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "投稿の積算"
    users: "ユーザーの増減"
    users-total: "ユーザーの積算"
+    active-users: "アクティブユーザー数"
    drive: "ドライブ使用量の増減"
    drive-total: "ドライブ使用量の積算"
    drive-files: "ドライブのファイル数の増減"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "ファイルIDまたはファイルURL"
+  file-not-found: "ファイルが見つかりません"
+  lookup: "照会"
  sort:
    title: "ソート"
    createdAtAsc: "アップロード日時が古い順"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "削除しました"
  mark-as-sensitive: "閲覧注意に設定"
  unmark-as-sensitive: "閲覧注意を解除"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
  operation: "操作"
  username-or-userid: "ユーザー名またはユーザーID"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "登録日時が新しい順"
      updatedAtAsc: "更新日時が古い順"
      updatedAtDesc: "更新日時が新しい順"
+    state:
+      title: "状態"
+      all: "すべて"
+      admin: "管理者"
+      moderator: "モデレーター"
+      adminOrModerator: "管理者+モデレーター"
+      verified: "公式アカウント"
+      suspended: "凍結済み"
    origin:
      title: "オリジン"
      combined: "ローカル+リモート"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
+    remove: "解除"
+    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "Geen foto's"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "Volgt jou"
-  stalk: "Stalken"
-  stalking: "Stalkend"
-  unstalk: "Stoppen met stalken"
-  mute: "Dempen"
-  muted: "Dempend"
-  unmute: "Ontdempen"
-  block: "ブロックする"
-  unblock: "ブロック解除"
-  block-confirm: "このユーザーをブロックしますか？"
-  push-to-a-list: "リストに追加"
-  list-pushed: "{user}を{list}に追加しました。"
+  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  is-bot: "このアカウントはBotです"
  years-old: "{age}歳"
  year: "年"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "Overzicht"
  timeline: "Tijdlijn"
  media: "Media"
-  mute: "ミュート"
-  unmute: "ミュート解除"
-  block: "ブロック"
-  unblock: "ブロック解除"
  years-old: "{age}歳"
-  push-to-list: "リストに追加"
-  select-list: "リストを選択してください"
-  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "Recente notities"
  images: "Afbeeldingen"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  images: "画像"
  activity: "アクティビティ"
  timeline: "タイムライン"
  pinned-notes: "ピン留めされた投稿"
-  push-to-a-list: "リストに追加"
 docs:
  edit-this-page-on-github: "Heb je een fout ontdekt of wil je bijdragen aan de documentatie? "
  edit-this-page-on-github-link: "Bewerk deze pagina op GitHub!"
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
  load-more: "もっと読み込む"
  enter-password: "パスワードを入力してください"
+  2fa: "二段階認証"
  got-it: "Skjønner!"
  customization-tips:
    title: "カスタマイズのヒント"
@@ -120,6 +121,12 @@ common:
  reduce-motion: "UIの動きを減らす"
  this-setting-is-this-device-only: "このデバイスのみ"
  use-os-default-emojis: "OS標準の絵文字を使用"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
+  hide-password: "パスワードを隠す"
+  show-password: "パスワードを表示する"
  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
  user-suspended: "このユーザーは凍結されています。"
  is-remote-user: "このユーザー情報はコピーです。"
@@ -333,6 +340,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "メンション"
  detail: "Detaljer"
+  copy-content: "内容をコピー"
  copy-link: "リンクをコピー"
  favorite: "Merket som favoritt"
  unfavorite: "お気に入り解除"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "Slett"
  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"
+common/views/components/user-menu.vue:
+  mention: "メンション"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  report-abuse: "スパムを報告"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
  vote-to: "「{}」に投票する"
  vote-count: "{} stemmer"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "セキュリティ"
  signin: "サインイン履歴"
  password: "Passord"
-  2fa: "To-faktor autentisering"
  other: "Annet"
  license: "Lisens"
  theme: "Utseende"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
  auto-popout: "ウィンドウの自動ポップアウト"
  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  advanced: "Avanserte innstillinger"
-  api-via-stream: "ストリームを経由したAPIリクエスト"
-  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
  deck-default: "デッキをデフォルトのUIにする"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "ダークモード"
  use-shadow: "UIに影を使用"
  rounded-corners: "UIの角を丸める"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "円形のアイコンを使用"
  contrasted-acct: "ユーザー名にコントラストを付ける"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
+  abuse: "スパム報告"
  back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
  dashboard: "ダッシュボード"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "インスタンス"
  this-instance: "このインスタンス"
  federated: "連合"
+admin/views/abuse.vue:
+  title: "スパム報告"
+  target: "対象"
+  reporter: "報告者"
+  details: "詳細"
+  remove-report: "削除"
 admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "投稿の最大文字数"
  disable-registration: "ユーザー登録の受付を停止する"
  disable-local-timeline: "ローカルタイムラインを無効にする"
+  disable-global-timeline: "グローバルタイムラインを無効にする"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "招待"
  save: "保存"
  saved: "保存しました"
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "投稿の積算"
    users: "ユーザーの増減"
    users-total: "ユーザーの積算"
+    active-users: "アクティブユーザー数"
    drive: "ドライブ使用量の増減"
    drive-total: "ドライブ使用量の積算"
    drive-files: "ドライブのファイル数の増減"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "ファイルIDまたはファイルURL"
+  file-not-found: "ファイルが見つかりません"
+  lookup: "照会"
  sort:
    title: "ソート"
    createdAtAsc: "アップロード日時が古い順"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "削除しました"
  mark-as-sensitive: "閲覧注意に設定"
  unmark-as-sensitive: "閲覧注意を解除"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
  operation: "操作"
  username-or-userid: "ユーザー名またはユーザーID"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "登録日時が新しい順"
      updatedAtAsc: "更新日時が古い順"
      updatedAtDesc: "更新日時が新しい順"
+    state:
+      title: "状態"
+      all: "すべて"
+      admin: "管理者"
+      moderator: "モデレーター"
+      adminOrModerator: "管理者+モデレーター"
+      verified: "公式アカウント"
+      suspended: "凍結済み"
    origin:
      title: "オリジン"
      combined: "ローカル+リモート"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
+    remove: "解除"
+    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "写真はありません"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "フォローされています"
-  stalk: "ストークする"
-  stalking: "ストーキングしています"
-  unstalk: "ストーク解除"
-  mute: "ミュートする"
-  muted: "ミュートしています"
-  unmute: "ミュート解除"
-  block: "ブロックする"
-  unblock: "ブロック解除"
-  block-confirm: "このユーザーをブロックしますか？"
-  push-to-a-list: "リストに追加"
-  list-pushed: "{user}を{list}に追加しました。"
+  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
  posts: "Innlegg"
  following: "Følger"
  followers: "フォロワー"
-  mention: "メンション"
  is-bot: "このアカウントはBotです"
  years-old: "{age}歳"
  year: "年"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "Oversikt"
  timeline: "タイムライン"
  media: "Media"
-  mute: "ミュート"
-  unmute: "ミュート解除"
-  block: "ブロック"
-  unblock: "ブロック解除"
  years-old: "{age}歳"
-  push-to-list: "リストに追加"
-  select-list: "リストを選択してください"
-  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "Nylige innlegg"
  images: "Bilder"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  images: "画像"
  activity: "アクティビティ"
  timeline: "タイムライン"
  pinned-notes: "ピン留めされた投稿"
-  push-to-a-list: "リストに追加"
 docs:
  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
  edit-this-page-on-github-link: "このページをGitHubで編集"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
  load-more: "Załaduj więcej"
  enter-password: "Wprowadź Hasło"
+  2fa: "二段階認証"
  got-it: "Rozumiem!"
  customization-tips:
    title: "Wskazówki o dostosowywaniu"
@@ -120,11 +121,17 @@ common:
  reduce-motion: "Zredukuj ruch w UI"
  this-setting-is-this-device-only: "このデバイスのみ"
  use-os-default-emojis: "Użyj domyślnych Emoji systemowych"
+  line-width: "Szerokości linii"
+  line-width-thin: "Chuda"
+  line-width-normal: "Normalna"
+  line-width-thick: "Gruba"
+  hide-password: "Ukryj hasło"
+  show-password: "Pokaż hasło"
  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
  user-suspended: "このユーザーは凍結されています。"
  is-remote-user: "Informacje o użytkowniku są kopiowane."
  is-remote-post: "この投稿情報はコピーです。"
-  view-on-remote: "正確な情報を見る"
+  view-on-remote: "Dla dopełnienia, zobacz to zdalnie."
  renoted-by: "{user} udostępnił(a)"
  error:
    title: "Coś poszło nie tak"
@@ -257,11 +264,11 @@ common/views/components/connect-failed.troubleshooter.vue:
  flush: "Wyczyść pamięć podręczną"
  set-version: "Określ wersję"
 common/views/components/media-banner.vue:
-  sensitive: "閲覧注意"
-  click-to-show: "クリックして表示"
+  sensitive: "NSFW"
+  click-to-show: "Naciśnij aby wyświetlić"
 common/views/components/theme.vue:
-  theme: "テーマ"
-  light-theme: "非ダークモード時に使用するテーマ"
+  theme: "Motyw"
+  light-theme: "Motyw"
  dark-theme: "ダークモード時に使用するテーマ"
  light-themes: "Jasny Motyw"
  dark-themes: "Ciemny motyw"
@@ -277,22 +284,22 @@ common/views/components/theme.vue:
  base-theme: "Podstawowy motyw"
  base-theme-light: "Jasny"
  base-theme-dark: "Ciemny"
-  find-more-theme: "その他のテーマを入手"
+  find-more-theme: "Odkryj więcej motywów"
  theme-name: "Nazwa motywu"
  preview-created-theme: "Pokaż podgląd"
-  invalid-theme: "テーマが正しくありません。"
+  invalid-theme: "Nieprawidłowy motyw"
  already-installed: "Ten motyw jest już zainstalowany"
  saved: "Zapisano"
  manage-themes: "Zarządzanie motywami"
  builtin-themes: "Standardowe motywy"
  my-themes: "Moje motywy"
  installed-themes: "Zainstalowane motywy"
-  select-theme: "テーマを選択してください"
+  select-theme: "Wybierz motyw"
  uninstall: "Odinstaluj"
  uninstalled: "\"{}\" został odinstalowany"
  author: "Author"
  desc: "Opis"
-  export: "エクスポート"
+  export: "Eksportuj"
  import: "Importuj"
  import-by-code: "lub wklej kod"
  theme-name-required: "Nazwa motywu jest obowiązkowa."
@@ -301,7 +308,7 @@ common/views/components/cw-button.vue:
  show: "Pokaż więcej"
  chars: "{count} znaków"
  files: "{count} plików"
-  poll: "アンケート"
+  poll: "Ankieta"
 common/views/components/messaging.vue:
  search-user: "Znajdź użytkownika"
  you: "Ty"
@@ -311,13 +318,13 @@ common/views/components/messaging-room.vue:
  no-history: "Brak dalszej historii"
  resize-form: "Przeciągnij aby zmienić rozmiar"
  new-message: "Nowa wiadomość"
-  only-one-file-attached: "メッセージに添付できるのはひとつのファイルのみです"
+  only-one-file-attached: "Tylko JEDEN plik może zostać dołączony do wiadomości"
 common/views/components/messaging-room.form.vue:
  input-message-here: "Wprowadź wiadomość tutaj"
  send: "Wyślij"
  attach-from-local: "Załącz pliki z komputera"
  attach-from-drive: "Załącz pliki z dysku"
-  only-one-file-attached: "メッセージに添付できるのはひとつのファイルのみです"
+  only-one-file-attached: "Tylko jeden plik może zostać dołączony do wiadomości"
 common/views/components/messaging-room.message.vue:
  is-read: "Przeczytano"
  deleted: "Wiadomość została usunięta"
@@ -331,8 +338,9 @@ common/views/components/nav.vue:
  develop: "Autorzy"
  feedback: "Podziel się opinią"
 common/views/components/note-menu.vue:
-  mention: "メンション"
+  mention: "Wspomnij"
  detail: "Szczegóły"
+  copy-content: "Skopiuj zawartość"
  copy-link: "Skopiuj adres"
  favorite: "Dodaj do ulubionych"
  unfavorite: "Usuń z ulubionych"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "Usuń"
  delete-confirm: "Czy na pewno chcesz usunąć ten wpis?"
  remote: "Pokaż oryginał"
+common/views/components/user-menu.vue:
+  mention: "メンション"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  report-abuse: "スパムを報告"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
  vote-to: "Zagłosuj na '{}'"
  vote-count: "{} głosów"
@@ -378,7 +397,7 @@ common/views/components/signin.vue:
  signin-with-discord: "Zaloguj się za pomocą Discorda"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
-  invitation-code: "招待コード"
+  invitation-code: "Kod zaproszenia"
  invitation-info: "招待コードをお持ちでない方は、<a href=\"{}\">管理者</a>までご連絡ください。"
  username: "Nazwa użytkownika"
  checking: "Sprawdzanie…"
@@ -408,31 +427,31 @@ common/views/components/stream-indicator.vue:
  reconnecting: "Ponowne łączenie"
  connected: "Połączono"
 common/views/components/notification-settings.vue:
-  title: "通知"
-  mark-as-read-all-notifications: "すべての通知を既読にする"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
-  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
+  title: "Powiadomienia"
+  mark-as-read-all-notifications: "Oznacz wszystkie powiadomienia jako przeczytane"
+  mark-as-read-all-unread-notes: "Oznacz wszystkie wpisy jako przeczytane"
+  mark-as-read-all-talk-messages: "Oznacz wszystkie rozmowy jako przeczytane"
+  auto-watch: "Automatycznie nasłuchuj wpisów"
+  auto-watch-desc: "Automatycznie otrzymuj powiadomienia o wpisach, w których zareagowałeś(-aś) lub odpowiedziałeś(-aś)."
 common/views/components/integration-settings.vue:
  title: "サービス連携"
  connect: "Połącz"
-  disconnect: "切断する"
-  connected-to: "次のアカウントに接続されています"
+  disconnect: "Rozłącz"
+  connected-to: "Jesteś połączony(-a) z następującym kontem"
 common/views/components/github-setting.vue:
  description: "お使いのGitHubアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでGitHubアカウント情報が表示されるようになったり、GitHubを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のGitHubアカウントに接続されています"
  detail: "Więcej..."
  reconnect: "Połącz ponownie"
  connect: "GitHubと接続する"
-  disconnect: "切断する"
+  disconnect: "Rozłącz"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "Szczegóły…"
  reconnect: "Połącz ponownie"
  connect: "Discordと接続する"
-  disconnect: "切断する"
+  disconnect: "Rozłącz"
 common/views/components/uploader.vue:
  waiting: "Oczekiwanie"
 common/views/components/visibility-chooser.vue:
@@ -443,7 +462,7 @@ common/views/components/visibility-chooser.vue:
  followers-desc: "Widoczny tylko dla osób, które Cię śledzą"
  specified: "Bezpośredni"
  specified-desc: "Tylko dla określonych użytkowników"
-  local-public: "公開 (ローカルのみ)"
+  local-public: "Publiczny (tylko lokalnie)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "Dla śledzących (tylko lokalnie)"
@@ -469,24 +488,24 @@ common/views/components/profile-editor.vue:
  banner: "Baner"
  is-cat: "To konto jest prowadzone przez kota"
  is-bot: "To konto jest prowadzone przez bota"
-  is-locked: "Żądanania śledzenia wymagają zatwierdzenia"
-  careful-bot: "Botからのフォローだけ承認制にする"
-  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
+  is-locked: "Prośby śledzenia wymagają zatwierdzenia"
+  careful-bot: "Prośby śledzenia od botów wymagają zatwierdzenia"
+  auto-accept-followed: "Automatyczne zatwierdzaj śledzenia od osób, które śledzisz."
  advanced: "Inne"
  privacy: "Prywatność"
  save: "Zapisz"
  saved: "Pomyślnie zaktualizowano profil"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
-  email: "メール設定"
+  uploading: "Wysyłanie"
+  upload-failed: "Wysyłanie nie powiodło się"
+  email: "Ustawienia e-mail"
  email-address: "Adres e-mail"
  email-verified: "メールアドレスが確認されました"
  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
 common/views/components/user-list-editor.vue:
-  users: "ユーザー"
-  rename: "リスト名を変更"
-  delete: "リストを削除"
-  remove-user: "このリストから削除"
+  users: "Użytkownicy"
+  rename: "Zmień nazwę listy"
+  delete: "Usuń listę"
+  remove-user: "Usuń z tej listy"
  delete-are-you-sure: "リスト「$1」を削除しますか？"
  deleted: "削除しました"
 common/views/widgets/broadcast.vue:
@@ -542,13 +561,13 @@ common/views/widgets/tips.vue:
  tips-line24: "Misskey zaczął działać w 2014."
  tips-line25: "Możesz otrzymywać powiadomienia nawet jeżeli Misskey nie jest otwarty w obsługiwanej przeglądarce."
 common/views/pages/not-found.vue:
-  page-not-found: "ページが見つかりませんでした"
+  page-not-found: "Strona nie została znaleziona"
 common/views/pages/follow.vue:
  signed-in-as: "Zalogowany jako {}"
  following: "Śledzisz"
  follow: "Śledź"
  request-pending: "Oczekiwanie na pozwolenie"
-  follow-processing: "フォロー処理中"
+  follow-processing: "Przetwarzanie śledzenia"
  follow-request: "Poproś o śledzenie"
 desktop:
  banner-crop-title: "バナーとして表示する部分を選択"
@@ -662,7 +681,7 @@ desktop/views/components/friends-maker.vue:
 desktop/views/components/game-window.vue:
  game: "Reversi"
 desktop/views/components/home.vue:
-  done: "Wyślij"
+  done: "Zakończ"
  add-widget: "Dodaj widżet:"
  add: "Dodaj"
 desktop/views/input-dialog.vue:
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "Bezpieczeństwo"
  signin: "Historia logowań"
  password: "Hasło"
-  2fa: "Uwierzytelnianie dwuetapowe"
  other: "Inne"
  license: "Licencja"
  theme: "Motyw"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "Np: https://www.google.com/?#q={{query}}"
  auto-popout: "Automatycznie pojawiające się okna"
  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  advanced: "Ustawienia zaawansowane"
-  api-via-stream: "ストリームを経由したAPIリクエスト"
-  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
  deck-default: "Użyj Talię jako domyślne UI"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "Tryb ciemny"
  use-shadow: "Użyj cieni w UI"
  rounded-corners: "Zaokrąglaj rogi w UI"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "Używaj okrągłych ikon"
  contrasted-acct: "ユーザー名にコントラストを付ける"
  post-form-on-timeline: "Wyświetlaj formularz tworzenia wpisu w górnej części osi czasu"
@@ -864,7 +875,7 @@ desktop/views/components/settings.2fa.vue:
  info: "Od teraz, wprowadzaj token wyświetlany na urządzeniu przy każdym logowaniu do Misskey."
 common/views/components/api-settings.vue:
  intro: "Aby uzyskać dostęp do API, ustaw ten token jako klucz 'i' parametrów żądań."
-  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
+  caution: "Nie pokazuj tego tokenu osobom trzecim (nie wprowadzaj go nigdzie indziej), aby konto nie trafiło w niepowołane ręce."
  regeneration-of-token: "W przypadku wycieku tokenu, możesz wygenerować nowy."
  regenerate-token: "Wygeneruj nowy token"
  token: "Token:"
@@ -895,9 +906,9 @@ common/views/components/mute-and-block.vue:
  save: "Zapisz"
 common/views/components/password-settings.vue:
  reset: "Zmień hasło"
-  enter-current-password: "現在のパスワードを入力してください"
-  enter-new-password: "新しいパスワードを入力してください"
-  enter-new-password-again: "もう一度新しいパスワードを入力してください"
+  enter-current-password: "Wprowadź obecne hasło"
+  enter-new-password: "Wprowadź nowe hasło"
+  enter-new-password-again: "Wprowadź ponownie nowe hasło"
  not-match: "新しいパスワードが一致しません"
  changed: "パスワードを変更しました"
  failed: "パスワード変更に失敗しました"
@@ -908,7 +919,7 @@ desktop/views/components/sub-note-content.vue:
  poll: "Ankieta"
 desktop/views/components/settings.tags.vue:
  title: "Tagi"
-  query: "クエリ (省略可)"
+  query: "Zapytanie (opcjonalne)"
  add: "Dodaj"
  save: "Zapisz"
 desktop/views/components/taskmanager.vue:
@@ -949,7 +960,7 @@ desktop/views/components/ui.header.post.vue:
 desktop/views/components/ui.header.search.vue:
  placeholder: "Szukaj"
 desktop/views/components/received-follow-requests-window.vue:
-  title: "Poproś o śledzenie"
+  title: "Prośby o śledzenie"
  accept: "Zatwierdź"
  reject: "Odmów"
 desktop/views/components/user-lists-window.vue:
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "連合"
  announcements: "Ogłoszenia"
  hashtags: "Hashtagi"
+  abuse: "スパム報告"
  back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
  dashboard: "ダッシュボード"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "インスタンス"
  this-instance: "このインスタンス"
  federated: "連合"
+admin/views/abuse.vue:
+  title: "スパム報告"
+  target: "対象"
+  reporter: "報告者"
+  details: "詳細"
+  remove-report: "削除"
 admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "投稿の最大文字数"
  disable-registration: "ユーザー登録の受付を停止する"
  disable-local-timeline: "ローカルタイムラインを無効にする"
+  disable-global-timeline: "グローバルタイムラインを無効にする"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "Zaproś"
  save: "Zapisz"
  saved: "Zapisano"
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "投稿の積算"
    users: "ユーザーの増減"
    users-total: "ユーザーの積算"
+    active-users: "アクティブユーザー数"
    drive: "ドライブ使用量の増減"
    drive-total: "ドライブ使用量の積算"
    drive-files: "ドライブのファイル数の増減"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "Czas reakcji"
    network-usage: "通信量"
 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "ファイルIDまたはファイルURL"
+  file-not-found: "ファイルが見つかりません"
+  lookup: "照会"
  sort:
    title: "ソート"
    createdAtAsc: "アップロード日時が古い順"
@@ -1099,10 +1124,12 @@ admin/views/drive.vue:
  deleted: "削除しました"
  mark-as-sensitive: "閲覧注意に設定"
  unmark-as-sensitive: "閲覧注意を解除"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
  operation: "操作"
  username-or-userid: "ユーザー名またはユーザーID"
-  user-not-found: "ユーザーが見つかりません"
+  user-not-found: "Nie znaleziono użytkownika"
  lookup: "照会"
  reset-password: "パスワードをリセット"
  password-updated: "パスワードは現在「{password}」です"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "登録日時が新しい順"
      updatedAtAsc: "更新日時が古い順"
      updatedAtDesc: "更新日時が新しい順"
+    state:
+      title: "状態"
+      all: "すべて"
+      admin: "管理者"
+      moderator: "モデレーター"
+      adminOrModerator: "管理者+モデレーター"
+      verified: "公式アカウント"
+      suspended: "凍結済み"
    origin:
      title: "Źródło"
      combined: "ローカル+リモート"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "モデレーターの登録"
    add: "Zarejestruj się"
    added: "モデレーターを登録しました"
+    remove: "解除"
+    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "Brak zdjęć"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "Śledzi Cię"
-  stalk: "Stalkuj"
-  stalking: "Stalkujesz"
-  unstalk: "Przestań stalkować"
-  mute: "Wycisz"
-  muted: "Wyciszyłeś"
-  unmute: "Cofnij wyciszenie"
-  block: "Zablokuj"
-  unblock: "ブロック解除"
-  block-confirm: "このユーザーをブロックしますか？"
-  push-to-a-list: "Dodaj do listy"
-  list-pushed: "Dodałeś(-aś) {user} do {list}."
+  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
  posts: "Wpisy"
  following: "Śledzeni"
  followers: "Śledzący"
-  mention: "メンション"
  is-bot: "To konto jest botem"
  years-old: "{age} lat"
  year: "/"
@@ -1240,7 +1266,7 @@ desktop/views/pages/user/user.timeline.vue:
  default: "Wpisy"
  with-replies: "Wpisy i odpowiedzi"
  with-media: "Multimedia"
-  my-posts: "私の投稿"
+  my-posts: "Moje wpisy"
  empty: "Ten użytkownik nie umieścił jeszcze niczego."
 desktop/views/widgets/messaging.vue:
  title: "Wiadomości"
@@ -1304,7 +1330,7 @@ common/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "Śledź"
  request-pending: "フォロー許可待ち"
-  follow-processing: "フォロー処理中"
+  follow-processing: "Przetwarzanie"
  follow-request: "Poproś o śledzenie"
 mobile/views/components/friends-maker.vue:
  title: "Zacznij śledzić ludzi takich jak Ty"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "Przegląd"
  timeline: "Oś czasu"
  media: "Multimedia"
-  mute: "Wycisz"
-  unmute: "ミュート解除"
-  block: "Zablokuj"
-  unblock: "Odblokuj"
  years-old: "{age} lat"
-  push-to-list: "Dodaj do listy"
-  select-list: "Wybierz listę"
-  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "Ostatnie wpisy"
  images: "Zdjęcia"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "Wpisy"
  following: "Śledzeni"
  followers: "Śledzący"
-  mention: "メンション"
  images: "Zdjęcia"
  activity: "Aktywność"
  timeline: "Oś czasu"
  pinned-notes: "Przypięte posty"
-  push-to-a-list: "Dodaj do listy"
 docs:
  edit-this-page-on-github: "Znalazłeś błąd lub chcesz pomóc w tworzeniu dokumentacji?"
  edit-this-page-on-github-link: "Edytuj stronę na GitHubie!"
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "Por favor, não digite ou copie o código aqui. A conta pode ser comprometida."
  load-more: "もっと読み込む"
  enter-password: "パスワードを入力してください"
+  2fa: "二段階認証"
  got-it: "Entendi!"
  customization-tips:
    title: "Dicas de personalização"
@@ -120,6 +121,12 @@ common:
  reduce-motion: "UIの動きを減らす"
  this-setting-is-this-device-only: "このデバイスのみ"
  use-os-default-emojis: "OS標準の絵文字を使用"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
+  hide-password: "パスワードを隠す"
+  show-password: "パスワードを表示する"
  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
  user-suspended: "このユーザーは凍結されています。"
  is-remote-user: "このユーザー情報はコピーです。"
@@ -333,6 +340,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "メンション"
  detail: "詳細"
+  copy-content: "内容をコピー"
  copy-link: "リンクをコピー"
  favorite: "お気に入り"
  unfavorite: "お気に入り解除"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "削除"
  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"
+common/views/components/user-menu.vue:
+  mention: "メンション"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  report-abuse: "スパムを報告"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
  vote-to: "「{}」に投票する"
  vote-count: "{}票"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "セキュリティ"
  signin: "サインイン履歴"
  password: "パスワード"
-  2fa: "二段階認証"
  other: "その他"
  license: "ライセンス"
  theme: "テーマ"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
  auto-popout: "ウィンドウの自動ポップアウト"
  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  advanced: "詳細設定"
-  api-via-stream: "ストリームを経由したAPIリクエスト"
-  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
  deck-default: "デッキをデフォルトのUIにする"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "ダークモード"
  use-shadow: "UIに影を使用"
  rounded-corners: "UIの角を丸める"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "円形のアイコンを使用"
  contrasted-acct: "ユーザー名にコントラストを付ける"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
+  abuse: "スパム報告"
  back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
  dashboard: "ダッシュボード"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "インスタンス"
  this-instance: "このインスタンス"
  federated: "連合"
+admin/views/abuse.vue:
+  title: "スパム報告"
+  target: "対象"
+  reporter: "報告者"
+  details: "詳細"
+  remove-report: "削除"
 admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "投稿の最大文字数"
  disable-registration: "ユーザー登録の受付を停止する"
  disable-local-timeline: "ローカルタイムラインを無効にする"
+  disable-global-timeline: "グローバルタイムラインを無効にする"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "招待"
  save: "保存"
  saved: "保存しました"
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "投稿の積算"
    users: "ユーザーの増減"
    users-total: "ユーザーの積算"
+    active-users: "アクティブユーザー数"
    drive: "ドライブ使用量の増減"
    drive-total: "ドライブ使用量の積算"
    drive-files: "ドライブのファイル数の増減"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "ファイルIDまたはファイルURL"
+  file-not-found: "ファイルが見つかりません"
+  lookup: "照会"
  sort:
    title: "ソート"
    createdAtAsc: "アップロード日時が古い順"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "削除しました"
  mark-as-sensitive: "閲覧注意に設定"
  unmark-as-sensitive: "閲覧注意を解除"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
  operation: "操作"
  username-or-userid: "ユーザー名またはユーザーID"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "登録日時が新しい順"
      updatedAtAsc: "更新日時が古い順"
      updatedAtDesc: "更新日時が新しい順"
+    state:
+      title: "状態"
+      all: "すべて"
+      admin: "管理者"
+      moderator: "モデレーター"
+      adminOrModerator: "管理者+モデレーター"
+      verified: "公式アカウント"
+      suspended: "凍結済み"
    origin:
      title: "オリジン"
      combined: "ローカル+リモート"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
+    remove: "解除"
+    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "写真はありません"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "フォローされています"
-  stalk: "ストークする"
-  stalking: "ストーキングしています"
-  unstalk: "ストーク解除"
-  mute: "ミュートする"
-  muted: "ミュートしています"
-  unmute: "ミュート解除"
-  block: "ブロックする"
-  unblock: "ブロック解除"
-  block-confirm: "このユーザーをブロックしますか？"
-  push-to-a-list: "リストに追加"
-  list-pushed: "{user}を{list}に追加しました。"
+  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  is-bot: "このアカウントはBotです"
  years-old: "{age}歳"
  year: "年"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "概要"
  timeline: "Linha do tempo"
  media: "Mídia"
-  mute: "ミュート"
-  unmute: "ミュート解除"
-  block: "ブロック"
-  unblock: "ブロック解除"
  years-old: "{age}歳"
-  push-to-list: "リストに追加"
-  select-list: "リストを選択してください"
-  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "Notas recentes"
  images: "Imagens"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  images: "画像"
  activity: "アクティビティ"
  timeline: "タイムライン"
  pinned-notes: "ピン留めされた投稿"
-  push-to-a-list: "リストに追加"
 docs:
  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
  edit-this-page-on-github-link: "Edite esta página no GitHub!"
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "Пожалуйста, не вводите и не вставляйте сюда код. Аккаунту может угрожать опасность."
  load-more: "Загрузить больше"
  enter-password: "Пожалуйста, введите ваш пароль"
+  2fa: "二段階認証"
  got-it: "わかった"
  customization-tips:
    title: "Советы по настройке"
@@ -120,6 +121,12 @@ common:
  reduce-motion: "Уменьшить движение в интерфейсе"
  this-setting-is-this-device-only: "Только для этого устройства"
  use-os-default-emojis: "Использовать стандартные Emoji из ОС"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
+  hide-password: "パスワードを隠す"
+  show-password: "パスワードを表示する"
  do-not-use-in-production: "Эта сборка для разработчиков. Не используйте в продакшне."
  user-suspended: "このユーザーは凍結されています。"
  is-remote-user: "このユーザー情報はコピーです。"
@@ -333,6 +340,7 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  mention: "メンション"
  detail: "詳細"
+  copy-content: "内容をコピー"
  copy-link: "リンクをコピー"
  favorite: "お気に入り"
  unfavorite: "お気に入り解除"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "削除"
  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"
+common/views/components/user-menu.vue:
+  mention: "メンション"
+  mute: "ミュート"
+  unmute: "ミュート解除"
+  block: "ブロック"
+  unblock: "ブロック解除"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  report-abuse: "スパムを報告"
+  report-abuse-detail: "どのような迷惑行為を行っていますか？"
+  report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。"
 common/views/components/poll.vue:
  vote-to: "「{}」に投票する"
  vote-count: "{}票"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "セキュリティ"
  signin: "サインイン履歴"
  password: "パスワード"
-  2fa: "二段階認証"
  other: "その他"
  license: "ライセンス"
  theme: "テーマ"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
  auto-popout: "ウィンドウの自動ポップアウト"
  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  advanced: "詳細設定"
-  api-via-stream: "ストリームを経由したAPIリクエスト"
-  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
  deck-default: "デッキをデフォルトのUIにする"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "ダークモード"
  use-shadow: "UIに影を使用"
  rounded-corners: "UIの角を丸める"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "円形のアイコンを使用"
  contrasted-acct: "ユーザー名にコントラストを付ける"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
+  abuse: "スパム報告"
  back-to-misskey: "Misskeyに戻る"
 admin/views/dashboard.vue:
  dashboard: "ダッシュボード"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "インスタンス"
  this-instance: "このインスタンス"
  federated: "連合"
+admin/views/abuse.vue:
+  title: "スパム報告"
+  target: "対象"
+  reporter: "報告者"
+  details: "詳細"
+  remove-report: "削除"
 admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "投稿の最大文字数"
  disable-registration: "ユーザー登録の受付を停止する"
  disable-local-timeline: "ローカルタイムラインを無効にする"
+  disable-global-timeline: "グローバルタイムラインを無効にする"
+  disabling-timelines-info: "これらのタイムラインを無効にしても、管理者およびモデレーターは引き続き利用できます。"
  invite: "招待"
  save: "保存"
  saved: "保存しました"
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "投稿の積算"
    users: "ユーザーの増減"
    users-total: "ユーザーの積算"
+    active-users: "アクティブユーザー数"
    drive: "ドライブ使用量の増減"
    drive-total: "ドライブ使用量の積算"
    drive-files: "ドライブのファイル数の増減"
@@ -1084,6 +1105,10 @@ admin/views/charts.vue:
    network-time: "応答時間"
    network-usage: "通信量"
 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "ファイルIDまたはファイルURL"
+  file-not-found: "ファイルが見つかりません"
+  lookup: "照会"
  sort:
    title: "ソート"
    createdAtAsc: "アップロード日時が古い順"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "削除しました"
  mark-as-sensitive: "閲覧注意に設定"
  unmark-as-sensitive: "閲覧注意を解除"
+  marked-as-sensitive: "閲覧注意に設定しました"
+  unmarked-as-sensitive: "閲覧注意を解除しました"
 admin/views/users.vue:
  operation: "操作"
  username-or-userid: "ユーザー名またはユーザーID"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "登録日時が新しい順"
      updatedAtAsc: "更新日時が古い順"
      updatedAtDesc: "更新日時が新しい順"
+    state:
+      title: "状態"
+      all: "すべて"
+      admin: "管理者"
+      moderator: "モデレーター"
+      adminOrModerator: "管理者+モデレーター"
+      verified: "公式アカウント"
+      suspended: "凍結済み"
    origin:
      title: "オリジン"
      combined: "ローカル+リモート"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
+    remove: "解除"
+    removed: "モデレーター登録を解除しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "写真はありません"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "フォローされています"
-  stalk: "ストークする"
-  stalking: "ストーキングしています"
-  unstalk: "ストーク解除"
-  mute: "ミュートする"
-  muted: "ミュートしています"
-  unmute: "ミュート解除"
-  block: "ブロックする"
-  unblock: "ブロック解除"
-  block-confirm: "このユーザーをブロックしますか？"
-  push-to-a-list: "リストに追加"
-  list-pushed: "{user}を{list}に追加しました。"
+  menu: "メニュー"
 desktop/views/pages/user/user.header.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  is-bot: "このアカウントはBotです"
  years-old: "{age}歳"
  year: "年"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "概要"
  timeline: "タイムライン"
  media: "メディア"
-  mute: "ミュート"
-  unmute: "ミュート解除"
-  block: "ブロック"
-  unblock: "ブロック解除"
  years-old: "{age}歳"
-  push-to-list: "リストに追加"
-  select-list: "リストを選択してください"
-  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "投稿"
  following: "フォロー"
  followers: "フォロワー"
-  mention: "メンション"
  images: "画像"
  activity: "アクティビティ"
  timeline: "タイムライン"
  pinned-notes: "ピン留めされた投稿"
-  push-to-a-list: "リストに追加"
 docs:
  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
  edit-this-page-on-github-link: "このページをGitHubで編集"
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -3,12 +3,12 @@ meta:
  lang: "中文(简体)"
  divider: ""
 common:
-  misskey: "A ⭐ of the fediverse"
-  about-title: "A ⭐ of the fediverse."
-  about: "感谢您找到Misskey. Misskey是一个开源的程序, 她可以同其他的社交网站进行联系. 为什么不从喧嚣的城市中休息一下, 来试一试这个新的程序呢?"
+  misskey: "Fediverse中的一颗⭐"
+  about-title: "Fediverse中的一颗⭐"
+  about: "非常感谢您找到了Misskey。 Misskey是出生于地球上的<b>分布式微博SNS</b>。因为她处于Fediverse(由各种SNS组成的宇宙)中，所以她与其他SNS相互连接。想要远离喧嚣的城市，不如深入这个新的互联网来探索一下吧。"
  intro:
    title: "什么是 Misskey 呢?"
-    about: "Misskey是开源的<b>分散式微博服务</b>。复杂的完全可定制的Ui，各种各样的帖子反应，提供集成管理系统和其他先进功能的免费文件存储。此外，网络系统称为“Fediverse”使我们能够与其他SNS的用户进行通信。比如，如果你张贴一些东西，那么你的帖子不仅会发送给Misskey，还会发送到其他平台。想象一下，行星正在向另一颗行星发送微波来进行通信。"
+    about: "Misskey是开源的<b>分散式微博SNS</b>。复杂的完全可定制的Ui，各种各样的帖子反应，提供集成管理系统和其他先进功能的免费文件存储。此外，称为“Fediverse”的网络系统使我们能够与其他SNS的用户进行通信。比如，如果你张贴一些东西，那么你的帖子不仅会发送给Misskey，还会发送到其他SNS平台。想象一下，正如一颗行星和另一颗行星通过发送微波来进行通信一样。"
    features: "特点"
    rich-contents: "发布"
    rich-contents-desc: "您只需要发布您的想法, 热门话题或者任何您想分享的好东西. 你可以装饰你的文字, 加上你最喜欢的图片, 发送文件或者电影, 甚至创造一个投票. 这些事情您都可以在 Misskey 上做。"
@@ -27,6 +27,7 @@ common:
  do-not-copy-paste: "请不要在这里输入或粘贴代码。您帐户可能会受到损害。"
  load-more: "加载更多"
  enter-password: "请输入您的密码"
+  2fa: "双重身份验证"
  got-it: "没问题"
  customization-tips:
    title: "客制化提示"
@@ -53,7 +54,7 @@ common:
    years_ago: "{}年前"
  month-and-day: "{month}月 {day}日"
  trash: "垃圾箱"
-  drive: "Misskey 云盘"
+  drive: "网盘"
  messaging: "聊天"
  weekday-short:
    sunday: "日"
@@ -109,7 +110,7 @@ common:
  my-token-regenerated: "您的 Token 已被重置, 您将自动登出。"
  i-like-sushi: "相比于布丁来说, 我更喜欢寿司。"
  show-reversi-board-labels: "在 Reversi 中显示行和列表签"
-  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
+  use-avatar-reversi-stones: "用头像作为 Reversi 中的 “石头”"
  verified-user: "认证用户"
  disable-animated-mfm: "在帖子中禁用动画文本"
  suggest-recent-hashtags: "在帖子表单上显示最近流行的主题标签"
@@ -120,8 +121,14 @@ common:
  reduce-motion: "减弱UI中的动画效果"
  this-setting-is-this-device-only: "设置仅在本设备中生效"
  use-os-default-emojis: "使用设备系统默认的 emojis"
+  line-width: "线条宽度"
+  line-width-thin: "细"
+  line-width-normal: "正常"
+  line-width-thick: "粗"
+  hide-password: "隐藏密码"
+  show-password: "显示密码"
  do-not-use-in-production: "这是一个开发者测试版. 请勿在生产环境中使用."
-  user-suspended: "このユーザーは凍結されています。"
+  user-suspended: "该用户已被冻结。"
  is-remote-user: "该用户的信息已被复制."
  is-remote-post: "该投稿已被复制."
  view-on-remote: "查看准确的信息"
@@ -260,7 +267,7 @@ common/views/components/media-banner.vue:
  sensitive: "阅读注意"
  click-to-show: "点击以显示"
 common/views/components/theme.vue:
-  theme: "テーマ"
+  theme: "主题"
  light-theme: "主题"
  dark-theme: "黑暗模式主题"
  light-themes: "明亮主题"
@@ -277,7 +284,7 @@ common/views/components/theme.vue:
  base-theme: "基础主题"
  base-theme-light: "亮"
  base-theme-dark: "暗"
-  find-more-theme: "その他のテーマを入手"
+  find-more-theme: "获取更多主题"
  theme-name: "主题名称"
  preview-created-theme: "预览"
  invalid-theme: "无效主题"
@@ -299,9 +306,9 @@ common/views/components/theme.vue:
 common/views/components/cw-button.vue:
  hide: "隐藏"
  show: "查看更多"
-  chars: "{count}文字"
+  chars: "{count} 字"
  files: "{count} 个文件"
-  poll: "アンケート"
+  poll: "调查问卷"
 common/views/components/messaging.vue:
  search-user: "查找用户"
  you: "您"
@@ -331,8 +338,9 @@ common/views/components/nav.vue:
  develop: "开发者"
  feedback: "反馈"
 common/views/components/note-menu.vue:
-  mention: "メンション"
+  mention: "提到"
  detail: "详细信息"
+  copy-content: "复制内容"
  copy-link: "复制链接"
  favorite: "收藏这个投稿"
  unfavorite: "取消收藏"
@@ -341,6 +349,17 @@ common/views/components/note-menu.vue:
  delete: "删除"
  delete-confirm: "确定删除这个投稿吗?"
  remote: "显示原始投稿"
+common/views/components/user-menu.vue:
+  mention: "提及"
+  mute: "静音"
+  unmute: "取消静音"
+  block: "屏蔽"
+  unblock: "取消屏蔽"
+  push-to-list: "添加至列表"
+  select-list: "请选择一个列表"
+  report-abuse: "举报垃圾邮件"
+  report-abuse-detail: "做了什么骚扰的行为？"
+  report-abuse-reported: "已报告给管理员。 非常感谢你的合作。"
 common/views/components/poll.vue:
  vote-to: "为\"{}\"投票"
  vote-count: "{}票"
@@ -409,16 +428,16 @@ common/views/components/stream-indicator.vue:
  connected: "已连接"
 common/views/components/notification-settings.vue:
  title: "通知"
-  mark-as-read-all-notifications: "すべての通知を既読にする"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
-  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
+  mark-as-read-all-notifications: "将所有通知标为已读"
+  mark-as-read-all-unread-notes: "将所有帖子标为已读"
+  mark-as-read-all-talk-messages: "将所有对话标为已读"
+  auto-watch: "自动查看帖子"
+  auto-watch-desc: "自动接收有关您做出反应或回复的帖子的通知。"
 common/views/components/integration-settings.vue:
-  title: "サービス連携"
+  title: "服务合作"
  connect: "连接"
  disconnect: "未连接"
-  connected-to: "次のアカウントに接続されています"
+  connected-to: "您的账号已连接一下社交账号"
 common/views/components/github-setting.vue:
  description: "当您用GitHub连接Misskey账户后，您将能够看到有关您自己的信息，并且您将能够使用GitHub登录。"
  connected-to: "此账户已连接GitHub"
@@ -471,7 +490,7 @@ common/views/components/profile-editor.vue:
  is-bot: "整个账户是机器人"
  is-locked: "关注者请求需要批准"
  careful-bot: "机器人的关注者请求需要批准"
-  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
+  auto-accept-followed: "自动同意来自您关注的人的关注申请"
  advanced: "其他选项"
  privacy: "隐私"
  save: "保存"
@@ -538,11 +557,11 @@ common/views/widgets/tips.vue:
  tips-line19: "可以在浏览器外部分离多个窗口。"
  tips-line20: "日历小部件的百分比显示经过的时间百分比。"
  tips-line21: "您也可以使用API开发机器人。"
-  tips-line23: "藍かわいいよ藍"
+  tips-line23: "Ai-chan kawaii!"
  tips-line24: "Misskey自2014年开始运营。"
  tips-line25: "在与通知功能兼容的浏览器中，您可以在Misskey未打开的情况下接收通知"
 common/views/pages/not-found.vue:
-  page-not-found: "ページが見つかりませんでした"
+  page-not-found: "啊喔, 页面走丢了..."
 common/views/pages/follow.vue:
  signed-in-as: "用 {}登录"
  following: "正在关注"
@@ -678,12 +697,12 @@ desktop/views/components/note-detail.vue:
  location: "位置信息"
  renote: "转发"
  add-reaction: "添加一个反应"
-  undo-reaction: "リアクション解除"
+  undo-reaction: "取消反应"
 desktop/views/components/note.vue:
  reply: "回复"
  renote: "Renote"
  add-reaction: "添加一个反应"
-  undo-reaction: "リアクション解除"
+  undo-reaction: "取消反应"
  detail: "详细信息"
  private: "这个投稿是私密的"
  deleted: "投稿已删除"
@@ -754,7 +773,6 @@ desktop/views/components/settings.vue:
  security: "安全性"
  signin: "登录历史"
  password: "密码"
-  2fa: "两步验证"
  other: "其他"
  license: "许可证"
  theme: "主题"
@@ -768,9 +786,6 @@ desktop/views/components/settings.vue:
  web-search-engine-desc: "例如: https://www.google.com/?#q={{query}}"
  auto-popout: "自动弹出窗口"
  auto-popout-desc: "如果可用，将使用弹出显示而不是打开新窗口。 此设置存储在浏览器中。"
-  advanced: "更多设置"
-  api-via-stream: "通过API请求的Stream"
-  api-via-stream-desc: "API请求通过WebSocket连接而不是本机提取API执行（以获得更好的性能）。 此设置存储在浏览器中。"
  deck-nav: "Deck 内的导航"
  deck-nav-desc: "在使用Deck时，您会在导航期间获得一个没有页面过渡的临时列。"
  deck-default: "将Deck界面设置为默认UI显示界面"
@@ -782,10 +797,6 @@ desktop/views/components/settings.vue:
  dark-mode: "黑暗模式"
  use-shadow: "在UI中使用阴影效果"
  rounded-corners: "UI界面圆角效果"
-  line-width: "線の太さ"
-  line-width-thin: "細い"
-  line-width-normal: "普通"
-  line-width-thick: "太い"
  circle-icons: "使用圆形图标"
  contrasted-acct: "增加用户名的对比度"
  post-form-on-timeline: "在时间线顶部显示帖子表单"
@@ -797,16 +808,16 @@ desktop/views/components/settings.vue:
  show-local-renotes: "在时间线中显示Local Renote(s)"
  show-maps: "显示地图以显示位置"
  remain-deleted-note: "继续显示已删除的帖子"
-  deck-column-align: "デッキのカラムの配置"
+  deck-column-align: "列对齐设置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
-  deck-column-align-flexible: "フレキシブル"
-  deck-column-width: "デッキのカラムの幅"
-  deck-column-width-narrow: "狭"
-  deck-column-width-narrower: "やや狭"
+  deck-column-align-flexible: "可变"
+  deck-column-width: "列宽度"
+  deck-column-width-narrow: "窄"
+  deck-column-width-narrower: "更窄"
  deck-column-width-normal: "正常"
-  deck-column-width-wider: "やや広"
-  deck-column-width-wide: "広"
+  deck-column-width-wider: "更宽"
+  deck-column-width-wide: "宽"
  sound: "声音"
  enable-sounds: "开启声音"
  enable-sounds-desc: "收到帖子/留言时播放声音。 此设置将被存储在浏览器中。"
@@ -855,7 +866,7 @@ desktop/views/components/settings.2fa.vue:
  enter-password: "请输入您的密码"
  authenticator: "首先，您需要在设备上安装 Google Authenticator："
  howtoinstall: "怎样安装"
-  token: "トークン"
+  token: "令牌"
  scan: "然后，扫描二维码:"
  done: "请输入显示在您设备上的密钥:"
  submit: "提交"
@@ -978,6 +989,7 @@ admin/views/index.vue:
  federation: "联合"
  announcements: "公告"
  hashtags: "标签"
+  abuse: "举报垃圾信息"
  back-to-misskey: "返回 Misskey"
 admin/views/dashboard.vue:
  dashboard: "Dashboard"
@@ -987,6 +999,12 @@ admin/views/dashboard.vue:
  instances: "例子"
  this-instance: "此实例"
  federated: "联合"
+admin/views/abuse.vue:
+  title: "举报垃圾信息"
+  target: "目标"
+  reporter: "报告者"
+  details: "详情"
+  remove-report: "删除"
 admin/views/instance.vue:
  instance: "例子"
  instance-name: "实例名称"
@@ -1033,6 +1051,8 @@ admin/views/instance.vue:
  max-note-text-length: "最大帖子字符数"
  disable-registration: "停用新用户注册功能"
  disable-local-timeline: "停用本地时间线功能"
+  disable-global-timeline: "禁用全局时间线"
+  disabling-timelines-info: "即使禁用时间线，管理员和版主仍然可用。"
  invite: "邀请"
  save: "保存"
  saved: "保存完毕"
@@ -1054,7 +1074,7 @@ admin/views/instance.vue:
  smtp-pass: "SMTP 密码"
  serviceworker-config: "ServiceWorker"
  enable-serviceworker: "启用ServiceWorker"
-  serviceworker-info: "プッシュ通知を行うには有効する必要があります。"
+  serviceworker-info: "您需要启用推送通知"
  vapid-publickey: "VAPID公钥"
  vapid-privatekey: "VAPID私钥"
  vapid-info: "如果您想要启用ServiceWorker，那么您需要生成VAPID秘钥。除非您已经在其他地方设置了全局node_modules位置，否则您需要将其作为root用户运行："
@@ -1076,6 +1096,7 @@ admin/views/charts.vue:
    notes-total: "帖子总数"
    users: "用户数量：增加/减少"
    users-total: "用户总数"
+    active-users: "活跃用户数"
    drive: "存储容量：增加/减少"
    drive-total: "云盘总容量"
    drive-files: "云盘上的文件数：增加/减少"
@@ -1084,12 +1105,16 @@ admin/views/charts.vue:
    network-time: "响应时间"
    network-usage: "网络流量"
 admin/views/drive.vue:
+  operation: "操作"
+  fileid-or-url: "文件ID或文件URL"
+  file-not-found: "找不到文件"
+  lookup: "查询"
  sort:
    title: "排序"
-    createdAtAsc: "アップロード日時が古い順"
-    createdAtDesc: "アップロード日時が新しい順"
-    sizeAsc: "サイズが小さい順"
-    sizeDesc: "サイズが大きい順"
+    createdAtAsc: "按上传时间（升序）"
+    createdAtDesc: "按上传时间（降序）"
+    sizeAsc: "按大小（升序）"
+    sizeDesc: "按大小（降序）"
  origin:
    title: "源自"
    combined: "本地+远程"
@@ -1099,6 +1124,8 @@ admin/views/drive.vue:
  deleted: "已删除"
  mark-as-sensitive: "标记为“敏感”"
  unmark-as-sensitive: "取消标记为“敏感”"
+  marked-as-sensitive: "标记为关注"
+  unmarked-as-sensitive: "解除关注标记"
 admin/views/users.vue:
  operation: "操作"
  username-or-userid: "用户名或用户ID"
@@ -1122,6 +1149,14 @@ admin/views/users.vue:
      createdAtDesc: "注册时间从新到旧"
      updatedAtAsc: "更新时间从旧到新"
      updatedAtDesc: "更新时间从新到旧"
+    state:
+      title: "状态"
+      all: "全部"
+      admin: "管理员"
+      moderator: "版主"
+      adminOrModerator: "管理员+版主"
+      verified: "官方认证账户"
+      suspended: "已冻结"
    origin:
      title: "源自"
      combined: "本地+远程"
@@ -1134,6 +1169,8 @@ admin/views/moderators.vue:
    title: "注册版主"
    add: "注册"
    added: "已注册版主。"
+    remove: "解除"
+    removed: "取消注册版主"
 admin/views/emoji.vue:
  add-emoji:
    title: "添加emoji"
@@ -1215,22 +1252,11 @@ desktop/views/pages/user/user.photos.vue:
  no-photos: "没有图片"
 desktop/views/pages/user/user.profile.vue:
  follows-you: "关注您"
-  stalk: "跟踪"
-  stalking: "正在跟踪"
-  unstalk: "解除跟踪"
-  mute: "静音"
-  muted: "正在静音"
-  unmute: "取消静音"
-  block: "屏蔽"
-  unblock: "取消屏蔽"
-  block-confirm: "您确定要屏蔽这个用户吗？"
-  push-to-a-list: "添加至列表"
-  list-pushed: "成功添加{user}到{list}"
+  menu: "菜单"
 desktop/views/pages/user/user.header.vue:
  posts: "帖子"
  following: "关注中"
  followers: "关注者"
-  mention: "メンション"
  is-bot: "这个账户是Bot"
  years-old: "{age}岁"
  year: "年"
@@ -1240,7 +1266,7 @@ desktop/views/pages/user/user.timeline.vue:
  default: "帖子"
  with-replies: "帖子与回复"
  with-media: "媒体"
-  my-posts: "私の投稿"
+  my-posts: "我的帖子"
  empty: "看起来这个用户还没有发布什么呢。"
 desktop/views/widgets/messaging.vue:
  title: "信息"
@@ -1471,14 +1497,7 @@ mobile/views/pages/user.vue:
  overview: "概观"
  timeline: "时间线"
  media: "媒体"
-  mute: "静音"
-  unmute: "取消静音"
-  block: "屏蔽"
-  unblock: "取消屏蔽"
  years-old: "{age}岁"
-  push-to-list: "添加至列表"
-  select-list: "选择一个列表"
-  list-pushed: "成功添加{user}到{list}"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近的帖子"
  images: "图片"
@@ -1524,12 +1543,10 @@ deck/deck.user-column.vue:
  posts: "帖子"
  following: "关注中"
  followers: "关注者"
-  mention: "メンション"
  images: "图片"
  activity: "活动"
  timeline: "时间线"
  pinned-notes: "标记投稿"
-  push-to-a-list: "添加至列表"
 docs:
  edit-this-page-on-github: "发现错误或想要为文档做出贡献？"
  edit-this-page-on-github-link: "在GitHub上编辑这个页面。"
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.73.0",
-	"clientVersion": "2.0.13266",
+	"version": "10.78.5",
+	"clientVersion": "2.0.13712",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -20,11 +20,11 @@
 		"format": "gulp format"
 	},
 	"dependencies": {
-		"@fortawesome/fontawesome-svg-core": "1.2.8",
-		"@fortawesome/free-brands-svg-icons": "5.6.0",
+		"@fortawesome/fontawesome-svg-core": "1.2.12",
+		"@fortawesome/free-brands-svg-icons": "5.6.3",
 		"@fortawesome/free-regular-svg-icons": "5.5.0",
 		"@fortawesome/free-solid-svg-icons": "5.6.3",
-		"@fortawesome/vue-fontawesome": "0.1.2",
+		"@fortawesome/vue-fontawesome": "0.1.5",
 		"@koa/cors": "2.2.3",
 		"@prezzemolo/rap": "0.1.2",
 		"@prezzemolo/zip": "0.0.3",
@@ -34,7 +34,7 @@
 		"@types/debug": "0.0.31",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/elasticsearch": "5.0.29",
+		"@types/elasticsearch": "5.0.30",
 		"@types/file-type": "10.6.0",
 		"@types/gulp": "3.8.36",
 		"@types/gulp-mocha": "0.0.32",
@@ -43,26 +43,27 @@
 		"@types/gulp-uglify": "3.0.6",
 		"@types/gulp-util": "3.0.34",
 		"@types/is-root": "1.0.0",
+		"@types/is-svg": "3.0.0",
 		"@types/is-url": "1.2.28",
 		"@types/js-yaml": "3.11.4",
 		"@types/katex": "0.5.0",
-		"@types/koa": "2.0.47",
+		"@types/koa": "2.0.48",
 		"@types/koa-bodyparser": "5.0.2",
 		"@types/koa-compress": "2.0.8",
 		"@types/koa-favicon": "2.0.19",
 		"@types/koa-logger": "3.1.1",
 		"@types/koa-mount": "3.0.1",
 		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.35",
+		"@types/koa-router": "7.0.38",
 		"@types/koa-send": "4.1.1",
 		"@types/koa-views": "2.0.3",
 		"@types/koa__cors": "2.2.3",
 		"@types/minio": "7.0.1",
 		"@types/mkdirp": "0.5.2",
 		"@types/mocha": "5.2.5",
-		"@types/mongodb": "3.1.14",
+		"@types/mongodb": "3.1.18",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.12.10",
+		"@types/node": "10.12.18",
 		"@types/nodemailer": "4.6.5",
 		"@types/oauth": "0.9.1",
 		"@types/parsimmon": "1.10.0",
@@ -70,13 +71,13 @@
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.3.0",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.8",
+		"@types/redis": "2.8.10",
 		"@types/request": "2.48.1",
 		"@types/request-promise-native": "1.0.15",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
 		"@types/sharp": "0.21.0",
-		"@types/showdown": "1.9.0",
+		"@types/showdown": "1.9.2",
 		"@types/speakeasy": "2.0.3",
 		"@types/systeminformation": "3.23.1",
 		"@types/tinycolor2": "1.4.1",
@@ -86,8 +87,8 @@
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
-		"animejs": "2.2.0",
-		"apexcharts": "2.4.2",
+		"animejs": "3.0.1",
+		"apexcharts": "2.5.1",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
@@ -96,27 +97,27 @@
 		"bootstrap-vue": "2.0.0-rc.11",
 		"cafy": "12.0.0",
 		"chai": "4.2.0",
-		"chai-http": "4.2.0",
-		"chalk": "2.4.1",
+		"chalk": "2.4.2",
+		"chai-http": "4.2.1",
 		"commander": "2.19.0",
 		"crc-32": "1.2.0",
 		"css-loader": "1.0.1",
-		"cssnano": "4.1.7",
+		"cssnano": "4.1.8",
 		"dateformat": "3.0.3",
 		"debug": "4.1.0",
 		"deep-equal": "1.0.1",
 		"deepcopy": "0.6.3",
 		"diskusage": "1.0.0",
 		"double-ended-queue": "2.1.0-0",
-		"elasticsearch": "15.2.0",
+		"elasticsearch": "15.3.0",
 		"emojilib": "2.4.0",
 		"escape-regexp": "0.0.1",
-		"eslint": "5.11.1",
-		"eslint-plugin-vue": "5.0.0",
+		"eslint": "5.12.0",
+		"eslint-plugin-vue": "5.1.0",
 		"eventemitter3": "3.1.0",
 		"feed": "2.0.2",
 		"file-loader": "2.0.0",
-		"file-type": "10.6.0",
+		"file-type": "10.7.0",
 		"fuckadblock": "3.2.1",
 		"gulp": "3.9.1",
 		"gulp-cssnano": "2.1.3",
@@ -136,8 +137,9 @@
 		"http-signature": "1.2.0",
 		"insert-text-at-cursor": "0.1.1",
 		"is-root": "2.0.0",
+		"is-svg": "3.0.0",
 		"is-url": "1.2.4",
-		"js-yaml": "3.12.0",
+		"js-yaml": "3.12.1",
 		"jsdom": "13.1.0",
 		"json5": "2.1.0",
 		"json5-loader": "1.0.1",
@@ -156,17 +158,18 @@
 		"koa-views": "6.1.4",
 		"langmap": "0.0.16",
 		"loader-utils": "1.2.3",
-		"minio": "7.0.2",
+		"lookup-dns-cache": "2.1.0",
+		"minio": "7.0.3",
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",
 		"moji": "0.5.1",
-		"moment": "2.22.2",
+		"moment": "2.23.0",
 		"mongodb": "3.1.10",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nan": "2.12.1",
 		"nested-property": "0.0.7",
-		"nodemailer": "4.7.0",
+		"nodemailer": "5.1.1",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"on-build-webpack": "0.1.0",
@@ -175,7 +178,8 @@
 		"parsimmon": "1.12.0",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
-		"progress-bar-webpack-plugin": "1.11.0",
+		"progress-bar-webpack-plugin": "1.12.0",
+		"promise-any": "0.2.0",
 		"promise-limit": "2.7.0",
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
@@ -189,7 +193,7 @@
 		"request": "2.88.0",
 		"request-promise-native": "1.0.5",
 		"request-stats": "3.0.0",
-		"rimraf": "2.6.2",
+		"rimraf": "2.6.3",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
 		"seedrandom": "2.4.4",
@@ -204,15 +208,15 @@
 		"summaly": "2.2.0",
 		"systeminformation": "3.52.2",
 		"syuilo-password-strength": "0.0.1",
-		"terser-webpack-plugin": "1.1.0",
+		"terser-webpack-plugin": "1.2.1",
 		"textarea-caret": "3.1.0",
 		"tinycolor2": "1.4.1",
 		"tmp": "0.0.33",
-		"ts-loader": "5.3.1",
+		"ts-loader": "5.3.3",
 		"ts-node": "7.0.1",
 		"tslint": "5.12.0",
 		"tslint-sonarts": "1.8.0",
-		"typescript": "3.2.2",
+		"typescript": "3.2.4",
 		"typescript-eslint-parser": "21.0.2",
 		"uglify-es": "3.3.9",
 		"url-loader": "1.1.2",
@@ -222,10 +226,10 @@
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.5.3",
 		"vue-cropperjs": "3.0.0",
-		"vue-i18n": "8.3.2",
+		"vue-i18n": "8.7.0",
 		"vue-js-modal": "1.3.28",
-		"vue-loader": "15.4.2",
-		"vue-marquee-text-component": "1.1.0",
+		"vue-loader": "15.5.1",
+		"vue-marquee-text-component": "1.1.1",
 		"vue-router": "3.0.2",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
@@ -237,8 +241,8 @@
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
 		"webfinger.js": "2.7.0",
-		"webpack": "4.26.1",
-		"webpack-cli": "3.1.2",
+		"webpack": "4.28.4",
+		"webpack-cli": "3.2.1",
 		"websocket": "1.0.28",
 		"ws": "6.1.2",
 		"xev": "2.0.1"
--- a/src/chart/active-users.ts
+++ b/src/chart/active-users.ts
@@ -0,0 +1,48 @@
+import autobind from 'autobind-decorator';
+import Chart, { Obj } from '.';
+import { IUser, isLocalUser } from '../models/user';
+
+/**
+ * アクティブユーザーに関するチャート
+ */
+type ActiveUsersLog = {
+	local: {
+		/**
+		 * アクティブユーザー数
+		 */
+		count: number;
+	};
+
+	remote: ActiveUsersLog['local'];
+};
+
+class ActiveUsersChart extends Chart<ActiveUsersLog> {
+	constructor() {
+		super('activeUsers');
+	}
+
+	@autobind
+	protected async getTemplate(init: boolean, latest?: ActiveUsersLog): Promise<ActiveUsersLog> {
+		return {
+			local: {
+				count: 0
+			},
+			remote: {
+				count: 0
+			}
+		};
+	}
+
+	@autobind
+	public async update(user: IUser) {
+		const update: Obj = {
+			count: 1
+		};
+
+		await this.incIfUnique({
+			[isLocalUser(user) ? 'local' : 'remote']: update
+		}, 'users', user._id.toHexString());
+	}
+}
+
+export default new ActiveUsersChart();
--- a/src/chart/index.ts
+++ b/src/chart/index.ts
@@ -316,21 +316,9 @@ export default abstract class Chart<T> {
 		const res: ArrayValue<T> = {} as any;

 		/**
-		 * [{
-		 * 	xxxxx: 1, yyyyy: 5
-		 * }, {
-		 * 	xxxxx: 2, yyyyy: 6
-		 * }, {
-		 * 	xxxxx: 3, yyyyy: 7
-		 * }]
-		 *
+		 * [{ foo: 1, bar: 5 }, { foo: 2, bar: 6 }, { foo: 3, bar: 7 }]
 		 * を
-		 *
-		 * {
-		 * 	xxxxx: [1, 2, 3],
-		 * 	yyyyy: [5, 6, 7]
-		 * }
-		 *
+		 * { foo: [1, 2, 3], bar: [5, 6, 7] }
 		 * にする
 		 */
 		const dive = (x: Obj, path?: string) => {
--- a/src/client/app/admin/views/abuse.vue
+++ b/src/client/app/admin/views/abuse.vue
@@ -0,0 +1,83 @@
+<template>
+<div>
+	<ui-card>
+		<div slot="title"><fa :icon="faExclamationCircle"/> {{ $t('title') }}</div>
+		<section class="fit-top">
+			<sequential-entrance animation="entranceFromTop" delay="25">
+				<div v-for="report in userReports" :key="report.id" class="haexwsjc">
+					<ui-horizon-group inputs>
+						<ui-input :value="report.user | acct" type="text" readonly>
+							<span>{{ $t('target') }}</span>
+						</ui-input>
+						<ui-input :value="report.reporter | acct" type="text" readonly>
+							<span>{{ $t('reporter') }}</span>
+						</ui-input>
+					</ui-horizon-group>
+					<ui-textarea :value="report.comment" readonly>
+						<span>{{ $t('details') }}</span>
+					</ui-textarea>
+					<ui-button @click="removeReport(report)">{{ $t('remove-report') }}</ui-button>
+				</div>
+			</sequential-entrance>
+			<ui-button v-if="existMore" @click="fetchUserReports">{{ $t('@.load-more') }}</ui-button>
+		</section>
+	</ui-card>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../i18n';
+import { faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
+
+export default Vue.extend({
+	i18n: i18n('admin/views/abuse.vue'),
+
+	data() {
+		return {
+			limit: 10,
+			untilId: undefined,
+			userReports: [],
+			existMore: false,
+			faExclamationCircle
+		};
+	},
+
+	mounted() {
+		this.fetchUserReports();
+	},
+
+	methods: {
+		fetchUserReports() {
+			this.$root.api('admin/abuse-user-reports', {
+				untilId: this.untilId,
+				limit: this.limit + 1
+			}).then(reports => {
+				if (reports.length == this.limit + 1) {
+					reports.pop();
+					this.existMore = true;
+				} else {
+					this.existMore = false;
+				}
+				this.userReports = this.userReports.concat(reports);
+				this.untilId = this.userReports[this.userReports.length - 1].id;
+			});
+		},
+
+		removeReport(report) {
+			this.$root.api('admin/remove-abuse-user-report', {
+				reportId: report.id
+			}).then(() => {
+				this.userReports = this.userReports.filter(r => r.id != report.id);
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.haexwsjc
+	padding-bottom 16px
+	border-bottom solid 1px var(--faceDivider)
+
+</style>
--- a/src/client/app/admin/views/announcements.vue
+++ b/src/client/app/admin/views/announcements.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="cdeuzmsthagexbkpofbmatmugjuvogfb">
+<div>
 	<ui-card>
 		<div slot="title"><fa icon="broadcast-tower"/> {{ $t('announcements') }}</div>
 		<section v-for="(announcement, i) in announcements" class="fit-top">
@@ -83,10 +83,3 @@ export default Vue.extend({
 	}
 });
 </script>
-
-<style lang="stylus" scoped>
-.cdeuzmsthagexbkpofbmatmugjuvogfb
-	@media (min-width 500px)
-		padding 16px
-
-</style>
--- a/src/client/app/admin/views/charts.vue
+++ b/src/client/app/admin/views/charts.vue
@@ -10,6 +10,7 @@
 			<optgroup :label="$t('users')">
 				<option value="users">{{ $t('charts.users') }}</option>
 				<option value="users-total">{{ $t('charts.users-total') }}</option>
+				<option value="active-users">{{ $t('charts.active-users') }}</option>
 			</optgroup>
 			<optgroup :label="$t('notes')">
 				<option value="notes">{{ $t('charts.notes') }}</option>
@@ -67,6 +68,7 @@ export default Vue.extend({
 				case 'federation-instances-total': return this.federationInstancesChart(true);
 				case 'users': return this.usersChart(false);
 				case 'users-total': return this.usersChart(true);
+				case 'active-users': return this.activeUsersChart();
 				case 'notes': return this.notesChart('combined');
 				case 'local-notes': return this.notesChart('local');
 				case 'remote-notes': return this.notesChart('remote');
@@ -107,12 +109,14 @@ export default Vue.extend({
 		const [perHour, perDay] = await Promise.all([Promise.all([
 			this.$root.api('charts/federation', { limit: limit, span: 'hour' }),
 			this.$root.api('charts/users', { limit: limit, span: 'hour' }),
+			this.$root.api('charts/active-users', { limit: limit, span: 'hour' }),
 			this.$root.api('charts/notes', { limit: limit, span: 'hour' }),
 			this.$root.api('charts/drive', { limit: limit, span: 'hour' }),
 			this.$root.api('charts/network', { limit: limit, span: 'hour' })
 		]), Promise.all([
 			this.$root.api('charts/federation', { limit: limit, span: 'day' }),
 			this.$root.api('charts/users', { limit: limit, span: 'day' }),
+			this.$root.api('charts/active-users', { limit: limit, span: 'day' }),
 			this.$root.api('charts/notes', { limit: limit, span: 'day' }),
 			this.$root.api('charts/drive', { limit: limit, span: 'day' }),
 			this.$root.api('charts/network', { limit: limit, span: 'day' })
@@ -122,16 +126,18 @@ export default Vue.extend({
 			perHour: {
 				federation: perHour[0],
 				users: perHour[1],
-				notes: perHour[2],
-				drive: perHour[3],
-				network: perHour[4]
+				activeUsers: perHour[2],
+				notes: perHour[3],
+				drive: perHour[4],
+				network: perHour[5]
 			},
 			perDay: {
 				federation: perDay[0],
 				users: perDay[1],
-				notes: perDay[2],
-				drive: perDay[3],
-				network: perDay[4]
+				activeUsers: perDay[2],
+				notes: perDay[3],
+				drive: perDay[4],
+				network: perDay[5]
 			}
 		};

@@ -183,7 +189,7 @@ export default Vue.extend({
 				},
 				legend: {
 					labels: {
-						color: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
+						colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text')).toRgbString()
 					},
 				},
 				xaxis: {
@@ -321,6 +327,24 @@ export default Vue.extend({
 			};
 		},

+		activeUsersChart(): any {
+			return {
+				series: [{
+					name: 'Combined',
+					type: 'line',
+					data: this.format(sum(this.stats.activeUsers.local.count, this.stats.activeUsers.remote.count))
+				}, {
+					name: 'Local',
+					type: 'area',
+					data: this.format(this.stats.activeUsers.local.count)
+				}, {
+					name: 'Remote',
+					type: 'area',
+					data: this.format(this.stats.activeUsers.remote.count)
+				}]
+			};
+		},
+
 		driveChart(): any {
 			return {
 				bytes: true,
--- a/src/client/app/admin/views/dashboard.vue
+++ b/src/client/app/admin/views/dashboard.vue
@@ -148,7 +148,7 @@ export default Vue.extend({
 		},

 		updateStats() {
-			this.$root.api('stats', {}, false, true).then(stats => {
+			this.$root.api('stats', {}, true).then(stats => {
 				this.stats = stats;
 			});
 		}
@@ -161,7 +161,7 @@ export default Vue.extend({
 	padding 16px

 	@media (min-width 500px)
-		padding 32px
+		padding 16px

 	> header
 		display flex
--- a/src/client/app/admin/views/drive.vue
+++ b/src/client/app/admin/views/drive.vue
@@ -1,5 +1,21 @@
 <template>
-<div class="pwnqwyet">
+<div>
+	<ui-card>
+		<div slot="title"><fa :icon="faTerminal"/> {{ $t('operation') }}</div>
+		<section class="fit-top">
+			<ui-input v-model="target" type="text">
+				<span>{{ $t('fileid-or-url') }}</span>
+			</ui-input>
+			<ui-horizon-group>
+				<ui-button @click="findAndToggleSensitive(true)"><fa :icon="faEyeSlash"/> {{ $t('mark-as-sensitive') }}</ui-button>
+				<ui-button @click="findAndToggleSensitive(false)"><fa :icon="faEye"/> {{ $t('unmark-as-sensitive') }}</ui-button>
+			</ui-horizon-group>
+			<ui-button @click="findAndDel()"><fa :icon="faTrashAlt"/> {{ $t('delete') }}</ui-button>
+			<ui-button @click="show()"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
+			<ui-textarea v-if="file" :value="file | json5" readonly tall style="margin-top:16px;"></ui-textarea>
+		</section>
+	</ui-card>
+
 	<ui-card>
 		<div slot="title"><fa :icon="faCloud"/> {{ $t('@.drive') }}</div>
 		<section class="fit-top">
@@ -39,6 +55,7 @@
 						</div>
 					</div>
 					<div v-show="file._open">
+						<ui-input readonly :value="file.url"></ui-input>
 						<ui-horizon-group>
 							<ui-button @click="toggleSensitive(file)" v-if="file.isSensitive"><fa :icon="faEye"/> {{ $t('unmark-as-sensitive') }}</ui-button>
 							<ui-button @click="toggleSensitive(file)" v-else><fa :icon="faEyeSlash"/> {{ $t('mark-as-sensitive') }}</ui-button>
@@ -56,7 +73,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
-import { faCloud } from '@fortawesome/free-solid-svg-icons';
+import { faCloud, faTerminal, faSearch } from '@fortawesome/free-solid-svg-icons';
 import { faTrashAlt, faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons';

 export default Vue.extend({
@@ -64,13 +81,15 @@ export default Vue.extend({

 	data() {
 		return {
+			file: null,
+			target: null,
 			sort: '+createdAt',
 			origin: 'combined',
 			limit: 10,
 			offset: 0,
 			files: [],
 			existMore: false,
-			faCloud, faTrashAlt, faEye, faEyeSlash
+			faCloud, faTrashAlt, faEye, faEyeSlash, faTerminal, faSearch
 		};
 	},

@@ -93,6 +112,24 @@ export default Vue.extend({
 	},

 	methods: {
+		async fetchFile() {
+			try {
+				return await this.$root.api('drive/files/show', this.target.startsWith('http') ? { url: this.target } : { fileId: this.target });
+			} catch (e) {
+				if (e == 'file-not-found') {
+					this.$root.dialog({
+						type: 'error',
+						text: this.$t('file-not-found')
+					});
+				} else {
+					this.$root.dialog({
+						type: 'error',
+						text: e.toString()
+					});
+				}
+			}
+		},
+
 		fetch() {
 			this.$root.api('admin/drive/files', {
 				origin: this.origin,
@@ -146,43 +183,85 @@ export default Vue.extend({

 			file.isSensitive = !file.isSensitive;
 		},
+
+		async show() {
+			const file = await this.fetchFile();
+			this.$root.api('admin/drive/show-file', { fileId: file.id }).then(info => {
+				this.file = info;
+			});
+		},
+
+		async findAndToggleSensitive(sensitive) {
+			const process = async () => {
+				const file = await this.fetchFile();
+				await this.$root.api('drive/files/update', {
+					fileId: file.id,
+					isSensitive: sensitive
+				});
+				this.$root.dialog({
+					type: 'success',
+					text: sensitive ? this.$t('marked-as-sensitive') : this.$t('unmarked-as-sensitive')
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+		},
+
+		async findAndDel() {
+			const process = async () => {
+				const file = await this.fetchFile();
+				await this.$root.api('drive/files/delete', { fileId: file.id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('deleted')
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+		},
 	}
 });
 </script>

 <style lang="stylus" scoped>
-.pwnqwyet
-	@media (min-width 500px)
-		padding 16px
+.kidvdlkg
+	padding 16px 0
+	border-top solid 1px var(--faceDivider)

-	.kidvdlkg
-		padding 16px 0
-		border-top solid 1px var(--faceDivider)
+	> div:first-child
+		display flex
+		cursor pointer

-		> div:first-child
-			display flex
-			cursor pointer
+		> div:nth-child(1)
+			> .thumbnail
+				display block
+				width 64px
+				height 64px
+				background-size cover
+				background-position center center

-			> div:nth-child(1)
-				> .thumbnail
-					display block
-					width 64px
-					height 64px
-					background-size cover
-					background-position center center
+		> div:nth-child(2)
+			flex 1
+			padding-left 16px

-			> div:nth-child(2)
-				flex 1
-				padding-left 16px
+			@media (max-width 500px)
+				font-size 14px

-				@media (max-width 500px)
-					font-size 14px
+			> header
+				word-break break-word

-				> header
-					word-break break-word
-
-					> .username
-						margin-left 8px
-						opacity 0.7
+				> .username
+					margin-left 8px
+					opacity 0.7

 </style>
--- a/src/client/app/admin/views/emoji.vue
+++ b/src/client/app/admin/views/emoji.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="tumhkfkmgtvzljezfvmgkeurkfncshbe">
+<div>
 	<ui-card>
 		<div slot="title"><fa icon="plus"/> {{ $t('add-emoji.title') }}</div>
 		<section class="fit-top">
@@ -150,25 +150,21 @@ export default Vue.extend({
 </script>

 <style lang="stylus" scoped>
-.tumhkfkmgtvzljezfvmgkeurkfncshbe
+.oryfrbft
 	@media (min-width 500px)
-		padding 16px
+		display flex
+
+	> div:first-child
+		@media (max-width 500px)
+			padding-bottom 16px
+
+		> img
+			vertical-align bottom
+
+	> div:last-child
+		flex 1

-	.oryfrbft
 		@media (min-width 500px)
-			display flex
-
-		> div:first-child
-			@media (max-width 500px)
-				padding-bottom 16px
-
-			> img
-				vertical-align bottom
-
-		> div:last-child
-			flex 1
-
-			@media (min-width 500px)
-				padding-left 16px
+			padding-left 16px

 </style>
--- a/src/client/app/admin/views/hashtags.vue
+++ b/src/client/app/admin/views/hashtags.vue
@@ -39,10 +39,3 @@ export default Vue.extend({
 	}
 });
 </script>
-
-<style lang="stylus" scoped>
-.jdnqwkzlnxcfftthoybjxrebyolvoucw
-	width 100%
-	min-height 300px
-
-</style>
--- a/src/client/app/admin/views/index.vue
+++ b/src/client/app/admin/views/index.vue
@@ -27,6 +27,7 @@
 			<li @click="nav('emoji')" :class="{ active: page == 'emoji' }"><fa :icon="faGrin" fixed-width/>{{ $t('emoji') }}</li>
 			<li @click="nav('announcements')" :class="{ active: page == 'announcements' }"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</li>
 			<li @click="nav('hashtags')" :class="{ active: page == 'hashtags' }"><fa icon="hashtag" fixed-width/>{{ $t('hashtags') }}</li>
+			<li @click="nav('abuse')" :class="{ active: page == 'abuse' }"><fa :icon="faExclamationCircle" fixed-width/>{{ $t('abuse') }}</li>
 		</ul>
 		<div class="back-to-misskey">
 			<a href="/"><fa :icon="faArrowLeft"/> {{ $t('back-to-misskey') }}</a>
@@ -45,7 +46,7 @@
 			<div v-if="page == 'announcements'"><x-announcements/></div>
 			<div v-if="page == 'hashtags'"><x-hashtags/></div>
 			<div v-if="page == 'drive'"><x-drive/></div>
-			<div v-if="page == 'update'"></div>
+			<div v-if="page == 'abuse'"><x-abuse/></div>
 		</div>
 	</main>
 </div>
@@ -63,7 +64,8 @@ import XAnnouncements from "./announcements.vue";
 import XHashtags from "./hashtags.vue";
 import XUsers from "./users.vue";
 import XDrive from "./drive.vue";
-import { faHeadset, faArrowLeft, faShareAlt } from '@fortawesome/free-solid-svg-icons';
+import XAbuse from "./abuse.vue";
+import { faHeadset, faArrowLeft, faShareAlt, faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
 import { faGrin } from '@fortawesome/free-regular-svg-icons';

 // Detect the user agent
@@ -81,6 +83,7 @@ export default Vue.extend({
 		XHashtags,
 		XUsers,
 		XDrive,
+		XAbuse,
 	},
 	provide: {
 		isMobile
@@ -94,7 +97,8 @@ export default Vue.extend({
 			faGrin,
 			faArrowLeft,
 			faHeadset,
-			faShareAlt
+			faShareAlt,
+			faExclamationCircle
 		};
 	},
 	methods: {
@@ -270,6 +274,9 @@ export default Vue.extend({
 		> .page
 			max-width 1150px

+			@media (min-width 500px)
+				padding 16px
+
 	&.isMobile
 		> main
 			padding $headerHeight 0 0 0
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@@ -1,11 +1,12 @@
 <template>
-<div class="axbwjelsbymowqjyywpirzhdlszoncqs">
+<div>
 	<ui-card>
 		<div slot="title"><fa icon="cog"/> {{ $t('instance') }}</div>
 		<section class="fit-top fit-bottom">
 			<ui-input :value="host" readonly>{{ $t('host') }}</ui-input>
 			<ui-input v-model="name">{{ $t('instance-name') }}</ui-input>
 			<ui-textarea v-model="description">{{ $t('instance-description') }}</ui-textarea>
+			<ui-input v-model="mascotImageUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('logo-url') }}</ui-input>
 			<ui-input v-model="bannerUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('banner-url') }}</ui-input>
 			<ui-input v-model="errorImageUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('error-image-url') }}</ui-input>
 			<ui-input v-model="languages"><i slot="icon"><fa icon="language"/></i>{{ $t('languages') }}<span slot="desc">{{ $t('languages-desc') }}</span></ui-input>
@@ -21,6 +22,8 @@
 		<section>
 			<ui-switch v-model="disableRegistration">{{ $t('disable-registration') }}</ui-switch>
 			<ui-switch v-model="disableLocalTimeline">{{ $t('disable-local-timeline') }}</ui-switch>
+			<ui-switch v-model="disableGlobalTimeline">{{ $t('disable-global-timeline') }}</ui-switch>
+			<ui-info>{{ $t('disabling-timelines-info') }}</ui-info>
 		</section>
 		<section class="fit-bottom">
 			<header><fa icon="cloud"/> {{ $t('drive-config') }}</header>
@@ -53,7 +56,7 @@
 			</ui-horizon-group>
 			<ui-horizon-group inputs>
 				<ui-input v-model="smtpUser" :disabled="!enableEmail">{{ $t('smtp-user') }}</ui-input>
-				<ui-input v-model="smtpPass" :disabled="!enableEmail">{{ $t('smtp-pass') }}</ui-input>
+				<ui-input v-model="smtpPass" type="password" :withPasswordToggle="true" :disabled="!enableEmail">{{ $t('smtp-pass') }}</ui-input>
 			</ui-horizon-group>
 			<ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-secure') }}<span slot="desc">{{ $t('smtp-secure-info') }}</span></ui-switch>
 		</section>
@@ -149,6 +152,8 @@ export default Vue.extend({
 			maintainerEmail: null,
 			disableRegistration: false,
 			disableLocalTimeline: false,
+			disableGlobalTimeline: false,
+			mascotImageUrl: null,
 			bannerUrl: null,
 			errorImageUrl: null,
 			name: null,
@@ -196,6 +201,8 @@ export default Vue.extend({
 			this.maintainerEmail = meta.maintainer.email;
 			this.disableRegistration = meta.disableRegistration;
 			this.disableLocalTimeline = meta.disableLocalTimeline;
+			this.disableGlobalTimeline = meta.disableGlobalTimeline;
+			this.mascotImageUrl = meta.mascotImageUrl;
 			this.bannerUrl = meta.bannerUrl;
 			this.errorImageUrl = meta.errorImageUrl;
 			this.name = meta.name;
@@ -253,6 +260,8 @@ export default Vue.extend({
 				maintainerEmail: this.maintainerEmail,
 				disableRegistration: this.disableRegistration,
 				disableLocalTimeline: this.disableLocalTimeline,
+				disableGlobalTimeline: this.disableGlobalTimeline,
+				mascotImageUrl: this.mascotImageUrl,
 				bannerUrl: this.bannerUrl,
 				errorImageUrl: this.errorImageUrl,
 				name: this.name,
@@ -304,10 +313,3 @@ export default Vue.extend({
 	}
 });
 </script>
-
-<style lang="stylus" scoped>
-.axbwjelsbymowqjyywpirzhdlszoncqs
-	@media (min-width 500px)
-		padding 16px
-
-</style>
--- a/src/client/app/admin/views/moderators.vue
+++ b/src/client/app/admin/views/moderators.vue
@@ -1,12 +1,13 @@
 <template>
-<div class="jnhmugbb">
+<div>
 	<ui-card>
 		<div slot="title"><fa icon="plus"/> {{ $t('add-moderator.title') }}</div>
 		<section class="fit-top">
 			<ui-input v-model="username" type="text">
 				<span slot="prefix">@</span>
 			</ui-input>
-			<ui-button @click="add" :disabled="adding">{{ $t('add-moderator.add') }}</ui-button>
+			<ui-button @click="add" :disabled="changing">{{ $t('add-moderator.add') }}</ui-button>
+			<ui-button @click="remove" :disabled="changing">{{ $t('add-moderator.remove') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
@@ -23,13 +24,13 @@ export default Vue.extend({
 	data() {
 		return {
 			username: '',
-			adding: false
+			changing: false
 		};
 	},

 	methods: {
 		async add() {
-			this.adding = true;
+			this.changing = true;

 			const process = async () => {
 				const user = await this.$root.api('users/show', parseAcct(this.username));
@@ -47,15 +48,30 @@ export default Vue.extend({
 				});
 			});

-			this.adding = false;
+			this.changing = false;
+		},
+
+		async remove() {
+			this.changing = true;
+
+			const process = async () => {
+				const user = await this.$root.api('users/show', parseAcct(this.username));
+				await this.$root.api('admin/moderators/remove', { userId: user.id });
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('add-moderator.removed')
+				});
+			};
+
+			await process().catch(e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.toString()
+				});
+			});
+
+			this.changing = false;
 		},
 	}
 });
 </script>
-
-<style lang="stylus" scoped>
-.jnhmugbb
-	@media (min-width 500px)
-		padding 16px
-
-</style>
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="ucnffhbtogqgscfmqcymwmmupoknpfsw">
+<div>
 	<ui-card>
 		<div slot="title"><fa :icon="faTerminal"/> {{ $t('operation') }}</div>
 		<section class="fit-top">
@@ -31,6 +31,14 @@
 					<option value="-updatedAt">{{ $t('users.sort.updatedAtAsc') }}</option>
 					<option value="+updatedAt">{{ $t('users.sort.updatedAtDesc') }}</option>
 				</ui-select>
+				<ui-select v-model="state">
+					<span slot="label">{{ $t('users.state.title') }}</span>
+					<option value="all">{{ $t('users.state.all') }}</option>
+					<option value="admin">{{ $t('users.state.admin') }}</option>
+					<option value="moderator">{{ $t('users.state.moderator') }}</option>
+					<option value="verified">{{ $t('users.state.verified') }}</option>
+					<option value="suspended">{{ $t('users.state.suspended') }}</option>
+				</ui-select>
 				<ui-select v-model="origin">
 					<span slot="label">{{ $t('users.origin.title') }}</span>
 					<option value="combined">{{ $t('users.origin.combined') }}</option>
@@ -39,7 +47,7 @@
 				</ui-select>
 			</ui-horizon-group>
 			<sequential-entrance animation="entranceFromTop" delay="25">
-				<div class="kofvwchc" v-for="user in users">
+				<div class="kofvwchc" v-for="user in users" :key="user.id">
 					<div>
 						<a :href="user | userPage(null, true)">
 							<mk-avatar class="avatar" :user="user" :disable-link="true"/>
@@ -49,6 +57,10 @@
 						<header>
 							<b><mk-user-name :user="user"/></b>
 							<span class="username">@{{ user | acct }}</span>
+							<span class="is-admin" v-if="user.isAdmin">admin</span>
+							<span class="is-moderator" v-if="user.isModerator">moderator</span>
+							<span class="is-verified" v-if="user.isVerified" :title="$t('@.verified-user')"><fa icon="star"/></span>
+							<span class="is-suspended" v-if="user.isSuspended" :title="$t('@.suspended-user')"><fa :icon="faSnowflake"/></span>
 						</header>
 						<div>
 							<span>{{ $t('users.updatedAt') }}: <mk-time :time="user.updatedAt" mode="detail"/></span>
@@ -84,6 +96,7 @@ export default Vue.extend({
 			suspending: false,
 			unsuspending: false,
 			sort: '+createdAt',
+			state: 'all',
 			origin: 'combined',
 			limit: 10,
 			offset: 0,
@@ -100,6 +113,12 @@ export default Vue.extend({
 			this.fetchUsers();
 		},

+		state() {
+			this.users = [];
+			this.offset = 0;
+			this.fetchUsers();
+		},
+
 		origin() {
 			this.users = [];
 			this.offset = 0;
@@ -236,7 +255,8 @@ export default Vue.extend({
 		},

 		fetchUsers() {
-			this.$root.api('users', {
+			this.$root.api('admin/show-users', {
+				state: this.state,
 				origin: this.origin,
 				sort: this.sort,
 				offset: this.offset,
@@ -257,31 +277,42 @@ export default Vue.extend({
 </script>

 <style lang="stylus" scoped>
-.ucnffhbtogqgscfmqcymwmmupoknpfsw
-	@media (min-width 500px)
-		padding 16px
+.kofvwchc
+	display flex
+	padding 16px 0
+	border-top solid 1px var(--faceDivider)

-	.kofvwchc
-		display flex
-		padding 16px 0
-		border-top solid 1px var(--faceDivider)
+	> div:first-child
+		> a
+			> .avatar
+				width 64px
+				height 64px

-		> div:first-child
-			> a
-				> .avatar
-					width 64px
-					height 64px
+	> div:last-child
+		flex 1
+		padding-left 16px

-		> div:last-child
-			flex 1
-			padding-left 16px
+		@media (max-width 500px)
+			font-size 14px

-			@media (max-width 500px)
-				font-size 14px
+		> header
+			> .username
+				margin-left 8px
+				opacity 0.7

-			> header
-				> .username
-					margin-left 8px
-					opacity 0.7
+			> .is-admin
+			> .is-moderator
+				flex-shrink 0
+				align-self center
+				margin 0 0 0 .5em
+				padding 1px 6px
+				font-size 80%
+				border-radius 3px
+				background var(--noteHeaderAdminBg)
+				color var(--noteHeaderAdminFg)

+			> .is-verified
+			> .is-suspended
+				margin 0 0 0 .5em
+				color #4dabf7
 </style>
--- a/src/client/app/common/scripts/copy-to-clipboard.ts
+++ b/src/client/app/common/scripts/copy-to-clipboard.ts
@@ -2,12 +2,32 @@
 * Clipboardに値をコピー(TODO: 文字列以外も対応)
 */
 export default val => {
-	const form = document.createElement('textarea');
-	form.textContent = val;
-	document.body.appendChild(form);
-	form.select();
+	// 空div 生成
+	const tmp = document.createElement('div');
+	// 選択用のタグ生成
+	const pre = document.createElement('pre');
+
+	// 親要素のCSSで user-select: none だとコピーできないので書き換える
+	pre.style.webkitUserSelect = 'auto';
+	pre.style.userSelect = 'auto';
+
+	tmp.appendChild(pre).textContent = val;
+
+	// 要素を画面外へ
+	const s = tmp.style;
+	s.position = 'fixed';
+	s.right = '200%';
+
+	// body に追加
+	document.body.appendChild(tmp);
+	// 要素を選択
+	document.getSelection().selectAllChildren(tmp);
+
+	// クリップボードにコピー
 	const result = document.execCommand('copy');
-	document.body.removeChild(form);
+
+	// 要素削除
+	document.body.removeChild(tmp);

 	return result;
 };
--- a/src/client/app/common/scripts/note-mixin.ts
+++ b/src/client/app/common/scripts/note-mixin.ts
@@ -76,7 +76,7 @@ export default (opts: Opts = {}) => ({
 		},

 		title(): string {
-			return new Date(this.appearNote.createdAt).toLocaleString();
+			return '';
 		},

 		urls(): string[] {
--- a/src/client/app/common/views/components/acct.vue
+++ b/src/client/app/common/views/components/acct.vue
@@ -2,6 +2,7 @@
 <span class="mk-acct">
 	<span class="name">@{{ user.username }}</span>
 	<span class="host" :class="{ fade: $store.state.settings.contrastedAcct }" v-if="user.host || detail || $store.state.settings.showFullAcct">@{{ user.host || host }}</span>
+	<fa v-if="user.isLocked == true" class="locked" icon="lock" fixed-width/>
 </span>
 </template>

@@ -23,4 +24,8 @@ export default Vue.extend({
 .mk-acct
 	> .host.fade
 		opacity 0.5
+
+	> .locked
+		opacity 0.8
+		margin-left 0.5em
 </style>
--- a/src/client/app/common/views/components/dialog.vue
+++ b/src/client/app/common/views/components/dialog.vue
@@ -20,7 +20,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as anime from 'animejs';
+import anime from 'animejs';
 import { faTimesCircle, faQuestionCircle } from '@fortawesome/free-regular-svg-icons';
 import parseAcct from "../../../../../misc/acct/parse";

@@ -93,7 +93,7 @@ export default Vue.extend({
 				opacity: 1,
 				scale: [1.2, 1],
 				duration: 300,
-				easing: [0, 0.5, 0.5, 1]
+				easing: 'cubicBezier(0, 0.5, 0.5, 1)'
 			});

 			if (this.splash) {
@@ -142,7 +142,7 @@ export default Vue.extend({
 				opacity: 0,
 				scale: 0.8,
 				duration: 300,
-				easing: [0, 0.5, 0.5, 1],
+				easing: 'cubicBezier(0, 0.5, 0.5, 1)',
 				complete: () => this.destroyDom()
 			});
 		},
--- a/src/client/app/common/views/components/drive-settings.vue
+++ b/src/client/app/common/views/components/drive-settings.vue
@@ -93,8 +93,7 @@ export default Vue.extend({
 					},
 					plotOptions: {
 						bar: {
-							columnWidth: '90%',
-							endingShape: 'rounded'
+							columnWidth: '90%'
 						}
 					},
 					grid: {
--- a/src/client/app/common/views/components/games/reversi/reversi.game.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue
@@ -4,13 +4,18 @@
 	<header><b><router-link :to="blackUser | userPage"><mk-user-name :user="blackUser"/></router-link></b>({{ $t('@.reversi.black') }}) vs <b><router-link :to="whiteUser | userPage"><mk-user-name :user="whiteUser"/></router-link></b>({{ $t('@.reversi.white') }})</header>

 	<div style="overflow: hidden; line-height: 28px;">
-		<p class="turn" v-if="!iAmPlayer && !game.isEnded">{{ $t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) }) }}<mk-ellipsis/></p>
-		<p class="turn" v-if="logPos != logs.length">{{ $t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) }) }}</p>
+		<p class="turn" v-if="!iAmPlayer && !game.isEnded">
+			<mfm :text="$t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
+			<mk-ellipsis/>
+		</p>
+		<p class="turn" v-if="logPos != logs.length">
+			<mfm :text="$t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
+		</p>
 		<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">{{ $t('@.reversi.opponent-turn') }}<mk-ellipsis/></p>
 		<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">{{ $t('@.reversi.my-turn') }}</p>
 		<p class="result" v-if="game.isEnded && logPos == logs.length">
 			<template v-if="game.winner">
-				<misskey-flavored-markdown :text="$t('@.reversi.won', { name: $options.filters.userName(game.winner) })" :shouldBreak="false" :plainText="true" :custom-emojis="game.winner.emojis"/>
+				<mfm :text="$t('@.reversi.won', { name: $options.filters.userName(game.winner) })" :should-break="false" :plain-text="true" :custom-emojis="game.winner.emojis"/>
 				<span v-if="game.surrendered != null"> ({{ $t('surrendered') }})</span>
 			</template>
 			<template v-else>{{ $t('@.reversi.drawn') }}</template>
--- a/src/client/app/common/views/components/games/reversi/reversi.index.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.index.vue
@@ -26,7 +26,7 @@
 	</section>
 	<section v-if="myGames.length > 0">
 		<h2>{{ $t('my-games') }}</h2>
-		<a class="game" v-for="g in myGames" tabindex="-1" @click.prevent="go(g)" :href="`/reversi/${g.id}`">
+		<a class="game" v-for="g in myGames" tabindex="-1" @click.prevent="go(g)" :href="`/games/reversi/${g.id}`">
 			<mk-avatar class="avatar" :user="g.user1"/>
 			<mk-avatar class="avatar" :user="g.user2"/>
 			<span><b><mk-user-name :user="g.user1"/></b> vs <b><mk-user-name :user="g.user2"/></b></span>
@@ -36,7 +36,7 @@
 	</section>
 	<section v-if="games.length > 0">
 		<h2>{{ $t('all-games') }}</h2>
-		<a class="game" v-for="g in games" tabindex="-1" @click.prevent="go(g)" :href="`/reversi/${g.id}`">
+		<a class="game" v-for="g in games" tabindex="-1" @click.prevent="go(g)" :href="`/games/reversi/${g.id}`">
 			<mk-avatar class="avatar" :user="g.user1"/>
 			<mk-avatar class="avatar" :user="g.user2"/>
 			<span><b><mk-user-name :user="g.user1"/></b> vs <b><mk-user-name :user="g.user2"/></b></span>
--- a/src/client/app/common/views/components/image-viewer.vue
+++ b/src/client/app/common/views/components/image-viewer.vue
@@ -7,7 +7,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as anime from 'animejs';
+import anime from 'animejs';

 export default Vue.extend({
 	props: ['image'],
--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@@ -45,6 +45,7 @@ import uiInfo from './ui/info.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';

+Vue.component('mfm', misskeyFlavoredMarkdown);
 Vue.component('mk-user-name', userName);
 Vue.component('mk-follow-button', followButton);
 Vue.component('mk-error', error);
@@ -63,7 +64,6 @@ Vue.component('mk-forkit', forkit);
 Vue.component('mk-acct', acct);
 Vue.component('mk-avatar', avatar);
 Vue.component('mk-nav', nav);
-Vue.component('misskey-flavored-markdown', misskeyFlavoredMarkdown);
 Vue.component('mk-poll', poll);
 Vue.component('mk-poll-editor', pollEditor);
 Vue.component('mk-reaction-icon', reactionIcon);
--- a/src/client/app/common/views/components/menu.vue
+++ b/src/client/app/common/views/components/menu.vue
@@ -14,7 +14,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as anime from 'animejs';
+import anime from 'animejs';

 export default Vue.extend({
 	props: {
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@@ -7,7 +7,7 @@
 				<img src="/assets/desktop/remove.png" alt="Delete"/>
 			</button>
 			<div class="content" v-if="!message.isDeleted">
-				<misskey-flavored-markdown class="text" v-if="message.text" ref="text" :text="message.text" :i="$store.state.i"/>
+				<mfm class="text" v-if="message.text" ref="text" :text="message.text" :i="$store.state.i"/>
 				<div class="file" v-if="message.file">
 					<a :href="message.file.url" target="_blank" :title="message.file.name">
 						<img v-if="message.file.type.split('/')[0] == 'image'" :src="message.file.url" :alt="message.file.name"
--- a/src/client/app/common/views/components/misskey-flavored-markdown.vue
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.vue
@@ -1,14 +1,14 @@
 <template>
-<mfm v-bind="$attrs" class="havbbuyv"/>
+<mfm-core v-bind="$attrs" class="havbbuyv"/>
 </template>

 <script lang="ts">
 import Vue from 'vue';
-import Mfm from './mfm';
+import MfmCore from './mfm';

 export default Vue.extend({
 	components: {
-		Mfm
+		MfmCore
 	}
 });
 </script>
--- a/src/client/app/common/views/components/note-header.vue
+++ b/src/client/app/common/views/components/note-header.vue
@@ -18,7 +18,7 @@
 		<span class="visibility" v-if="note.visibility != 'public'">
 			<fa v-if="note.visibility == 'home'" icon="home"/>
 			<fa v-if="note.visibility == 'followers'" icon="unlock"/>
-			<fa v-if="note.visibility == 'specified'" icon="lock"/>
+			<fa v-if="note.visibility == 'specified'" icon="envelope"/>
 		</span>
 		<span class="localOnly" v-if="note.localOnly == true"><fa icon="heart"/></span>
 	</div>
--- a/src/client/app/common/views/components/note-menu.vue
+++ b/src/client/app/common/views/components/note-menu.vue
@@ -10,6 +10,7 @@ import i18n from '../../../i18n';
 import { url } from '../../../config';
 import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
 import { concat, intersperse } from '../../../../../prelude/array';
+import { faCopy } from '@fortawesome/free-regular-svg-icons';

 export default Vue.extend({
 	i18n: i18n('common/views/components/note-menu.vue'),
@@ -29,6 +30,10 @@ export default Vue.extend({
 						icon: 'info-circle',
 						text: this.$t('detail'),
 						action: this.detail
+					}], [{
+						icon: faCopy,
+						text: this.$t('copy-content'),
+						action: this.copyContent
 					}], [{
 						icon: 'link',
 						text: this.$t('copy-link'),
@@ -81,8 +86,20 @@ export default Vue.extend({
 			this.$router.push(`/notes/${this.note.id}`);
 		},

+		copyContent() {
+			copyToClipboard(this.note.text);
+			this.$root.dialog({
+				type: 'success',
+				splash: true
+			});
+		},
+
 		copyLink() {
 			copyToClipboard(`${url}/notes/${this.note.id}`);
+			this.$root.dialog({
+				type: 'success',
+				splash: true
+			});
 		},

 		pin() {
--- a/src/client/app/common/views/components/poll.vue
+++ b/src/client/app/common/views/components/poll.vue
@@ -5,7 +5,7 @@
 			<div class="backdrop" :style="{ 'width': (showResult ? (choice.votes / total * 100) : 0) + '%' }"></div>
 			<span>
 				<template v-if="choice.isVoted"><fa icon="check"/></template>
-				<span>{{ choice.text }}</span>
+				<mfm :text="choice.text" :should-break="false" :plain-text="true" :custom-emojis="note.emojis"/>
 				<span class="votes" v-if="showResult">({{ $t('vote-count').replace('{}', choice.votes) }})</span>
 			</span>
 		</li>
--- a/src/client/app/common/views/components/reaction-picker.vue
+++ b/src/client/app/common/views/components/reaction-picker.vue
@@ -22,7 +22,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import * as anime from 'animejs';
+import anime from 'animejs';

 export default Vue.extend({
 	i18n: i18n('common/views/components/reaction-picker.vue'),
--- a/src/client/app/common/views/components/reactions-viewer.vue
+++ b/src/client/app/common/views/components/reactions-viewer.vue
@@ -18,7 +18,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import Icon from './reaction-icon.vue';
-import * as anime from 'animejs';
+import anime from 'animejs';

 export default Vue.extend({
 	props: {
--- a/src/client/app/common/views/components/renote.vue
+++ b/src/client/app/common/views/components/renote.vue
@@ -13,7 +13,7 @@
 		<span class="visibility" v-if="note.visibility != 'public'">
 			<fa v-if="note.visibility == 'home'" icon="home"/>
 			<fa v-if="note.visibility == 'followers'" icon="unlock"/>
-			<fa v-if="note.visibility == 'specified'" icon="lock"/>
+			<fa v-if="note.visibility == 'specified'" icon="envelope"/>
 		</span>
 		<span class="localOnly" v-if="note.localOnly == true"><fa icon="heart"/></span>
 	</div>
--- a/src/client/app/common/views/components/signin.vue
+++ b/src/client/app/common/views/components/signin.vue
@@ -6,11 +6,14 @@
 		<span slot="prefix">@</span>
 		<span slot="suffix">@{{ host }}</span>
 	</ui-input>
-	<ui-input v-model="password" type="password" required styl="fill">
+	<ui-input v-model="password" type="password" :with-password-toggle="true" required styl="fill">
 		<span>{{ $t('password') }}</span>
 		<span slot="prefix"><fa icon="lock"/></span>
 	</ui-input>
-	<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required styl="fill"/>
+	<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required styl="fill">
+		<span>{{ $t('@.2fa') }}</span>
+		<span slot="prefix"><fa icon="gavel"/></span>
+	</ui-input>
 	<ui-button type="submit" :disabled="signing">{{ signing ? $t('signing-in') : $t('signin') }}</ui-button>
 	<p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`">{{ $t('signin-with-twitter') }}</a></p>
 	<p v-if="meta && meta.enableGithubIntegration"  style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`">{{ $t('signin-with-github') }}</a></p>
@@ -72,7 +75,7 @@ export default Vue.extend({
 				username: this.username,
 				password: this.password,
 				token: this.user && this.user.twoFactorEnabled ? this.token : undefined
-			}, true).then(res => {
+			}).then(res => {
 				localStorage.setItem('i', res.i);
 				location.reload();
 			}).catch(() => {
--- a/src/client/app/common/views/components/signup.vue
+++ b/src/client/app/common/views/components/signup.vue
@@ -142,11 +142,11 @@ export default Vue.extend({
 				password: this.password,
 				invitationCode: this.invitationCode,
 				'g-recaptcha-response': this.meta.enableRecaptcha ? (window as any).grecaptcha.getResponse() : null
-			}, true).then(() => {
+			}).then(() => {
 				this.$root.api('signin', {
 					username: this.username,
 					password: this.password
-				}, true).then(res => {
+				}).then(res => {
 					localStorage.setItem('i', res.i);
 					location.reload();
 				});
--- a/src/client/app/common/views/components/stream-indicator.vue
+++ b/src/client/app/common/views/components/stream-indicator.vue
@@ -18,7 +18,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import * as anime from 'animejs';
+import anime from 'animejs';

 export default Vue.extend({
 	i18n: i18n('common/views/components/stream-indicator.vue'),
--- a/src/client/app/common/views/components/time.vue
+++ b/src/client/app/common/views/components/time.vue
@@ -1,5 +1,5 @@
 <template>
-<time class="mk-time">
+<time class="mk-time" :title="absolute">
 	<span v-if=" mode == 'relative' ">{{ relative }}</span>
 	<span v-if=" mode == 'absolute' ">{{ absolute }}</span>
 	<span v-if=" mode == 'detail' ">{{ absolute }} ({{ relative }})</span>
--- a/src/client/app/common/views/components/ui/horizon-group.vue
+++ b/src/client/app/common/views/components/ui/horizon-group.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="vnxwkwuf" :class="{ inputs, noGrow }">
+<div class="vnxwkwuf" :class="{ inputs, noGrow }" :data-children-count="children">
 	<slot></slot>
 </div>
 </template>
@@ -21,6 +21,16 @@ export default Vue.extend({
 			required: false,
 			default: false
 		}
+	},
+	data() {
+		return {
+			children: 0
+		};
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.children = this.$slots.default.length;
+		});
 	}
 });
 </script>
@@ -48,4 +58,19 @@ export default Vue.extend({
 	> *:not(:last-child)
 		margin-right 16px !important

+	&[data-children-count="3"]
+		@media (max-width 600px)
+			display block
+
+			> *
+				display block
+				width 100% !important
+				margin 16px 0 !important
+
+				&:first-child
+					margin-top 0 !important
+
+				&:last-child
+					margin-bottom 0 !important
+
 </style>
--- a/src/client/app/common/views/components/ui/input.vue
+++ b/src/client/app/common/views/components/ui/input.vue
@@ -39,6 +39,12 @@
 		</template>
 		<div class="suffix" ref="suffix"><slot name="suffix"></slot></div>
 	</div>
+	<div class="toggle" v-if="withPasswordToggle">
+		<a @click='togglePassword'>
+			<span v-if="type == 'password'"><fa :icon="['fa', 'eye']"/> {{ $t('@.show-password') }}</span>
+			<span v-if="type != 'password'"><fa :icon="['far', 'eye-slash']"/> {{ $t('@.hide-password') }}</span>
+		</a>
+	</div>
 	<div class="desc"><slot name="desc"></slot></div>
 </div>
 </template>
@@ -97,6 +103,11 @@ export default Vue.extend({
 			required: false,
 			default: false
 		},
+		withPasswordToggle: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
 		inline: {
 			type: Boolean,
 			required: false,
@@ -178,6 +189,13 @@ export default Vue.extend({
 		focus() {
 			this.$refs.input.focus();
 		},
+		togglePassword() {
+			if (this.type == 'password') {
+				this.type = 'text'
+			} else {
+				this.type = 'password'
+			}
+		},
 		chooseFile() {
 			this.$refs.file.click();
 		},
@@ -356,6 +374,17 @@ root(fill)
 			if fill
 				padding-right 12px

+	> .toggle
+		cursor pointer
+		padding-left 0.5em
+		font-size 0.7em
+		opacity 0.7
+		text-align left
+
+		> a
+			color var(--inputLabel)
+			text-decoration none
+
 	> .desc
 		margin 6px 0
 		font-size 13px
--- a/src/client/app/common/views/components/url-preview.vue
+++ b/src/client/app/common/views/components/url-preview.vue
@@ -8,16 +8,16 @@
 	</blockquote>
 </div>
 <div v-else class="mk-url-preview">
-	<a :class="{ mini }" :href="url" target="_blank" :title="url" v-if="!fetching">
+	<a :class="{ mini, compact }" :href="url" target="_blank" :title="url" v-if="!fetching">
 		<div class="thumbnail" v-if="thumbnail" :style="`background-image: url(${thumbnail})`"></div>
 		<article>
 			<header>
-				<h1>{{ title }}</h1>
+				<h1 :title="title">{{ title }}</h1>
 			</header>
-			<p v-if="description">{{ description.length > 85 ? description.slice(0, 85) + '…' : description }}</p>
+			<p v-if="description" :title="description">{{ description.length > 85 ? description.slice(0, 85) + '…' : description }}</p>
 			<footer>
 				<img class="icon" v-if="icon" :src="icon"/>
-				<p>{{ sitename }}</p>
+				<p :title="sitename">{{ sitename }}</p>
 			</footer>
 		</article>
 	</a>
@@ -120,6 +120,12 @@ export default Vue.extend({
 			default: false
 		},

+		compact: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+
 		mini: {
 			type: Boolean,
 			required: false,
@@ -302,6 +308,23 @@ export default Vue.extend({
 						width 12px
 						height 12px

+			&.compact
+				> .thumbnail
+					position: absolute
+					width 56px
+					height 100%
+
+				> article
+					left 56px
+					width calc(100% - 56px)
+					padding 4px
+
+					> header
+						margin-bottom 2px
+
+					> footer
+						margin-top 2px
+
 		&.mini
 			font-size 10px

@@ -325,4 +348,27 @@ export default Vue.extend({
 						width 12px
 						height 12px

+			&.compact
+				> .thumbnail
+					position: absolute
+					width 56px
+					height 100%
+
+				> article
+					left 56px
+					width calc(100% - 56px)
+					padding 4px
+
+					> header
+						margin-bottom 2px
+
+					> footer
+						margin-top 2px
+
+		&.compact
+			> article
+				> header h1, p, footer
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
 </style>
--- a/src/client/app/common/views/components/user-menu.vue
+++ b/src/client/app/common/views/components/user-menu.vue
@@ -0,0 +1,154 @@
+<template>
+<div style="position:initial">
+	<mk-menu :source="source" :items="items" @closed="closed"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
+import { faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/user-menu.vue'),
+
+	props: ['user', 'source'],
+
+	data() {
+		let menu = [{
+			icon: ['fas', 'at'],
+			text: this.$t('mention'),
+			action: () => {
+				this.$post({ mention: this.user });
+			}
+		}, null, {
+			icon: ['fas', 'list'],
+			text: this.$t('push-to-list'),
+			action: this.pushList
+		}, null, {
+			icon: this.user.isMuted ? ['fas', 'eye'] : ['far', 'eye-slash'],
+			text: this.user.isMuted ? this.$t('unmute') : this.$t('mute'),
+			action: this.toggleMute
+		}, {
+			icon: 'ban',
+			text: this.user.isBlocking ? this.$t('unblock') : this.$t('block'),
+			action: this.toggleBlock
+		}, null, {
+			icon: faExclamationCircle,
+			text: this.$t('report-abuse'),
+			action: this.reportAbuse
+		}];
+
+		return {
+			items: menu
+		};
+	},
+
+	methods: {
+		closed() {
+			this.$nextTick(() => {
+				this.destroyDom();
+			});
+		},
+
+		async pushList() {
+			const lists = await this.$root.api('users/lists/list');
+			const { canceled, result: listId } = await this.$root.dialog({
+				type: null,
+				title: this.$t('select-list'),
+				select: {
+					items: lists.map(list => ({
+						value: list.id, text: list.title
+					}))
+				},
+				showCancelButton: true
+			});
+			if (canceled) return;
+			await this.$root.api('users/lists/push', {
+				listId: listId,
+				userId: this.user.id
+			});
+			this.$root.dialog({
+				type: 'success',
+				splash: true
+			});
+		},
+
+		toggleMute() {
+			if (this.user.isMuted) {
+				this.$root.api('mute/delete', {
+					userId: this.user.id
+				}).then(() => {
+					this.user.isMuted = false;
+				}, () => {
+					this.$root.dialog({
+						type: 'error',
+						text: e
+					});
+				});
+			} else {
+				this.$root.api('mute/create', {
+					userId: this.user.id
+				}).then(() => {
+					this.user.isMuted = true;
+				}, () => {
+					this.$root.dialog({
+						type: 'error',
+						text: e
+					});
+				});
+			}
+		},
+
+		toggleBlock() {
+			if (this.user.isBlocking) {
+				this.$root.api('blocking/delete', {
+					userId: this.user.id
+				}).then(() => {
+					this.user.isBlocking = false;
+				}, () => {
+					this.$root.dialog({
+						type: 'error',
+						text: e
+					});
+				});
+			} else {
+				this.$root.api('blocking/create', {
+					userId: this.user.id
+				}).then(() => {
+					this.user.isBlocking = true;
+				}, () => {
+					this.$root.dialog({
+						type: 'error',
+						text: e
+					});
+				});
+			}
+		},
+
+		async reportAbuse() {
+			const reported = this.$t('report-abuse-reported'); // なぜか後で参照すると null になるので最初にメモリに確保しておく
+			const { canceled, result: comment } = await this.$root.dialog({
+				title: this.$t('report-abuse-detail'),
+				input: true
+			});
+			if (canceled) return;
+			this.$root.api('users/report-abuse', {
+				userId: this.user.id,
+				comment: comment
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					text: reported
+				});
+			}, e => {
+				this.$root.dialog({
+					type: 'error',
+					text: e
+				});
+			});
+		}
+	}
+});
+</script>
--- a/src/client/app/common/views/components/user-name.vue
+++ b/src/client/app/common/views/components/user-name.vue
@@ -1,5 +1,5 @@
 <template>
-<misskey-flavored-markdown :text="user.name || user.username" :should-break="false" :plain-text="true" :custom-emojis="user.emojis"/>
+<mfm :text="user.name || user.username" :should-break="false" :plain-text="true" :custom-emojis="user.emojis"/>
 </template>

 <script lang="ts">
--- a/src/client/app/common/views/components/visibility-chooser.vue
+++ b/src/client/app/common/views/components/visibility-chooser.vue
@@ -23,7 +23,7 @@
 			</div>
 		</div>
 		<div @click="choose('specified')" :class="{ active: v == 'specified' }">
-			<div><fa icon="lock"/></div>
+			<div><fa icon="envelope"/></div>
 			<div>
 				<span>{{ $t('specified') }}</span>
 				<span>{{ $t('specified-desc') }}</span>
@@ -55,7 +55,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import * as anime from 'animejs';
+import anime from 'animejs';

 export default Vue.extend({
 	i18n: i18n('common/views/components/visibility-chooser.vue'),
--- a/src/client/app/common/views/components/welcome-timeline.vue
+++ b/src/client/app/common/views/components/welcome-timeline.vue
@@ -16,7 +16,7 @@
 					</div>
 				</header>
 				<div class="text">
-					<misskey-flavored-markdown v-if="note.text" :text="note.cw != null ? note.cw : note.text" :author="note.user" :custom-emojis="note.emojis"/>
+					<mfm v-if="note.text" :text="note.cw != null ? note.cw : note.text" :author="note.user" :custom-emojis="note.emojis"/>
 				</div>
 			</div>
 		</div>
--- a/src/client/app/common/views/pages/follow.vue
+++ b/src/client/app/common/views/pages/follow.vue
@@ -1,7 +1,8 @@
 <template>
 <div class="syxhndwprovvuqhmyvveewmbqayniwkv" v-if="!fetching">
-	<div class="signed-in-as" v-html="this.$t('signed-in-as').replace('{}', `<b>${myName}`)"></div>
-
+	<div class="signed-in-as">
+		<mfm :text="$t('signed-in-as').replace('{}', myName)" :should-break="false" :plain-text="true" :custom-emojis="$store.state.i.emojis"/>
+	</div>
 	<main>
 		<div class="banner" :style="bannerStyle"></div>
 		<mk-avatar class="avatar" :user="user" :disable-preview="true"/>
@@ -11,7 +12,7 @@
 			</router-link>
 			<span class="username">@{{ user | acct }}</span>
 			<div class="description">
-				<misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
+				<mfm v-if="user.description" :text="user.description" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
 			</div>
 		</div>
 	</main>
@@ -127,6 +128,7 @@ export default Vue.extend({
 	> .signed-in-as
 		margin-bottom 16px
 		font-size 14px
+		font-weight bold

 	> main
 		margin-bottom 16px
--- a/src/client/app/common/views/widgets/slideshow.vue
+++ b/src/client/app/common/views/widgets/slideshow.vue
@@ -13,7 +13,7 @@
 </template>

 <script lang="ts">
-import * as anime from 'animejs';
+import anime from 'animejs';
 import define from '../../../common/define-widget';
 import i18n from '../../../i18n';

--- a/src/client/app/common/views/widgets/tips.vue
+++ b/src/client/app/common/views/widgets/tips.vue
@@ -5,7 +5,7 @@
 </template>

 <script lang="ts">
-import * as anime from 'animejs';
+import anime from 'animejs';
 import define from '../../../common/define-widget';
 import i18n from '../../../i18n';

--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -147,7 +147,7 @@ init(async (launch) => {
 			{ path: '/search', component: MkSearch },
 			{ path: '/tags/:tag', name: 'tag', component: MkTag },
 			{ path: '/share', component: MkShare },
-			{ path: '/reversi/:game?', component: MkReversi },
+			{ path: '/games/reversi/:game?', component: MkReversi },
 			{ path: '/@:user', name: 'user', component: MkUser },
 			{ path: '/@:user/following', name: 'userFollowing', component: MkUserFollowingOrFollowers },
 			{ path: '/@:user/followers', name: 'userFollowers', component: MkUserFollowingOrFollowers },
--- a/src/client/app/desktop/views/components/context-menu.vue
+++ b/src/client/app/desktop/views/components/context-menu.vue
@@ -6,7 +6,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as anime from 'animejs';
+import anime from 'animejs';
 import contains from '../../../common/scripts/contains';
 import XMenu from './context-menu.menu.vue';

--- a/src/client/app/desktop/views/components/drive.file.vue
+++ b/src/client/app/desktop/views/components/drive.file.vue
@@ -34,8 +34,10 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import * as anime from 'animejs';
+import anime from 'animejs';
 import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
+import updateAvatar from '../../api/update-avatar';
+import updateBanner from '../../api/update-banner';

 export default Vue.extend({
 	i18n: i18n('desktop/views/components/drive.file.vue'),
@@ -180,11 +182,11 @@ export default Vue.extend({
 		},

 		setAsAvatar() {
-			this.$updateAvatar(this.file);
+			updateAvatar(this.$root)(this.file);
 		},

 		setAsBanner() {
-			this.$updateBanner(this.file);
+			updateBanner(this.$root)(this.file);
 		},

 		addApp() {
--- a/src/client/app/desktop/views/components/drive.vue
+++ b/src/client/app/desktop/views/components/drive.vue
@@ -66,6 +66,7 @@ import XFolder from './drive.folder.vue';
 import XFile from './drive.file.vue';
 import contains from '../../../common/scripts/contains';
 import { url } from '../../../config';
+import { faCloudUploadAlt } from '@fortawesome/free-solid-svg-icons';

 export default Vue.extend({
 	i18n: i18n('desktop/views/components/drive.vue'),
@@ -149,7 +150,7 @@ export default Vue.extend({
 			}, {
 				type: 'item',
 				text: this.$t('contextmenu.url-upload'),
-				icon: 'cloud-upload-alt',
+				icon: faCloudUploadAlt,
 				action: this.urlUpload
 			}]);
 		},
--- a/src/client/app/desktop/views/components/game-window.vue
+++ b/src/client/app/desktop/views/components/game-window.vue
@@ -23,8 +23,8 @@ export default Vue.extend({
 	computed: {
 		popout(): string {
 			return this.game
-				? `${url}/reversi/${this.game.id}`
-				: `${url}/reversi`;
+				? `${url}/games/reversi/${this.game.id}`
+				: `${url}/games/reversi`;
 		}
 	}
 });
--- a/src/client/app/desktop/views/components/media-video-dialog.vue
+++ b/src/client/app/desktop/views/components/media-video-dialog.vue
@@ -7,7 +7,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as anime from 'animejs';
+import anime from 'animejs';

 export default Vue.extend({
 	props: ['video', 'start'],
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@@ -32,7 +32,7 @@
 					<span class="visibility" v-if="appearNote.visibility != 'public'">
 						<fa v-if="appearNote.visibility == 'home'" icon="home"/>
 						<fa v-if="appearNote.visibility == 'followers'" icon="unlock"/>
-						<fa v-if="appearNote.visibility == 'specified'" icon="lock"/>
+						<fa v-if="appearNote.visibility == 'specified'" icon="envelope"/>
 					</span>
 					<span class="localOnly" v-if="appearNote.localOnly == true"><fa icon="heart"/></span>
 				</div>
@@ -40,14 +40,14 @@
 		</header>
 		<div class="body">
 			<p v-if="appearNote.cw != null" class="cw">
-				<misskey-flavored-markdown v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
+				<mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
 				<mk-cw-button v-model="showContent" :note="appearNote"/>
 			</p>
 			<div class="content" v-show="appearNote.cw == null || showContent">
 				<div class="text">
 					<span v-if="appearNote.isHidden" style="opacity: 0.5">{{ $t('private') }}</span>
 					<span v-if="appearNote.deletedAt" style="opacity: 0.5">{{ $t('deleted') }}</span>
-					<misskey-flavored-markdown v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
+					<mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
 				</div>
 				<div class="files" v-if="appearNote.files.length > 0">
 					<mk-media-list :media-list="appearNote.files" :raw="true"/>
@@ -70,7 +70,7 @@
 				<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
 			</button>
 			<button v-if="['public', 'home'].includes(appearNote.visibility)" class="renoteButton" @click="renote()" :title="$t('renote')">
-				<fa icon="retweet"/>
+				<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount > 0">{{ appearNote.renoteCount }}</p>
 			</button>
 			<button v-else class="inhibitedButton">
 				<fa icon="ban"/>
--- a/src/client/app/desktop/views/components/note-preview.vue
+++ b/src/client/app/desktop/views/components/note-preview.vue
@@ -5,7 +5,7 @@
 		<mk-note-header class="header" :note="note" :mini="true"/>
 		<div class="body">
 			<p v-if="note.cw != null" class="cw">
-				<misskey-flavored-markdown v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis" />
+				<mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis" />
 				<mk-cw-button v-model="showContent" :note="note"/>
 			</p>
 			<div class="content" v-show="note.cw == null || showContent">
--- a/src/client/app/desktop/views/components/note.sub.vue
+++ b/src/client/app/desktop/views/components/note.sub.vue
@@ -5,7 +5,7 @@
 		<mk-note-header class="header" :note="note"/>
 		<div class="body">
 			<p v-if="note.cw != null" class="cw">
-				<misskey-flavored-markdown v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis" />
+				<mfm v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis" />
 				<mk-cw-button v-model="showContent" :note="note"/>
 			</p>
 			<div class="content" v-show="note.cw == null || showContent">
--- a/src/client/app/desktop/views/components/note.vue
+++ b/src/client/app/desktop/views/components/note.vue
@@ -20,14 +20,14 @@
 			<mk-note-header class="header" :note="appearNote" :mini="mini"/>
 			<div class="body" v-if="appearNote.deletedAt == null">
 				<p v-if="appearNote.cw != null" class="cw">
-					<misskey-flavored-markdown v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
+					<mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
 					<mk-cw-button v-model="showContent" :note="appearNote"/>
 				</p>
 				<div class="content" v-show="appearNote.cw == null || showContent">
 					<div class="text">
 						<span v-if="appearNote.isHidden" style="opacity: 0.5">{{ $t('private') }}</span>
 						<a class="reply" v-if="appearNote.reply"><fa icon="reply"/></a>
-						<misskey-flavored-markdown v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis"/>
+						<mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis"/>
 						<a class="rp" v-if="appearNote.renote">RN:</a>
 					</div>
 					<div class="files" v-if="appearNote.files.length > 0">
@@ -36,7 +36,7 @@
 					<mk-poll v-if="appearNote.poll" :note="appearNote" ref="pollViewer"/>
 					<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" target="_blank"><fa icon="map-marker-alt"/> 位置情報</a>
 					<div class="renote" v-if="appearNote.renote"><mk-note-preview :note="appearNote.renote" :mini="mini"/></div>
-					<mk-url-preview v-for="url in urls" :url="url" :key="url" :mini="mini"/>
+					<mk-url-preview v-for="url in urls" :url="url" :key="url" :mini="mini" :compact="compact"/>
 				</div>
 			</div>
 			<footer v-if="appearNote.deletedAt == null">
@@ -48,7 +48,7 @@
 					<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
 				</button>
 				<button v-if="['public', 'home'].includes(appearNote.visibility)" class="renoteButton" @click="renote()" :title="$t('renote')">
-					<fa icon="retweet"/>
+					<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount > 0">{{ appearNote.renoteCount }}</p>
 				</button>
 				<button v-else class="inhibitedButton">
 					<fa icon="ban"/>
@@ -102,6 +102,11 @@ export default Vue.extend({
 			required: false,
 			default: false
 		},
+		compact: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
 		mini: {
 			type: Boolean,
 			required: false,
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@@ -15,7 +15,7 @@
 	<!-- トランジションを有効にするとなぜかメモリリークする -->
 	<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="notes transition" tag="div" ref="notes">
 		<template v-for="(note, i) in _notes">
-			<x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)" ref="note"/>
+			<x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)" :compact="true" ref="note"/>
 			<p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date">
 				<span><fa icon="angle-up"/>{{ note._datetext }}</span>
 				<span><fa icon="angle-down"/>{{ _notes[i + 1]._datetext }}</span>
--- a/src/client/app/desktop/views/components/notifications.vue
+++ b/src/client/app/desktop/views/components/notifications.vue
@@ -24,7 +24,7 @@
 							</p>
 							<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 								<fa icon="quote-left"/>
-									<misskey-flavored-markdown :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+									<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
 								<fa icon="quote-right"/>
 							</router-link>
 						</div>
@@ -40,7 +40,7 @@
 							</p>
 							<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)">
 								<fa icon="quote-left"/>
-									<misskey-flavored-markdown :text="getNoteSummary(notification.note.renote)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.renote.emojis"/>
+									<mfm :text="getNoteSummary(notification.note.renote)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.renote.emojis"/>
 								<fa icon="quote-right"/>
 							</router-link>
 						</div>
@@ -55,7 +55,7 @@
 								</router-link>
 							</p>
 							<router-link class="note-preview" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
-								<misskey-flavored-markdown :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+								<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
 							</router-link>
 						</div>
 					</template>
@@ -91,7 +91,7 @@
 								</router-link>
 							</p>
 							<router-link class="note-preview" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
-								<misskey-flavored-markdown :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+								<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
 							</router-link>
 						</div>
 					</template>
@@ -105,7 +105,7 @@
 								</router-link>
 							</p>
 							<a class="note-preview" :href="notification.note | notePage" :title="getNoteSummary(notification.note)">
-								<misskey-flavored-markdown :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+								<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
 							</a>
 						</div>
 					</template>
@@ -118,7 +118,7 @@
 							</a></p>
 							<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 								<fa icon="quote-left"/>
-									<misskey-flavored-markdown :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+									<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
 								<fa icon="quote-right"/>
 							</router-link>
 						</div>
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@@ -50,7 +50,7 @@
 		<span v-if="visibility === 'public'"><fa icon="globe"/></span>
 		<span v-if="visibility === 'home'"><fa icon="home"/></span>
 		<span v-if="visibility === 'followers'"><fa icon="unlock"/></span>
-		<span v-if="visibility === 'specified'"><fa icon="lock"/></span>
+		<span v-if="visibility === 'specified'"><fa icon="envelope"/></span>
 	</button>
 	<p class="text-count" :class="{ over: trimmedLength(text) > maxNoteTextLength }">{{ maxNoteTextLength - trimmedLength(text) }}</p>
 	<ui-button primary :wait="posting" class="submit" :disabled="!canPost" @click="post">
@@ -77,6 +77,7 @@ import extractMentions from '../../../../../misc/extract-mentions';

 export default Vue.extend({
 	i18n: i18n('desktop/views/components/post-form.vue'),
+
 	components: {
 		XDraggable,
 		MkVisibilityChooser
@@ -197,11 +198,11 @@ export default Vue.extend({
 				const mention = x.host ? `@${x.username}@${toASCII(x.host)}` : `@${x.username}`;

 				// 自分は除外
-				if (this.$store.state.i.username == x.username && x.host == null) return;
-				if (this.$store.state.i.username == x.username && x.host == host) return;
+				if (this.$store.state.i.username == x.username && x.host == null) continue;
+				if (this.$store.state.i.username == x.username && x.host == host) continue;

 				// 重複は除外
-				if (this.text.indexOf(`${mention} `) != -1) return;
+				if (this.text.indexOf(`${mention} `) != -1) continue;

 				this.text += `${mention} `;
 			}
--- a/src/client/app/desktop/views/components/renote-form.vue
+++ b/src/client/app/desktop/views/components/renote-form.vue
@@ -21,7 +21,14 @@ import i18n from '../../../i18n';

 export default Vue.extend({
 	i18n: i18n('desktop/views/components/renote-form.vue'),
-	props: ['note'],
+
+	props: {
+		note: {
+			type: Object,
+			required: true
+		}
+	},
+
 	data() {
 		return {
 			wait: false,
@@ -29,6 +36,7 @@ export default Vue.extend({
 			visibility: this.$store.state.settings.defaultNoteVisibility
 		};
 	},
+
 	methods: {
 		ok(v: string) {
 			this.wait = true;
@@ -44,9 +52,11 @@ export default Vue.extend({
 				this.wait = false;
 			});
 		},
+
 		cancel() {
 			this.$emit('canceled');
 		},
+
 		onQuote() {
 			this.quote = true;

@@ -54,6 +64,7 @@ export default Vue.extend({
 				(this.$refs.form as any).focus();
 			});
 		},
+
 		onChildFormPosted() {
 			this.$emit('posted');
 		}
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -32,13 +32,6 @@
 					<span slot="desc">{{ $t('auto-popout-desc') }}</span>
 				</ui-switch>
 				<ui-switch v-model="deckNav">{{ $t('deck-nav') }}<span slot="desc">{{ $t('deck-nav-desc') }}</span></ui-switch>
-
-				<details>
-					<summary>{{ $t('advanced') }}</summary>
-					<ui-switch v-model="apiViaStream">{{ $t('api-via-stream') }}
-						<span slot="desc">{{ $t('api-via-stream-desc') }}</span>
-					</ui-switch>
-				</details>
 			</section>

 			<section>
@@ -203,7 +196,7 @@
 		</ui-card>

 		<ui-card class="2fa" v-show="page == 'security'">
-			<div slot="title"><fa icon="mobile-alt"/> {{ $t('2fa') }}</div>
+			<div slot="title"><fa icon="mobile-alt"/> {{ $t('@.2fa') }}</div>
 			<section>
 				<x-2fa/>
 			</section>
@@ -333,11 +326,6 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'reduceMotion', value }); }
 		},

-		apiViaStream: {
-			get() { return this.$store.state.device.apiViaStream; },
-			set(value) { this.$store.commit('device/set', { key: 'apiViaStream', value }); }
-		},
-
 		autoPopout: {
 			get() { return this.$store.state.device.autoPopout; },
 			set(value) { this.$store.commit('device/set', { key: 'autoPopout', value }); }
--- a/src/client/app/desktop/views/components/sub-note-content.vue
+++ b/src/client/app/desktop/views/components/sub-note-content.vue
@@ -4,7 +4,7 @@
 		<span v-if="note.isHidden" style="opacity: 0.5">{{ $t('private') }}</span>
 		<span v-if="note.deletedAt" style="opacity: 0.5">{{ $t('deleted') }}</span>
 		<a class="reply" v-if="note.replyId"><fa icon="reply"/></a>
-		<misskey-flavored-markdown v-if="note.text" :text="note.text" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis"/>
+		<mfm v-if="note.text" :text="note.text" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis"/>
 		<a class="rp" v-if="note.renoteId" :href="`/notes/${note.renoteId}`">RN: ...</a>
 	</div>
 	<details v-if="note.files.length > 0">
--- a/src/client/app/desktop/views/components/timeline.vue
+++ b/src/client/app/desktop/views/components/timeline.vue
@@ -4,7 +4,7 @@
 		<span :data-active="src == 'home'" @click="src = 'home'"><fa icon="home"/> {{ $t('home') }}</span>
 		<span :data-active="src == 'local'" @click="src = 'local'" v-if="enableLocalTimeline"><fa :icon="['far', 'comments']"/> {{ $t('local') }}</span>
 		<span :data-active="src == 'hybrid'" @click="src = 'hybrid'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('hybrid') }}</span>
-		<span :data-active="src == 'global'" @click="src = 'global'"><fa icon="globe"/> {{ $t('global') }}</span>
+		<span :data-active="src == 'global'" @click="src = 'global'" v-if="enableGlobalTimeline"><fa icon="globe"/> {{ $t('global') }}</span>
 		<span :data-active="src == 'tag'" @click="src = 'tag'" v-if="tagTl"><fa icon="hashtag"/> {{ tagTl.title }}</span>
 		<span :data-active="src == 'list'" @click="src = 'list'" v-if="list"><fa icon="list"/> {{ list.title }}</span>
 		<div class="buttons">
@@ -43,7 +43,8 @@ export default Vue.extend({
 			src: 'home',
 			list: null,
 			tagTl: null,
-			enableLocalTimeline: false
+			enableLocalTimeline: false,
+			enableGlobalTimeline: false,
 		};
 	},

@@ -65,7 +66,8 @@ export default Vue.extend({

 	created() {
 		this.$root.getMeta().then(meta => {
-			this.enableLocalTimeline = !meta.disableLocalTimeline;
+			this.enableLocalTimeline = !meta.disableLocalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin;
+			this.enableGlobalTimeline = !meta.disableGlobalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin;
 		});

 		if (this.$store.state.device.tl) {
--- a/src/client/app/desktop/views/components/ui-notification.vue
+++ b/src/client/app/desktop/views/components/ui-notification.vue
@@ -6,7 +6,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as anime from 'animejs';
+import anime from 'animejs';

 export default Vue.extend({
 	props: ['message'],
--- a/src/client/app/desktop/views/components/ui.header.vue
+++ b/src/client/app/desktop/views/components/ui.header.vue
@@ -29,7 +29,6 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import * as anime from 'animejs';
 import { env } from '../../../config';

 import XNav from './ui.header.nav.vue';
--- a/src/client/app/desktop/views/components/user-card.vue
+++ b/src/client/app/desktop/views/components/user-card.vue
@@ -7,9 +7,10 @@
 		<router-link :to="user | userPage" class="name">
 			<mk-user-name :user="user"/>
 		</router-link>
-		<span class="username">@{{ user | acct }}</span>
+		<span class="username">@{{ user | acct }} <fa v-if="user.isLocked == true" class="locked" icon="lock" fixed-width/></span>
+
 		<div class="description">
-			<misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
+			<mfm v-if="user.description" :text="user.description" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
 		</div>
 	</div>
 </div>
@@ -75,6 +76,9 @@ export default Vue.extend({
 			display block
 			opacity 0.7

+			> .locked
+				opacity 0.8
+
 		> .description
 			margin 8px 0 16px 0

--- a/src/client/app/desktop/views/components/user-preview.vue
+++ b/src/client/app/desktop/views/components/user-preview.vue
@@ -8,7 +8,7 @@
 			<p class="username"><mk-acct :user="u"/></p>
 		</div>
 		<div class="description">
-			<misskey-flavored-markdown v-if="u.description" :text="u.description" :author="u" :i="$store.state.i" :custom-emojis="u.emojis"/>
+			<mfm v-if="u.description" :text="u.description" :author="u" :i="$store.state.i" :custom-emojis="u.emojis"/>
 		</div>
 		<div class="status">
 			<div>
@@ -29,7 +29,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import * as anime from 'animejs';
+import anime from 'animejs';
 import parseAcct from '../../../../../misc/acct/parse';

 export default Vue.extend({
--- a/src/client/app/desktop/views/components/window.vue
+++ b/src/client/app/desktop/views/components/window.vue
@@ -37,7 +37,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import * as anime from 'animejs';
+import anime from 'animejs';
 import contains from '../../../common/scripts/contains';

 const minHeight = 40;
@@ -196,7 +196,7 @@ export default Vue.extend({
 				opacity: 0,
 				scale: 0.8,
 				duration: this.animation ? 300 : 0,
-				easing: [0.5, -0.5, 1, 0.5]
+				easing: 'cubicBezier(0.5, -0.5, 1, 0.5)'
 			});

 			setTimeout(() => {
--- a/src/client/app/desktop/views/pages/deck/deck.note-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.note-column.vue
@@ -1,7 +1,7 @@
 <template>
 <x-column>
 	<span slot="header">
-		<fa :icon="['far', 'comment-alt']"/><span>{{ title }}</span>
+		<fa :icon="['far', 'comment-alt']"/><mk-user-name :user="note.user" v-if="note"/>
 	</span>

 	<div class="rvtscbadixhhbsczoorqoaygovdeecsx" v-if="note">
@@ -45,12 +45,6 @@ export default Vue.extend({
 		};
 	},

-	computed: {
-		title(): string {
-			return this.note ? Vue.filter('userName')(this.note.user) : '';
-		}
-	},
-
 	created() {
 		this.$root.api('notes/show', { noteId: this.noteId }).then(note => {
 			this.note = note;
--- a/src/client/app/desktop/views/pages/deck/deck.notes.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notes.vue
@@ -18,6 +18,7 @@
 				:key="note.id"
 				@update:note="onNoteUpdated(i, $event)"
 				:media-view="mediaView"
+				:compact="true"
 				:mini="true"/>
 			<p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date">
 				<span><fa icon="angle-up"/>{{ note._datetext }}</span>
--- a/src/client/app/desktop/views/pages/deck/deck.notification.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notification.vue
@@ -12,7 +12,7 @@
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 				<fa icon="quote-left"/>
-					<misskey-flavored-markdown :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+					<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
 				<fa icon="quote-right"/>
 			</router-link>
 		</div>
@@ -30,7 +30,7 @@
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)">
 				<fa icon="quote-left"/>
-					<misskey-flavored-markdown :text="getNoteSummary(notification.note.renote)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.renote.emojis"/>
+					<mfm :text="getNoteSummary(notification.note.renote)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.renote.emojis"/>
 				<fa icon="quote-right"/>
 			</router-link>
 		</div>
@@ -74,7 +74,7 @@
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 				<fa icon="quote-left"/>
-					<misskey-flavored-markdown :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+					<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
 				<fa icon="quote-right"/>
 			</router-link>
 		</div>
--- a/src/client/app/desktop/views/pages/deck/deck.user-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.user-column.vue
@@ -1,7 +1,7 @@
 <template>
 <x-column>
 	<span slot="header">
-		<fa icon="user"/><span>{{ title }}</span>
+		<fa icon="user"/><mk-user-name :user="user" v-if="user"/>
 	</span>

 	<div class="zubukjlciycdsyynicqrnlsmdwmymzqu" v-if="user">
@@ -19,20 +19,20 @@
 				<span class="name">
 					<mk-user-name :user="user"/>
 				</span>
-				<span class="acct">@{{ user | acct }}</span>
+				<span class="acct">@{{ user | acct }} <fa v-if="user.isLocked == true" class="locked" icon="lock" fixed-width/></span>
 			</div>
 		</header>
 		<div class="info">
 			<div class="description">
-				<misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
+				<mfm v-if="user.description" :text="user.description" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
 			</div>
 			<div class="fields" v-if="user.fields">
 				<dl class="field" v-for="(field, i) in user.fields" :key="i">
 					<dt class="name">
-						<misskey-flavored-markdown :text="field.name" :shouldBreak="false" :plainText="true" :custom-emojis="user.emojis"/>
+						<mfm :text="field.name" :should-break="false" :plain-text="true" :custom-emojis="user.emojis"/>
 					</dt>
 					<dd class="value">
-						<misskey-flavored-markdown :text="field.value" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
+						<mfm :text="field.value" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
 					</dd>
 				</dl>
 			</div>
@@ -49,9 +49,6 @@
 					<b>{{ user.followersCount | number }}</b>
 					<span>{{ $t('followers') }}</span>
 				</div>
-				<div class="mention">
-					<button @click="mention" :title="$t('mention')"><fa icon="at"/></button>
-				</div>
 			</div>
 		</div>
 		<div class="pinned" v-if="user.pinnedNotes && user.pinnedNotes.length > 0">
@@ -100,8 +97,7 @@ import parseAcct from '../../../../../../misc/acct/parse';
 import XColumn from './deck.column.vue';
 import XNotes from './deck.notes.vue';
 import XNote from '../../components/note.vue';
-import Menu from '../../../../common/views/components/menu.vue';
-import MkUserListsWindow from '../../components/user-lists-window.vue';
+import XUserMenu from '../../../../common/views/components/user-menu.vue';
 import { concat } from '../../../../../../prelude/array';
 import * as ApexCharts from 'apexcharts';

@@ -137,10 +133,6 @@ export default Vue.extend({
 	},

 	computed: {
-		title(): string {
-			return this.user ? Vue.filter('userName')(this.user) : '';
-		},
-
 		bannerStyle(): any {
 			if (this.user == null) return {};
 			if (this.user.bannerUrl == null) return {};
@@ -169,6 +161,7 @@ export default Vue.extend({
 			this.$root.api('users/notes', {
 				userId: this.user.id,
 				fileType: image,
+				excludeNsfw: !this.$store.state.device.alwaysShowNsfw,
 				limit: 9,
 				untilDate: new Date().getTime() + 1000 * 86400 * 365
 			}).then(notes => {
@@ -222,8 +215,7 @@ export default Vue.extend({
 					},
 					plotOptions: {
 						bar: {
-							columnWidth: '90%',
-							endingShape: 'rounded'
+							columnWidth: '90%'
 						}
 					},
 					grid: {
@@ -310,33 +302,10 @@ export default Vue.extend({
 			return promise;
 		},

-		mention() {
-			this.$post({ mention: this.user });
-		},
-
 		menu() {
-			let menu = [{
-				icon: 'list',
-				text: this.$t('push-to-a-list'),
-				action: () => {
-					const w = this.$root.new(MkUserListsWindow);
-					w.$once('choosen', async list => {
-						w.close();
-						await this.$root.api('users/lists/push', {
-							listId: list.id,
-							userId: this.user.id
-						});
-						this.$root.dialog({
-							type: 'success',
-							splash: true
-						});
-					});
-				}
-			}];
-
-			this.$root.new(Menu, {
+			this.$root.new(XUserMenu, {
 				source: this.$refs.menu,
-				items: menu
+				user: this.user
 			});
 		},

@@ -411,6 +380,9 @@ export default Vue.extend({
 				opacity 0.7
 				text-shadow 0 0 8px #000

+				> .locked
+					opacity 0.8
+
 	> .info
 		padding 16px
 		font-size 12px
@@ -460,7 +432,7 @@ export default Vue.extend({

 		> .counts
 			display grid
-			grid-template-columns 2fr 2fr 2fr 1fr
+			grid-template-columns 2fr 2fr 2fr
 			margin-top 8px
 			border-top solid var(--lineWidth) var(--faceDivider)

@@ -477,9 +449,6 @@ export default Vue.extend({
 					font-size 80%
 					opacity 0.7

-			> .mention
-				display flex
-
 	> *
 		> p.caption
 			margin 0
--- a/Show More
+++ b/Show More