11.35.0

New Crowdin translations (#5503 )
* New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (English) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean)
2019-11-01 06:17:43 +09:00 · 2019-11-01 05:46:47 +09:00 · 2019-11-01 05:46:20 +09:00 · 2019-11-01 05:43:54 +09:00 · 2019-11-01 05:40:11 +09:00 · 2019-11-01 05:39:00 +09:00
212 changed files with 6342 additions and 3853 deletions
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -116,8 +116,25 @@ autoAdmin: true
 # Whether disable HSTS
 #disableHsts: true

-# Clustering
+# Number of worker processes
 #clusterLimit: 1

+# Job concurrency per worker
+# deliverJobConcurrency: 128
+# inboxJobConcurrency: 16
+
 # IP address family used for outgoing request (ipv4, ipv6 or dual)
 #outgoingAddressFamily: ipv4
+
+# Syslog option
+#syslog:
+#  host: localhost
+#  port: 514
+
+# Proxy for HTTP/HTTPS
+#proxy: http://127.0.0.1:3128
+
+# Proxy for SMTP/SMTPS
+#proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
+#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
+#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-v12.8.1
+v12.11.1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,152 @@
 ChangeLog
 =========

+11.35.0 (2019/11/01)
+--------------------
+### ✨Improvements
+* 一対一でのトークを連合するように
+* カスタム絵文字をカテゴリ分け出来るように
+* カスタム絵文字をカテゴリ, 名前でソートするように
+* 絵文字ピッカーに最近使った絵文字を表示するように
+* 絵文字ピッカーで最後に使ったページを覚えておくように
+* 絵文字ピッカーで正方形じゃない絵文字のアスペクト比を保持するように
+* EscやBackspaceでメディアビューワが閉じれるように
+
+### 🐛Fixes
+* AP: リモートアカウントを解決するとき、そのActorにendpointsが無いとTypeErrorになる問題を修正
+* AP: 新規投稿のMFMをHTMLに変換する際、リモートユーザーへのメンションのリンク先を(できれば)urlに
+* AP: menionのclassにu-urlを付けるように
+* AP: Noteの添付ファイルを提示する時に添付順を保持するように
+* リモートユーザーの更新に失敗することがある問題を修正
+* ミュートしているユーザーのプロフィールを開くと投稿が表示されない問題を修正
+* チャートで値が減ったときの記録が正しく行われていなかった問題を修正
+* カスタム絵文字を登録できない場合がある問題を修正
+* カスタム絵文字を重複登録できないように
+* みつけるの微修正
+* プロフィールで他のユーザーにうつってもfieldsが更新されない問題を修正
+* 絵文字ピッカーでアニメーション停止オプションが効かないのを修正
+
+11.34.0 (2019/10/14)
+--------------------
+### ✨Improvements
+* みつけるに連合分を表示するように
+* リアクションピッカーをカスタマイズできるように
+* inputで不正な値を入力したときにメッセージを表示するように
+* ドライブファイルダウンロードURLにdownloadを付けないように
+* web-pushでProxyを使用するように
+
+### 🐛Fixes
+* 投稿本文が合字を含んで8192文字の場合に制限をパスしても投稿できない問題を修正
+* meta.maxNoteTextLengthをnote.textの最大サイズより大きく設定できる問題を修正
+* ページ移動等してもメニュー等が閉じずに残ってしまう問題を修正
+* ページ移動してもメディアビューワーが残ってしまう問題を修正
+* APに関する問題の修正
+* オフライン時に大室櫻子が出てこない問題を修正
+
+11.33.0 (2019/09/27)
+--------------------
+### ✨Improvements
+* 絵文字ピッカーの Unicode 12.0 対応
+* Adminページのユーザー一覧フィルターに利用可能アカウントを追加
+* お知らせウィジェットのデザインを変更
+
+### 🐛Fixes
+* ユーザーを特定のリストから外すと他のリストからも消える問題を修正
+* 任意のグループからユーザーを削除すると他のグループからでも削除されちゃうのを修正
+* 非公開の投稿にリアクションや返信がついたとき通知が正しく行われない問題を修正
+* AP: featured collectionの取り扱いが間違ってるのを修正
+* AP: 存在しないユーザーをAPで参照すると404にするべきところ500になってしまうのを修正
+* AndoridとデスクトップOSのChromeでPWAとしてインストール（ホーム画面に追加）できない問題を修正
+* /@:user/* でユーザー用のページを返さない問題を修正
+* インスタンス設定で空Arrayがうまく保存できない問題を修正
+* 絵文字サジェスト時にそれがサロゲートペアだった場合「1文字」分しかカーソルが移動しない問題を修正
+* ハッシュタグパースの修正
+* MFMでKeycap Number Signが表示できない問題を修正
+* フォローリクエストページのデザインを修正
+* selectコンポーネントに余分な下線が付く問題を修正
+
+11.32.0 (2019/09/10)
+--------------------
+### ✨Improvements
+* APでRenote/Boost取り消しをやりとりするように
+* リモートNote存在確認から作成までの間にLockをかけるように
+* 広告ブロッカーの警告を削除
+
+### 🐛Fixes
+* ミュートしているユーザーからトークメッセージが来たときに通知インジケーターが点灯する問題を修正
+* リアクションした人が10人を超えるときツールチップの表示がおかしい問題を修正
+
+11.31.4 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.3 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.2 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.1 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.0 (2019/09/02)
+--------------------
+### ✨Improvements
+* Syslogサポート
+* チャートの同期機能をAPI経由で使えるように
+* SMTPでProxyを使用できるように
+* リアクションにホバーすることで誰がリアクションしたか見れるように
+* リプライ時、返信元のlocalOnly属性を引き継ぐように
+* 引用付き、ローカルのみなどの案内文にアイコン追加
+* AP deliver/inbox job の並列度を変更できるように
+* clusterLimitの既定値を1に
+* AP inbox ジョブの並列度を下げる
+* CWが付いた投稿はAP上でNote.sensitiveフラグを付けるように
+* メモウィジェットの内容を自動で保存するように
+* ページURLが他と重複してたらエラーを投げるように
+* ページURLが空の時エラーを投げるように
+* リアクションが解除されたときはアニメーションしないように
+* 設定の各セクションごとにURLを割り当てるように
+* 管理画面の各セクションごとにURLを割り当てるように
+
+### 🐛Fixes
+* 未実装のTLのRenoteクエリを実装
+* タイムラインAPIのexcludeNsfwオプションを実装
+* ユーザーページの投稿一覧の私の投稿にRenoteが表示される問題を修正
+* meta APIでemojiプロパティに不要な情報が含まれているのを修正
+* モバイル版でドライブのファイルを削除したときの挙動がおかしい問題を修正
+* visiblity-chooserにlocalOnly属性が伝わらなかったのを修正
+* 言語指定したときコードブロックが表示されない問題を修正
+* トークのメッセージがはみ出す問題を修正
+* CWの中のサムネイルのサイズが変なのを少し修正
+* リアクションが初めて付いた時のエフェクトが消えている問題を修正
+* 無効になっているスイッチを操作できる問題を修正
+* Mキー連打で画面が真っ暗問題を修正
+* AmazonのURLプレビューが出来ない問題を修正
+* 表記ゆれを修正
+
+11.30.0 (2019/08/24)
+--------------------
+### ✨Improvements
+* Room: 家具をすべてしまうボタンを追加
+* Room: カップ麺追加
+* Room: ホログラフィックディスプレイ追加
+* Room: エナジードリンク追加
+* Room: ピンギンの色を変えられるように
+* Room: プレビューの見やすさを向上
+* Room保存時にダイアログを表示するように
+* Roomから移動するときに未保存ならば警告するように
+
+### 🐛Fixes
+* MisskeyRoomからページを戻した時、テキスト入力画面で選択位置変更ができない問題を修正
+
 11.29.0 (2019/08/19)
 --------------------
 ### ✨Improvements
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,10 +39,12 @@ Misskey uses CircleCI for executing automated tests.
 Configuration files are located in [`/.circleci`](/.circleci).

 ## Adding MisskeyRoom items
-* Use English for material, object and texture names
-* Use meter for unit of length
-* Your PR should include all source files of your models (for later editing)
-* Your PR must include the glTF binary files (.glb) of your models
+* Use English for material, object and texture names.
+* Use meter for unit of length.
+* Your PR should include all source files (e.g. `.png`, `.blend`) of your models (for later editing).
+* Your PR must include the glTF binary files (`.glb`) of your models.
+* Add a locale key `room.furnitures.YOUR_ITEM` at [`/locales/ja-JP.yml`](/locales/ja-JP.yml).
+* Add a furniture definition at [`/src/client/app/common/scripts/room/furnitures.json5`](/src/client/app/common/scripts/room/furnitures.json5).

 If you have no experience on 3D modeling, we suggest to use the free 3DCG software [Blender](https://www.blender.org/).
 You can find information on glTF 2.0 at [glTF 2.0 — Blender Manual]( https://docs.blender.org/manual/en/dev/addons/io_scene_gltf2.html).
@@ -268,3 +270,7 @@ npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
 ```

 作成されたスクリプトは不必要な変更を含むため除去してください。
+
+## その他
+### HTMLのクラス名で follow という単語は使わない
+広告ブロッカーで誤ってブロックされる
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM node:12.8-alpine AS base
+FROM node:12.11.1-alpine AS base

 ENV NODE_ENV=production

--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 <a href="https://misskey.io">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 an 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://join.misskey.page/">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>
@@ -103,69 +103,71 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 ----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5888816/36da0f7c15954df0ab13f9abdf227f66/1.jpeg?token-time=2145916800&token-hash=at8QpJXJ8C0zINY_NmoMKv-MhXVoUK-YzTgaJPJzJYU%3D" alt="Hiroshi Seki" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/20010324/b8af4bd31ae34fbf8806cc0e6228e400/1.png?token-time=2145916800&token-hash=iyiocfousNIUwASmatsIDq8EOsmLUdrQNkWyktHlmJg%3D" alt="Nemo" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weepjp" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19045173/cb91c0f345c24d4ebfd05f19906d5e26/1.png?token-time=2145916800&token-hash=o_zKBytJs_AxHwSYw_5R8eD0eSJe3RoTR3kR3Q0syN0%3D" alt="kiritan" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/776209" alt="Denshi" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/557245" alt="mkatze" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/4.jpe?token-time=2145916800&token-hash=zEyJqVM7u9d8Ri-65fJYSJcWF1jBH1nJ5a3taRzrTmw%3D" alt="Melilot" width="100"></td>
 </tr><tr>
-<td><a href="https://www.patreon.com/rane_hs">Hiroshi Seki</a></td>
+<td><a href="https://www.patreon.com/user?u=20010324">Nemo</a></td>
 <td><a href="https://www.patreon.com/weepjp">weepjp</a></td>
 <td><a href="https://www.patreon.com/user?u=19045173">kiritan</a></td>
 <td><a href="https://www.patreon.com/user?u=776209">Denshi</a></td>
 <td><a href="https://www.patreon.com/user?u=557245">mkatze</a></td>
-<td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
 </tr></table>
 <table><tr>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5788159/af42076ab3354bb49803cfba65f94bee/1.jpg?token-time=2145916800&token-hash=iSaxp_Yr2-ZiU2YVi9rcpZZj9mj3UvNSMrZr4CU4qtA%3D" alt="mewl hayabusa" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1.png?token-time=2145916800&token-hash=9nEQje_eMvUjq9a7L3uBqW-MQbS-rRMaMgd7UYVoFNM%3D" alt="mydarkstar" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/16542964" alt="Takumi Sugita" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s" width="100"></td>
 </tr><tr>
 <td><a href="https://www.patreon.com/osapon">osapon</a></td>
 <td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
 <td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61</a></td>
+<td><a href="https://www.patreon.com/hs_sh_net">mewl hayabusa</a></td>
 <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</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=17866454">sikyosyounin</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
-<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5827393/59893c191dda408f9cabd0f20a3a5627/1.jpeg?token-time=2145916800&token-hash=i9N05vOph-eP1LTLb9_npATjYOpntL0ZsHNaZFSsPmE%3D" alt="motcha" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13737140/1adf7835017d479280d90fe8d30aade2/1.png?token-time=2145916800&token-hash=0pdle8h5pDZrww0BDOjdz6zO-HudeGTh36a3qi1biVU%3D" alt="Satsuki Yanagi" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpe?token-time=2145916800&token-hash=CPxGQhKIlEaa6WUcgbyHixyKEhakiw9RFdOhsIJBQ_o%3D" alt="takimura" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/619ab87cc08448439222631ebb26802f/1.gif?token-time=2145916800&token-hash=o27K7M02s1z-LkDUEO5Oa7cu-GviRXeOXxryi4o_6VU%3D" alt="Atsuko Tominaga" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1.jpe?token-time=2145916800&token-hash=EWxXhVbZYH7KB4IDT3joc8TbIg8zPO40x1r5IDn3R7c%3D" alt="Hiratake" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5923936/2a743cbfbff946c2af3f09026047c0da/2.png?token-time=2145916800&token-hash=h6yphW1qnM0n_NOWaf8qtszMRLXEwIxfk5beu4RxdT0%3D" alt="noellabo" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/2384390/5681180e1efb46a8b28e0e8d4c8b9037/1.jpg?token-time=2145916800&token-hash=SJcMy-Q1BcS940-LFUVOMfR7-5SgrzsEQGhYb3yowFk%3D" alt="CG" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.jpe?token-time=2145916800&token-hash=qA8j97lIZNc-74AuZ0p4F3ms6sKPeKjtNt2vEuwpsyo%3D" alt="Hekovic" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s</a></td>
+<td><a href="https://www.patreon.com/user?u=5827393">motcha</a></td>
 <td><a href="https://www.patreon.com/user?u=13737140">Satsuki Yanagi</a></td>
 <td><a href="https://www.patreon.com/takimura">takimura</a></td>
 <td><a href="https://www.patreon.com/user?u=16900731">Atsuko Tominaga</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/noellabo">noellabo</a></td>
 <td><a href="https://www.patreon.com/Corset">CG</a></td>
 <td><a href="https://www.patreon.com/hekovic">Hekovic</a></td>
 </tr></table>
 <table><tr>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1.jpeg?token-time=2145916800&token-hash=L55UhJ0rcuNAH3w_ryeeGN4hC6taoOixyAhraEi0bzw%3D" alt="dansup" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1.jpeg?token-time=2145916800&token-hash=d8jBQLMOHD87KtXs5C9fk1o58DMF73pQ-dYH3uZJPBE%3D" alt="Gargron" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1.png?token-time=2145916800&token-hash=hBayGfOmQH3kRMdNnDe4oCZD_9fsJWSt29xXR3KRMVk%3D" alt="Nokotaro Takeda" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/23932002" alt="nenohi" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1.jpeg?token-time=2145916800&token-hash=vGe7wXGqmA8Q7m-kDNb6fyGdwk-Dxk4F-ut8ZZu51RM%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>
 <td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
+<td><a href="https://www.patreon.com/user?u=23932002">nenohi</a></td>
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>

-**Last updated:** Mon, 05 Aug 2019 20:46:06 UTC
+**Last updated:** Thu, 31 Oct 2019 06:09:07 UTC
 <!-- PATREON_END -->

 :four_leaf_clover: Copyright
--- a/assets/icons/512.png
+++ b/assets/icons/512.png
--- a/assets/icons/icon.svg
+++ b/assets/icons/icon.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 135.46667 135.46667"
+   height="512"
+   width="512"
+   sodipodi:docname="icon.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:export-filename="H:\misskey\assets\icons\512.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="965"
+     id="namedview10"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-page="true"
+     inkscape:zoom="0.921875"
+     inkscape:cx="219.9952"
+     inkscape:cy="361.00053"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="opacity:1;fill:#2ba3bc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32291675;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+     id="rect828"
+     width="135.46667"
+     height="135.46667"
+     x="1.896631e-16"
+     y="0" />
+  <g
+     transform="matrix(0.57430748,0,0,0.57430748,11.070705,-35.453717)"
+     id="layer1"
+     style="stroke-width:1.74122751;fill:#ffffff;fill-opacity:1">
+    <g
+       transform="matrix(1.096096,0,0,1.096096,-2.960633,-44.023579)"
+       id="g4502"
+       style="stroke-width:1.74122751;fill:#ffffff;fill-opacity:1">
+      <g
+         id="g5125"
+         transform="translate(-1.3333333e-6,-1.3439941e-6)"
+         style="fill:#ffffff;fill-opacity:1;stroke-width:1.74122751">
+        <g
+           aria-label="Mi"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:141.03404236px;line-height:476.69509888px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.50409585px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="text4489"
+           transform="matrix(0.91391326,0,0,0.91391326,7.9719907,17.595761)">
+          <path
+             id="path5210"
+             transform="matrix(0.26412464,0,0,0.26412464,24.988264,136.28626)"
+             d="m 62.474609,76.585938 c -7.47555,0 -14.595784,1.246427 -21.359375,3.738281 C 29.011968,84.595952 19.044417,92.249798 11.212891,103.28516 3.7373405,113.96451 0,125.88934 0,139.06055 v 233.8789 c 0,17.08697 6.0510264,31.85913 18.154297,44.31836 12.459246,12.10327 27.233346,18.15625 44.320312,18.15625 17.442947,0 32.215089,-6.05298 44.318361,-18.15625 12.45925,-12.45923 18.68945,-27.23139 18.68945,-44.31836 V 330.4082 c 0.13441,-9.21122 9.6225,-6.79429 14.41797,0 8.98111,15.55395 28.02226,28.91242 50.19141,28.83594 22.16915,-0.0764 40.58194,-11.03699 50.19336,-28.83594 3.63981,-4.29263 13.89902,-11.60675 14.95117,0 v 42.53125 c 0,17.08697 6.05102,31.85913 18.15429,44.31836 12.45923,12.10327 27.23335,18.15625 44.32032,18.15625 17.44294,0 32.21509,-6.05298 44.31836,-18.15625 12.45923,-12.45923 18.68945,-27.23139 18.68945,-44.31836 v -233.8789 c 0,-13.17121 -3.9146,-25.09604 -11.74609,-35.77539 -7.47557,-11.035362 -17.26588,-18.689208 -29.36914,-22.960941 -7.11956,-2.491854 -14.23982,-3.738281 -21.35938,-3.738281 -19.22286,0 -35.41865,7.476649 -48.58984,22.427734 l -63.40235,74.199218 c -1.42391,1.06791 -6.14093,9.23242 -16.16015,9.23242 -10.01923,0 -14.20109,-8.16451 -15.625,-9.23242 L 110.53125,99.013672 C 97.716024,84.062587 81.697447,76.585938 62.474609,76.585938 Z m 395.060551,0 c -14.9511,-10e-7 -27.76596,5.340179 -38.44532,16.019531 -10.32338,10.323381 -15.48437,22.961011 -15.48437,37.912111 0,14.9511 5.16099,27.76596 15.48437,38.44531 10.67936,10.32338 23.49422,15.48633 38.44532,15.48633 14.95109,0 27.76596,-5.16295 38.44531,-15.48633 C 506.65982,158.28354 512,145.46868 512,130.51758 512,115.56648 506.65982,102.92885 495.98047,92.605469 485.30112,81.926117 472.48625,76.585938 457.53516,76.585938 Z m 0.5332,118.541012 c -14.9511,0 -27.76596,5.34018 -38.44531,16.01953 -10.67936,10.67936 -16.01758,23.49422 -16.01758,38.44532 v 131.89062 c 0,14.9511 5.33822,27.76596 16.01758,38.44531 10.67935,10.32339 23.49421,15.48633 38.44531,15.48633 14.9511,0 27.58873,-5.16294 37.91211,-15.48633 C 506.65982,409.24838 512,396.43352 512,381.48242 V 249.5918 c 0,-14.9511 -5.34018,-27.76596 -16.01953,-38.44532 -10.32338,-10.67935 -22.96101,-16.01953 -37.91211,-16.01953 z"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#ffffff;fill-opacity:1;stroke-width:1.90855289px"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
--- a/docs/examples/misskey.nginx
+++ b/docs/examples/misskey.nginx
@@ -1,7 +1,7 @@
 # Sample nginx configuration for Misskey
 #
 # 1. Replace example.tld to your domain
-# 2. Copy to /etc/nginx/sites-available/ and then symlink from /etc/nginx/sites-ebabled/
+# 2. Copy to /etc/nginx/sites-available/ and then symlink from /etc/nginx/sites-enabled/
 #    or copy to /etc/nginx/conf.d/

 # For WebSocket
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -12,7 +12,6 @@ const stylus = require('gulp-stylus');
 import * as uglifyComposer from 'gulp-uglify/composer';
 import * as rimraf from 'rimraf';
 import chalk from 'chalk';
-const imagemin = require('gulp-imagemin');
 import * as rename from 'gulp-rename';
 import * as mocha from 'gulp-mocha';
 import * as replace from 'gulp-replace';
@@ -54,6 +53,7 @@ gulp.task('build:copy:fonts', () =>
 gulp.task('build:copy', gulp.parallel('build:copy:views', 'build:copy:fonts', () =>
 	gulp.src([
 		'./src/const.json',
+		'./src/emojilist.json',
 		'./src/server/web/views/**/*',
 		'./src/**/assets/**/*',
 		'!./src/client/app/**/assets/**/*'
@@ -121,7 +121,6 @@ gulp.task('copy:client', () =>
 			'./src/client/assets/**/*',
 			'./src/client/app/*/assets/**/*'
 		])
-			.pipe(isProduction ? (imagemin as any)() : gutil.noop())
 			.pipe(rename(path => {
 				path.dirname = path.dirname!.replace('assets', '.');
 			}))
--- a/index.js
+++ b/index.js
@@ -1 +1,7 @@
-require('./built').default();
+const fs = require('fs');
+
+if (fs.existsSync('./built')) {
+	require('./built').default();
+} else {
+	console.log('Built code is not found. Probably an error occurred during a build or you just forgot to build.');
+}
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -18,9 +18,6 @@ common:
    drive: "Disk"
    drive-desc: "Chcete sdílet obrázek, který jste již nahráli? Chcete vaše nahrané soubory organizovat, pojmenovávat a vytvářet pro ně složky? Misskey Disk je pro vás nejlepší řešení. Je velmi snadné sdílet vaše soubory online."
    outro: "Podívejte se na unikátní vlastnosti Misskey vlastníma očima! Pokud si myslíte, že tato instance není pro vás, zkuste jiné instance, neboť Misskey je decentralizovaná sociální síť, takže můžete snadno najít své přátele. Hodně štěstí a zábavy!"
-  adblock:
-    detected: "Prosím vypněte svůj blokovač reklam"
-    warning: "Některé vlastnosti mohou být nedostupné nebo mohou způsobovat chyby, pokud máte povolený blokovač reklam. <strong>Misskey nepoužívá reklamy</strong>."
  application-authorization: "Autorizované aplikace"
  close: "Zavřít"
  do-not-copy-paste: "Prosím nezadávejte ani nevkládejte sem kód. Váš účet může být kompromitován."
@@ -34,6 +31,7 @@ common:
  signup: "Registrovat"
  signout: "Odhlásit"
  reload-to-apply-the-setting: "Pro uplatnění tohoto nastavení musíte znovu načíst tuto stránku. Chcete ji načíst teď?"
+  fetching-as-ap-object: "Načítám data z Fediversu..."
  delete-confirm: "Opravdu chcete smazat tento příspěvek?"
  signin-required: "Přihlašte se, prosím"
  notification-type: "Typy oznámení"
@@ -104,6 +102,9 @@ common:
    "read:reactions": "Prohlížet reakce"
    "write:reactions": "Narabět s reakcemi"
    "write:votes": "Hlasovat"
+    "read:pages": "Zhlédnutí stránky"
+    "write:pages": "Upravit stránky"
+    "write:user-groups": "Upravit uživatelskou skupinu"
  empty-timeline-info:
    follow-users-to-make-your-timeline: "Poznámky sledujících se zobrazí ve vaší časové ose"
    explore: "Najít uživatele"
@@ -118,16 +119,21 @@ common:
    renote: "Renotovat"
    posting: "Posílání"
    attach-media-from-local: "Nahrát soubor z vašeho zařízení"
+    attach-media-from-drive: "Přiložit soubory z vašeho Drivu"
    insert-a-kao: "v('ω')v"
    create-poll: "Vytvořit anketu"
    text-remain: "zbývá ještě {} znaků"
    recent-tags: "Nejnovější"
+    local-only-message: "Publikovat zprávu pouze lokálně"
+    click-to-tagging: "Klikni pro otágování"
    visibility: "Viditelnost"
    geolocation-alert: "Vaše zařízení nedalo k dispozici lokaci"
    error: "Chyba"
    enter-username: "Zadejte své uživatelské jméno"
+    specified-recipient: "Pro"
    add-visible-user: "Přidat uživatele"
    username-prompt: "Zadejte své uživatelské jméno"
+    enter-file-name: "Upravit název souboru"
  weekday-short:
    sunday: "Ne"
    monday: "Po"
@@ -187,6 +193,7 @@ common:
    other: "Ostatní"
    appearance: "Vzhled"
    behavior: "Chování"
+    reactions: "Reakce"
    fetch-on-scroll: "Nekonečné načítaní posuvem"
    fetch-on-scroll-desc: "Pokud budete rolovat dolů po stránce, automaticky bude načten další obsah."
    note-visibility: "Viditelnost příspěvku"
@@ -195,6 +202,8 @@ common:
    web-search-engine: "Webové vyhledávače"
    web-search-engine-desc: "Například: https://www.google.com/?#q={{query}}"
    paste: "Vložit"
+    pasted-file-name-desc: "Například: \"rrrr-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "Upravit název vloženého souboru"
    keep-cw: "Zachovat varování o obsahu"
    keep-cw-desc: "Při odpovědi na příspěvek bude varování o obsahu nastaveno stejně jako původní příspěvek."
    i-like-sushi: "Mam radši sushi (než puding)"
@@ -232,7 +241,7 @@ common:
    deck-column-width-wide: "Široké"
    use-shadow: "Používat v rozhraní stíny"
    rounded-corners: "Zakulatit rohy v rozhraní"
-    circle-icons: "Používat kulaté ikony"
+    circle-icons: "Používat kulaté avatary"
    contrasted-acct: "Přidat uživatelskému účtu kontrast"
    wallpaper: "Obrázek na pozadí"
    choose-wallpaper: "Zvolit pozadí"
@@ -280,6 +289,15 @@ common:
    sync: "Synchronizace"
    save: "Uložit"
    saved: "Uloženo"
+    room: "Místnost"
+    _room:
+      graphicsQuality: "Kvalita grafiky"
+      _graphicsQuality:
+        ultra: "Nejvyšší"
+        high: "Vysoká"
+        medium: "Střední"
+        low: "Nízká"
+        cheep: "Nejnižší"
  search: "Hledání"
  delete: "Odstranit"
  loading: "Načítám..."
@@ -372,7 +390,9 @@ common/views/components/games/reversi/reversi.vue:
    cancel: "Zrušit"
 common/views/components/games/reversi/reversi.game.vue:
  surrender: "Vzdát se"
+  surrendered: "Vzdaním se"
  looped-map: "Zacyklená mapa"
+  can-put-everywhere: "Lze položit kamkoliv"
 common/views/components/games/reversi/reversi.index.vue:
  title: "Misskey Reversi"
  sub-title: "Hrajte Reversi s Vašimi kamarády!"
@@ -405,6 +425,7 @@ common/views/components/connect-failed.vue:
  title: "Nelze se připojit k serveru"
  description: "Nastal problém s Vaším připojením k internetu, nebo server není dostupný nebo zrovna probíhá údržba. Prosím {zkuste to znova} za pár minut."
  thanks: "Děkujeme že jste použili Misskey."
+  troubleshoot: "Odstranění problémů"
 common/views/components/connect-failed.troubleshooter.vue:
  title: "Poradce při potížích"
  network: "Síťové připojení"
@@ -413,12 +434,15 @@ common/views/components/connect-failed.troubleshooter.vue:
  checking-internet: "Ověřuji připojení k internetu."
  server: "Připojení k serveru"
  checking-server: "Spojuji se se serverem"
+  finding: "Vyšetřování problému"
+  no-network: "Žádné připojení k síti"
  no-network-desc: "Ujistěte se že jste připojeni k Internetu."
  no-internet: "Nejste připojeni k internetu"
  no-internet-desc: "Jste připojen k síti, ale zdá se že stále chybí připojení k Internetu. Prosím zkontrolujte Vaše připojení k Internetu."
  no-server: "Nelze se připojit k serveru Misskey"
  success: "Úspěšně se podařilo spojit s Misskey serverem"
  flush: "Vyčistit mezipaměť"
+  set-version: "Vyberte verzi"
 common/views/components/media-banner.vue:
  sensitive: "Choulostivý obsah"
  click-to-show: "Klikněte pro zobrazení"
@@ -472,6 +496,7 @@ common/views/components/messaging.vue:
  group: "Skupina"
  start-with-user: "Zahájit konverzaci s uživatelem"
  start-with-group: "Zahájit skupinovou konverzaci"
+  select-group: "Vybrat skupinu"
 common/views/components/messaging-room.vue:
  new-message: "Máte novou zprávu"
 common/views/components/messaging-room.form.vue:
@@ -543,6 +568,7 @@ common/views/components/poll-editor.vue:
  deadline-date: "Termín ukončení"
  deadline-time: "Doba trvání"
  interval: "Trvání"
+  unit: "Jednotka"
  second: "Sekunda"
  minute: "Minuta"
  hour: "Hodina"
@@ -561,6 +587,12 @@ common/views/components/emoji-picker.vue:
  symbols: "Symboly"
  flags: "Vlajky"
 common/views/components/settings/app-type.vue:
+  title: "Režim"
+  intro: "Můžete vybrat zdali chcete použít stolní, nebo mobilní vzhled."
+  choices:
+    auto: "Vybrat vzhled automaticky"
+    desktop: "Vždy použít stolní vzhled"
+    mobile: "Vždy použít mobilní vzhled"
  info: "Pro aktivování změn musíte znovu načíst stránky."
 common/views/components/signin.vue:
  username: "Přezdívka"
@@ -572,6 +604,7 @@ common/views/components/signin.vue:
  signin-with-github: "Přihlásit se pomocí účtu GitHub"
  signin-with-discord: "Přihlásit se pomocí účtu Discord"
  login-failed: "Nelze se přihlásit. Zkontrolujte prosím své uživatelské jméno a heslo."
+  enter-2fa-code: "Vložte Váš verifikační kód"
 common/views/components/signup.vue:
  invitation-code: "Kód pozvánky"
  invitation-info: "Pokud máte pozvánku, prosím kontaktujte <a href=\"{}\">administrátora</a>."
@@ -593,6 +626,7 @@ common/views/components/signup.vue:
  password-matched: "OK"
  password-not-matched: "Neshodují se"
  recaptcha: "Potvrzení"
+  agree-to: "Souhlasím s {0}."
  tos: "Podmínky užívání"
  create: "Vytvořit účet"
  some-error: "Pokus o vytvoření účtu selhal. Prosím zkuste to znovu."
@@ -609,8 +643,10 @@ common/views/components/notification-settings.vue:
  mark-as-read-all-unread-notes: "Označit všechny příspěvky za přečtené"
  mark-as-read-all-talk-messages: "Označit všechny zprávy za přečtené"
 common/views/components/integration-settings.vue:
+  title: "Integrace"
  connect: "Připojit"
  disconnect: "Odpojit"
+  connected-to: "Jste připojen k tomuto GitHub účtu"
 common/views/components/github-setting.vue:
  description: "Jakmile spojíte Váš GitHub účet s Vaším Misskey účtem, uvidíte informace o Vašem GitHub účtu na Vašem profilu a budete se moci přihlásit skrze GitHub."
  connected-to: "Je připojen k tomuto GitHub účtu"
@@ -630,6 +666,8 @@ common/views/components/uploader.vue:
 common/views/components/visibility-chooser.vue:
  public: "Veřejné"
  home: "Domů"
+  home-desc: "Poslat pouze na domovskou časovou osu"
+  specified: "Přímá"
  specified-desc: "Poslat pouze zmíněným uživatelům"
  local-public: "Veřejná (pouze místní)"
  local-public-desc: "Nepublikovat na vzdálených serverech"
@@ -714,12 +752,14 @@ common/views/components/user-groups.vue:
  group-name: "Název skupiny"
  owned-groups: "Moje skupiny"
  invites: "Pozvat"
+  accept-invite: "Přidat se"
  reject-invite: "Odmítnout"
 common/views/widgets/broadcast.vue:
  fetching: "Načítám"
  no-broadcasts: "Žádná nová oznámení"
  have-a-nice-day: "Přejeme Vám příjemný den!"
  next: "Další"
+  prev: "Předchozí"
 common/views/widgets/calendar.vue:
  year: "Rok {}"
  month: "{},"
@@ -728,6 +768,7 @@ common/views/widgets/calendar.vue:
  this-month: "Měsíc:"
  this-year: "Rok:"
 common/views/widgets/photo-stream.vue:
+  title: "Foto stream"
  no-photos: "Žádné obrázky"
 common/views/widgets/posts-monitor.vue:
  title: "Grafy příspěvků"
@@ -743,6 +784,8 @@ common/views/widgets/memo.vue:
  save: "Uložit"
 common/views/widgets/slideshow.vue:
  no-image: "V této složce nebyly nalezeny žádné fotky."
+common/views/widgets/tips.vue:
+  tips-line23: "Ai-chan kawaii!"
 common/views/pages/not-found.vue:
  page-not-found: "Stránka nenalezena"
 common/views/pages/follow.vue:
@@ -814,6 +857,7 @@ desktop/views/components/drive.folder.vue:
    input-new-folder-name: "Zadejte nové jméno"
    else-folders: "Ostatní"
 desktop/views/components/drive.vue:
+  search: "Vyhledávání"
  empty-drive-description: "Klikněte pravým tlačítkem myši pro otevření menu, nebo sem přetáhněte soubor pro nahrání."
  empty-folder: "Tato složka je prázdná"
  unable-to-process: "Operace nemohla být dokončena."
@@ -829,10 +873,13 @@ desktop/views/components/drive.vue:
    url-upload: "Nahrát z URL"
 desktop/views/components/media-video.vue:
  click-to-show: "Klikněte pro zobrazení"
+desktop/views/components/followers.vue:
+  empty: "Vypadá to že Vás nikdo nesleduje."
 desktop/views/components/game-window.vue:
  game: "Reversi"
 desktop/views/components/home.vue:
  done: "Hotovo"
+  add-widget: "Přidat widget:"
  add: "Přidat"
 desktop/views/input-dialog.vue:
  cancel: "Zrušit"
@@ -840,6 +887,7 @@ desktop/views/input-dialog.vue:
 desktop/views/components/note-detail.vue:
  private: "Tento příspěvek je soukromý"
  deleted: "Tento příspěvek byl odstraněn"
+  location: "Lokace"
  renote: "Renotovat"
  add-reaction: "Přidat reakci"
  undo-reaction: "Odebrat reakci"
@@ -854,6 +902,8 @@ desktop/views/components/note.vue:
 desktop/views/components/notes.vue:
  error: "Načítání selhalo."
  retry: "Opakovat"
+desktop/views/components/notifications.vue:
+  empty: "Žádné nové notifikace!"
 desktop/views/components/post-form.vue:
  posted: "Odesláno!"
  replied: "Odpověděno!"
@@ -878,10 +928,29 @@ desktop/views/components/renote-form-window.vue:
 desktop/views/components/settings.2fa.vue:
  detail: "Více…"
  url: "https://www.google.cz/landing/2step/"
+  register: "Přidat zařízení"
+  already-registered: "Toto zařízení je již připojené"
+  unregister: "Odebrat"
+  enter-password: "Prosím zadejte heslo"
+  authenticator: "Nejprve musíte nainstalovat Google Authenticator na Vašem zařízení:"
+  howtoinstall: "Jak nainstalovat"
  token: "Token"
+  scan: "Poté naskenujte QR kód:"
+  done: "Prosím vložte kód zobrazený na Vašem zařízení:"
+  submit: "Uložit"
+  success: "Nastavení uloženo!"
+  failed: "Nepodařilo se spárovat. Prosím zkontrolujte správnost bezpečnostního kódu."
+  totp-header: "Ověřovací aplikace"
+  security-key-header: "Bezpečnostní klíč"
+  last-used: "Naposledy použito:"
+  activate-key: "Klikněte pro aktivaci bezpečnostního klíče"
+  security-key-name: "Název klíče"
+  key-unregistered: "Bezpečnostní klíč byl odstraněn"
 common/views/components/media-image.vue:
+  sensitive: "NSFW"
  click-to-show: "Klikněte pro zobrazení"
 common/views/components/api-settings.vue:
+  caution: "Nepoužívejte tento kód v žádné jiné aplikace nebo ho sdílejte s ostatními (jinak můžete ohrozit svojí bezpečnost)."
  token: "Token:"
  enter-password: "Prosím zadejte heslo"
  console:
@@ -937,6 +1006,7 @@ desktop/views/components/ui.header.account.vue:
  lists: "Seznamy"
  groups: "Skupiny"
  admin: "Administrace"
+  room: "Místnost"
 desktop/views/components/ui.header.nav.vue:
  game: "Hry"
 desktop/views/components/ui.header.notifications.vue:
@@ -962,20 +1032,48 @@ admin/views/index.vue:
  announcements: "Oznámení"
  queue: "Fronta úloh"
  logs: "Logy"
+  db: "Databáze"
  back-to-misskey: "Zpět na Misskey"
+admin/views/db.vue:
+  tables: "Tabulky"
+  vacuum: "Vysavač"
+  vacuum-info: "Uklidí databázi. Neohrozí data a sníží využití disku. Tohle se děje automaticky a opakovaně."
+  vacuum-exclamation: "Vysavač může dočasně přetížit databázi a dočasně omezit akce uživatelů."
 admin/views/dashboard.vue:
+  dashboard: "Kontrolní panel"
  accounts: "Účty"
  notes: "Poznámky"
  drive: "Disk"
  instances: "Instance"
  this-instance: "Tato instance"
  federated: "Z fedivesmíru"
+admin/views/queue.vue:
+  title: "Ve frontě"
+  remove-all-jobs: "Vyčistit frontu"
+  jobs: "Úkoly"
+  queue: "Ve frontě"
+  domains:
+    inbox: "Obdržené"
+    db: "Databáze"
+  states:
+    active: "V procesu"
+    delayed: "Naplánováno"
+    waiting: "Ve frontě"
+  result-is-truncated: "Zkrácený výsledek"
 admin/views/logs.vue:
  logs: "Logy"
+  domain: "Doména"
+  level: "Úroveň"
  levels:
+    all: "Vše"
    info: "Informace"
+    success: "Podařilo se"
+    warning: "Varování"
    error: "Chyba"
+    debug: "Debug"
+  delete-all: "Smazat vše"
 admin/views/abuse.vue:
+  target: "Cíl"
  details: "Popis"
  remove-report: "Odstranit"
 admin/views/instance.vue:
@@ -983,17 +1081,33 @@ admin/views/instance.vue:
  instance-name: "Název instance"
  instance-description: "Popis instance"
  host: "Hostitel"
+  icon-url: "URL ikonky"
+  logo-url: "URL loga"
  banner-url: "URL pro baner"
+  error-image-url: "URL pro chybový obrázek"
  languages: "Jazyk této instance"
  languages-desc: "Můžete nastavit více než jeden, oddělte mezerami."
+  tos-url: "URL pro smluvní podmínky"
+  repository-url: "URL adresa repositáře"
+  feedback-url: "URL pro zpětnou vazbu"
  maintainer-config: "Informace o administrátorovi"
  maintainer-name: "Jméno administrátora"
  maintainer-email: "Kontakt na administrátora"
+  advanced-config: "Další nastavení"
+  object-storage-base-url: "URL"
+  object-storage-prefix: "Předpona"
  object-storage-endpoint: "Endpoint"
+  object-storage-region: "Region"
+  object-storage-port: "Port"
+  object-storage-access-key: "Přístupový klíč"
+  object-storage-secret-key: "Tajný Klíč (Secret Key)"
+  object-storage-use-ssl: "Použít SSL"
+  object-storage-s3-info-here: "zde"
  mb: "V megabajtech"
  recaptcha-config: "nastavení služby reCAPTCHA"
  recaptcha-info: "reCAPTCHA token je povinný. Můžete jej získat na https://www.google.com/recaptcha/intro/"
  enable-recaptcha: "povolit reCAPTCHA"
+  recaptcha-secret-key: "Tajný Klíč (Secret Key)"
  recaptcha-preview: "Náhled"
  twitter-integration-config: "Nastavení spojení s Twitterem"
  twitter-integration-info: "The callback URL is set on {url}."
@@ -1192,6 +1306,9 @@ desktop/views/widgets/notifications.vue:
  title: "Oznámení"
 desktop/views/widgets/polls.vue:
  title: "Ankety"
+  nothing: "Žádné nové notifikace!"
+desktop/views/widgets/trends.vue:
+  nothing: "Žádné nové notifikace!"
 desktop/views/widgets/users.vue:
  title: "Doporučení uživatelé"
 mobile/views/components/drive.vue:
@@ -1234,6 +1351,8 @@ mobile/views/components/note-sub.vue:
  admin: "admin"
  bot: "bot"
  cat: "kočka"
+mobile/views/components/notifications.vue:
+  empty: "Žádné nové notifikace!"
 mobile/views/components/sub-note-content.vue:
  private: "Tento příspěvek je soukromý"
  deleted: "Tento příspěvek byl odstraněn"
@@ -1277,6 +1396,7 @@ mobile/views/pages/note.vue:
 mobile/views/pages/games/reversi.vue:
  reversi: "Reversi"
 mobile/views/pages/search.vue:
+  search: "Vyhledávání"
  not-found: "Pro '{q}' nebyly nalezeny žádné příspěvky."
 mobile/views/pages/selectdrive.vue:
  select-file: "Vybrat soubory"
@@ -1353,6 +1473,7 @@ pages:
 room:
  translate: "Přesunout"
  save: "Uložit"
+  saved: "Uloženo"
  furnitures:
-    moon: "Po"
+    moon: "Měsíc"
    bin: "Koš"
--- a/locales/da-DK.yml
+++ b/locales/da-DK.yml
@@ -18,9 +18,6 @@ common:
    drive: "Drev"
    drive-desc: "Vil du poste et billede, som du tidligere har uploadet? Har du brug for at navngive filer og organisere dem i mapper, som du selv har navngivet? Så er Misskey Drev den bedste løsning for dig. Den gør det så let som ingenting at dele dine filer online."
    outro: "Tjek Misskey's unikke funktioner ved at se dem med dine egne øjne. Hvis du kommer frem til, at den ene server ikke er noget for dig, så kan du prøve en anden. Misskey er et decentraliseret SNS, så du kan lettere finde frem til brugere, som du klikker med. God fornøjelse!"
-  adblock:
-    detected: "Her kan du deaktivere ad blocker."
-    warning: "Visse funktioner kan forsvinde eller medføre forstyrrelser, hvis ad blocking er aktiveret. <strong>Misskey kører ikke annoncer</strong>."
  application-authorization: "Adgangsstyring"
  close: "Luk"
  do-not-copy-paste: "Undgå venligst at skrive eller klistre kode ind her. I modsat fald kan din konto blive kompromitteret."
@@ -169,6 +166,7 @@ common:
    other: "Andet"
    appearance: "Udseende"
    behavior: "Opførsel"
+    reactions: "Reaktion"
    fetch-on-scroll: "Uendeligt scroll"
    fetch-on-scroll-desc: "Når du scroller ned ad siden, hentes der automatisk nyt indhold ind"
    note-visibility: "Post synlighed"
@@ -213,7 +211,7 @@ common:
    deck-column-width-wide: "Bred"
    use-shadow: "Vis skygger"
    rounded-corners: "Vis afrundede hjørner"
-    circle-icons: "Anvend cykliske ikoner"
+    circle-icons: "Anvend cykliske avatar"
    contrasted-acct: "Tilføj kontrast til brugerkontoen"
    wallpaper: "Baggrundsbillede"
    choose-wallpaper: "Vælg en baggrund"
@@ -680,7 +678,7 @@ common/views/components/profile-editor.vue:
  you-can-include-hashtags: "Du må gerne bruge hashtags i din profil beskrivelse"
  language: "Sprog"
  birthday: "Fødselsdag"
-  avatar: "Ikon"
+  avatar: "Avatar"
  banner: "Banner"
  is-cat: "Denne konto er en Kat"
  is-bot: "Denne konto er en Bot"
@@ -1913,6 +1911,7 @@ pages:
 room:
  translate: "Flyt"
  save: "Gem"
+  saved: "Gemt"
  furnitures:
-    moon: "Man"
+    moon: "Måne"
    bin: "Skraldespand"
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -18,9 +18,6 @@ common:
    drive: "Drive"
    drive-desc: "Du willst ein hochgeladenes Foto nochmal posten? Deine Dateien benennen und in Ordnern sortieren? Misskeys Drive ist der beste Ort dafür. Damit wird das Teilen zum Kinderspiel!"
    outro: "Probiere Misskey aus und entdecke Misskeys einzigartige Funktionen. Wenn dir diese Instanz nicht zusagt, nimm einfach eine andere. Dank Misskeys dezentralem System kannst du dich überall mit deinen Freunden verbinden. Also dann, GLHF!"
-  adblock:
-    detected: "Bitte deaktiviere den Werbeblocker."
-    warning: "<strong>Misskey hat keine Werbung.</strong> Allerdings können Werbeblocker für unerwartete Probleme und fehlende Funktionen sorgen."
  application-authorization: "Autorisierte Anwendungen"
  close: "Schließen"
  do-not-copy-paste: "Bitte keinen Code einfügen. Ihr Account könnte gefährdet werden."
@@ -207,7 +204,7 @@ common:
    deck-column-width-wide: "Sehr breit"
    use-shadow: "Nutze Schatten"
    rounded-corners: "Abgerundete Ecken"
-    circle-icons: "Kreisförmige Icons"
+    circle-icons: "Kreisförmige Avatar"
    contrasted-acct: "Nutzernamen kontrastreicher darstellen"
    wallpaper: "Hintergrund"
    choose-wallpaper: "Hintergrund auswählen"
@@ -605,6 +602,7 @@ common/views/widgets/memo.vue:
  save: "Speichern"
 desktop:
  banner: "Banner"
+  avatar: "Avatar"
  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
 desktop/views/components/activity.chart.vue:
  total: "Schwarz ... komplett"
@@ -948,6 +946,7 @@ pages:
      array: "Listen"
 room:
  save: "Speichern"
+  saved: "Gespeichert"
  furnitures:
-    moon: "Mo"
+    moon: "Mond"
    bin: "Papierkorb"
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -12,15 +12,12 @@ common:
    rich-contents: "Post"
    rich-contents-desc: "Just post your idea, hot topics, and anything you want to share. You may want to decorate your words, attach your favorite pictures, send files, including videos, or create a poll - those are some of the things you can do with Misskey!"
    reaction: "Reactions"
-    reaction-desc: "The easiest way to express your emotions. Misskey allows you to add various kinds of reactions to other's posts. The emotional experience on Misskey will never be on other SNSs, which are only able to push “likes”."
+    reaction-desc: "The easiest way to express your emotions. Misskey allows you to add various reactions to posts. Other SNSs only have a \"like\" reaction."
    ui: "Interface"
    ui-desc: "No single UI can suit everyone. Therefore, Misskey has a highly customizable UI for your tastes. You can make your home original by editing the layout of your timeline, and moving around selectable widgets that you can easily adjust to make this place your own."
    drive: "Drive"
    drive-desc: "Wanna post a picture you have already uploaded? Wish to organize, name and create a folder for your uploaded files? Misskey Drive is the best solution for you. Very easy to share your files online."
    outro: "Check Misskey-unique features by seeing them with your own eyes! If you feel like this instance is not for you, try other instances, as Misskey is a decentralized SNS, so that you can easily find your mates. Then, GLHF!"
-  adblock:
-    detected: "Please disable ad blocker."
-    warning: "Some features may be unavailable or cause malfunctions if ad blocking features are enabled. <strong>Misskey is not running ads</strong>."
  application-authorization: "Application authorizations"
  close: "Close"
  do-not-copy-paste: "Please do not enter or paste the code here. Account may be compromised."
@@ -94,7 +91,7 @@ common:
    "write:drive": "Work with the Drive"
    "read:favorites": "View Favorites"
    "write:favorites": "Work with Favorites"
-    "read:following": "View Follower info"
+    "read:following": "View your Follow info"
    "write:following": "Work with Follow info"
    "read:messaging": "View Messaging"
    "write:messaging": "Work with Messaging"
@@ -106,6 +103,12 @@ common:
    "read:reactions": "View reactions"
    "write:reactions": "Work with reactions"
    "write:votes": "Vote"
+    "read:pages": "View Pages"
+    "write:pages": "Update Pages"
+    "read:page-likes": "View Likes on Pages"
+    "write:page-likes": "Update Likes on Pages"
+    "read:user-groups": "View User groups"
+    "write:user-groups": "Edit User groups"
  empty-timeline-info:
    follow-users-to-make-your-timeline: "Following users will show their posts in your timeline."
    explore: "Find users"
@@ -133,6 +136,7 @@ common:
    geolocation-alert: "Your device does not provide location services"
    error: "Error"
    enter-username: "Please enter username"
+    specified-recipient: "Recipient"
    add-visible-user: "Add a user"
    cw-placeholder: "Comments for the post (optional)"
    username-prompt: "Please enter username"
@@ -196,6 +200,8 @@ common:
    other: "Other"
    appearance: "Appearance"
    behavior: "Behavior"
+    reactions: "Reaction"
+    reactions-description: "Customize Emojis of Reaction picker delimited by line breaks"
    fetch-on-scroll: "Endless loading on scroll"
    fetch-on-scroll-desc: "When you scroll down the page, it automatically fetches additional content."
    note-visibility: "Post visibility"
@@ -246,7 +252,7 @@ common:
    deck-column-width-wide: "Wide"
    use-shadow: "Use shadows in the UI"
    rounded-corners: "Round the corners of the UI"
-    circle-icons: "Use circular icons"
+    circle-icons: "Use circular avatar icon"
    contrasted-acct: "Add contrast to user account"
    wallpaper: "Background image"
    choose-wallpaper: "Choose a background"
@@ -386,10 +392,15 @@ common/views/pages/explore.vue:
  popular-users: "Popular users"
  recently-updated-users: "Recently active users"
  recently-registered-users: "Users who joined recently"
+  recently-discovered-users: "Recently Discovered Users"
  popular-tags: "Popular Tags"
  federated: "From the fediverse"
  explore: "Explore {host}"
+  explore-fediverse: "Explore Fediverse"
  users-info: "Currently, {users} users are registered here"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users} reacted with {reaction}"
+  many-users: "{users}, and {omitted} more reacted with {reaction}"
 common/views/components/url-preview.vue:
  enable-player: "Enable playback"
  disable-player: "Close the player"
@@ -618,7 +629,9 @@ common/views/components/reaction-picker.vue:
  choose-reaction: "Send a reaction"
  input-reaction-placeholder: "or input Emoji"
 common/views/components/emoji-picker.vue:
+  recent-emoji: "Recently used"
  custom-emoji: "Custom Emoji"
+  no-category: "Uncategorized"
  people: "People"
  animals-and-nature: "Animals & Nature"
  food-and-drink: "Food & drink"
@@ -752,8 +765,8 @@ common/views/components/profile-editor.vue:
  uploading: "Uploading"
  upload-failed: "Failed to upload"
  unable-to-process: "The operation could not be completed."
-  avatar-not-an-image: "The file specified as an avatar is not an image"
-  banner-not-an-image: "The file specified as a banner is not an image"
+  avatar-not-an-image: "The file you specified as an avatar is not an image"
+  banner-not-an-image: "The file you specified as a banner is not an image"
  email: "Email settings"
  email-address: "Email Address"
  email-verified: "Your email has been verified."
@@ -814,6 +827,7 @@ common/views/widgets/broadcast.vue:
  no-broadcasts: "No announcements"
  have-a-nice-day: "Have a nice day!"
  next: "Next"
+  prev: "Previous"
 common/views/widgets/calendar.vue:
  year: "Year {}"
  month: "{},"
@@ -927,7 +941,7 @@ desktop/views/components/drive.file.vue:
    copy-url: "Copy URL"
    download: "Download"
    else-files: "Other"
-    set-as-avatar: "Set as an avatar"
+    set-as-avatar: "Set as avatar"
    set-as-banner: "Set as a banner"
    open-in-app: "Open in app"
    add-app: "Add app"
@@ -1292,7 +1306,7 @@ admin/views/instance.vue:
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "Proxy account"
-  proxy-account-info: "Proxy account can follow a remote user to deliver activities if no one in this instance follow him or her. When you add a remote user who is followed by nobody in this instance to your list, in order to get his or her data, proxy account follow him or her instead of your following."
+  proxy-account-info: "A proxy account is an account that acts as a remote follower for users under certain conditions. For example, when a user adds a remote user to the list, the activity will not be delivered to the server if no one is following that user, so the proxy account will follow instead."
  proxy-account-username: "Proxy account user name"
  proxy-account-username-desc: "Specify the user name of the account that is used as a proxy."
  proxy-account-warn: "You must make an account having this username before this action."
@@ -1412,6 +1426,7 @@ admin/views/users.vue:
    state:
      title: "Sort"
      all: "All"
+      available: "Available"
      admin: "Administrator"
      moderator: "Moderator"
      adminOrModerator: "Admin/Moderator"
@@ -1442,6 +1457,7 @@ admin/views/emoji.vue:
    title: "Add emoji"
    name: "Emoji name"
    name-desc: "You can use the characters a~z 0~9 _"
+    category: "Categories"
    aliases: "Aliases"
    aliases-desc: "You can add more than one, separated by spaces."
    url: "Image URL"
@@ -1817,6 +1833,9 @@ pages:
  read-page: "Viewing the source"
  page-created: "Created the page!"
  page-updated: "Updated the page"
+  name-already-exists: "The specified page name already exists"
+  title-invalid-name: "The specified page URL is invalid"
+  text-invalid-name: "Check whether that is not a blank"
  are-you-sure-delete: "Do you want to delete this page?"
  page-deleted: "The page has been deleted"
  edit-this-page: "Edit this page"
@@ -2092,6 +2111,10 @@ room:
  exit: "Deselect"
  remove: "Remove"
  save: "Save"
+  saved: "Saved"
+  clear: "Remove All"
+  clear-confirm: "Are you sure to remove all furnitures in your room?"
+  leave-confirm: "There are unsaved changes. Do you really want to leave?"
  chooseImage: "Select an image"
  room-type: "Room type"
  carpet-color: "Color of carpet"
@@ -2120,7 +2143,7 @@ room:
    piano: "Piano"
    facial-tissue: "Facial tissue"
    server: "Servers"
-    moon: "M"
+    moon: "Moon"
    corkboard: "Cork board"
    mousepad: "Mousepad"
    monitor: "Monitor"
@@ -2136,4 +2159,9 @@ room:
    rubik-cube: "Rubik's Cube"
    poster-h: "Poster (Horizontal)"
    poster-v: "Poster (Vertical)"
-    bin: "Trash"
+    sofa: "Sofa"
+    spiral: "Spiral Staircase"
+    bin: "Waste bin"
+    cup-noodle: "Cup noodle"
+    holo-display: "Holographic display"
+    energy-drink: "Energy drink"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -16,9 +16,6 @@ common:
    ui: "Interfaz"
    ui-desc: "No hay ninguna interfaz que le vaya bien a todos. Por eso, Misskey tiene una interfaz altamente personalizable para tus gustos. Puedes hacer tu página principal única editando la interfaz de tu timeline y moviendo varios widgets para conseguir hacer de este lugar uno propio."
    drive: "Drive"
-  adblock:
-    detected: "Por favor, desactive el bloqueador de publicidad."
-    warning: "<strong>Misskey no tiene anuncios publicitarios.</strong> Sin embargo, algunas características podrían no estar disponibles si el bloqueador de publicidad está habilitado."
  application-authorization: "Autorizaciones de la aplicación."
  close: "Cerrar"
  do-not-copy-paste: "Por favor no copies código aquí. Tu cuenta puede resultar comprometida."
@@ -177,7 +174,7 @@ common:
    deck-column-width-wide: "Ancho"
    use-shadow: "Usar sombras en la Interfaz de Usuario"
    rounded-corners: "Esquinas redondeadas en la Interfaz de Usuario"
-    circle-icons: "Usar iconos circulares"
+    circle-icons: "Usar avatar circulares"
    contrasted-acct: "Añadir contraste al nombre de usuario"
    wallpaper: "Fondo de pantalla"
    choose-wallpaper: "Escoge un fondo de pantalla"
@@ -1137,6 +1134,7 @@ pages:
      array: "Listas"
 room:
  save: "Guardar"
+  saved: "Guardado"
  furnitures:
    moon: "Luna"
    bin: "Papelera"
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -18,9 +18,6 @@ common:
    drive: "Drive"
    drive-desc: "Vous voulez poster une photo que vous avez déjà transférée ? Vous souhaitez organiser, nommer et créer un dossier pour vos fichiers téléversés ? Misskey Drive est la meilleure solution pour vous. Très facile de partager vos fichiers en ligne."
    outro: "Découvrez vous-même les fonctionnalités de Misskey. Étant donné que Misskey est un réseau social fédéré, vous pouvez essayer d’autres instances afin de trouver vos amis si la présente instance ne vous correspond pas. Bonne chance et amusez-vous bien !"
-  adblock:
-    detected: "Veuillez désactiver votre bloqueur de publicités"
-    warning: "<strong>Misskey n’utilise pas de publicités</strong>, mais quelques options peuvent être non disponibles ou fonctionneraient mal si un bloqueur de publicités est activé."
  application-authorization: "Autorisations de l’application"
  close: "Fermer"
  do-not-copy-paste: "Veuillez ne pas entrer ou coller le code ici. Le compte pourrait être compromis."
@@ -37,17 +34,17 @@ common:
  unfollow-confirm: "Désirez-vous vous désabonner de {name} ?"
  delete-confirm: "Supprimer cette publication ?"
  signin-required: "Veuillez vous connecter"
-  notification-type: "Type de notification"
+  notification-type: "Type de notifications"
  notification-types:
    all: "Tout"
-    pollVote: "Sondage"
+    pollVote: "Sondages"
    follow: "Abonnements"
    receiveFollowRequest: "Demandes d’abonnements"
-    reply: "Répondre"
+    reply: "Réponses"
    quote: "Cité par"
-    renote: "Republier"
+    renote: "Partages"
    mention: "Mentions"
-    reaction: "Réaction"
+    reaction: "Réactions"
  got-it: "J’ai compris !"
  customization-tips:
    title: "Conseils de personnalisation"
@@ -102,6 +99,7 @@ common:
    "read:reactions": "Lire les réactions"
    "write:reactions": "Gérer vos réactions"
    "write:votes": "Vote"
+    "read:pages": "Afficher la page"
  empty-timeline-info:
    follow-users-to-make-your-timeline: "Les utilisateur·rice·s suivant·e·s afficheront leurs publications sur votre fil."
    explore: "Trouver des utilisateur·rice·s"
@@ -183,7 +181,7 @@ common:
    notification: "Notifications"
    apps: "Applications"
    tags: "Hashtags"
-    mute-and-block: "Silencés / Bloqués"
+    mute-and-block: "Masqués / Bloqués"
    blocking: "En cours blocage"
    security: "Sécurité"
    signin: "Historique des connexions"
@@ -191,6 +189,7 @@ common:
    other: "Avancé"
    appearance: "Apparence"
    behavior: "Comportement"
+    reactions: "Réaction"
    fetch-on-scroll: "Chargement automatique lors du défilement"
    fetch-on-scroll-desc: "Chargement automatique du contenu lors du défilement de la page."
    note-visibility: "Visibilité de la publication"
@@ -199,6 +198,7 @@ common:
    web-search-engine: "Moteur de recherche Web"
    web-search-engine-desc: "Exemple : https://www.google.com/?#q={{query}}"
    paste: "Coller"
+    pasted-file-name-desc: "Exemple : \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
    keep-cw: "Maintenir l'avertissement de contenu"
    keep-cw-desc: "Lorsque vous répondez à un message, le même avertissement de contenu est reprit par défaut dans la réponse, le même que celui qui a été défini dans le message original."
    i-like-sushi: "Je préfère les sushis plutôt que le pudding"
@@ -236,7 +236,7 @@ common:
    deck-column-width-wide: "Large"
    use-shadow: "Utiliser les ombres dans l'interface utilisateur"
    rounded-corners: "Coins arrondis de l'interface utilisateur"
-    circle-icons: "Utiliser des icônes circulaires"
+    circle-icons: "Utiliser des avatar circulaires"
    contrasted-acct: "Ajouter du contraste au nom de l’utilisateur"
    wallpaper: "Image du fond d'écran"
    choose-wallpaper: "Sélectionner un fond d'écran"
@@ -284,6 +284,18 @@ common:
    sync: "Synchroniser"
    save: "Enregistrer"
    saved: "enregistré"
+    home-profile: "Profil principal"
+    deck-profile: "Profil deck"
+    room: "Pièce"
+    _room:
+      graphicsQuality: "Qualité des graphismes"
+      _graphicsQuality:
+        ultra: "Très élevée"
+        high: "Élevée"
+        medium: "Moyenne"
+        low: "Basse"
+        cheep: "Minimale"
+      useOrthographicCamera: "Utiliser une caméra orthographique"
  search: "Recherche"
  delete: "Supprimer"
  loading: "Chargement en cours …"
@@ -368,6 +380,8 @@ common/views/pages/explore.vue:
  federated: "Du Fédiverse"
  explore: "Explorer {host}"
  users-info: "Actuellement, {users} utilisateur·rice·s se sont inscrit ici"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users} ont réagit avec {reaction}"
 common/views/components/url-preview.vue:
  enable-player: "Activer la lecture"
  disable-player: "Fermer le lecteur"
@@ -533,8 +547,9 @@ common/views/components/note-menu.vue:
  unpin: "Désépingler"
  delete: "Supprimer"
  delete-confirm: "Supprimer cette publication ?"
-  delete-and-edit: "Effacer et éditer"
+  delete-and-edit: "Supprimer et réécrire"
  remote: "Afficher la note originale"
+  pin-limit-exceeded: "Vous ne pouvez plus épingler davantage de publications."
 common/views/components/user-menu.vue:
  mention: "Mention"
  mute: "Silencier"
@@ -588,7 +603,7 @@ common/views/components/poll-editor.vue:
  hour: "Heures"
  day: "D"
 common/views/components/reaction-picker.vue:
-  choose-reaction: "Choisissez votre réaction"
+  choose-reaction: "Envoyer une réaction"
  input-reaction-placeholder: "ou insérez un émoji"
 common/views/components/emoji-picker.vue:
  custom-emoji: "Émoji personnalisé"
@@ -966,8 +981,8 @@ desktop/views/components/note-detail.vue:
  deleted: "cette publication a été supprimée"
  location: "Géolocalisation"
  renote: "Republier"
-  add-reaction: "Ajouter votre reaction"
-  undo-reaction: "Inverser la réaction"
+  add-reaction: "Ajouter une réaction"
+  undo-reaction: "Annuler la réaction"
 desktop/views/components/note.vue:
  reply: "Répondre"
  renote: "Partager"
@@ -1063,9 +1078,9 @@ common/views/components/drive-settings.vue:
  default-upload-folder-name: "Dossier·s"
  change-default-upload-folder: "Changer de dossier"
 common/views/components/mute-and-block.vue:
-  mute-and-block: "Silencés / Bloqués"
-  mute: "Mettre en sourdine"
-  block: "En cours blocage"
+  mute-and-block: "Masqués / Bloqués"
+  mute: "Mis en sourdine"
+  block: "Vous avez bloqué"
  no-muted-users: "Aucun utilisateur n’est mis en sourdine"
  no-blocked-users: "Aucun utilisateur n’est bloqué"
  word-mute: "Filtre de mots"
@@ -1115,6 +1130,7 @@ desktop/views/components/ui.header.account.vue:
  groups: "Groupes"
  follow-requests: "Demandes d’abonnement"
  admin: "Admin"
+  room: "Pièce"
 desktop/views/components/ui.header.nav.vue:
  game: "Jeux"
 desktop/views/components/ui.header.notifications.vue:
@@ -1369,6 +1385,7 @@ admin/views/users.vue:
    state:
      title: "État"
      all: "Tout"
+      available: "Disponible"
      admin: "Admin"
      moderator: "Modérateur"
      adminOrModerator: "Administrateur/Modérateur"
@@ -1762,6 +1779,8 @@ pages:
  read-page: "Voir la source"
  page-created: "Page a été créée !"
  page-updated: "A mis à jour la page"
+  name-already-exists: "Une page portant le même nom existe déjà"
+  title-invalid-name: "L’URL de la page spécifiée n’est pas valide"
  are-you-sure-delete: "Confirmez-vous la suppression de cette page ?"
  page-deleted: "La page a bien été supprimée."
  edit-this-page: "Éditer cette page"
@@ -1770,6 +1789,7 @@ pages:
  view-source: "Afficher la source"
  view-page: "Afficher la page"
  like: "Bien"
+  unlike: "Je n’aime pas"
  liked-pages: "Pages favorites"
  my-pages: "Mes pages"
  inspector: "Inspecteur"
@@ -2000,8 +2020,60 @@ pages:
    enviromentVariables: "Variables d'environnement"
    pageVariables: "Élément de page"
 room:
+  add-furniture: "Placer des meubles"
  translate: "Déplacer"
+  rotate: "Tourner"
+  remove: "Enlever"
  save: "Enregistrer"
+  saved: "enregistré"
+  clear: "Tout enlever"
+  clear-confirm: "Désirez-vous enlever tout les meubles de votre chambre ?"
+  leave-confirm: "Vous avez des modifications non-sauvegardées. Voulez-vous vraiment quitter ?"
+  chooseImage: "Sélectionnez une image"
+  room-type: "Type de chambre"
+  carpet-color: "Couleur du tapis"
+  rooms:
+    default: "Par défaut"
+    washitsu: "Style japonnais"
  furnitures:
-    moon: "L"
+    milk: "Lait en carton"
+    bed: "Lit"
+    low-table: "Table basse"
+    desk: "Bureau"
+    chair: "Chaise"
+    chair2: "Chaise 2"
+    fan: "Ventilateur"
+    pc: "Ordinateur"
+    plant: "Plante d’intérieur"
+    plant2: "Plante d’intérieur 2"
+    eraser: "Gomme"
+    pencil: "Crayon"
+    cardboard-box: "Boîte en carton"
+    cardboard-box2: "Boîte en carton 2"
+    cardboard-box3: "Boîte en carton 3"
+    book: "Livre"
+    book2: "Livre 2"
+    piano: "Piano"
+    facial-tissue: "Mouchoirs en papier"
+    server: "Serveurs"
+    moon: "Lune"
+    corkboard: "Tableau en liège"
+    mousepad: "Tapis de souris"
+    monitor: "Écran"
+    keyboard: "Clavier"
+    carpet-stripe: "Tapis (zébré)"
+    color-box: "Étagère"
+    wall-clock: "Horloge murale"
+    photoframe: "Cadre photo"
+    cube: "Cube"
+    tv: "Téléviseur"
+    pinguin: "Pingouin"
+    rubik-cube: "Cube de Rubik"
+    poster-h: "Affiche (horizontale)"
+    poster-v: "Affiche (verticale)"
+    sofa: "Canapé"
+    spiral: "Escaliers en spirale"
    bin: "Corbeille"
+    cup-noodle: "Bol de nouilles"
+    holo-display: "Affichage holographique"
+    energy-drink: "Boisson énergétique"
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -19,9 +19,6 @@ common:
    drive: "ドライブ"
    drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
    outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
-  adblock:
-    detected: "広告ブロッカーを無効にしてください"
-    warning: "<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。"
  application-authorization: "アプリの連携"
  close: "閉じる"
  do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
@@ -110,6 +107,12 @@ common:
    "read:reactions": "リアクションを見る"
    "write:reactions": "リアクションを操作する"
    "write:votes": "投票する"
+    "read:pages": "ページを見る"
+    "write:pages": "ページを操作する"
+    "read:page-likes": "ページのいいねを見る"
+    "write:page-likes": "ページのいいねを操作する"
+    "read:user-groups": "ユーザーグループを見る"
+    "write:user-groups": "ユーザーグループを操作する"

  empty-timeline-info:
    follow-users-to-make-your-timeline: "ユーザーをフォローすると投稿がタイムラインに表示されます。"
@@ -139,6 +142,7 @@ common:
    geolocation-alert: "お使いの端末は位置情報に対応していません"
    error: "エラー"
    enter-username: "ユーザー名を入力してください"
+    specified-recipient: "宛先"
    add-visible-user: "ユーザーを追加"
    cw-placeholder: "内容への注釈 (オプション)"
    username-prompt: "ユーザー名を入力してください"
@@ -208,6 +212,8 @@ common:
    other: "その他"
    appearance: "デザイン"
    behavior: "動作"
+    reactions: "リアクション"
+    reactions-description: "リアクションピッカーに表示するリアクションを改行で区切って設定します。"
    fetch-on-scroll: "スクロールで自動読み込み"
    fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
    note-visibility: "投稿の公開範囲"
@@ -258,7 +264,7 @@ common:
    deck-column-width-wide: "広"
    use-shadow: "UIに影を使用"
    rounded-corners: "UIの角を丸める"
-    circle-icons: "円形のアイコンを使用"
+    circle-icons: "円形のアバターを使用"
    contrasted-acct: "ユーザー名にコントラストを付ける"
    wallpaper: "壁紙"
    choose-wallpaper: "壁紙を選択"
@@ -407,11 +413,17 @@ common/views/pages/explore.vue:
  popular-users: "人気のユーザー"
  recently-updated-users: "最近投稿したユーザー"
  recently-registered-users: "新規ユーザー"
+  recently-discovered-users: "最近発見されたユーザー"
  popular-tags: "人気のタグ"
  federated: "連合"
  explore: "{host}を探索"
+  explore-fediverse: "Fediverseを探索"
  users-info: "現在{users}ユーザーが登録されています"

+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users}が{reaction}をリアクション"
+  many-users: "{users}と他{omitted}人が{reaction}をリアクション"
+
 common/views/components/url-preview.vue:
  enable-player: "プレイヤーを開く"
  disable-player: "プレイヤーを閉じる"
@@ -661,7 +673,9 @@ common/views/components/reaction-picker.vue:
  input-reaction-placeholder: "または絵文字を入力"

 common/views/components/emoji-picker.vue:
+  recent-emoji: "最近使った絵文字"
  custom-emoji: "カスタム絵文字"
+  no-category: "カテゴリなし"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
@@ -795,7 +809,7 @@ common/views/components/profile-editor.vue:
  you-can-include-hashtags: "ハッシュタグを含めることができます。"
  language: "言語"
  birthday: "誕生日"
-  avatar: "アイコン"
+  avatar: "アバター"
  banner: "バナー"
  is-cat: "このアカウントはCatです"
  is-bot: "このアカウントはBotです"
@@ -809,7 +823,7 @@ common/views/components/profile-editor.vue:
  uploading: "アップロード中"
  upload-failed: "アップロードに失敗しました"
  unable-to-process: "操作を完了できません"
-  avatar-not-an-image: "アイコンとして指定したファイルは画像ではありません"
+  avatar-not-an-image: "アバターとして指定したファイルは画像ではありません"
  banner-not-an-image: "バナーとして指定したファイルは画像ではありません"
  email: "メール設定"
  email-address: "メールアドレス"
@@ -876,6 +890,7 @@ common/views/widgets/broadcast.vue:
  no-broadcasts: "お知らせはありません"
  have-a-nice-day: "良い一日を！"
  next: "次"
+  prev: "前"

 common/views/widgets/calendar.vue:
  year: "{}年"
@@ -999,7 +1014,7 @@ desktop/views/components/drive-window.vue:
  used: "使用中"

 desktop/views/components/drive.file.vue:
-  avatar: "アイコン"
+  avatar: "アバター"
  banner: "バナー"
  nsfw: "閲覧注意"
  contextmenu:
@@ -1009,7 +1024,7 @@ desktop/views/components/drive.file.vue:
    copy-url: "URLをコピー"
    download: "ダウンロード"
    else-files: "その他"
-    set-as-avatar: "アイコンに設定"
+    set-as-avatar: "アバターに設定"
    set-as-banner: "バナーに設定"
    open-in-app: "アプリで開く"
    add-app: "アプリを追加"
@@ -1545,6 +1560,7 @@ admin/views/users.vue:
    state:
      title: "状態"
      all: "すべて"
+      available: "利用可能"
      admin: "管理者"
      moderator: "モデレーター"
      adminOrModerator: "管理者+モデレーター"
@@ -1577,6 +1593,7 @@ admin/views/emoji.vue:
    title: "絵文字の登録"
    name: "絵文字名"
    name-desc: "a~z 0~9 _ の文字が使えます。"
+    category: "カテゴリ"
    aliases: "エイリアス"
    aliases-desc: "スペースで区切って複数設定できます。"
    url: "絵文字画像URL"
@@ -2014,6 +2031,9 @@ pages:
  read-page: "ソースを表示中"
  page-created: "ページを作成しました"
  page-updated: "ページを更新しました"
+  name-already-exists: "指定されたページURLは既に存在しています"
+  title-invalid-name: "不正なページURLです"
+  text-invalid-name: "空白でないか確認してください"
  are-you-sure-delete: "このページを削除しますか？"
  page-deleted: "ページを削除しました"
  edit-this-page: "このページを編集"
@@ -2300,6 +2320,10 @@ room:
  exit: "戻る"
  remove: "しまう"
  save: "保存"
+  saved: "保存しました"
+  clear: "片付け"
+  clear-confirm: "全ての家具をしまいますか？"
+  leave-confirm: "未保存の変更があります、移動しますか？"
  chooseImage: "画像を選択"
  room-type: "部屋のタイプ"
  carpet-color: "床の色"
@@ -2347,3 +2371,6 @@ room:
    sofa: "ソファ"
    spiral: "螺旋階段"
    bin: "ゴミ箱"
+    cup-noodle: "カップ麺"
+    holo-display: "ホログラフィックディスプレイ"
+    energy-drink: "エナジードリンク"
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -18,9 +18,6 @@ common:
    drive: "ドライブ"
    drive-desc: "「こないだの画像、どこやったかな……また投稿したいんやけど……」「さっきのファイルあのフォルダに直しといて」そんなこと言わんとって。Misskeyはもとからドライブ機能持っとるさかい、心配あらへん。ファイルの「わけわけ」したってな。"
    outro: "Misskeyの機能は無限大や！知らんけど。知らん言うとるやんけ、あんたが見に行けや！Misskeyは分散型SNSやから、ここがあかんくても他がある。阪神でもオリックスでもワイは応援するで！"
-  adblock:
-    detected: "広告ブロッカーを無効にしてや"
-    warning: "<strong>Misskeyは広告を掲載してへん</strong>けど、広告をブロックしはる機能がおると一部の機能が利用できんくなったり、不具合が発生するかも分からん。知らんけど。"
  application-authorization: "アプリの連携"
  close: "さいなら"
  do-not-copy-paste: "ここにコードを入力したり張り付けたりせんといてください。アカウントが不正利用されるかも分からん。知らんけど。"
@@ -129,6 +126,7 @@ common:
    blocking: "ブロック"
    password: "パスワード"
    other: "その他"
+    reactions: "リアクション"
    timeline: "タイムライン"
    save: "保存"
    saved: "保存したで！"
@@ -467,7 +465,7 @@ common/views/components/profile-editor.vue:
  description: "自己紹介"
  language: "言語"
  birthday: "誕生日"
-  avatar: "アイコン"
+  avatar: "アバター"
  banner: "バナー"
  is-cat: "このアカウントはCatやで"
  is-bot: "このアカウントはBotやで"
@@ -605,7 +603,7 @@ desktop/views/components/crop-window.vue:
 desktop/views/components/drive-window.vue:
  used: "使うとる"
 desktop/views/components/drive.file.vue:
-  avatar: "アイコン"
+  avatar: "アバター"
  banner: "バナー"
  nsfw: "見たらあかんで"
  contextmenu:
@@ -615,7 +613,7 @@ desktop/views/components/drive.file.vue:
    copy-url: "URLをコピー"
    download: "ダウンロード"
    else-files: "その他"
-    set-as-avatar: "アイコンにする"
+    set-as-avatar: "アバターにする"
    set-as-banner: "バナーにする"
    open-in-app: "アプリで開く"
    add-app: "アプリ増やす"
@@ -1287,6 +1285,7 @@ pages:
 room:
  translate: "移動"
  save: "保存"
+  saved: "保存したで！"
  furnitures:
    moon: "月"
    bin: "ゴミ箱"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -18,9 +18,6 @@ common:
    drive: "드라이브"
    drive-desc: "이전에 올렸던 적 있는 이미지를 다시 올리고 싶을 때가 있지 않으신가요? 아니면 업로드했던 파일을 폴더로 정리하고 싶지 않으신가요? Misskey에 기본적으로 내장된 드라이브 기능으로 해결됩니다. 파일 공유도 쉽습니다."
    outro: "이외에도 Misskey에만 있는 기능이 아직도 더 있으니 부디 여러분 자신의 눈으로 확인해보시기 바랍니다. Misskey는 분산형 SNS라서 이 인스턴스가 마음에 들지 않으신다면 다른 인스턴스를 시도해보실 수도 있습니다. 그럼, GLHF!"
-  adblock:
-    detected: "광고 차단기를 해제하십시오"
-    warning: "<strong>Misskey는 광고를 게재하지 않습니다</strong>. 하지만 광고 차단 기능을 사용할 경우 일부 기능을 사용할 수 없거나 문제가 발생할 수 있습니다."
  application-authorization: "앱 연계"
  close: "닫기"
  do-not-copy-paste: "여기에 코드를 입력하거나 붙여넣지 마십시오. 계정이 무단으로 사용될 수 있습니다."
@@ -86,14 +83,14 @@ common:
  followers: "팔로워"
  favorites: "즐겨찾기"
  permissions:
-    "read:account": "계정의 정보를 볼 수 있습니다."
-    "write:account": "계정의 정보를 변경할 수 있습니다."
-    "read:blocks": "차단 목록을 볼 수 있습니다."
-    "write:blocks": "차단 목록을 조작할 수 있습니다."
-    "read:drive": "드라이브의 파일들을 볼 수 있습니다."
-    "write:drive": "드라이브의 파일들을 조작할 수 있습니다."
-    "read:favorites": "즐겨찾기 목록을 볼 수 있습니다."
-    "write:favorites": "즐겨찾기 목록을 조작할 수 있습니다."
+    "read:account": "계정 정보 보기"
+    "write:account": "계정 정보 변경"
+    "read:blocks": "차단 보기"
+    "write:blocks": "차단 수정"
+    "read:drive": "드라이브 보기"
+    "write:drive": "드라이브 수정"
+    "read:favorites": "즐겨찾기 보기"
+    "write:favorites": "즐겨찾기 수정"
    "read:following": "팔로우 정보 보기"
    "write:following": "팔로잉, 팔로우 수정"
    "read:messaging": "대화 보기"
@@ -106,6 +103,12 @@ common:
    "read:reactions": "리액션 보기"
    "write:reactions": "리액션 수정"
    "write:votes": "투표하기"
+    "read:pages": "페이지 보기"
+    "write:pages": "페이지 변경"
+    "read:page-likes": "페이지의 좋아요 보기"
+    "write:page-likes": "페이지의 좋아요 변경"
+    "read:user-groups": "유저 그룹 보기"
+    "write:user-groups": "유저 그룹을 변경"
  empty-timeline-info:
    follow-users-to-make-your-timeline: "사용자를 팔로우하면 글이 타임라인에 표시됩니다."
    explore: "사용자 탐색"
@@ -133,6 +136,7 @@ common:
    geolocation-alert: "사용 중이신 장치에서는 위치 정보를 사용할 수 없습니다"
    error: "오류"
    enter-username: "사용자명을 입력해주세요"
+    specified-recipient: "수신인"
    add-visible-user: "사용자 추가"
    cw-placeholder: "내용에 대한 주석 (옵션)"
    username-prompt: "사용자명을 입력해주세요"
@@ -196,6 +200,8 @@ common:
    other: "기타"
    appearance: "디자인"
    behavior: "동작"
+    reactions: "리액션"
+    reactions-description: "리액션 선택창에 표시할 리액션을 줄바꿈으로 구분해 설정합니다."
    fetch-on-scroll: "스크롤하여 자동으로 불러오기"
    fetch-on-scroll-desc: "페이지를 아래로 스크롤하였을 때 자동으로 추가 콘텐츠를 불러옵니다."
    note-visibility: "게시물의 공개 범위"
@@ -246,7 +252,7 @@ common:
    deck-column-width-wide: "넓음"
    use-shadow: "UI에 그림자 효과 적용"
    rounded-corners: "UI의 모서리를 둥글게 설정"
-    circle-icons: "원형 아이콘 사용"
+    circle-icons: "원형 아바타를 사용"
    contrasted-acct: "사용자명에 대비 추가"
    wallpaper: "배경"
    choose-wallpaper: "배경 설정"
@@ -386,10 +392,15 @@ common/views/pages/explore.vue:
  popular-users: "인기 사용자"
  recently-updated-users: "최근 게시한 사용자"
  recently-registered-users: "신규 사용자"
+  recently-discovered-users: "최근 발견된 유저"
  popular-tags: "인기 태그"
  federated: "연합"
  explore: "{host}을(를) 탐색"
+  explore-fediverse: "연합 우주를 탐색"
  users-info: "현재 {users} 사용자가 등록되어 있습니다"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users}님이 {reaction} 리액션"
+  many-users: "{users}님 외 {omitted}명이 {reaction} 리액션"
 common/views/components/url-preview.vue:
  enable-player: "플레이어 열기"
  disable-player: "플레이어 닫기"
@@ -618,7 +629,9 @@ common/views/components/reaction-picker.vue:
  choose-reaction: "리액션 선택"
  input-reaction-placeholder: "또는 이모지 입력"
 common/views/components/emoji-picker.vue:
+  recent-emoji: "최근 사용한 이모지"
  custom-emoji: "커스텀 이모지"
+  no-category: "카테고리 없음"
  people: "사람들"
  animals-and-nature: "동물 & 자연"
  food-and-drink: "음식 & 음료"
@@ -814,6 +827,7 @@ common/views/widgets/broadcast.vue:
  no-broadcasts: "공지사항이 없습니다"
  have-a-nice-day: "좋은 하루 되세요!"
  next: "다음"
+  prev: "이전"
 common/views/widgets/calendar.vue:
  year: "{}년"
  month: "{}월"
@@ -1400,7 +1414,7 @@ admin/views/users.vue:
  delete-all-files: "모든 파일 삭제"
  delete-all-files-confirm: "모든 파일을 삭제하시겠습니까?"
  username: "사용자명"
-  host: "관리자"
+  host: "호스트"
  users:
    title: "사용자"
    sort:
@@ -1412,6 +1426,7 @@ admin/views/users.vue:
    state:
      title: "상태"
      all: "모두"
+      available: "이용 가능"
      admin: "관리자"
      moderator: "모더레이터"
      adminOrModerator: "관리자+모더레이터"
@@ -1442,6 +1457,7 @@ admin/views/emoji.vue:
    title: "이모지 등록"
    name: "이모지 이름"
    name-desc: "a~z 0~9 _ 의 문자를 사용할 수 있습니다."
+    category: "카테고리"
    aliases: "별칭"
    aliases-desc: "공백으로 구분하여 여러 개 설정할 수 있습니다."
    url: "이모지 이미지 URL"
@@ -1817,6 +1833,9 @@ pages:
  read-page: "소스 표시중"
  page-created: "페이지를 만들었습니다"
  page-updated: "페이지를 수정했습니다"
+  name-already-exists: "지정한 페이지 URL은 이미 존재합니다"
+  title-invalid-name: "유효하지 않은 페이지 URL입니다"
+  text-invalid-name: "비어있지 않은지 확인해주세요"
  are-you-sure-delete: "이 페이지를 삭제하시겠습니까?"
  page-deleted: "페이지가 삭제되었습니다"
  edit-this-page: "이 페이지를 편집"
@@ -2092,6 +2111,10 @@ room:
  exit: "선택 해제"
  remove: "치우기"
  save: "저장"
+  saved: "저장하였습니다"
+  clear: "모두 치우기"
+  clear-confirm: "정말 방 안의 모든 가구를 치우시겠습니까?"
+  leave-confirm: "저장되지 않은 변경 사항이 있습니다. 정말 나가시겠습니까?"
  chooseImage: "이미지 선택"
  room-type: "룸 종류"
  carpet-color: "바닥 색상"
@@ -2120,7 +2143,7 @@ room:
    piano: "피아노"
    facial-tissue: "휴지 상자"
    server: "서버"
-    moon: "월"
+    moon: "달"
    corkboard: "게시판"
    mousepad: "마우스 패드"
    monitor: "모니터"
@@ -2136,4 +2159,9 @@ room:
    rubik-cube: "루빅스 큐브"
    poster-h: "포스터 (가로)"
    poster-v: "포스터 (세로)"
+    sofa: "소파"
+    spiral: "나선형 계단"
    bin: "휴지통"
+    cup-noodle: "컵라면"
+    holo-display: "홀로그램"
+    energy-drink: "에너지 드링크"
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -3,16 +3,58 @@ meta:
  lang: "Nederlands"
 common:
  misskey: "Deel alles met anderen die ook Misskey gebruiken."
+  about-title: "Een ster van het fediverse"
+  about: "Bedankt voor het ontdekken van Misskey. Misskey is een <b>gedecentraliseerd microblogging platform</b> geboren op aarde. Omdat het bestaat binnen het Fediverse (een georganiseerd universum van verschillende sociale mediaplatformen), staat het verbonden met andere sociale medieplatformen. Neem een pauze van de stedelijke drukte, en duik in het nieuwe intenet?"
  intro:
+    title: "Wat is Misskey?"
+    about: "Misskey is een open source <b>gedecentraliseerd blogplatform</b>. Het heeft een gesofisticeerde, volledig aanpasbare gebruikersinterface, uitgebreide reactiemogelijkheden voor posts, gratis geïntegreerd bestandsoplagbeheer en andere geavanceerde mogelijkheden. Daarnaast staat Misskey verbonden aan een netwerksysteem genaam het \"Fediverse\", hiermee kunnen we communiceren met andere gebruikers op andere SNSs. Dit betekent dat wanneer je iets post het niet enkel verstuurd wordt naar andere Misskey gebruikers, maar ook naar gebruikers op Mastodon en Pleroma. Stel je voor dat een planeet een radiosignaal verzendt naar een andere planeet als manier van communiceren."
+    features: "Kenmerken"
    rich-contents: "Bericht"
+    rich-contents-desc: "Post jouw idee, hot topic, wat je ook maar wil delen. Maak jouw teksten aantrekkelijk met je favoriete foto's, verzend bestanden, zelfs video's, of maak een poll. Dit zijn enkele van de mogelijkheden die Misskey aanbiedt!"
    reaction: "Reactie"
+    reaction-desc: "Dé makkelijkste manier om jouw gevoelens uit te drukken. Met Misskey kan je verschillende reacties toevoegen aan jouw posts. Andere SNSs hebben enkel maar een \"vind ik leuk\" reactie."
+    ui: "Interface"
+    ui-desc: "Niet één UI past nij iedereen. Daarom heeft Misskey een uitgebreide keuze om de UI naar jouw hand te zetten. Je kan jouw nieuwe thuis zo origineel maken als je zelf wil door jouw tijdslijn aan te passen door widgets te verplaatsen en hun look te veranderen. Zo maak je van Misskey jouw eigen stek."
+    drive: "Drive"
+    drive-desc: "Wil je een foto posten die je reeds het geüpload? Wens je georganiseerde map met zelfgekozen naam maken voor al jouw bestanden? De beste oplossing voor jou  is Misskey Drive. Dit maakt het supermakkelijk om jouw bestanden online te delen."
+  application-authorization: "Geauthoriseerde applicaties"
  close: "Sluiten"
+  do-not-copy-paste: "Gelieve de code hier niet in te geven of te plakken. De account kan gecompromiseerd zijn."
+  load-more: "Laad meer resultaten"
  enter-password: "Voer het wachtwoord in"
+  2fa: "Tweestapsverificatie"
+  customize-home: "Layout aanpassen"
+  featured-notes: "Uitgelicht"
+  dark-mode: "Donker thema"
+  signin: "Aanmelden"
+  signup: "Registreren"
+  signout: "Afmelden"
+  reload-to-apply-the-setting: "Herlaad de pagina om je aanpassingen te bekijken. Wil je de pagina nu herladen?"
+  fetching-as-ap-object: "Verzenden naar Fediverse"
+  unfollow-confirm: "Wil stoppen met {name} te volgen?"
+  delete-confirm: "Ben je zeker dat je dit bericht wil verwijderen?"
+  signin-required: "Gelieve in te loggen"
+  notification-type: "Notificatietype"
  notification-types:
    all: "Alle"
+    pollVote: "Stemmen"
    follow: "Volgend"
+    receiveFollowRequest: "Volgverzoeken"
    reply: "Beantwoorden"
+    quote: "Bron"
+    mention: "Vermeldingen"
    reaction: "Reactie"
+  got-it: "Ik snap het!"
+  customization-tips:
+    title: "Aanpassingstips"
+    gotit: "Ik snap het!"
+  notification:
+    file-uploaded: "Je bestand is geüpload"
+    message-from: "Bericht van {}:"
+    reversi-invited: "Uitgenodigd voor spel"
+    notified-by: "Bemerkt door: {}"
+    reply-from: "Antwoord van: {}"
+    quoted-by: "Geciteerd door: {}"
  time:
    unknown: "onbekend"
    future: "toekomstig"
@@ -24,7 +66,13 @@ common:
    weeks_ago: "{}week/weken geleden"
    months_ago: "{}maand(en) geleden"
    years_ago: "{}jaar geleden"
+  month-and-day: "{day} {month}"
+  trash: "Prullenbak"
+  drive: "Drive"
+  pages: "Pagina's"
+  messaging: "Gesprekken"
  home: "Startpagina"
+  deck: "Deck"
  timeline: "Tijdlijn"
  followers: "Volgers"
  favorites: "Deze notitie toevoegen aan favorieten"
@@ -59,7 +107,11 @@ common:
    profile: "Je profiel"
    notification: "Meldingen"
    password: "Wachtwoord"
+    reactions: "Reactie"
+    deck-column-align-center: "Centreren"
+    deck-column-align-left: "Links"
    timeline: "Tijdlijn"
+    navbar-position-left: "Links"
  search: "Zoeken"
  delete: "Verwijderen"
  loading: "Bezig met laden"
@@ -232,6 +284,7 @@ common/views/pages/follow.vue:
  follow: "Volgend"
 desktop:
  banner: "Omslagfoto"
+  avatar: "Gebruikersafbeelding"
  unable-to-process: "De operatie kan niet worden voltooid."
 desktop/views/components/activity.chart.vue:
  total: "Zwart ... totaal"
@@ -422,11 +475,13 @@ admin/views/index.vue:
  users: "Gebruiker"
 admin/views/dashboard.vue:
  notes: "Bericht"
+  drive: "Drive"
 admin/views/abuse.vue:
  remove-report: "Verwijderen"
 admin/views/charts.vue:
  notes: "Bericht"
  users: "Gebruiker"
+  drive: "Drive"
 admin/views/drive.vue:
  origin:
    local: "Lokaal"
@@ -562,6 +617,7 @@ mobile/views/pages/home.vue:
  global: "Algemeen"
 mobile/views/pages/widgets.vue:
  add-widget: "Toevoegen"
+  customization-tips: "Aanpassingstips"
 mobile/views/pages/widgets/activity.vue:
  activity: "Activiteit"
 mobile/views/pages/note.vue:
@@ -641,4 +697,5 @@ pages:
 room:
  translate: "Verplaatsen"
  furnitures:
-    moon: "M"
+    moon: "Maan"
+    bin: "Prullenbak"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -14,9 +14,6 @@ common:
    ui: "Interfejs"
    drive: "Dysk"
    drive-desc: "Chcesz opublikować zdjęcie, które już przesłałeś? Chcesz uporządkować, nazwać i utworzyć folder dla przesłanych plików? Dysk Misskey to najlepsze rozwiązanie dla Ciebie. Bardzo łatwo udostępniać swoje pliki online."
-  adblock:
-    detected: "Spróbuj wyłączyć blokadę reklam."
-    warning: "<strong>Misskey nie zawiera reklam</strong>, ale część funkcji może nie działać prawidłowo z włączonym blokowaniem reklam."
  application-authorization: "Współpraca aplikacji"
  close: "Zamknij"
  load-more: "Załaduj więcej"
@@ -98,8 +95,10 @@ common:
    visibility: "Widoczność"
    error: "Błąd"
    enter-username: "Wprowadź nazwę użytkownika"
+    specified-recipient: "Adresat"
    add-visible-user: "Dodaj użytkownika"
    username-prompt: "Wprowadź nazwę użytkownika"
+    enter-file-name: "Wprowadź nazwę pliku"
  weekday-short:
    sunday: "N"
    monday: "Pn"
@@ -158,10 +157,12 @@ common:
    other: "Inne"
    appearance: "Wygląd"
    behavior: "Zachowanie"
+    reactions: "Reakcja"
    fetch-on-scroll: "Automatycznie ładuj po przeciągnięciu w dół"
    note-visibility: "Widoczność wpisów"
    remember-note-visibility: "Zapamiętaj widoczność wpisów"
    web-search-engine: "Wyszukiwarka internetowa"
+    paste: "Wklej"
    line-width: "Szerokości linii"
    line-width-thin: "Cienka"
    line-width-normal: "Normalna"
@@ -1259,6 +1260,7 @@ pages:
 room:
  translate: "Przenieś"
  save: "Zapisz"
+  saved: "Zapisano"
  furnitures:
-    moon: "Pn"
+    moon: "Księżyc"
    bin: "Kosz"
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -12,9 +12,7 @@ common:
    rich-contents: "Post"
    rich-contents-desc: "Apenas poste suas ideias, temas do momento e qualquer coisa que você queira compartilhar. Você pode querer decorar suas palavras, anexar suas imagens favoritas, enviar arquivos, inclusive vídeos ou criar uma enquete. Essas são as coisas que você pode fazer em Misskey."
    reaction: "Reações"
-  adblock:
-    detected: "Por favor, desative o bloqueador de anúncios."
-    warning: "Alguns recursos podem não estar disponíveis ou apresentar mal funcionamento se o bloqueio de anúncios estiver ativado. <strong>Misskey não está usando anúncios</strong>"
+    reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません"
  application-authorization: "Aplicativos autorizados"
  close: "Fechar"
  do-not-copy-paste: "Por favor, não digite ou copie o código aqui. A conta pode ser comprometida."
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -18,9 +18,6 @@ common:
    drive: "Хранилище файлов"
    drive-desc: "Хотите запостить картинку, которую уже отправляли ранее? Хочется сортировать, переименовать и создать папку для ваших выложенных файлов? Тогда Misskey Drive - это лучшее решение для вас. Очень лёгкий способ делиться своими файлами онлайн."
    outro: "Попробуйте будущие, уникальные для Misskey функции своими глазами! Если чувствуете, что это не в вашем вкусе, то попробуйте другие инстанции, ведь Misskey - это децентрализованная социальная сеть, так что ты можешь с лёгкостью найти себе товарищей. И наконец, GLHF!"
-  adblock:
-    detected: "Пожалуйста, отключите блокировщик рекламы."
-    warning: "Некоторые функции перестанут быть доступными или будут работать неправильно, если включена блокировка рекламы. <strong>В Misskey нет рекламы</strong>."
  application-authorization: "Авторизация приложений"
  close: "Закрыть"
  do-not-copy-paste: "Пожалуйста, не вводите и не вставляйте сюда код. Аккаунту может угрожать опасность."
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -2,12 +2,12 @@
 meta:
  lang: "中文(简体)"
 common:
-  misskey: "Fediverse中的一颗⭐"
-  about-title: "Fediverse中的一颗⭐"
-  about: "非常感谢您找到了Misskey。 Misskey是诞生于地球的<b>分布式微博SNS</b>。因为她处于Fediverse(由各种SNS组成的宇宙)中，所以她与其他SNS相互连接。想要远离喧嚣的城市，不如深入这个新的互联网来探索一下吧。"
+  misskey: "联邦宇宙中的一颗⭐"
+  about-title: "联邦宇宙中的一颗⭐"
+  about: "非常感谢您找到了Misskey。 Misskey是诞生于地球的<b>分布式微博SNS</b>。因为她处于联邦宇宙(由各种SNS组成的宇宙)中，所以她与其他SNS相互连接。为什么不试试远离喧嚣的城市，潜入这片新的网络海洋之中呢？"
  intro:
    title: "什么是 Misskey 呢?"
-    about: "Misskey是开源的<b>分散式微博SNS</b>。复杂的完全可定制的Ui，各种各样的帖子反应，提供集成管理系统和其他先进功能的免费文件存储。此外，称为“Fediverse”的网络系统使我们能够与其他SNS的用户进行通信。比如，如果你张贴一些东西，那么你的帖子不仅会发送给Misskey，还会发送到其他SNS平台。想象一下，正如一颗行星和另一颗行星通过电磁波来进行通信一样。"
+    about: "Misskey是开源的<b>分散式微博SNS</b>。丰富且可以高度定制的Ui，对别人的帖子进行各种回应，集成管理系统的网盘等先进功能。此外，称为“联邦世界”的网络系统使我们能够与其他SNS的用户进行通信。比如，如果你发布一个帖子，那么你的帖子不仅会发送给Misskey，还会发送到其他SNS平台。想象一下，正如一颗行星和另一颗行星通过电磁波来进行通信一样。"
    features: "功能"
    rich-contents: "发布"
    rich-contents-desc: "请分享您的想法，热门话题，以及任何您想与大家分享的内容。如果有需要的话，您可以使用各种语法来修饰文章，发布问卷调查，或者添加各种您喜欢的图像和视频等文件。"
@@ -16,11 +16,8 @@ common:
    ui: "交互界面"
    ui-desc: "世界上没有一个UI可以适合每一个人. 所以, Misskey 提供一个可以高度定制的UI交互界面. 您可以通过编辑, 调整布局, 放置可选择的小部件来轻松定制您的专属UI界面。"
    drive: "网盘"
-    drive-desc: "想要发布一张您已经上传过的照片吗？想要管理文件或为上传的文件创建文件夹吗？Misskey的网盘是一个最好的解决方案。"
+    drive-desc: "想要发布一张您已经上传过的照片吗？想要管理文件或为上传的文件创建文件夹吗？Misskey的内置网盘将为您完美解决这些问题。简单地分享您的文件。"
    outro: "Misskey还有其他更多功能，请亲身体验一下吧。因为 Misskey 是一个分布式的 SNS，如果您感觉某个功能不适合自己，试试其他的吧。祝您玩得开心！"
-  adblock:
-    detected: "请关闭广告拦截器"
-    warning: "<strong>Misskey不会发布广告</strong>如果您启用广告拦截器, 可能会导致某些功能无法正常使用。"
  application-authorization: "应用程序授权"
  close: "关闭"
  do-not-copy-paste: "请不要在这里输入或粘贴代码。您帐户可能会受到损害。"
@@ -106,6 +103,12 @@ common:
    "read:reactions": "查看回应"
    "write:reactions": "回应操作"
    "write:votes": "投票"
+    "read:pages": "查看页面"
+    "write:pages": "操作页面"
+    "read:page-likes": "查看喜欢的页面"
+    "write:page-likes": "操作喜欢的页面"
+    "read:user-groups": "查看用户组"
+    "write:user-groups": "操作用户组"
  empty-timeline-info:
    follow-users-to-make-your-timeline: "关注其他用户时，帖子将显示在时间线中。"
    explore: "查找用户"
@@ -133,6 +136,7 @@ common:
    geolocation-alert: "您的设备不支持定位服务"
    error: "错误"
    enter-username: "输入用户名"
+    specified-recipient: "收件人"
    add-visible-user: "添加用户"
    cw-placeholder: "评论帖子(可选)"
    username-prompt: "输入用户名"
@@ -187,7 +191,7 @@ common:
    profile: "个人资料"
    notification: "通知"
    apps: "应用程序"
-    tags: "哈希标签"
+    tags: "话题标签"
    mute-and-block: "屏蔽/拉黑"
    blocking: "拉黑"
    security: "安全性"
@@ -196,6 +200,8 @@ common:
    other: "其他"
    appearance: "设计"
    behavior: "行为"
+    reactions: "回应"
+    reactions-description: "快速选择回应中的自定义表情符号，以换行符分隔。"
    fetch-on-scroll: "向下滚动时自动加载"
    fetch-on-scroll-desc: "向下滚动页面时，它会自动提取其他内容。"
    note-visibility: "帖子可见性"
@@ -246,7 +252,7 @@ common:
    deck-column-width-wide: "宽"
    use-shadow: "在UI中使用阴影效果"
    rounded-corners: "UI界面圆角效果"
-    circle-icons: "使用圆形图标"
+    circle-icons: "使用圆形头像"
    contrasted-acct: "增加用户名的对比度"
    wallpaper: "壁纸"
    choose-wallpaper: "选择壁纸"
@@ -386,10 +392,15 @@ common/views/pages/explore.vue:
  popular-users: "热门用户"
  recently-updated-users: "活跃用户"
  recently-registered-users: "新用户"
+  recently-discovered-users: "最近发现的用户"
  popular-tags: "热门标签"
-  federated: "联合"
+  federated: "联邦"
  explore: "查找{host}"
+  explore-fediverse: "探索Fediverse"
  users-info: "当前有{users}个注册用户"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users}作出了{reaction}的回应"
+  many-users: "{users}和其他{omitted}人做出了{reaction}的回应"
 common/views/components/url-preview.vue:
  enable-player: "打开播放器"
  disable-player: "关闭播放器"
@@ -618,7 +629,9 @@ common/views/components/reaction-picker.vue:
  choose-reaction: "选择回应"
  input-reaction-placeholder: "表情符号输入"
 common/views/components/emoji-picker.vue:
+  recent-emoji: "最近使用的表情符号"
  custom-emoji: "自定义表情符号"
+  no-category: "未分类"
  people: "人"
  animals-and-nature: "动物与自然"
  food-and-drink: "食物与饮品"
@@ -639,7 +652,7 @@ common/views/components/signin.vue:
  username: "用户名"
  password: "密码"
  token: "Token (令牌)"
-  signing-in: "正在登录..."
+  signing-in: "在弄了在弄了..."
  or: "或者"
  signin-with-twitter: "用 Twitter 登录"
  signin-with-github: "用 GitHub 登录"
@@ -814,6 +827,7 @@ common/views/widgets/broadcast.vue:
  no-broadcasts: "没有公告"
  have-a-nice-day: "祝你有愉快的一天！"
  next: "下一个"
+  prev: "上一首"
 common/views/widgets/calendar.vue:
  year: "{}年"
  month: "{}月"
@@ -927,7 +941,7 @@ desktop/views/components/drive.file.vue:
    copy-url: "复制链接"
    download: "下载"
    else-files: "其他"
-    set-as-avatar: "设置为头像"
+    set-as-avatar: "设为头像"
    set-as-banner: "设置为背景"
    open-in-app: "在应用程序中打开"
    add-app: "添加应用"
@@ -1168,16 +1182,16 @@ desktop/views/components/window.vue:
  popout: "弹出"
  close: "关闭"
 admin/views/index.vue:
-  dashboard: "Dashboard"
-  instance: "例"
-  emoji: "Emoji"
+  dashboard: "仪表盘"
+  instance: "实例"
+  emoji: "自定义Emoji"
  moderators: "版主"
  users: "用户"
-  federation: "联合"
+  federation: "联邦"
  announcements: "公告"
  abuse: "举报垃圾信息"
  queue: "作业队列"
-  logs: "登录"
+  logs: "日志"
  db: "数据库"
  back-to-misskey: "返回 Misskey"
 admin/views/db.vue:
@@ -1190,7 +1204,7 @@ admin/views/dashboard.vue:
  accounts: "账户"
  notes: "帖子"
  drive: "网盘"
-  instances: "例子"
+  instances: "实例"
  this-instance: "此实例"
  federated: "联合"
 admin/views/queue.vue:
@@ -1211,7 +1225,7 @@ admin/views/queue.vue:
  result-is-truncated: "结果已省略"
  other-queues: "其他队列"
 admin/views/logs.vue:
-  logs: "登录"
+  logs: "日志"
  domain: "域"
  level: "级别"
  levels:
@@ -1229,7 +1243,7 @@ admin/views/abuse.vue:
  details: "详情"
  remove-report: "删除"
 admin/views/instance.vue:
-  instance: "例子"
+  instance: "实例"
  instance-name: "实例名称"
  instance-description: "实例介绍"
  host: "主机名"
@@ -1412,6 +1426,7 @@ admin/views/users.vue:
    state:
      title: "状态"
      all: "全部"
+      available: "可用"
      admin: "管理员"
      moderator: "版主"
      adminOrModerator: "管理员+版主"
@@ -1432,7 +1447,7 @@ admin/views/moderators.vue:
    remove: "取消"
    removed: "取消注册版主"
  logs:
-    title: "登录"
+    title: "日志"
    moderator: "版主"
    type: "操作"
    at: "日期和时间"
@@ -1442,6 +1457,7 @@ admin/views/emoji.vue:
    title: "添加emoji"
    name: "Emoji 名称"
    name-desc: "你可以使用字符a~z 0~9 _"
+    category: "类别"
    aliases: "别名"
    aliases-desc: "您可以添加多个，以空格分隔。"
    url: "emoji 地址"
@@ -1486,7 +1502,7 @@ admin/views/federation.vue:
  block: "拉黑"
  marked-as-closed: "标记为已关闭"
  lookup: "查询"
-  instances: "联合"
+  instances: "联邦"
  instance-not-registered: "实例未注册"
  sort: "排序"
  sorts:
@@ -1606,7 +1622,7 @@ desktop/views/widgets/trends.vue:
 desktop/views/widgets/users.vue:
  title: "推荐用户"
  refresh: "更多"
-  no-one: "不是！"
+  no-one: "没有任何推荐用户！"
 mobile/views/components/drive.vue:
  used: "已使用"
  folder-count: "文件夹"
@@ -1817,6 +1833,9 @@ pages:
  read-page: "查看源"
  page-created: "页面已创建"
  page-updated: "页面已更新"
+  name-already-exists: "该页面URL已存在"
+  title-invalid-name: "无效的页面URL"
+  text-invalid-name: "请确认该项不为空"
  are-you-sure-delete: "是否删除此页面？"
  page-deleted: "该页面已被删除。"
  edit-this-page: "编辑此页面"
@@ -2092,6 +2111,10 @@ room:
  exit: "返回"
  remove: "移除"
  save: "保存"
+  saved: "已保存"
+  clear: "清理"
+  clear-confirm: "是否清除所有家具？"
+  leave-confirm: "有尚未保存的修改。是否离开？"
  chooseImage: "选择图片"
  room-type: "房间类型"
  carpet-color: "地板颜色"
@@ -2120,14 +2143,14 @@ room:
    piano: "钢琴"
    facial-tissue: "纸巾盒"
    server: "服务器"
-    moon: "一"
+    moon: "月球"
    corkboard: "软木板"
    mousepad: "鼠标垫"
    monitor: "显示器"
    keyboard: "键盘"
    carpet-stripe: "地毯(条纹)"
    mat: "垫子"
-    color-box: "彩盒"
+    color-box: "收纳柜"
    wall-clock: "挂钟"
    photoframe: "相框"
    cube: "立方体"
@@ -2136,4 +2159,9 @@ room:
    rubik-cube: "魔方"
    poster-h: "海报(横向)"
    poster-v: "海报(纵向)"
+    sofa: "沙发"
+    spiral: "螺旋楼梯"
    bin: "垃圾箱"
+    cup-noodle: "杯面"
+    holo-display: "全息显示器"
+    energy-drink: "能量饮料"
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -7,8 +7,6 @@ common:
    rich-contents: "發佈"
    reaction: "回應"
    drive: "雲端硬碟"
-  adblock:
-    detected: "請禁用廣告封鎖器"
  close: "關閉"
  enter-password: "請輸入密碼"
  2fa: "雙重身份驗證"
--- a/migration/1571220798684-CustomEmojiCategory.ts
+++ b/migration/1571220798684-CustomEmojiCategory.ts
@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class CustomEmojiCategory1571220798684 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "emoji" ADD "category" character varying(128)`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "category"`, undefined);
+    }
+
+}
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.29.0",
+	"version": "11.35.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -27,20 +27,23 @@
 	},
 	"resolutions": {
 		"gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1",
+		"https-proxy-agent": "^3.0.0",
 		"lodash": "^4.17.13"
 	},
 	"dependencies": {
-		"@elastic/elasticsearch": "7.3.0",
-		"@fortawesome/fontawesome-svg-core": "1.2.19",
-		"@fortawesome/free-brands-svg-icons": "5.9.0",
-		"@fortawesome/free-regular-svg-icons": "5.9.0",
-		"@fortawesome/free-solid-svg-icons": "5.9.0",
-		"@fortawesome/vue-fontawesome": "0.1.6",
+		"@elastic/elasticsearch": "7.4.0",
+		"@fortawesome/fontawesome-svg-core": "1.2.25",
+		"@fortawesome/free-brands-svg-icons": "5.11.2",
+		"@fortawesome/free-regular-svg-icons": "5.11.2",
+		"@fortawesome/free-solid-svg-icons": "5.11.2",
+		"@fortawesome/vue-fontawesome": "0.1.7",
 		"@koa/cors": "3.0.0",
+		"@koa/multer": "2.0.0",
+		"@koa/router": "8.0.2",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.5.15",
+		"@types/bull": "3.10.3",
 		"@types/cbor": "2.0.0",
-		"@types/dateformat": "3.0.0",
+		"@types/dateformat": "3.0.1",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.1",
 		"@types/gulp": "4.0.6",
@@ -52,89 +55,86 @@
 		"@types/is-url": "1.2.28",
 		"@types/js-yaml": "3.12.1",
 		"@types/jsdom": "12.2.4",
-		"@types/katex": "0.10.1",
-		"@types/koa": "2.0.49",
+		"@types/katex": "0.10.2",
+		"@types/koa": "2.0.50",
 		"@types/koa-bodyparser": "5.0.2",
 		"@types/koa-compress": "2.0.9",
 		"@types/koa-cors": "0.0.0",
 		"@types/koa-favicon": "2.0.19",
 		"@types/koa-logger": "3.1.1",
 		"@types/koa-mount": "4.0.0",
-		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.42",
 		"@types/koa-send": "4.1.2",
 		"@types/koa-views": "2.0.3",
 		"@types/koa__cors": "2.2.3",
+		"@types/koa__multer": "2.0.0",
+		"@types/koa__router": "8.0.0",
 		"@types/lolex": "3.1.1",
 		"@types/mocha": "5.2.7",
-		"@types/node": "12.0.10",
-		"@types/nodemailer": "6.2.0",
+		"@types/node": "12.7.12",
+		"@types/nodemailer": "6.2.1",
 		"@types/nprogress": "0.2.0",
 		"@types/oauth": "0.9.1",
-		"@types/parse5": "5.0.0",
+		"@types/parse5": "5.0.2",
 		"@types/parsimmon": "1.10.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
-		"@types/qrcode": "1.3.3",
+		"@types/qrcode": "1.3.4",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.13",
+		"@types/redis": "2.8.14",
 		"@types/rename": "1.0.1",
-		"@types/request": "2.48.2",
-		"@types/request-promise-native": "1.0.16",
+		"@types/request": "2.48.3",
+		"@types/request-promise-native": "1.0.17",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.28",
-		"@types/sharp": "0.22.2",
+		"@types/sharp": "0.22.3",
 		"@types/showdown": "1.9.3",
-		"@types/speakeasy": "2.0.4",
+		"@types/speakeasy": "2.0.5",
 		"@types/systeminformation": "3.23.1",
 		"@types/tinycolor2": "1.4.2",
 		"@types/tmp": "0.1.0",
 		"@types/uuid": "3.4.5",
 		"@types/web-push": "3.3.0",
-		"@types/webpack": "4.4.34",
+		"@types/webpack": "4.39.3",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
-		"@types/ws": "6.0.1",
-		"@typescript-eslint/parser": "1.11.0",
-		"agentkeepalive": "4.0.2",
+		"@types/ws": "6.0.3",
+		"@typescript-eslint/parser": "2.3.3",
+		"agentkeepalive": "4.1.0",
 		"animejs": "3.1.0",
-		"apexcharts": "3.8.4",
+		"apexcharts": "3.10.0",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.512.0",
+		"aws-sdk": "2.548.0",
 		"bcryptjs": "2.4.3",
 		"bootstrap": "4.3.1",
-		"bootstrap-vue": "2.0.0-rc.13",
-		"bull": "3.10.0",
+		"bootstrap-vue": "2.0.4",
+		"bull": "3.11.0",
 		"cafy": "15.1.1",
-		"cbor": "4.2.1",
+		"cbor": "5.0.1",
 		"chai": "4.2.0",
 		"chalk": "2.4.2",
 		"cli-highlight": "2.1.1",
-		"commander": "2.20.0",
+		"commander": "3.0.2",
 		"content-disposition": "0.5.3",
 		"crc-32": "1.2.0",
 		"css-loader": "3.2.0",
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
-		"deep-equal": "1.0.1",
+		"deep-equal": "1.1.0",
 		"diskusage": "1.1.3",
 		"double-ended-queue": "2.1.0-0",
-		"emojilib": "2.4.0",
-		"eslint": "6.1.0",
+		"eslint": "6.5.1",
 		"eslint-plugin-vue": "5.2.3",
 		"eventemitter3": "4.0.0",
-		"feed": "3.0.0",
-		"file-type": "12.1.0",
+		"feed": "4.0.0",
+		"file-type": "12.3.0",
 		"fluent-ffmpeg": "2.1.2",
-		"fuckadblock": "3.2.1",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
-		"gulp-imagemin": "6.0.0",
-		"gulp-mocha": "6.0.0",
+		"gulp-mocha": "7.0.2",
 		"gulp-rename": "1.4.0",
 		"gulp-replace": "1.0.0",
 		"gulp-sourcemaps": "2.6.5",
@@ -146,38 +146,37 @@
 		"hard-source-webpack-plugin": "0.13.1",
 		"html-minifier": "4.0.0",
 		"http-signature": "1.2.0",
-		"https-proxy-agent": "2.2.2",
+		"https-proxy-agent": "3.0.0",
 		"insert-text-at-cursor": "0.3.0",
 		"is-root": "2.1.0",
 		"is-svg": "4.2.0",
 		"js-yaml": "3.13.1",
 		"jsdom": "15.1.1",
-		"json5": "2.1.0",
+		"json5": "2.1.1",
 		"json5-loader": "3.0.0",
 		"jsrsasign": "8.0.12",
-		"katex": "0.11.0",
-		"koa": "2.7.0",
+		"katex": "0.11.1",
+		"koa": "2.10.0",
 		"koa-bodyparser": "4.2.1",
 		"koa-compress": "3.0.0",
 		"koa-favicon": "2.0.1",
 		"koa-json-body": "5.3.0",
 		"koa-logger": "3.2.1",
 		"koa-mount": "4.0.0",
-		"koa-multer": "1.0.2",
-		"koa-router": "7.4.0",
 		"koa-send": "5.0.0",
 		"koa-slow": "2.1.0",
-		"koa-views": "6.2.0",
+		"koa-views": "6.2.1",
 		"langmap": "0.0.16",
 		"loader-utils": "1.2.3",
 		"lolex": "4.2.0",
 		"lookup-dns-cache": "2.1.0",
-		"mocha": "6.2.0",
+		"mocha": "6.2.1",
 		"moji": "0.5.1",
 		"ms": "2.1.2",
+		"multer": "1.4.2",
 		"nested-property": "1.0.1",
 		"node-fetch": "2.6.0",
-		"nodemailer": "6.3.0",
+		"nodemailer": "6.3.1",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"os-utils": "0.0.14",
@@ -193,74 +192,76 @@
 		"pug": "2.0.4",
 		"punycode": "2.1.1",
 		"pureimage": "0.1.6",
-		"qrcode": "1.4.1",
+		"qrcode": "1.4.2",
 		"random-seed": "0.3.0",
 		"randomcolor": "0.5.4",
 		"ratelimiter": "3.3.1",
 		"recaptcha-promise": "0.1.3",
-		"reconnecting-websocket": "4.1.10",
+		"reconnecting-websocket": "4.2.0",
 		"redis": "2.8.0",
+		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
 		"request": "2.88.0",
 		"request-promise-native": "1.0.7",
 		"request-stats": "3.0.0",
 		"require-all": "3.0.0",
-		"rimraf": "2.6.3",
+		"rimraf": "3.0.0",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"seedrandom": "3.0.3",
-		"sharp": "0.23.0",
+		"seedrandom": "3.0.5",
+		"sharp": "0.23.1",
 		"showdown": "1.9.0",
 		"showdown-highlightjs-extension": "0.1.2",
 		"speakeasy": "2.0.0",
 		"stringz": "2.0.0",
-		"style-loader": "0.23.1",
-		"stylus": "0.54.5",
+		"style-loader": "1.0.0",
+		"stylus": "0.54.7",
 		"stylus-loader": "3.0.2",
-		"summaly": "2.3.0",
-		"systeminformation": "4.14.4",
+		"summaly": "2.3.1",
+		"syslog-pro": "1.0.0",
+		"systeminformation": "4.14.11",
 		"syuilo-password-strength": "0.0.1",
-		"terser-webpack-plugin": "1.4.1",
+		"terser-webpack-plugin": "2.1.3",
 		"textarea-caret": "3.1.0",
-		"three": "0.107.0",
+		"three": "0.109.0",
 		"tinycolor2": "1.4.1",
 		"tmp": "0.1.0",
-		"ts-loader": "5.3.3",
-		"ts-node": "7.0.1",
-		"tslint": "5.18.0",
+		"ts-loader": "6.2.0",
+		"ts-node": "8.4.1",
+		"tslint": "5.20.0",
 		"tslint-sonarts": "1.9.0",
-		"typeorm": "0.2.18",
-		"typescript": "3.5.3",
+		"typeorm": "0.2.19",
+		"typescript": "3.6.4",
 		"uglify-es": "3.3.9",
 		"ulid": "2.3.0",
-		"url-loader": "2.1.0",
-		"uuid": "3.3.2",
+		"url-loader": "2.2.0",
+		"uuid": "3.3.3",
 		"v-animate-css": "0.0.3",
 		"v-debounce": "0.1.2",
 		"vue": "2.6.10",
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.6.0",
 		"vue-cropperjs": "4.0.0",
-		"vue-i18n": "8.14.0",
+		"vue-i18n": "8.14.1",
 		"vue-js-modal": "1.3.31",
-		"vue-json-pretty": "1.6.0",
+		"vue-json-pretty": "1.6.2",
 		"vue-loader": "15.7.1",
 		"vue-marquee-text-component": "1.1.1",
 		"vue-prism-component": "1.1.1",
-		"vue-router": "3.1.2",
+		"vue-router": "3.1.3",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.16",
+		"vue-svg-inline-loader": "1.3.3",
 		"vue-template-compiler": "2.6.10",
-		"vuedraggable": "2.23.0",
+		"vuedraggable": "2.23.2",
 		"vuewordcloud": "18.7.11",
 		"vuex": "3.1.1",
 		"vuex-persistedstate": "2.5.4",
-		"web-push": "3.3.5",
-		"webpack": "4.39.2",
-		"webpack-cli": "3.3.7",
-		"websocket": "1.0.29",
+		"web-push": "3.4.0",
+		"webpack": "4.41.1",
+		"webpack-cli": "3.3.9",
+		"websocket": "1.0.30",
 		"ws": "7.1.2",
 		"xev": "2.0.1"
 	},
--- a/src/boot/master.ts
+++ b/src/boot/master.ts
@@ -159,7 +159,7 @@ async function init(): Promise<Config> {
 	return config;
 }

-async function spawnWorkers(limit: number = Infinity) {
+async function spawnWorkers(limit: number = 1) {
 	const workers = Math.min(limit, os.cpus().length);
 	bootLogger.info(`Starting ${workers} worker${workers === 1 ? '' : 's'}...`);
 	await Promise.all([...Array(workers)].map(spawnWorker));
--- a/src/client/app/admin/script.ts
+++ b/src/client/app/admin/script.ts
@@ -19,7 +19,8 @@ init(launch => {
 		mode: 'history',
 		base: '/admin/',
 		routes: [
-			{ path: '/', component: Index },
+			{ path: '/:page', component: Index },
+			{ path: '/', redirect: '/dashboard' },
 			{ path: '*', component: NotFound }
 		]
 	});
--- a/src/client/app/admin/views/emoji.vue
+++ b/src/client/app/admin/views/emoji.vue
@@ -8,6 +8,9 @@
 					<span>{{ $t('add-emoji.name') }}</span>
 					<template #desc>{{ $t('add-emoji.name-desc') }}</template>
 				</ui-input>
+				<ui-input v-model="category" :datalist="categoryList">
+					<span>{{ $t('add-emoji.category') }}</span>
+				</ui-input>
 				<ui-input v-model="aliases">
 					<span>{{ $t('add-emoji.aliases') }}</span>
 					<template #desc>{{ $t('add-emoji.aliases-desc') }}</template>
@@ -24,7 +27,7 @@

 	<ui-card>
 		<template #title><fa :icon="faGrin"/> {{ $t('emojis.title') }}</template>
-		<section v-for="emoji in emojis" class="oryfrbft">
+		<section v-for="emoji in emojis" :key="emoji.name" class="oryfrbft">
 			<div>
 				<img :src="emoji.url" :alt="emoji.name" style="width: 64px;"/>
 			</div>
@@ -33,6 +36,9 @@
 					<ui-input v-model="emoji.name">
 						<span>{{ $t('add-emoji.name') }}</span>
 					</ui-input>
+					<ui-input v-model="emoji.category" :datalist="categoryList">
+						<span>{{ $t('add-emoji.category') }}</span>
+					</ui-input>
 					<ui-input v-model="emoji.aliases">
 						<span>{{ $t('add-emoji.aliases') }}</span>
 					</ui-input>
@@ -55,12 +61,14 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import { faGrin } from '@fortawesome/free-regular-svg-icons';
+import { unique } from '../../../../prelude/array';

 export default Vue.extend({
 	i18n: i18n('admin/views/emoji.vue'),
 	data() {
 		return {
 			name: '',
+			category: '',
 			url: '',
 			aliases: '',
 			emojis: [],
@@ -72,10 +80,17 @@ export default Vue.extend({
 		this.fetchEmojis();
 	},

+	computed: {
+		categoryList() {
+			return unique(this.emojis.map((x: any) => x.category || '').filter((x: string) => x !== ''));
+		}
+	},
+
 	methods: {
 		add() {
 			this.$root.api('admin/emoji/add', {
 				name: this.name,
+				category: this.category,
 				url: this.url,
 				aliases: this.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
@@ -94,7 +109,6 @@ export default Vue.extend({

 		fetchEmojis() {
 			this.$root.api('admin/emoji/list').then(emojis => {
-				emojis.reverse();
 				for (const e of emojis) {
 					e.aliases = (e.aliases || []).join(' ');
 				}
@@ -106,6 +120,7 @@ export default Vue.extend({
 			this.$root.api('admin/emoji/update', {
 				id: emoji.id,
 				name: emoji.name,
+				category: emoji.category,
 				url: emoji.url,
 				aliases: emoji.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
--- a/src/client/app/admin/views/federation.vue
+++ b/src/client/app/admin/views/federation.vue
@@ -509,7 +509,7 @@ export default Vue.extend({

 		saveBlockedHosts() {
 			this.$root.api('admin/update-meta', {
-				blockedHosts: this.blockedHosts.split('\n')
+				blockedHosts: this.blockedHosts ? this.blockedHosts.split('\n') : []
 			}).then(() => {
 				this.$root.dialog({
 					type: 'success',
--- a/src/client/app/admin/views/index.vue
+++ b/src/client/app/admin/views/index.vue
@@ -18,18 +18,18 @@
 			<p class="name"><mk-user-name :user="$store.state.i"/></p>
 		</div>
 		<ul>
-			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</li>
-			<li @click="nav('instance')" :class="{ active: page == 'instance' }"><fa icon="cog" fixed-width/>{{ $t('instance') }}</li>
-			<li @click="nav('queue')" :class="{ active: page == 'queue' }"><fa :icon="faTasks" fixed-width/>{{ $t('queue') }}</li>
-			<li @click="nav('logs')" :class="{ active: page == 'logs' }"><fa :icon="faStream" fixed-width/>{{ $t('logs') }}</li>
-			<li @click="nav('db')" :class="{ active: page == 'db' }"><fa :icon="faDatabase" fixed-width/>{{ $t('db') }}</li>
-			<li @click="nav('moderators')" :class="{ active: page == 'moderators' }"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</li>
-			<li @click="nav('users')" :class="{ active: page == 'users' }"><fa icon="users" fixed-width/>{{ $t('users') }}</li>
-			<li @click="nav('drive')" :class="{ active: page == 'drive' }"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</li>
-			<li @click="nav('federation')" :class="{ active: page == 'federation' }"><fa :icon="faGlobe" fixed-width/>{{ $t('federation') }}</li>
-			<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('abuse')" :class="{ active: page == 'abuse' }"><fa :icon="faExclamationCircle" fixed-width/>{{ $t('abuse') }}</li>
+			<li><router-link to="/dashboard" active-class="active"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</router-link></li>
+			<li><router-link to="/instance" active-class="active"><fa icon="cog" fixed-width/>{{ $t('instance') }}</router-link></li>
+			<li><router-link to="/queue" active-class="active"><fa :icon="faTasks" fixed-width/>{{ $t('queue') }}</router-link></li>
+			<li><router-link to="/logs" active-class="active"><fa :icon="faStream" fixed-width/>{{ $t('logs') }}</router-link></li>
+			<li><router-link to="/db" active-class="active"><fa :icon="faDatabase" fixed-width/>{{ $t('db') }}</router-link></li>
+			<li><router-link to="/moderators" active-class="active"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</router-link></li>
+			<li><router-link to="/users" active-class="active"><fa icon="users" fixed-width/>{{ $t('users') }}</router-link></li>
+			<li><router-link to="/drive" active-class="active"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</router-link></li>
+			<li><router-link to="/federation" active-class="active"><fa :icon="faGlobe" fixed-width/>{{ $t('federation') }}</router-link></li>
+			<li><router-link to="/emoji" active-class="active"><fa :icon="faGrin" fixed-width/>{{ $t('emoji') }}</router-link></li>
+			<li><router-link to="/announcements" active-class="active"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</router-link></li>
+			<li><router-link to="/abuse" active-class="active"><fa :icon="faExclamationCircle" fixed-width/>{{ $t('abuse') }}</router-link></li>
 		</ul>
 		<div class="back-to-misskey">
 			<a href="/"><fa :icon="faArrowLeft"/> {{ $t('back-to-misskey') }}</a>
@@ -102,7 +102,6 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			page: 'dashboard',
 			version,
 			isMobile,
 			navOpend: !isMobile,
@@ -116,9 +115,9 @@ export default Vue.extend({
 			faDatabase,
 		};
 	},
-	methods: {
-		nav(page: string) {
-			this.page = page;
+	computed: {
+		page() {
+			return this.$route.params.page;
 		}
 	}
 });
@@ -240,11 +239,10 @@ export default Vue.extend({
 			list-style none
 			font-size 15px

-			> li
+			> li > a
 				display block
 				padding 10px 16px
 				margin 0
-				cursor pointer
 				user-select none
 				color #eee
 				transition margin-left 0.2s ease
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@@ -461,7 +461,7 @@ export default Vue.extend({
 				iconUrl: this.iconUrl,
 				name: this.name,
 				description: this.description,
-				langs: this.languages.split(' '),
+				langs: this.languages ? this.languages.split(' ') : [],
 				cacheRemoteFiles: this.cacheRemoteFiles,
 				localDriveCapacityMb: parseInt(this.localDriveCapacityMb, 10),
 				remoteDriveCapacityMb: parseInt(this.remoteDriveCapacityMb, 10),
@@ -490,8 +490,8 @@ export default Vue.extend({
 				enableServiceWorker: this.enableServiceWorker,
 				swPublicKey: this.swPublicKey,
 				swPrivateKey: this.swPrivateKey,
-				pinnedUsers: this.pinnedUsers.split('\n'),
-				hiddenTags: this.hiddenTags.split('\n'),
+				pinnedUsers: this.pinnedUsers ? this.pinnedUsers.split('\n') : [],
+				hiddenTags: this.hiddenTags ? this.hiddenTags.split('\n') : [],
 				useObjectStorage: this.useObjectStorage,
 				objectStorageBaseUrl: this.objectStorageBaseUrl ? this.objectStorageBaseUrl : null,
 				objectStorageBucket: this.objectStorageBucket ? this.objectStorageBucket : null,
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@@ -42,6 +42,7 @@
 				<ui-select v-model="state">
 					<template #label>{{ $t('users.state.title') }}</template>
 					<option value="all">{{ $t('users.state.all') }}</option>
+					<option value="available">{{ $t('users.state.available') }}</option>
 					<option value="admin">{{ $t('users.state.admin') }}</option>
 					<option value="moderator">{{ $t('users.state.moderator') }}</option>
 					<option value="silenced">{{ $t('users.state.silenced') }}</option>
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -98,15 +98,10 @@

 	// If mobile, insert the viewport meta tag
 	if (isMobile) {
-		const meta = document.createElement('meta');
-		meta.setAttribute('name', 'viewport');
-		meta.setAttribute('content',
-			'width=device-width,' +
-			'initial-scale=1,' +
-			'minimum-scale=1,' +
-			'maximum-scale=1,' +
-			'user-scalable=no');
-		head.appendChild(meta);
+		const viewport = document.getElementsByName("viewport").item(0);
+		viewport.setAttribute('content',
+			`${viewport.getAttribute('content')},minimum-scale=1,maximum-scale=1,user-scalable=no`);
+		head.appendChild(viewport);
 	}

 	// Switch desktop or mobile version
--- a/src/client/app/common/scripts/fuck-ad-block.ts
+++ b/src/client/app/common/scripts/fuck-ad-block.ts
@@ -1,18 +0,0 @@
-declare const fuckAdBlock: any;
-
-export default ($root: any) => {
-	require('fuckadblock');
-
-	function adBlockDetected() {
-		$root.dialog({
-			title: $root.$t('@.adblock.detected'),
-			text: $root.$t('@.adblock.warning')
-		});
-	}
-
-	if (fuckAdBlock === undefined) {
-		adBlockDetected();
-	} else {
-		fuckAdBlock.onDetected(adBlockDetected);
-	}
-};
--- a/src/client/app/common/scripts/note-mixin.ts
+++ b/src/client/app/common/scripts/note-mixin.ts
@@ -27,7 +27,8 @@ export default (opts: Opts = {}) => ({
 	data() {
 		return {
 			showContent: false,
-			hideThisNote: false
+			hideThisNote: false,
+			openingMenu: false
 		};
 	},

@@ -42,7 +43,7 @@ export default (opts: Opts = {}) => ({
 				'ctrl+q': this.renoteDirectly,
 				'up|k|shift+tab': this.focusBefore,
 				'down|j|tab': this.focusAfter,
-				'esc': this.blur,
+				//'esc': this.blur,
 				'm|o': () => this.menu(true),
 				's': this.toggleShowContent,
 				'1': () => this.reactDirectly('like'),
@@ -142,12 +143,15 @@ export default (opts: Opts = {}) => ({
 		react(viaKeyboard = false) {
 			pleaseLogin(this.$root);
 			this.blur();
-			this.$root.new(MkReactionPicker, {
+			const w = this.$root.new(MkReactionPicker, {
 				source: this.$refs.reactButton,
 				note: this.appearNote,
 				showFocus: viaKeyboard,
 				animation: !viaKeyboard
 			}).$once('closed', this.focus);
+			this.$once('hook:beforeDestroy', () => {
+				w.close();
+			});
 		},

 		reactDirectly(reaction) {
@@ -192,11 +196,19 @@ export default (opts: Opts = {}) => ({
 		},

 		menu(viaKeyboard = false) {
-			this.$root.new(MkNoteMenu, {
+			if (this.openingMenu) return;
+			this.openingMenu = true;
+			const w = this.$root.new(MkNoteMenu, {
 				source: this.$refs.menuButton,
 				note: this.appearNote,
 				animation: !viaKeyboard
-			}).$once('closed', this.focus);
+			}).$once('closed', () => {
+				this.openingMenu = false;
+				this.focus();
+			});
+			this.$once('hook:beforeDestroy', () => {
+				w.destroyDom();
+			});
 		},

 		toggleShowContent() {
--- a/src/client/app/common/scripts/post-form.ts
+++ b/src/client/app/common/scripts/post-form.ts
@@ -153,6 +153,10 @@ export default (opts) => ({
 		// デフォルト公開範囲
 		this.applyVisibility(this.$store.state.settings.rememberNoteVisibility ? (this.$store.state.device.visibility || this.$store.state.settings.defaultNoteVisibility) : this.$store.state.settings.defaultNoteVisibility);

+		if (this.reply && this.reply.localOnly) {
+			this.localOnly = true;
+		}
+
 		// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
 		if (this.reply && ['home', 'followers', 'specified'].includes(this.reply.visibility)) {
 			this.visibility = this.reply.visibility;
@@ -162,13 +166,13 @@ export default (opts) => ({
 				}).then(users => {
 					this.visibleUsers.push(...users);
 				});
-			}
-		}

-		if (this.reply && this.reply.userId !== this.$store.state.i.id) {
-			this.$root.api('users/show', { userId: this.reply.userId }).then(user => {
-				this.visibleUsers.push(user);
-			});
+				if (this.reply.userId !== this.$store.state.i.id) {
+					this.$root.api('users/show', { userId: this.reply.userId }).then(user => {
+						this.visibleUsers.push(user);
+					});
+				}
+			}
 		}

 		// keep cw when reply
@@ -199,8 +203,9 @@ export default (opts) => ({
 					this.$emit('change-attached-files', this.files);
 				}
 			}
+
+			// 削除して編集
 			if (this.initialNote) {
-				// 削除して編集
 				const init = this.initialNote;
 				this.text = init.text ? init.text : '';
 				this.files = init.files;
@@ -318,11 +323,14 @@ export default (opts) => ({
 		setVisibility() {
 			const w = this.$root.new(MkVisibilityChooser, {
 				source: this.$refs.visibilityButton,
-				currentVisibility: this.visibility
+				currentVisibility: this.localOnly ? `local-${this.visibility}` : this.visibility
 			});
 			w.$once('chosen', v => {
 				this.applyVisibility(v);
 			});
+			this.$once('hook:beforeDestroy', () => {
+				w.close();
+			});
 		},

 		applyVisibility(v: string) {
@@ -452,6 +460,9 @@ export default (opts) => ({
 			vm.$once('chosen', emoji => {
 				insertTextAtCursor(this.$refs.text, emoji);
 			});
+			this.$once('hook:beforeDestroy', () => {
+				vm.close();
+			});
 		},

 		saveDraft() {
--- a/src/client/app/common/scripts/room/furnitures.json5
+++ b/src/client/app/common/scripts/room/furnitures.json5
@@ -279,7 +279,15 @@
 	},
 	{
 		id: "pinguin",
-		place: "floor"
+		place: "floor",
+		props: {
+			body: 'color',
+			belly: 'color'
+		},
+		color: {
+			Body: 'body',
+			Belly: 'belly',
+		}
 	},
 	{
 		id: "rubik-cube",
@@ -351,4 +359,39 @@
 			Bin: 'color'
 		}
 	},
+	{
+		id: "cup-noodle",
+		place: "floor"
+	},
+	{
+		id: "holo-display",
+		place: "floor",
+		props: {
+			image: 'image'
+		},
+		texture: {
+			Image_Front: {
+				prop: 'image',
+				uv: {
+					x: 0,
+					y: 0,
+					width: 1024,
+					height: 1024,
+				},
+			},
+			Image_Back: {
+				prop: 'image',
+				uv: {
+					x: 0,
+					y: 0,
+					width: 1024,
+					height: 1024,
+				},
+			},
+		},
+	},
+	{
+		id: 'energy-drink',
+		place: "floor",
+	}
 ]
--- a/src/client/app/common/scripts/room/room.ts
+++ b/src/client/app/common/scripts/room/room.ts
@@ -102,7 +102,6 @@ export class Room {
 		this.renderer.autoClear = false;
 		this.renderer.setClearColor(new THREE.Color(0x051f2d));
 		this.renderer.shadowMap.enabled = this.enableShadow;
-		this.renderer.gammaOutput = true;
 		this.renderer.shadowMap.type =
 			this.graphicsQuality === 'ultra' ? THREE.PCFSoftShadowMap :
 			this.graphicsQuality === 'high' ? THREE.PCFSoftShadowMap :
@@ -343,7 +342,8 @@ export class Room {

 	@autobind
 	private loadRoom() {
-		new GLTFLoader().load(`/assets/room/rooms/${this.roomInfo.roomType}/${this.roomInfo.roomType}.glb`, gltf => {
+		const type = this.roomInfo.roomType;
+		new GLTFLoader().load(`/assets/room/rooms/${type}/${type}.glb`, gltf => {
 			gltf.scene.traverse(child => {
 				if (!(child instanceof THREE.Mesh)) return;

@@ -429,34 +429,42 @@ export class Room {
 	private applyCarpetColor() {
 		this.roomObj.traverse(child => {
 			if (!(child instanceof THREE.Mesh)) return;
-			if (child.material && (child.material as THREE.MeshStandardMaterial).name && (child.material as THREE.MeshStandardMaterial).name === 'Carpet') {
-				(child.material as THREE.MeshStandardMaterial).color.setHex(parseInt(this.roomInfo.carpetColor.substr(1), 16));
+			if (child.material &&
+				(child.material as THREE.MeshStandardMaterial).name &&
+				(child.material as THREE.MeshStandardMaterial).name === 'Carpet'
+			) {
+				const colorHex = parseInt(this.roomInfo.carpetColor.substr(1), 16);
+				(child.material as THREE.MeshStandardMaterial).color.setHex(colorHex);
 			}
 		});
 	}

 	@autobind
-	public applyCustomColor(model: THREE.Object3D) {
+	private applyCustomColor(model: THREE.Object3D) {
 		const furniture = this.furnitures.find(furniture => furniture.id === model.name);
 		const def = furnitureDefs.find(d => d.id === furniture.type);
 		if (def.color == null) return;
 		model.traverse(child => {
 			if (!(child instanceof THREE.Mesh)) return;
 			for (const t of Object.keys(def.color)) {
-				if (!child.material || !(child.material as THREE.MeshStandardMaterial).name || (child.material as THREE.MeshStandardMaterial).name !== t) continue;
+				if (!child.material ||
+					!(child.material as THREE.MeshStandardMaterial).name ||
+					(child.material as THREE.MeshStandardMaterial).name !== t
+				) continue;

 				const prop = def.color[t];
 				const val = furniture.props ? furniture.props[prop] : undefined;

 				if (val == null) continue;

-				(child.material as THREE.MeshStandardMaterial).color.setHex(parseInt(val.substr(1), 16));
+				const colorHex = parseInt(val.substr(1), 16);
+				(child.material as THREE.MeshStandardMaterial).color.setHex(colorHex);
 			}
 		});
 	}

 	@autobind
-	public applyCustomTexture(model: THREE.Object3D) {
+	private applyCustomTexture(model: THREE.Object3D) {
 		const furniture = this.furnitures.find(furniture => furniture.id === model.name);
 		const def = furnitureDefs.find(d => d.id === furniture.type);
 		if (def.texture == null) return;
@@ -487,7 +495,9 @@ export class Room {
 					const uvInfo = def.texture[t].uv;

 					const ctx = canvas.getContext('2d');
-					ctx.drawImage(img, 0, 0, img.width, img.height, uvInfo.x, uvInfo.y, uvInfo.width, uvInfo.height);
+					ctx.drawImage(img,
+						0, 0, img.width, img.height,
+						uvInfo.x, uvInfo.y, uvInfo.width, uvInfo.height);

 					const texture = new THREE.Texture(canvas);
 					texture.wrapS = THREE.RepeatWrapping;
@@ -608,6 +618,10 @@ export class Room {
 		});
 	}

+	/**
+	 * 家具の移動/回転モードにします
+	 * @param type 移動か回転か
+	 */
 	@autobind
 	public enterTransformMode(type: 'translate' | 'rotate') {
 		this.isTransformMode = true;
@@ -615,12 +629,20 @@ export class Room {
 		this.furnitureControl.attach(this.selectedObject);
 	}

+	/**
+	 * 家具の移動/回転モードを終了します
+	 */
 	@autobind
 	public exitTransformMode() {
 		this.isTransformMode = false;
 		this.furnitureControl.detach();
 	}

+	/**
+	 * 家具プロパティを更新します
+	 * @param key プロパティ名
+	 * @param value 値
+	 */
 	@autobind
 	public updateProp(key: string, value: any) {
 		const furniture = this.furnitures.find(furniture => furniture.id === this.selectedObject.name);
@@ -630,6 +652,10 @@ export class Room {
 		this.applyCustomTexture(this.selectedObject);
 	}

+	/**
+	 * 部屋に家具を追加します
+	 * @param type 家具の種類
+	 */
 	@autobind
 	public addFurniture(type: string) {
 		const furniture = {
@@ -655,6 +681,9 @@ export class Room {
 		});
 	}

+	/**
+	 * 現在選択されている家具を部屋から削除します
+	 */
 	@autobind
 	public removeFurniture() {
 		this.exitTransformMode();
@@ -666,12 +695,35 @@ export class Room {
 		this.onChangeSelect(null);
 	}

+	/**
+	 * 全ての家具を部屋から削除します
+	 */
+	@autobind
+	public removeAllFurnitures() {
+		this.exitTransformMode();
+		for (const obj of this.objects) {
+			this.scene.remove(obj);
+		}
+		this.objects = [];
+		this.furnitures = [];
+		this.selectedObject = null;
+		this.onChangeSelect(null);
+	}
+
+	/**
+	 * 部屋の床の色を変更します
+	 * @param color 色
+	 */
 	@autobind
 	public updateCarpetColor(color: string) {
 		this.roomInfo.carpetColor = color;
 		this.applyCarpetColor();
 	}

+	/**
+	 * 部屋の種類を変更します
+	 * @param type 種類
+	 */
 	@autobind
 	public changeRoomType(type: string) {
 		this.roomInfo.roomType = type;
@@ -679,6 +731,9 @@ export class Room {
 		this.loadRoom();
 	}

+	/**
+	 * 部屋データを取得します
+	 */
 	@autobind
 	public getRoomInfo() {
 		for (const obj of this.objects) {
@@ -694,6 +749,9 @@ export class Room {
 		return this.roomInfo;
 	}

+	/**
+	 * 選択されている家具を取得します
+	 */
 	@autobind
 	public getSelectedObject() {
 		return this.selectedObject;
@@ -704,9 +762,15 @@ export class Room {
 		return this.furnitures.find(furniture => furniture.id === id);
 	}

+	/**
+	 * レンダリングを終了します
+	 */
 	@autobind
 	public destroy() {
 		// Stop render loop
 		window.cancelAnimationFrame(this.renderFrameRequestId);
+
+		this.controls.dispose();
+		this.scene.dispose();
 	}
 }
--- a/src/client/app/common/views/components/autocomplete.vue
+++ b/src/client/app/common/views/components/autocomplete.vue
@@ -28,9 +28,9 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as emojilib from 'emojilib';
+import { emojilist } from '../../../../../misc/emojilist';
 import contains from '../../../common/scripts/contains';
-import { twemojiBase } from '../../../../../misc/twemoji-base';
+import { twemojiSvgBase } from '../../../../../misc/twemoji-base';
 import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url';

 type EmojiDef = {
@@ -41,9 +41,7 @@ type EmojiDef = {
 	isCustomEmoji?: boolean;
 };

-const lib = Object.entries(emojilib.lib).filter((x: any) => {
-	return x[1].category != 'flags';
-});
+const lib = emojilist.filter(x => x.category !== 'flags');

 const char2file = (char: string) => {
 	let codes = Array.from(char).map(x => x.codePointAt(0).toString(16));
@@ -52,21 +50,21 @@ const char2file = (char: string) => {
 	return codes.join('-');
 };

-const emjdb: EmojiDef[] = lib.map((x: any) => ({
-	emoji: x[1].char,
-	name: x[0],
+const emjdb: EmojiDef[] = lib.map(x => ({
+	emoji: x.char,
+	name: x.name,
 	aliasOf: null,
-	url: `${twemojiBase}/2/svg/${char2file(x[1].char)}.svg`
+	url: `${twemojiSvgBase}/${char2file(x.char)}.svg`
 }));

-for (const x of lib as any) {
-	if (x[1].keywords) {
-		for (const k of x[1].keywords) {
+for (const x of lib) {
+	if (x.keywords) {
+		for (const k of x.keywords) {
 			emjdb.push({
-				emoji: x[1].char,
+				emoji: x.char,
 				name: k,
-				aliasOf: x[0],
-				url: `${twemojiBase}/2/svg/${char2file(x[1].char)}.svg`
+				aliasOf: x.name,
+				url: `${twemojiSvgBase}/${char2file(x.char)}.svg`
 			});
 		}
 	}
@@ -85,7 +83,7 @@ export default Vue.extend({
 			hashtags: [],
 			emojis: [],
 			select: -1,
-			emojilib,
+			emojilist,
 			emojiDb: [] as EmojiDef[]
 		}
 	},
--- a/src/client/app/common/views/components/code-core.vue
+++ b/src/client/app/common/views/components/code-core.vue
@@ -1,16 +1,16 @@
 <template>
-<prism :inline="inline" :language="lang || 'js'">{{ code }}</prism>
+<x-prism :inline="inline" :language="prismLang">{{ code }}</x-prism>
 </template>

 <script lang="ts">
 import Vue from 'vue';
 import 'prismjs';
 import 'prismjs/themes/prism-okaidia.css';
-import Prism from 'vue-prism-component';
+import XPrism from 'vue-prism-component';

 export default Vue.extend({
 	components: {
-		Prism
+		XPrism
 	},
 	props: {
 		code: {
@@ -25,6 +25,12 @@ export default Vue.extend({
 			type: Boolean,
 			required: false
 		}
+	},
+
+	computed: {
+		prismLang() {
+			return Prism.languages[this.lang] ? this.lang : 'js';
+		}
 	}
 });
 </script>
--- a/src/client/app/common/views/components/connect-failed.vue
+++ b/src/client/app/common/views/components/connect-failed.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="mk-connect-failed">
-	<img src="https://raw.githubusercontent.com/syuilo/misskey/develop/src/client/assets/error.jpg" alt=""/>
+	<img src="/assets/error.jpg" onerror="this.src='https://raw.githubusercontent.com/syuilo/misskey/develop/src/client/assets/error.jpg';" alt=""/>
 	<h1>{{ $t('title') }}</h1>
 	<p class="text">
 		<span>{{ this.$t('description').substr(0, this.$t('description').indexOf('{')) }}</span>
--- a/src/client/app/common/views/components/dialog.vue
+++ b/src/client/app/common/views/components/dialog.vue
@@ -1,6 +1,12 @@
 <template>
-<div class="felqjxyj" :class="{ splash }">
-	<div class="bg" ref="bg" @click="onBgClick"></div>
+<ui-modal
+	ref="modal"
+	class="modal"
+	:class="{ splash }"
+	:close-anime-duration="300"
+	:close-on-bg-click="false"
+	@bg-click="onBgClick"
+	@before-close="onBeforeClose">
 	<div class="main" ref="main" :class="{ round: $store.state.device.roundedCorners }">
 		<template v-if="type == 'signin'">
 			<mk-signin/>
@@ -38,7 +44,7 @@
 			</ui-horizon-group>
 		</template>
 	</div>
-</div>
+</ui-modal>
 </template>

 <script lang="ts">
@@ -120,14 +126,6 @@ export default Vue.extend({
 		if (this.user) this.canOk = false;

 		this.$nextTick(() => {
-			(this.$refs.bg as any).style.pointerEvents = 'auto';
-			anime({
-				targets: this.$refs.bg,
-				opacity: 1,
-				duration: 100,
-				easing: 'linear'
-			});
-
 			anime({
 				targets: this.$refs.main,
 				opacity: 1,
@@ -170,33 +168,27 @@ export default Vue.extend({
 			this.close();
 		},

+		onBgClick() {
+			if (this.cancelableByBgClick) this.cancel();
+		}
+
 		close() {
+			this.$refs.modal.close();
+		},
+
+		onBeforeClose() {
 			this.$el.style.pointerEvents = 'none';
-			(this.$refs.bg as any).style.pointerEvents = 'none';
 			(this.$refs.main as any).style.pointerEvents = 'none';

-			anime({
-				targets: this.$refs.bg,
-				opacity: 0,
-				duration: 300,
-				easing: 'linear'
-			});
 			anime({
 				targets: this.$refs.main,
 				opacity: 0,
 				scale: 0.8,
 				duration: 300,
 				easing: 'cubicBezier(0, 0.5, 0.5, 1)',
-				complete: () => this.destroyDom()
 			});
 		},

-		onBgClick() {
-			if (this.cancelableByBgClick) {
-				this.cancel();
-			}
-		},
-
 		onInputKeydown(e) {
 			if (e.which == 13) { // Enter
 				e.preventDefault();
@@ -209,80 +201,63 @@ export default Vue.extend({
 </script>

 <style lang="stylus" scoped>
-.felqjxyj
+.modal
 	display flex
 	align-items center
 	justify-content center
-	position fixed
-	z-index 30000
-	top 0
-	left 0
-	width 100%
-	height 100%

 	&.splash
 		> .main
 			min-width 0
 			width initial

-	> .bg
-		display block
-		position fixed
-		top 0
-		left 0
-		width 100%
-		height 100%
-		background rgba(#000, 0.7)
-		opacity 0
-		pointer-events none
+.main
+	display block
+	position fixed
+	margin auto
+	padding 32px
+	min-width 320px
+	max-width 480px
+	width calc(100% - 32px)
+	text-align center
+	background var(--face)
+	color var(--faceText)
+	opacity 0

-	> .main
-		display block
-		position fixed
-		margin auto
-		padding 32px
-		min-width 320px
-		max-width 480px
-		width calc(100% - 32px)
-		text-align center
-		background var(--face)
-		color var(--faceText)
-		opacity 0
+	&.round
+		border-radius 8px

-		&.round
-			border-radius 8px
+	> .icon
+		font-size 32px

-		> .icon
-			font-size 32px
+		&.success
+			color #85da5a

-			&.success
-				color #85da5a
+		&.error
+			color #ec4137

-			&.error
-				color #ec4137
+		&.warning
+			color #ecb637

-			&.warning
-				color #ecb637
+		> *
+			display block
+			margin 0 auto

-			> *
-				display block
-				margin 0 auto
-
-			& + header
-				margin-top 16px
-
-		> header
-			margin 0 0 8px 0
-			font-weight bold
-			font-size 20px
-
-			& + .body
-				margin-top 8px
-
-		> .body
-			margin 16px 0 0 0
-
-		> .buttons
+		& + header
 			margin-top 16px

+	> header
+		margin 0 0 8px 0
+		font-weight bold
+		font-size 20px
+
+		& + .body
+			margin-top 8px
+
+	> .body
+		margin 16px 0 0 0
+
+	> .buttons
+		margin-top 16px
+
 </style>
--- a/src/client/app/common/views/components/drive-file-thumbnail.vue
+++ b/src/client/app/common/views/components/drive-file-thumbnail.vue
@@ -57,7 +57,8 @@ export default Vue.extend({
 		},
 		fit: {
 			type: String,
-			required: true
+			required: false,
+			default: 'cover'
 		},
 		detail: {
 			type: Boolean,
--- a/src/client/app/common/views/components/emoji-picker.vue
+++ b/src/client/app/common/views/components/emoji-picker.vue
@@ -5,29 +5,52 @@
 			:title="category.text"
 			@click="go(category)"
 			:class="{ active: category.isActive }"
+			:key="category.text"
 		>
 			<fa :icon="category.icon" fixed-width/>
 		</button>
 	</header>
 	<div class="emojis">
-		<header><fa :icon="categories.find(x => x.isActive).icon" fixed-width/> {{ categories.find(x => x.isActive).text }}</header>
-		<div v-if="categories.find(x => x.isActive).name">
-			<button v-for="emoji in Object.entries(lib).filter(([k, v]) => v.category === categories.find(x => x.isActive).name)"
-				:title="emoji[0]"
-				@click="chosen(emoji[1].char)"
-				:key="emoji[0]"
-			>
-				<mk-emoji :emoji="emoji[1].char"/>
-			</button>
-		</div>
-		<div v-else>
-			<button v-for="emoji in customEmojis"
-				:title="emoji.name"
-				@click="chosen(`:${emoji.name}:`)"
-			>
-				<img :src="emoji.url" :alt="emoji.name"/>
-			</button>
-		</div>
+		<template v-if="categories[0].isActive">
+			<header class="category"><fa :icon="faHistory" fixed-width/> {{ $t('recent-emoji') }}</header>
+			<div class="list">
+				<button v-for="(emoji, i) in ($store.state.device.recentEmojis || [])"
+					:title="emoji.name"
+					@click="chosen(emoji)"
+					:key="i"
+				>
+					<mk-emoji v-if="emoji.char != null" :emoji="emoji.char"/>
+					<img v-else :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
+				</button>
+			</div>
+		</template>
+
+		<header class="category"><fa :icon="categories.find(x => x.isActive).icon" fixed-width/> {{ categories.find(x => x.isActive).text }}</header>
+		<template v-if="categories.find(x => x.isActive).name">
+			<div class="list">
+				<button v-for="emoji in emojilist.filter(e => e.category === categories.find(x => x.isActive).name)"
+					:title="emoji.name"
+					@click="chosen(emoji)"
+					:key="emoji.name"
+				>
+					<mk-emoji :emoji="emoji.char"/>
+				</button>
+			</div>
+		</template>
+		<template v-else>
+			<div v-for="(key, i) in Object.keys(customEmojis)" :key="i">
+				<header class="sub">{{ key || $t('no-category') }}</header>
+				<div class="list">
+					<button v-for="emoji in customEmojis[key]"
+						:title="emoji.name"
+						@click="chosen(emoji)"
+						:key="emoji.name"
+					>
+						<img :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
+					</button>
+				</div>
+			</div>
+		</template>
 	</div>
 </div>
 </template>
@@ -35,17 +58,21 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { lib } from 'emojilib';
-import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice } from '@fortawesome/free-solid-svg-icons';
+import { emojilist } from '../../../../../misc/emojilist';
+import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url';
+import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faHistory } from '@fortawesome/free-solid-svg-icons';
 import { faHeart, faFlag } from '@fortawesome/free-regular-svg-icons';
+import { groupByX } from '../../../../../prelude/array';

 export default Vue.extend({
 	i18n: i18n('common/views/components/emoji-picker.vue'),

 	data() {
 		return {
-			lib,
-			customEmojis: [],
+			emojilist,
+			getStaticImageUrl,
+			customEmojis: {},
+			faGlobe, faHistory,
 			categories: [{
 				text: this.$t('custom-emoji'),
 				icon: faAsterisk,
@@ -95,18 +122,43 @@ export default Vue.extend({
 	},

 	created() {
-		this.customEmojis = (this.$root.getMetaSync() || { emojis: [] }).emojis || [];
+		let local = (this.$root.getMetaSync() || { emojis: [] }).emojis || [];
+		local = groupByX(local, (x: any) => x.category || '');
+		this.customEmojis = local;
+
+		if (this.$store.state.device.activeEmojiCategoryName) {
+			this.goCategory(this.$store.state.device.activeEmojiCategoryName);
+		}
 	},

 	methods: {
-		go(category) {
+		go(category: any) {
+			this.goCategory(category.name);
+		},
+
+		goCategory(name: string) {
+			let matched = false;
 			for (const c of this.categories) {
-				c.isActive = c.name === category.name;
+				c.isActive = c.name === name;
+				if (c.isActive) {
+					matched = true;
+					this.$store.commit('device/set', { key: 'activeEmojiCategoryName', value: c.name });
+				}
+			}
+			if (!matched) {
+				this.categories[0].isActive = true;
 			}
 		},

-		chosen(emoji) {
-			this.$emit('chosen', emoji);
+		chosen(emoji: any) {
+			const getKey = (emoji: any) => emoji.char || `:${emoji.name}:`;
+
+			let recents = this.$store.state.device.recentEmojis || [];
+			recents = recents.filter((e: any) => getKey(e) !== getKey(emoji));
+			recents.unshift(emoji)
+			this.$store.commit('device/set', { key: 'recentEmojis', value: recents.splice(0, 16) });
+
+			this.$emit('chosen', getKey(emoji));
 		}
 	}
 });
@@ -140,7 +192,7 @@ export default Vue.extend({
 		overflow-y auto
 		overflow-x hidden

-		> header
+		> header.category
 			position sticky
 			top 0
 			left 0
@@ -150,7 +202,12 @@ export default Vue.extend({
 			color var(--text)
 			font-size 12px

-		> div
+		>>> header.sub
+			padding 4px 8px
+			color var(--text)
+			font-size 12px
+
+		>>> div.list
 			display grid
 			grid-template-columns 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr
 			gap 4px
@@ -178,6 +235,7 @@ export default Vue.extend({
 					left 0
 					width 100%
 					height 100%
+					object-fit contain
 					font-size 28px
 					transition transform 0.2s ease
 					pointer-events none
--- a/src/client/app/common/views/components/emoji.vue
+++ b/src/client/app/common/views/components/emoji.vue
@@ -7,10 +7,8 @@

 <script lang="ts">
 import Vue from 'vue';
-// スクリプトサイズがデカい
-//import { lib } from 'emojilib';
 import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url';
-import { twemojiBase } from '../../../../../misc/twemoji-base';
+import { twemojiSvgBase } from '../../../../../misc/twemoji-base';

 export default Vue.extend({
 	props: {
@@ -92,7 +90,7 @@ export default Vue.extend({
 			if (!codes.includes('200d')) codes = codes.filter(x => x != 'fe0f');
 			codes = codes.filter(x => x && x.length);

-			this.url = `${twemojiBase}/2/svg/${codes.join('-')}.svg`;
+			this.url = `${twemojiSvgBase}/${codes.join('-')}.svg`;
 		}
 	},
 });
--- a/src/client/app/common/views/components/frac.vue
+++ b/src/client/app/common/views/components/frac.vue
@@ -0,0 +1,49 @@
+<template>
+<span class="mk-frac"><span>{{ pad }}</span><span>{{ value }} / {{ total }}</span></span>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+
+export default Vue.extend({
+	i18n: i18n(),
+	props: {
+		value: {
+			type: Number,
+			required: true,
+		},
+		total: {
+			type: Number,
+			required: true,
+		},
+	},
+	computed: {
+		pad(this: {
+			value: number;
+			total: number;
+			length(value: number): number;
+		}) {
+			return '0'.repeat(this.length(this.total) - this.length(this.value));
+		},
+	},
+	methods: {
+		length(value: number) {
+			const string = value.toString();
+
+			return string.includes('e') ? -~string.substr(string.indexOf('e')) : string.length;
+		},
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+.mk-frac
+	-webkit-font-feature-settings 'tnum'
+	-moz-font-feature-settings 'tnum'
+	font-feature-settings 'tnum'
+	font-variant-numeric tabular-nums
+
+	> :first-child
+		visibility hidden
+</style>
--- a/src/client/app/common/views/components/image-viewer.vue
+++ b/src/client/app/common/views/components/image-viewer.vue
@@ -1,70 +1,41 @@
 <template>
-<div class="dkjvrdxtkvqrwmhfickhndpmnncsgacq">
-	<div class="bg" @click="close"></div>
-	<img :src="image.url" :alt="image.name" :title="image.name" @click="close"/>
-</div>
+<ui-modal ref="modal" v-hotkey.global="keymap">
+	<img :src="image.url" :alt="image.name" :title="image.name" @click="close" />
+</ui-modal>
 </template>

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

 export default Vue.extend({
 	props: ['image'],
-	mounted() {
-		anime({
-			targets: this.$el,
-			opacity: 1,
-			duration: 100,
-			easing: 'linear'
-		});
+	computed: {
+		keymap(): any {
+			return {
+				'esc': this.close,
+			};
+		}
 	},
 	methods: {
 		close() {
-			anime({
-				targets: this.$el,
-				opacity: 0,
-				duration: 100,
-				easing: 'linear',
-				complete: () => this.destroyDom()
-			});
+			(this.$refs.modal as any).close();
 		}
 	}
 });
 </script>

 <style lang="stylus" scoped>
-.dkjvrdxtkvqrwmhfickhndpmnncsgacq
-	display block
+img
 	position fixed
-	z-index 2048
+	z-index 2
 	top 0
+	right 0
+	bottom 0
 	left 0
-	width 100%
-	height 100%
-	opacity 0
-
-	> .bg
-		display block
-		position fixed
-		z-index 1
-		top 0
-		left 0
-		width 100%
-		height 100%
-		background rgba(#000, 0.7)
-
-	> img
-		position fixed
-		z-index 2
-		top 0
-		right 0
-		bottom 0
-		left 0
-		max-width 100%
-		max-height 100%
-		margin auto
-		cursor zoom-out
-		image-orientation from-image
+	max-width 100%
+	max-height 100%
+	margin auto
+	cursor zoom-out
+	image-orientation from-image

 </style>
--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@@ -33,6 +33,7 @@ import fileTypeIcon from './file-type-icon.vue';
 import emoji from './emoji.vue';
 import welcomeTimeline from './welcome-timeline.vue';
 import userList from './user-list.vue';
+import frac from './frac.vue';
 import uiInput from './ui/input.vue';
 import uiButton from './ui/button.vue';
 import uiHorizonGroup from './ui/horizon-group.vue';
@@ -46,6 +47,7 @@ import uiInfo from './ui/info.vue';
 import uiMargin from './ui/margin.vue';
 import uiHr from './ui/hr.vue';
 import uiPagination from './ui/pagination.vue';
+import uiModal from './ui/modal.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';

@@ -82,6 +84,7 @@ Vue.component('mk-file-type-icon', fileTypeIcon);
 Vue.component('mk-emoji', emoji);
 Vue.component('mk-welcome-timeline', welcomeTimeline);
 Vue.component('mk-user-list', userList);
+Vue.component('mk-frac', frac);
 Vue.component('ui-input', uiInput);
 Vue.component('ui-button', uiButton);
 Vue.component('ui-horizon-group', uiHorizonGroup);
@@ -95,5 +98,6 @@ Vue.component('ui-info', uiInfo);
 Vue.component('ui-margin', uiMargin);
 Vue.component('ui-hr', uiHr);
 Vue.component('ui-pagination', uiPagination);
+Vue.component('ui-modal', uiModal);
 Vue.component('form-button', formButton);
 Vue.component('form-radio', formRadio);
--- a/src/client/app/common/views/components/media-image.vue
+++ b/src/client/app/common/views/components/media-image.vue
@@ -59,9 +59,12 @@ export default Vue.extend({
 	},
 	methods: {
 		onClick() {
-			this.$root.new(ImageViewer, {
+			const viewer = this.$root.new(ImageViewer, {
 				image: this.image
 			});
+			this.$once('hook:beforeDestroy', () => {
+				viewer.close();
+			});
 		}
 	}
 });
--- a/src/client/app/common/views/components/media-list.vue
+++ b/src/client/app/common/views/components/media-list.vue
@@ -35,7 +35,8 @@ export default Vue.extend({
 	mounted() {
 		//#region for Safari bug
 		if (this.$refs.grid) {
-			this.$refs.grid.style.height = this.$refs.grid.clientHeight ? `${this.$refs.grid.clientHeight}px` : '128px';
+			this.$refs.grid.style.height = this.$refs.grid.clientHeight ? `${this.$refs.grid.clientHeight}px`
+				: this.$store.state.device.inDeckMode ? '128px' : this.$root.isMobile ? '173px' : '287px';
 		}
 		//#endregion
 	},
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@@ -139,6 +139,7 @@ export default Vue.extend({
 					cursor pointer

 			> .content
+				max-width 100%

 				> .is-deleted
 					display block
@@ -155,6 +156,7 @@ export default Vue.extend({
 					padding 8px 16px
 					overflow hidden
 					overflow-wrap break-word
+					word-break break-word
 					font-size 1em
 					color rgba(#000, 0.8)

--- a/src/client/app/common/views/components/messaging.vue
+++ b/src/client/app/common/views/components/messaging.vue
@@ -138,7 +138,7 @@ export default Vue.extend({
 			}
 			this.$root.api('users/search', {
 				query: this.q,
-				localOnly: true,
+				localOnly: false,
 				limit: 10,
 				detail: false
 			}).then(users => {
--- a/src/client/app/common/views/components/misskey-flavored-markdown.vue
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.vue
@@ -19,6 +19,7 @@ export default Vue.extend({

 	&.nowrap
 		white-space pre
+		word-wrap normal // https://codeday.me/jp/qa/20190424/690106.html

 	>>> .title
 		display block
--- a/src/client/app/common/views/components/note-menu.vue
+++ b/src/client/app/common/views/components/note-menu.vue
@@ -227,6 +227,7 @@ export default Vue.extend({
 		},

 		closed() {
+			this.$emit('closed');
 			this.$nextTick(() => {
 				this.destroyDom();
 			});
--- a/src/client/app/common/views/components/reaction-picker.vue
+++ b/src/client/app/common/views/components/reaction-picker.vue
@@ -4,16 +4,7 @@
 	<div class="popover" :class="{ isMobile: $root.isMobile }" ref="popover">
 		<p v-if="!$root.isMobile">{{ title }}</p>
 		<div class="buttons" ref="buttons" :class="{ showFocus }">
-			<button @click="react('like')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="1" :title="$t('@.reactions.like')" v-particle><mk-reaction-icon reaction="like"/></button>
-			<button @click="react('love')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="2" :title="$t('@.reactions.love')" v-particle><mk-reaction-icon reaction="love"/></button>
-			<button @click="react('laugh')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="3" :title="$t('@.reactions.laugh')" v-particle><mk-reaction-icon reaction="laugh"/></button>
-			<button @click="react('hmm')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="4" :title="$t('@.reactions.hmm')" v-particle><mk-reaction-icon reaction="hmm"/></button>
-			<button @click="react('surprise')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="5" :title="$t('@.reactions.surprise')" v-particle><mk-reaction-icon reaction="surprise"/></button>
-			<button @click="react('congrats')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="6" :title="$t('@.reactions.congrats')" v-particle><mk-reaction-icon reaction="congrats"/></button>
-			<button @click="react('angry')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="7" :title="$t('@.reactions.angry')" v-particle><mk-reaction-icon reaction="angry"/></button>
-			<button @click="react('confused')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="8" :title="$t('@.reactions.confused')" v-particle><mk-reaction-icon reaction="confused"/></button>
-			<button @click="react('rip')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="9" :title="$t('@.reactions.rip')" v-particle><mk-reaction-icon reaction="rip"/></button>
-			<button @click="react('pudding')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="10" :title="$t('@.reactions.pudding')" v-particle><mk-reaction-icon reaction="pudding"/></button>
+			<button v-for="(reaction, i) in $store.state.settings.reactions" :key="reaction" @click="react(reaction)" @mouseover="onMouseover" @mouseout="onMouseout" :tabindex="i + 1" :title="/^[a-z]+$/.test(reaction) ? $t('@.reactions.' + reaction) : reaction" v-particle><mk-reaction-icon :reaction="reaction"/></button>
 		</div>
 		<div v-if="enableEmojiReaction" class="text">
 			<input v-model="text" :placeholder="$t('input-reaction-placeholder')" @keyup.enter="reactText" @input="tryReactText" v-autocomplete="{ model: 'text' }">
--- a/src/client/app/common/views/components/reactions-viewer.details.vue
+++ b/src/client/app/common/views/components/reactions-viewer.details.vue
@@ -0,0 +1,122 @@
+<template>
+<transition name="zoom-in-top">
+	<div class="buebdbiu" ref="popover" v-if="show">
+		<i18n path="few-users" v-if="users.length <= 10">
+			<span slot="users">
+				<b v-for="u in users" :key="u.id" style="margin-right: 12px;">
+					<mk-avatar :user="u" style="width: 24px; height: 24px; margin-right: 2px;"/>
+					<mk-user-name :user="u" :nowrap="false" style="line-height: 24px;"/>
+				</b>
+			</span>
+			<mk-reaction-icon slot="reaction" :reaction="reaction" ref="icon" />
+		</i18n>
+		<i18n path="many-users" v-if="10 < users.length">
+			<span slot="users">
+				<b v-for="u in users" :key="u.id" style="margin-right: 12px;">
+					<mk-avatar :user="u" style="width: 24px; height: 24px; margin-right: 2px;"/>
+					<mk-user-name :user="u" :nowrap="false" style="line-height: 24px;"/>
+				</b>
+			</span>
+			<span slot="omitted">{{ count - 10 }}</span>
+			<mk-reaction-icon slot="reaction" :reaction="reaction" ref="icon" />
+		</i18n>
+	</div>
+</transition>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/reactions-viewer.details.vue'),
+	props: {
+		reaction: {
+			type: String,
+			required: true,
+		},
+		users: {
+			type: Array,
+			required: true,
+		},
+		count: {
+			type: Number,
+			required: true,
+		},
+		source: {
+			required: true,
+		}
+	},
+	data() {
+		return {
+			show: false
+		};
+	},
+	mounted() {
+		this.show = true;
+
+		this.$nextTick(() => {
+			const popover = this.$refs.popover as any;
+
+			if (this.source == null) {
+				this.destroyDom();
+				return;
+			}
+			const rect = this.source.getBoundingClientRect();
+
+			const x = rect.left + window.pageXOffset + (this.source.offsetWidth / 2);
+			const y = rect.top + window.pageYOffset + this.source.offsetHeight;
+			popover.style.left = (x - 28) + 'px';
+			popover.style.top = (y + 16) + 'px';
+		});
+	}
+	methods: {
+		close() {
+			this.show = false;
+			setTimeout(this.destroyDom, 300);
+		}
+	}
+})
+</script>
+
+<style lang="stylus" scoped>
+.buebdbiu
+	$bgcolor = var(--popupBg)
+	z-index 10000
+	display block
+	position absolute
+	max-width 240px
+	font-size 0.8em
+	padding 6px 8px
+	background $bgcolor
+	text-align center
+	color var(--text)
+	border-radius 4px
+	box-shadow 0 var(--lineWidth) 4px rgba(#000, 0.25)
+	pointer-events none
+	transform-origin center -16px
+
+	&:before
+		content ""
+		pointer-events none
+		display block
+		position absolute
+		top -28px
+		left 12px
+		border-top solid 14px transparent
+		border-right solid 14px transparent
+		border-bottom solid 14px rgba(#000, 0.1)
+		border-left solid 14px transparent
+
+	&:after
+		content ""
+		pointer-events none
+		display block
+		position absolute
+		top -27px
+		left 12px
+		border-top solid 14px transparent
+		border-right solid 14px transparent
+		border-bottom solid 14px $bgcolor
+		border-left solid 14px transparent
+</style>
--- a/src/client/app/common/views/components/reactions-viewer.reaction.vue
+++ b/src/client/app/common/views/components/reactions-viewer.reaction.vue
@@ -5,6 +5,9 @@
 	@click="toggleReaction(reaction)"
 	v-if="count > 0"
 	v-particle="!isMe"
+	@mouseover="onMouseover"
+	@mouseleave="onMouseleave"
+	ref="reaction"
 >
 	<mk-reaction-icon :reaction="reaction" ref="icon"/>
 	<span>{{ count }}</span>
@@ -15,6 +18,7 @@
 import Vue from 'vue';
 import Icon from './reaction-icon.vue';
 import anime from 'animejs';
+import XDetails from './reactions-viewer.details.vue';

 export default Vue.extend({
 	props: {
@@ -26,6 +30,10 @@ export default Vue.extend({
 			type: Number,
 			required: true,
 		},
+		isInitial: {
+			type: Boolean,
+			required: true,
+		},
 		note: {
 			type: Object,
 			required: true,
@@ -36,14 +44,25 @@ export default Vue.extend({
 			default: true,
 		},
 	},
+	data() {
+		return {
+			details: null,
+			detailsTimeoutId: null,
+			isHovering: false
+		};
+	},
 	computed: {
 		isMe(): boolean {
 			return this.$store.getters.isSignedIn && this.$store.state.i.id === this.note.userId;
 		},
 	},
+	mounted() {
+		if (!this.isInitial) this.anime();
+	},
 	watch: {
-		count() {
-			this.anime();
+		count(newCount, oldCount) {
+			if (oldCount < newCount) this.anime();
+			if (this.details != null) this.openDetails();
 		},
 	},
 	methods: {
@@ -70,11 +89,49 @@ export default Vue.extend({
 				});
 			}
 		},
+		onMouseover() {
+			this.isHovering = true;
+			this.detailsTimeoutId = setTimeout(this.openDetails, 300);
+		},
+		onMouseleave() {
+			this.isHovering = false;
+			clearTimeout(this.detailsTimeoutId);
+			this.closeDetails();
+		},
+		openDetails() {
+			if (this.$root.isMobile) return;
+			this.$root.api('notes/reactions', {
+				noteId: this.note.id,
+				type: this.reaction,
+				limit: 11
+			}).then((reactions: any[]) => {
+				const users = reactions
+					.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime())
+					.map(x => x.user);
+
+				this.closeDetails();
+				if (!this.isHovering) return;
+				this.details = this.$root.new(XDetails, {
+					reaction: this.reaction,
+					users,
+					count: this.count,
+					source: this.$refs.reaction
+				});
+			});
+		},
+		closeDetails() {
+			if (this.details != null) {
+				this.details.close();
+				this.details = null;
+			}
+		},
 		anime() {
 			if (this.$store.state.device.reduceMotion) return;
 			if (document.hidden) return;

 			this.$nextTick(() => {
+				if (this.$refs.icon == null) return;
+
 				const rect = this.$refs.icon.$el.getBoundingClientRect();

 				const x = rect.left;
@@ -120,6 +177,14 @@ export default Vue.extend({
 	border-radius 4px
 	cursor pointer

+	&, *
+		-webkit-touch-callout none
+		-webkit-user-select none
+		-khtml-user-select none
+		-moz-user-select none
+		-ms-user-select none
+		user-select none
+
 	*
 		user-select none
 		pointer-events none
--- a/src/client/app/common/views/components/reactions-viewer.vue
+++ b/src/client/app/common/views/components/reactions-viewer.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="mk-reactions-viewer" :class="{ isMe }">
-	<x-reaction v-for="(count, reaction) in reactions" :reaction="reaction" :count="count" :note="note" :key="reaction"/>
+	<x-reaction v-for="(count, reaction) in note.reactions" :reaction="reaction" :count="count" :is-initial="initialReactions.has(reaction)" :note="note" :key="reaction"/>
 </div>
 </template>

@@ -12,6 +12,11 @@ export default Vue.extend({
 	components: {
 		XReaction
 	},
+	data() {
+		return {
+			initialReactions: new Set(Object.keys(this.note.reactions))
+		};
+	},
 	props: {
 		note: {
 			type: Object,
@@ -19,9 +24,6 @@ export default Vue.extend({
 		},
 	},
 	computed: {
-		reactions(): any {
-			return this.note.reactions;
-		},
 		isMe(): boolean {
 			return this.$store.getters.isSignedIn && this.$store.state.i.id === this.note.userId;
 		},
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@@ -108,6 +108,13 @@
 				<ui-switch v-if="$root.isMobile" v-model="disableViaMobile">{{ $t('@._settings.disable-via-mobile') }}</ui-switch>
 			</section>

+			<section>
+				<header>{{ $t('@._settings.reactions') }}</header>
+				<ui-textarea v-model="reactions">
+					{{ $t('@._settings.reactions') }}<template #desc>{{ $t('@._settings.reactions-description') }}</template>
+				</ui-textarea>
+			</section>
+
 			<section>
 				<header>{{ $t('@._settings.timeline') }}</header>
 				<ui-switch v-model="showMyRenotes">{{ $t('@._settings.show-my-renotes') }}</ui-switch>
@@ -407,6 +414,11 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'disableViaMobile', value }); }
 		},

+		reactions: {
+			get() { return this.$store.state.settings.reactions.join('\n'); },
+			set(value: string) { this.$store.dispatch('settings/set', { key: 'reactions', value: value.trim().split('\n') }); }
+		},
+
 		useShadow: {
 			get() { return this.$store.state.device.useShadow; },
 			set(value) { this.$store.commit('device/set', { key: 'useShadow', value }); }
--- a/src/client/app/common/views/components/ui/button.vue
+++ b/src/client/app/common/views/components/ui/button.vue
@@ -64,8 +64,7 @@ export default Vue.extend({
 	methods: {
 		onMousedown(e: MouseEvent) {
 			function distance(p, q) {
-				const sqrt = Math.sqrt, pow = Math.pow;
-				return sqrt(pow(p.x - q.x, 2) + pow(p.y - q.y, 2));
+				return Math.hypot(p.x - q.x, p.y - q.y);
 			}

 			function calcCircleScale(boxW, boxH, circleCenterX, circleCenterY) {
--- a/src/client/app/common/views/components/ui/input.vue
+++ b/src/client/app/common/views/components/ui/input.vue
@@ -6,7 +6,10 @@
 			<div class="value" ref="passwordMetar"></div>
 		</div>
 		<span class="label" ref="label"><slot></slot></span>
-		<span class="title" ref="title"><slot name="title"></slot></span>
+		<span class="title" ref="title">
+			<slot name="title"></slot>
+			<span class="warning" v-if="invalid"><fa :icon="['fa', 'exclamation-circle']"/>{{ $refs.input.validationMessage }}</span>
+		</span>
 		<div class="prefix" ref="prefix"><slot name="prefix"></slot></div>
 		<template v-if="type != 'file'">
 			<input v-if="debounce" ref="input"
@@ -158,6 +161,7 @@ export default Vue.extend({
 		return {
 			v: this.value,
 			focused: false,
+			invalid: false,
 			passwordStrength: '',
 			id: Math.random().toString()
 		};
@@ -200,6 +204,8 @@ export default Vue.extend({
 				this.passwordStrength = strength > 0.7 ? 'high' : strength > 0.3 ? 'medium' : 'low';
 				(this.$refs.passwordMetar as any).style.width = `${strength * 100}%`;
 			}
+
+			this.invalid = this.$refs.input.validity.badInput;
 		}
 	},
 	mounted() {
@@ -365,6 +371,17 @@ root(fill)
 			//will-change transform
 			transform-origin top left
 			transform scale(.75)
+			white-space nowrap
+			width 133%
+			overflow hidden
+			text-overflow ellipsis
+
+			> .warning
+				margin-left 0.5em
+				color var(--infoWarnFg)
+
+				> svg
+					margin-right 0.1em

 		> input
 			display block
--- a/src/client/app/common/views/components/ui/modal.vue
+++ b/src/client/app/common/views/components/ui/modal.vue
@@ -0,0 +1,80 @@
+<template>
+<div class="modal">
+	<div class="bg" ref="bg" @click="onBgClick" />
+	<slot class="main" />
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import anime from 'animejs';
+
+export default Vue.extend({
+	props: {
+		closeOnBgClick: {
+			type: Boolean,
+			required: false,
+			default: true
+		},
+		openAnimeDuration: {
+			type: Number,
+			required: false,
+			default: 100
+		},
+		closeAnimeDuration: {
+			type: Number,
+			required: false,
+			default: 100
+		}
+	},
+	mounted() {
+		anime({
+			targets: this.$refs.bg,
+			opacity: 1,
+			duration: this.openAnimeDuration,
+			easing: 'linear'
+		});
+	},
+	methods: {
+		onBgClick() {
+			this.$emit('bg-click');
+			if (this.closeOnBgClick) this.close();
+		},
+		close() {
+			this.$emit('before-close');
+
+			anime({
+				targets: this.$refs.bg,
+				opacity: 0,
+				duration: this.closeAnimeDuration,
+				easing: 'linear',
+				complete: () => (this as any).destroyDom()
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.modal
+	position fixed
+	z-index 2048
+	top 0
+	left 0
+	width 100%
+	height 100%
+
+.bg
+	display block
+	position fixed
+	z-index 1
+	top 0
+	left 0
+	width 100%
+	height 100%
+	background rgba(#000, 0.7)
+	opacity 0
+
+.main
+	z-index 1
+</style>
--- a/src/client/app/common/views/components/ui/select.vue
+++ b/src/client/app/common/views/components/ui/select.vue
@@ -176,6 +176,9 @@ root(fill)
 			color rgba(#000, 0.54)
 			pointer-events none

+			&:empty
+				display none
+
 			> *
 				display block
 				min-width 16px
--- a/src/client/app/common/views/components/ui/switch.vue
+++ b/src/client/app/common/views/components/ui/switch.vue
@@ -49,6 +49,7 @@ export default Vue.extend({
 	},
 	methods: {
 		toggle() {
+			if (this.disabled) return;
 			this.$emit('change', !this.checked);
 		}
 	}
--- a/src/client/app/common/views/components/user-list.vue
+++ b/src/client/app/common/views/components/user-list.vue
@@ -1,5 +1,5 @@
 <template>
-<ui-container :body-togglable="true">
+<ui-container :body-togglable="true" :expanded="expanded">
 	<template #header><slot></slot></template>

 	<mk-error v-if="error" @retry="init()"/>
@@ -18,7 +18,7 @@
 				<div class="description" v-if="user.description" :title="user.description">
 					<mfm :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :plain="true" :nowrap="true"/>
 				</div>
-				<mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
+				<mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
 			</div>
 		</div>
 		<button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMore()" :disabled="moreFetching">
@@ -50,7 +50,11 @@ export default Vue.extend({
 		iconOnly: {
 			type: Boolean,
 			default: false
-		}
+		},
+		expanded: {
+			type: Boolean,
+			default: true
+		},
 	},

 	computed: {
@@ -134,7 +138,7 @@ export default Vue.extend({
 				font-size 14px
 				padding-right 40px

-			> .follow-button
+			> .koudoku-button
 				position absolute
 				top 8px
 				right 0
--- a/src/client/app/common/views/deck/deck.user-column.vue
+++ b/src/client/app/common/views/deck/deck.user-column.vue
@@ -27,7 +27,7 @@
 			<div class="description">
 				<mfm v-if="user.description" :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :key="user.id"/>
 			</div>
-			<div class="fields" v-if="user.fields">
+			<div class="fields" v-if="user.fields" :key="user.id">
 				<dl class="field" v-for="(field, i) in user.fields" :key="i">
 					<dt class="name">
 						<mfm :text="field.name" :plain="true" :custom-emojis="user.emojis"/>
@@ -112,10 +112,13 @@ export default Vue.extend({
 		},

 		menu() {
-			this.$root.new(XUserMenu, {
+			const w = this.$root.new(XUserMenu, {
 				source: this.$refs.menu,
 				user: this.user
 			});
+			this.$once('hook:beforeDestroy', () => {
+				w.destroyDom();
+			});
 		}
 	}
 });
--- a/src/client/app/common/views/directives/autocomplete.ts
+++ b/src/client/app/common/views/directives/autocomplete.ts
@@ -240,7 +240,7 @@ class Autocomplete {
 			// キャレットを戻す
 			this.vm.$nextTick(() => {
 				this.textarea.focus();
-				const pos = trimmedBefore.length + (value.startsWith(':') ? value.length : 1);
+				const pos = trimmedBefore.length + value.length;
 				this.textarea.setSelectionRange(pos, pos);
 			});
 		}
--- a/src/client/app/common/views/pages/explore.vue
+++ b/src/client/app/common/views/pages/explore.vue
@@ -1,15 +1,30 @@
 <template>
 <div>
-	<ui-container :show-header="false" v-if="meta && stats">
-		<div class="kpdsmpnk" :style="{ backgroundImage: meta.bannerUrl ? `url(${meta.bannerUrl})` : null }">
-			<div>
-				<router-link to="/explore" class="title">{{ $t('explore', { host: meta.name || 'Misskey' }) }}</router-link>
-				<span>{{ $t('users-info', { users: num(stats.originalUsersCount) }) }}</span>
-			</div>
-		</div>
-	</ui-container>
+	<div class="localfedi7" v-if="meta && stats && tag == null" :style="{ backgroundImage: meta.bannerUrl ? `url(${meta.bannerUrl})` : null }">
+		<header>{{ $t('explore', { host: meta.name || 'Misskey' }) }}</header>
+		<div>{{ $t('users-info', { users: num(stats.originalUsersCount) }) }}</div>
+	</div>

-	<ui-container :body-togglable="true" :expanded="tag == null" ref="tags">
+	<template v-if="tag == null">
+		<mk-user-list :pagination="pinnedUsers" :expanded="false">
+			<fa :icon="faBookmark" fixed-width/>{{ $t('pinned-users') }}
+		</mk-user-list>
+		<mk-user-list :pagination="popularUsers" :expanded="false">
+			<fa :icon="faChartLine" fixed-width/>{{ $t('popular-users') }}
+		</mk-user-list>
+		<mk-user-list :pagination="recentlyUpdatedUsers" :expanded="false">
+			<fa :icon="faCommentAlt" fixed-width/>{{ $t('recently-updated-users') }}
+		</mk-user-list>
+		<mk-user-list :pagination="recentlyRegisteredUsers" :expanded="false">
+			<fa :icon="faPlus" fixed-width/>{{ $t('recently-registered-users') }}
+		</mk-user-list>
+	</template>
+
+	<div class="localfedi7" v-if="tag == null" :style="{ backgroundImage: `url(/assets/fedi.jpg)` }">
+		<header>{{ $t('explore-fediverse') }}</header>
+	</div>
+
+	<ui-container :body-togglable="true" :expanded="false" ref="tags">
 		<template #header><fa :icon="faHashtag" fixed-width/>{{ $t('popular-tags') }}</template>

 		<div class="vxjfqztj">
@@ -18,25 +33,18 @@
 		</div>
 	</ui-container>

-	<mk-user-list v-if="tag != null" :pagination="tagUsers" :key="`${tag}-local`">
+	<mk-user-list v-if="tag != null" :pagination="tagUsers" :key="`${tag}`">
 		<fa :icon="faHashtag" fixed-width/>{{ tag }}
 	</mk-user-list>
-	<mk-user-list v-if="tag != null" :pagination="tagRemoteUsers" :key="`${tag}-remote`">
-		<fa :icon="faHashtag" fixed-width/>{{ tag }} ({{ $t('federated') }})
-	</mk-user-list>
-
 	<template v-if="tag == null">
-		<mk-user-list :pagination="pinnedUsers">
-			<fa :icon="faBookmark" fixed-width/>{{ $t('pinned-users') }}
-		</mk-user-list>
-		<mk-user-list :pagination="popularUsers">
+		<mk-user-list :pagination="popularUsersF" :expanded="false">
 			<fa :icon="faChartLine" fixed-width/>{{ $t('popular-users') }}
 		</mk-user-list>
-		<mk-user-list :pagination="recentlyUpdatedUsers">
+		<mk-user-list :pagination="recentlyUpdatedUsersF" :expanded="false">
 			<fa :icon="faCommentAlt" fixed-width/>{{ $t('recently-updated-users') }}
 		</mk-user-list>
-		<mk-user-list :pagination="recentlyRegisteredUsers">
-			<fa :icon="faPlus" fixed-width/>{{ $t('recently-registered-users') }}
+		<mk-user-list :pagination="recentlyRegisteredUsersF" :expanded="false">
+			<fa :icon="faRocket" fixed-width/>{{ $t('recently-discovered-users') }}
 		</mk-user-list>
 	</template>
 </div>
@@ -45,7 +53,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { faChartLine, faPlus, faHashtag } from '@fortawesome/free-solid-svg-icons';
+import { faChartLine, faPlus, faHashtag, faRocket } from '@fortawesome/free-solid-svg-icons';
 import { faBookmark, faCommentAlt } from '@fortawesome/free-regular-svg-icons';

 export default Vue.extend({
@@ -58,6 +66,12 @@ export default Vue.extend({
 		}
 	},

+	inject: {
+		inNakedDeckColumn: {
+			default: false
+		}
+	},
+
 	data() {
 		return {
 			pinnedUsers: { endpoint: 'pinned-users' },
@@ -75,12 +89,25 @@ export default Vue.extend({
 				state: 'alive',
 				sort: '+createdAt',
 			} },
+			popularUsersF: { endpoint: 'users', limit: 10, params: {
+				state: 'alive',
+				origin: 'remote',
+				sort: '+follower',
+			} },
+			recentlyUpdatedUsersF: { endpoint: 'users', limit: 10, params: {
+				origin: 'combined',
+				sort: '+updatedAt',
+			} },
+			recentlyRegisteredUsersF: { endpoint: 'users', limit: 10, params: {
+				origin: 'combined',
+				sort: '+createdAt',
+			} },
 			tagsLocal: [],
 			tagsRemote: [],
 			stats: null,
 			meta: null,
 			num: Vue.filter('number'),
-			faBookmark, faChartLine, faCommentAlt, faPlus, faHashtag
+			faBookmark, faChartLine, faCommentAlt, faPlus, faHashtag, faRocket
 		};
 	},

@@ -91,21 +118,7 @@ export default Vue.extend({
 				limit: 30,
 				params: {
 					tag: this.tag,
-					state: 'alive',
-					origin: 'local',
-					sort: '+follower',
-				}
-			};
-		},
-
-		tagRemoteUsers(): any {
-			return {
-				endpoint: 'hashtags/users',
-				limit: 30,
-				params: {
-					tag: this.tag,
-					state: 'alive',
-					origin: 'remote',
+					origin: 'combined',
 					sort: '+follower',
 				}
 			};
@@ -152,6 +165,28 @@ export default Vue.extend({
 </script>

 <style lang="stylus" scoped>
+.localfedi7
+	overflow hidden
+	background var(--face)
+	color #fff
+	text-shadow 0 0 8px #000
+	border-radius 6px
+	padding 16px
+	margin-top 16px
+	margin-bottom 16px
+	height 80px
+	background-position 50%
+	background-size cover
+	> header
+		font-size 20px
+		font-weight bold
+	> div
+		font-size 14px
+		opacity 0.8
+
+.localfedi7:first-child
+	margin-top 0
+
 .vxjfqztj
 	padding 16px

@@ -160,35 +195,4 @@ export default Vue.extend({

 		&.local
 			font-weight bold
-
-.kpdsmpnk
-	min-height 100px
-	padding 16px
-	background-position center
-	background-size cover
-
-	&:before
-		content ""
-		display block
-		position absolute
-		top 0
-		left 0
-		width 100%
-		height 100%
-		background rgba(0, 0, 0, 0.3)
-
-	> div
-		color #fff
-		text-shadow 0 0 8px #00
-
-		> .title
-			display block
-			font-size 20px
-			font-weight bold
-			color inherit
-
-		> span
-			font-size 14px
-			opacity 0.8
-
 </style>
--- a/src/client/app/common/views/pages/follow-requests.vue
+++ b/src/client/app/common/views/pages/follow-requests.vue
@@ -9,7 +9,7 @@
 						<mk-user-name :user="req.follower"/>
 					</router-link>
 					<span>
-						<a @click="accept(req.follower)">{{ $t('accept') }}</a>|<a @click="reject(req.follower)">{{ $t('reject') }}</a>
+						<a @click="accept(req.follower)">{{ $t('accept') }}</a> | <a @click="reject(req.follower)">{{ $t('reject') }}</a>
 					</span>
 				</div>
 			</sequential-entrance>
@@ -70,5 +70,6 @@ export default Vue.extend({

 	> span
 		margin 0 0 0 auto
+		color var(--text)

 </style>
--- a/src/client/app/common/views/pages/page-editor/page-editor.vue
+++ b/src/client/app/common/views/pages/page-editor/page-editor.vue
@@ -220,37 +220,48 @@ export default Vue.extend({

 	methods: {
 		save() {
+			const options = {
+				title: this.title.trim(),
+				name: this.name.trim(),
+				summary: this.summary,
+				font: this.font,
+				hideTitleWhenPinned: this.hideTitleWhenPinned,
+				alignCenter: this.alignCenter,
+				content: this.content,
+				variables: this.variables,
+				eyeCatchingImageId: this.eyeCatchingImageId,
+			};
+
+			const onError = err => {
+				if (err.id == '3d81ceae-475f-4600-b2a8-2bc116157532') {
+					if (err.info.param == 'name') {
+						this.$root.dialog({
+							type: 'error',
+							title: this.$t('title-invalid-name'),
+							text: this.$t('text-invalid-name')
+						});
+					}
+				} else if (err.code == 'NAME_ALREADY_EXISTS') {
+					this.$root.dialog({
+						type: 'error',
+						text: this.$t('name-already-exists')
+					});
+				}
+			};
+
 			if (this.pageId) {
-				this.$root.api('pages/update', {
-					pageId: this.pageId,
-					title: this.title.trim(),
-					name: this.name.trim(),
-					summary: this.summary,
-					font: this.font,
-					hideTitleWhenPinned: this.hideTitleWhenPinned,
-					alignCenter: this.alignCenter,
-					content: this.content,
-					variables: this.variables,
-					eyeCatchingImageId: this.eyeCatchingImageId,
-				}).then(page => {
+				options.pageId = this.pageId;
+				this.$root.api('pages/update', options)
+				.then(page => {
 					this.currentName = this.name.trim();
 					this.$root.dialog({
 						type: 'success',
 						text: this.$t('page-updated')
 					});
-				});
+				}).catch(onError);
 			} else {
-				this.$root.api('pages/create', {
-					title: this.title.trim(),
-					name: this.name.trim(),
-					summary: this.summary,
-					font: this.font,
-					hideTitleWhenPinned: this.hideTitleWhenPinned,
-					alignCenter: this.alignCenter,
-					content: this.content,
-					variables: this.variables,
-					eyeCatchingImageId: this.eyeCatchingImageId,
-				}).then(page => {
+				this.$root.api('pages/create', options)
+				.then(page => {
 					this.pageId = page.id;
 					this.currentName = this.name.trim();
 					this.$root.dialog({
@@ -258,7 +269,7 @@ export default Vue.extend({
 						text: this.$t('page-created')
 					});
 					this.$router.push(`/i/pages/edit/${this.pageId}`);
-				});
+				}).catch(onError);
 			}
 		},

--- a/src/client/app/common/views/pages/room/preview.vue
+++ b/src/client/app/common/views/pages/room/preview.vue
@@ -10,7 +10,8 @@ export default Vue.extend({
 	data() {
 		return {
 			selected: null,
-			objectHeight: 0
+			objectHeight: 0,
+			orbitRadius: 5
 		};
 	},

@@ -57,9 +58,9 @@ export default Vue.extend({
 			const timer = Date.now() * 0.0004;
 			requestAnimationFrame(render);
 			
-			camera.position.y = 2 + this.objectHeight / 2;
-			camera.position.z = Math.cos(timer) * 10;
-			camera.position.x = Math.sin(timer) * 10;
+			camera.position.y = Math.sin(Math.PI / 6) * this.orbitRadius;	// Math.PI / 6 => 30deg
+			camera.position.z = Math.cos(timer) * this.orbitRadius;
+			camera.position.x = Math.sin(timer) * this.orbitRadius;
 			camera.lookAt(new THREE.Vector3(0, this.objectHeight / 2, 0));
 			renderer.render(scene, camera);
 		};
@@ -89,6 +90,13 @@ export default Vue.extend({
 			});
 			const objectBoundingBox = new THREE.Box3().setFromObject(obj);
 			this.objectHeight = objectBoundingBox.max.y - objectBoundingBox.min.y;
+
+			const objectWidth = objectBoundingBox.max.x - objectBoundingBox.min.x;
+			const objectDepth = objectBoundingBox.max.z - objectBoundingBox.min.z;
+
+			const horizontal = Math.hypot(objectWidth, objectDepth) / camera.aspect;
+			this.orbitRadius = Math.max(horizontal, this.objectHeight) * camera.zoom * 0.625 / Math.tan(camera.fov * 0.5 * (Math.PI / 180));
+		
 			scene.add(obj);
 		};

--- a/src/client/app/common/views/pages/room/room.vue
+++ b/src/client/app/common/views/pages/room/room.vue
@@ -42,7 +42,8 @@
 			</label>
 		</section>
 		<section>
-			<ui-button primary @click="save()"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
+			<ui-button :primary="changed" @click="save()"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
+			<ui-button @click="clear()"><fa :icon="faBroom"/> {{ $t('clear') }}</ui-button>
 		</section>
 	</div>
 </div>
@@ -55,7 +56,7 @@ import { Room } from '../../../scripts/room/room';
 import parseAcct from '../../../../../../misc/acct/parse';
 import XPreview from './preview.vue';
 const storeItems = require('../../../scripts/room/furnitures.json5');
-import { faBoxOpen, faUndo, faArrowsAlt, faBan } from '@fortawesome/free-solid-svg-icons';
+import { faBoxOpen, faUndo, faArrowsAlt, faBan, faBroom } from '@fortawesome/free-solid-svg-icons';
 import { faSave, faTrashAlt } from '@fortawesome/free-regular-svg-icons';
 import { query as urlQuery } from '../../../../../../prelude/url';

@@ -86,11 +87,14 @@ export default Vue.extend({
 			isTranslateMode: false,
 			isRotateMode: false,
 			isMyRoom: false,
-			faBoxOpen, faSave, faTrashAlt, faUndo, faArrowsAlt, faBan,
+			changed: false,
+			faBoxOpen, faSave, faTrashAlt, faUndo, faArrowsAlt, faBan, faBroom,
 		};
 	},

 	async mounted() {
+		window.addEventListener('beforeunload', this.beforeunload);
+
 		const user = await this.$root.api('users/show', {
 			...parseAcct(this.acct)
 		});
@@ -124,11 +128,37 @@ export default Vue.extend({
 		});
 	},

+	beforeRouteLeave(to, from, next) {
+		if (this.changed) {
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('leave-confirm'),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) {
+					next(false);
+				} else {
+					next();
+				}
+			});
+		} else {
+			next();
+		}
+	},
+
 	beforeDestroy() {
 		room.destroy();
+		window.removeEventListener('beforeunload', this.beforeunload);
 	},

 	methods: {
+		beforeunload(e: BeforeUnloadEvent) {
+			if (this.changed) {
+				e.preventDefault();
+				e.returnValue = '';
+			}
+		},
+
 		async add() {
 			const { canceled, result: id } = await this.$root.dialog({
 				type: null,
@@ -142,17 +172,42 @@ export default Vue.extend({
 			});
 			if (canceled) return;
 			room.addFurniture(id);
+			this.changed = true;
 		},

 		remove() {
 			this.isTranslateMode = false;
 			this.isRotateMode = false;
 			room.removeFurniture();
+			this.changed = true;
 		},

 		save() {
 			this.$root.api('room/update', {
 				room: room.getRoomInfo()
+			}).then(() => {
+				this.changed = false;
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('saved')
+				});
+			}).catch((e: any) => {
+				this.$root.dialog({
+					type: 'error',
+					text: e.message
+				});
+			});
+		},
+
+		clear() {
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('clear-confirm'),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) return;
+				room.removeAllFurnitures();
+				this.changed = true;
 			});
 		},

@@ -162,22 +217,26 @@ export default Vue.extend({
 			}).then(file => {
 				room.updateProp(key, `/proxy/?${urlQuery({ url: file.thumbnailUrl })}`);
 				this.$refs.preview.selected(room.getSelectedObject());
+				this.changed = true;
 			});
 		},

 		updateColor(key, ev) {
 			room.updateProp(key, ev.target.value);
 			this.$refs.preview.selected(room.getSelectedObject());
+			this.changed = true;
 		},

 		updateCarpetColor(ev) {
 			room.updateCarpetColor(ev.target.value);
 			this.carpetColor = ev.target.value;
+			this.changed = true;
 		},

 		updateRoomType(type) {
 			room.changeRoomType(type);
 			this.roomType = type;
+			this.changed = true;
 		},

 		translate() {
@@ -188,6 +247,7 @@ export default Vue.extend({
 				this.isTranslateMode = true;
 				room.enterTransformMode('translate');
 			}
+			this.changed = true;
 		},

 		rotate() {
@@ -198,12 +258,14 @@ export default Vue.extend({
 				this.isRotateMode = true;
 				room.enterTransformMode('rotate');
 			}
+			this.changed = true;
 		},

 		exit() {
 			this.isTranslateMode = false;
 			this.isRotateMode = false;
 			room.exitTransformMode();
+			this.changed = true;
 		}
 	}
 });
--- a/src/client/app/common/views/widgets/broadcast.vue
+++ b/src/client/app/common/views/widgets/broadcast.vue
@@ -1,28 +1,36 @@
 <template>
 <div class="anltbovirfeutcigvwgmgxipejaeozxi">
-	<ui-container :show-header="false" :naked="props.design == 1">
+	<ui-container :show-header="false" :naked="props.design === 1">
 		<div class="anltbovirfeutcigvwgmgxipejaeozxi-body"
-			:data-found="announcements && announcements.length != 0"
+			:data-found="announcements && announcements.length !== 0"
 			:data-melt="props.design == 1"
 			:data-mobile="platform == 'mobile'"
 		>
-			<div class="icon">
-				<svg height="32" version="1.1" viewBox="0 0 32 32" width="32">
-					<path class="tower" d="M16.04,11.24c1.79,0,3.239-1.45,3.239-3.24S17.83,4.76,16.04,4.76c-1.79,0-3.24,1.45-3.24,3.24 C12.78,9.78,14.24,11.24,16.04,11.24z M16.04,13.84c-0.82,0-1.66-0.2-2.4-0.6L7.34,29.98h2.98l1.72-2h8l1.681,2H24.7L18.42,13.24 C17.66,13.64,16.859,13.84,16.04,13.84z M16.02,14.8l2.02,7.2h-4L16.02,14.8z M12.04,25.98l2-2h4l2,2H12.04z"></path>
-					<path class="wave a" d="M4.66,1.04c-0.508-0.508-1.332-0.508-1.84,0c-1.86,1.92-2.8,4.44-2.8,6.94c0,2.52,0.94,5.04,2.8,6.96 c0.5,0.52,1.32,0.52,1.82,0s0.5-1.36,0-1.88C3.28,11.66,2.6,9.82,2.6,7.98S3.28,4.3,4.64,2.9C5.157,2.391,5.166,1.56,4.66,1.04z"></path>
-					<path class="wave b" d="M9.58,12.22c0.5-0.5,0.5-1.34,0-1.84C8.94,9.72,8.62,8.86,8.62,8s0.32-1.72,0.96-2.38c0.5-0.52,0.5-1.34,0-1.84 C9.346,3.534,9.02,3.396,8.68,3.4c-0.32,0-0.66,0.12-0.9,0.38C6.64,4.94,6.08,6.48,6.08,8s0.58,3.06,1.7,4.22 C8.28,12.72,9.1,12.72,9.58,12.22z"></path>
-					<path class="wave c" d="M22.42,3.78c-0.5,0.5-0.5,1.34,0,1.84c0.641,0.66,0.96,1.52,0.96,2.38s-0.319,1.72-0.96,2.38c-0.5,0.52-0.5,1.34,0,1.84 c0.487,0.497,1.285,0.505,1.781,0.018c0.007-0.006,0.013-0.012,0.02-0.018c1.139-1.16,1.699-2.7,1.699-4.22s-0.561-3.06-1.699-4.22 c-0.494-0.497-1.297-0.5-1.794-0.007C22.424,3.775,22.422,3.778,22.42,3.78z"></path>
-					<path class="wave d" d="M29.18,1.06c-0.479-0.502-1.273-0.522-1.775-0.044c-0.016,0.015-0.029,0.029-0.045,0.044c-0.5,0.52-0.5,1.36,0,1.88 c1.361,1.4,2.041,3.24,2.041,5.08s-0.68,3.66-2.041,5.08c-0.5,0.52-0.5,1.36,0,1.88c0.509,0.508,1.332,0.508,1.841,0 c1.86-1.92,2.8-4.44,2.8-6.96C31.99,5.424,30.98,2.931,29.18,1.06z"></path>
-				</svg>
+			<div class="broadcast-left" v-show="announcements && announcements.length !== 0">
+				<div class="icon">
+					<svg height="32" version="1.1" viewBox="0 0 32 32" width="32">
+						<path class="tower" d="M16.04,11.24c1.79,0,3.239-1.45,3.239-3.24S17.83,4.76,16.04,4.76c-1.79,0-3.24,1.45-3.24,3.24 C12.78,9.78,14.24,11.24,16.04,11.24z M16.04,13.84c-0.82,0-1.66-0.2-2.4-0.6L7.34,29.98h2.98l1.72-2h8l1.681,2H24.7L18.42,13.24 C17.66,13.64,16.859,13.84,16.04,13.84z M16.02,14.8l2.02,7.2h-4L16.02,14.8z M12.04,25.98l2-2h4l2,2H12.04z"></path>
+						<path class="wave a" d="M4.66,1.04c-0.508-0.508-1.332-0.508-1.84,0c-1.86,1.92-2.8,4.44-2.8,6.94c0,2.52,0.94,5.04,2.8,6.96 c0.5,0.52,1.32,0.52,1.82,0s0.5-1.36,0-1.88C3.28,11.66,2.6,9.82,2.6,7.98S3.28,4.3,4.64,2.9C5.157,2.391,5.166,1.56,4.66,1.04z"></path>
+						<path class="wave b" d="M9.58,12.22c0.5-0.5,0.5-1.34,0-1.84C8.94,9.72,8.62,8.86,8.62,8s0.32-1.72,0.96-2.38c0.5-0.52,0.5-1.34,0-1.84 C9.346,3.534,9.02,3.396,8.68,3.4c-0.32,0-0.66,0.12-0.9,0.38C6.64,4.94,6.08,6.48,6.08,8s0.58,3.06,1.7,4.22 C8.28,12.72,9.1,12.72,9.58,12.22z"></path>
+						<path class="wave c" d="M22.42,3.78c-0.5,0.5-0.5,1.34,0,1.84c0.641,0.66,0.96,1.52,0.96,2.38s-0.319,1.72-0.96,2.38c-0.5,0.52-0.5,1.34,0,1.84 c0.487,0.497,1.285,0.505,1.781,0.018c0.007-0.006,0.013-0.012,0.02-0.018c1.139-1.16,1.699-2.7,1.699-4.22s-0.561-3.06-1.699-4.22 c-0.494-0.497-1.297-0.5-1.794-0.007C22.424,3.775,22.422,3.778,22.42,3.78z"></path>
+						<path class="wave d" d="M29.18,1.06c-0.479-0.502-1.273-0.522-1.775-0.044c-0.016,0.015-0.029,0.029-0.045,0.044c-0.5,0.52-0.5,1.36,0,1.88 c1.361,1.4,2.041,3.24,2.041,5.08s-0.68,3.66-2.041,5.08c-0.5,0.52-0.5,1.36,0,1.88c0.509,0.508,1.332,0.508,1.841,0 c1.86-1.92,2.8-4.44,2.8-6.96C31.99,5.424,30.98,2.931,29.18,1.06z"></path>
+					</svg>
+				</div>
+				<div class="broadcast-nav" v-show="announcements && announcements.length > 1">
+					<mk-frac class="broadcast-page" :value="i + 1" :total="announcements.length"/>
+					<ui-button class="broadcast-prev" @click="prev" :title="$t('next')"><fa :icon="faAngleLeft"/></ui-button>
+					<ui-button class="broadcast-next" @click="next" :title="$t('prev')"><fa :icon="faAngleRight"/></ui-button>
+				</div>
+			</div>
+			<div class="broadcast-right">
+				<p class="fetching" v-if="fetching">{{ $t('fetching') }}<mk-ellipsis/></p>
+				<h1 v-if="!fetching">{{ announcements.length == 0 ? $t('no-broadcasts') : announcements[i].title }}</h1>
+				<p v-if="!fetching">
+					<mfm v-if="announcements.length != 0" :text="announcements[i].text" :key="i"/>
+					<img v-if="announcements.length != 0 && announcements[i].image" :src="announcements[i].image" alt="" style="display: block; max-height: 130px; max-width: 100%;"/>
+					<template v-if="announcements.length == 0">{{ $t('have-a-nice-day') }}</template>
+				</p>
 			</div>
-			<p class="fetching" v-if="fetching">{{ $t('fetching') }}<mk-ellipsis/></p>
-			<h1 v-if="!fetching">{{ announcements.length == 0 ? $t('no-broadcasts') : announcements[i].title }}</h1>
-			<p v-if="!fetching">
-				<mfm v-if="announcements.length != 0" :text="announcements[i].text" :key="i"/>
-				<img v-if="announcements.length != 0 && announcements[i].image" :src="announcements[i].image" alt="" style="display: block; max-height: 130px; max-width: 100%;"/>
-				<template v-if="announcements.length == 0">{{ $t('have-a-nice-day') }}</template>
-			</p>
-			<a v-if="announcements.length > 1" @click="next">{{ $t('next') }} &gt;&gt;</a>
 		</div>
 	</ui-container>
 </div>
@@ -30,6 +38,7 @@

 <script lang="ts">
 import define from '../../../common/define-widget';
+import { faAngleLeft, faAngleRight } from '@fortawesome/free-solid-svg-icons';
 import i18n from '../../../i18n';

 export default define({
@@ -43,7 +52,8 @@ export default define({
 		return {
 			i: 0,
 			fetching: true,
-			announcements: []
+			announcements: [],
+			faAngleLeft, faAngleRight
 		};
 	},
 	mounted() {
@@ -54,14 +64,21 @@ export default define({
 	},
 	methods: {
 		next() {
-			if (this.i == this.announcements.length - 1) {
+			if (this.i === this.announcements.length - 1) {
 				this.i = 0;
 			} else {
 				this.i++;
 			}
 		},
+		prev() {
+			if (this.i === 0) {
+				this.i = this.announcements.length - 1;
+			} else {
+				this.i--;
+			}
+		},
 		func() {
-			if (this.props.design == 1) {
+			if (this.props.design === 1) {
 				this.props.design = 0;
 			} else {
 				this.props.design++;
@@ -74,82 +91,115 @@ export default define({

 <style lang="stylus" scoped>
 .anltbovirfeutcigvwgmgxipejaeozxi-body
+	display flex
 	padding 10px
 	background var(--announcementsBg)

 	&[data-melt]
 		background transparent

-	&[data-found]
-		padding-left 50px
+	> .broadcast-left
+		width 32px
+		margin-right 8px

 		> .icon
-			display block
+			> svg
+				fill currentColor
+				color var(--announcementsTitle)

-	&:after
-		content ""
-		display block
-		clear both
+				> .wave
+					opacity 1

-	> .icon
-		display none
-		float left
-		margin-left -40px
+					&.a
+						animation wave 20s ease-in-out 2.1s infinite
+					&.b
+						animation wave 20s ease-in-out 2s infinite
+					&.c
+						animation wave 20s ease-in-out 2s infinite
+					&.d
+						animation wave 20s ease-in-out 2.1s infinite

-		> svg
-			fill currentColor
-			color #4078c0
+					@keyframes wave
+						0%
+							opacity 1
+						1.5%
+							opacity 0
+						3.5%
+							opacity 0
+						5%
+							opacity 1
+						6.5%
+							opacity 0
+						8.5%
+							opacity 0
+						10%
+							opacity 1

-			> .wave
-				opacity 1
+		> .broadcast-nav
+			display flex
+			flex-wrap wrap
+			padding 1px 0 2px

-				&.a
-					animation wave 20s ease-in-out 2.1s infinite
-				&.b
-					animation wave 20s ease-in-out 2s infinite
-				&.c
-					animation wave 20s ease-in-out 2s infinite
-				&.d
-					animation wave 20s ease-in-out 2.1s infinite
+			> .broadcast-page
+				width 100%
+				color var(--announcementsTitle)
+				text-align center
+				font-size .6rem

-				@keyframes wave
-					0%
-						opacity 1
-					1.5%
-						opacity 0
-					3.5%
-						opacity 0
-					5%
-						opacity 1
-					6.5%
-						opacity 0
-					8.5%
-						opacity 0
-					10%
-						opacity 1
+			> .broadcast-prev,
+			> .broadcast-next
+				flex 1
+				width 50%
+				display block
+				margin 0
+				padding 0
+				font-size .9rem
+				line-height 1.3em
+				color var(--link)
+				background transparent
+				cursor pointer

-	> h1
-		margin 0
-		font-size 0.95em
-		font-weight normal
-		color var(--announcementsTitle)
+				&:focus
+					&:after
+						top -1px
+						right -1px
+						bottom -1px
+						left -1px

-	> p
-		display block
-		z-index 1
-		margin 0
-		font-size 0.7em
-		color var(--announcementsText)
+				&.round:focus:after
+						border-radius 5px

-		&.fetching
-			text-align center
+			> .broadcast-prev
+				padding-right 3px

-	> a
-		display block
-		font-size 0.7em
+			> .broadcast-next
+				padding-left 3px
+
+	> .broadcast-right
+		flex 1
+		word-break break-word
+
+		> h1
+			margin 0
+			font-size .975em
+			font-weight normal
+			line-height 1.3em
+			color var(--announcementsTitle)
+			padding-bottom 2px

-	&[data-mobile]
 		> p
-			color #fff
+			display block
+			z-index 1
+			margin 0
+			font-size .8em
+			color var(--announcementsText)
+			width 100%
+
+			&.fetching
+				text-align center
+
+		&[data-mobile]
+			> p
+				color #fff

 </style>
--- a/src/client/app/common/views/widgets/memo.vue
+++ b/src/client/app/common/views/widgets/memo.vue
@@ -25,7 +25,8 @@ export default define({
 	data() {
 		return {
 			text: null,
-			changed: false
+			changed: false,
+			timeoutId: null
 		};
 	},

@@ -45,6 +46,8 @@ export default define({

 		onChange() {
 			this.changed = true;
+			clearTimeout(this.timeoutId);
+			this.timeoutId = setTimeout(this.saveMemo, 1000);
 		},

 		saveMemo() {
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -9,7 +9,6 @@ import VueRouter from 'vue-router';
 import './style.styl';

 import init from '../init';
-import fuckAdBlock from '../common/scripts/fuck-ad-block';
 import composeNotification from '../common/scripts/compose-notification';

 import MkHome from './views/home/home.vue';
@@ -185,7 +184,8 @@ init(async (launch, os) => {
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },
 			{ path: '/i/drive', component: MkDrive },
 			{ path: '/i/drive/folder/:folder', component: MkDrive },
-			{ path: '/i/settings', component: MkSettings },
+			{ path: '/i/settings', redirect: '/i/settings/profile' },
+			{ path: '/i/settings/:page', component: MkSettings },
 			{ path: '/selectdrive', component: MkSelectDrive },
 			{ path: '/@:acct/room', props: true, component: () => import('../common/views/pages/room/room.vue').then(m => m.default) },
 			{ path: '/share', component: MkShare },
@@ -202,13 +202,6 @@ init(async (launch, os) => {
 	// Launch the app
 	const [app, _] = launch(router);

-	if (os.store.getters.isSignedIn) {
-		/**
-		 * Fuck AD Block
-		 */
-		fuckAdBlock(app);
-	}
-
 	/**
 	 * Init Notification
 	 */
--- a/src/client/app/desktop/views/components/drive.file.vue
+++ b/src/client/app/desktop/views/components/drive.file.vue
@@ -37,7 +37,6 @@ import i18n from '../../../i18n';
 import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
 import updateAvatar from '../../api/update-avatar';
 import updateBanner from '../../api/update-banner';
-import { appendQuery } from '../../../../../prelude/url';
 import XFileThumbnail from '../../../common/views/components/drive-file-thumbnail.vue';

 export default Vue.extend({
@@ -87,7 +86,8 @@ export default Vue.extend({
 				action: this.copyUrl
 			}, {
 				type: 'link',
-				href: appendQuery(this.file.url, 'download'),
+				href: this.file.url,
+				target: '_blank',
 				text: this.$t('contextmenu.download'),
 				icon: 'download',
 				download: this.file.name
--- a/src/client/app/desktop/views/components/media-video-dialog.vue
+++ b/src/client/app/desktop/views/components/media-video-dialog.vue
@@ -1,36 +1,28 @@
 <template>
-<div class="mk-media-video-dialog">
-	<div class="bg" @click="close"></div>
-	<video :src="video.url" :title="video.name" controls autoplay ref="video" @volumechange="volumechange"/>
-</div>
+<ui-modal v-hotkey.global="keymap">
+	<video :src="video.url" :title="video.name" controls autoplay ref="video" @volumechange="volumechange" />
+</ui-modal>
 </template>

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

 export default Vue.extend({
 	props: ['video', 'start'],
 	mounted() {
-		anime({
-			targets: this.$el,
-			opacity: 1,
-			duration: 100,
-			easing: 'linear'
-		});
 		const videoTag = this.$refs.video as HTMLVideoElement;
 		if (this.start) videoTag.currentTime = this.start
 		videoTag.volume = this.$store.state.device.mediaVolume;
 	},
+	computed: {
+		keymap(): any {
+			return {
+				'esc': this.close,
+			};
+		}
+	},
 	methods: {
 		close() {
-			anime({
-				targets: this.$el,
-				opacity: 0,
-				duration: 100,
-				easing: 'linear',
-				complete: () => this.destroyDom()
-			});
 		},
 		volumechange() {
 			const videoTag = this.$refs.video as HTMLVideoElement;
@@ -41,35 +33,15 @@ export default Vue.extend({
 </script>

 <style lang="stylus" scoped>
-.mk-media-video-dialog
-	display block
+video
 	position fixed
-	z-index 2048
+	z-index 2
 	top 0
+	right 0
+	bottom 0
 	left 0
-	width 100%
-	height 100%
-	opacity 0
-
-	> .bg
-		display block
-		position fixed
-		z-index 1
-		top 0
-		left 0
-		width 100%
-		height 100%
-		background rgba(#000, 0.7)
-
-	> video
-		position fixed
-		z-index 2
-		top 0
-		right 0
-		bottom 0
-		left 0
-		max-width 80vw
-		max-height 80vh
-		margin auto
+	max-width 80vw
+	max-height 80vh
+	margin auto

 </style>
--- a/src/client/app/desktop/views/components/media-video.vue
+++ b/src/client/app/desktop/views/components/media-video.vue
@@ -53,10 +53,13 @@ export default Vue.extend({
 				start = videoTag.currentTime
 				videoTag.pause()
 			}
-			this.$root.new(MkMediaVideoDialog, {
+			const viewer = this.$root.new(MkMediaVideoDialog, {
 				video: this.video,
 				start,
-			})
+			});
+			this.$once('hook:beforeDestroy', () => {
+				viewer.close();
+			});
 		}
 	}
 })
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@@ -10,14 +10,18 @@
 			<b>{{ $t('@.post-form.recent-tags') }}:</b>
 			<a v-for="tag in recentHashtags.slice(0, 5)" @click="addTag(tag)" :title="$t('@.post-form.click-to-tagging')">#{{ tag }}</a>
 		</div>
-		<div class="with-quote" v-if="quoteId">{{ $t('@.post-form.quote-attached') }} <a @click="quoteId = null">[x]</a></div>
-		<div v-if="visibility === 'specified'" class="visibleUsers">
-			<span v-for="u in visibleUsers">
-				<mk-user-name :user="u"/><a @click="removeVisibleUser(u)">[x]</a>
-			</span>
-			<a @click="addVisibleUser">{{ $t('@.post-form.add-visible-user') }}</a>
+		<div class="with-quote" v-if="quoteId"><fa icon="quote-left"/> {{ $t('@.post-form.quote-attached') }}<button @click="quoteId = null"><fa icon="times"/></button></div>
+		<div v-if="visibility === 'specified'" class="to-specified">
+			<fa icon="envelope"/> {{ $t('@.post-form.specified-recipient') }}
+			<div class="visibleUsers">
+				<span v-for="u in visibleUsers">
+					<mk-user-name :user="u"/>
+					<button @click="removeVisibleUser(u)"><fa icon="times"/></button>
+				</span>
+				<button @click="addVisibleUser">{{ $t('@.post-form.add-visible-user') }}</button>
+			</div>
 		</div>
-		<div class="local-only" v-if="localOnly === true">{{ $t('@.post-form.local-only-message') }}</div>
+		<div class="local-only" v-if="localOnly === true"><fa icon="heart"/> {{ $t('@.post-form.local-only-message') }}</div>
 		<input v-show="useCw" ref="cw" v-model="cw" :placeholder="$t('@.post-form.cw-placeholder')" v-autocomplete="{ model: 'cw' }">
 		<div class="textarea">
 			<textarea :class="{ with: (files.length != 0 || poll) }"
@@ -207,13 +211,37 @@ export default Vue.extend({
 			margin 0 0 8px 0
 			color var(--primary)

-		> .visibleUsers
-			margin-bottom 8px
-			font-size 14px
+			> button
+				padding 4px 8px
+				color var(--primaryAlpha04)

-			> span
-				margin-right 16px
-				color var(--primary)
+				&:hover
+					color var(--primaryAlpha06)
+
+				&:active
+					color var(--primaryDarken30)
+
+		> .to-specified
+			margin 0 0 8px 0
+			color var(--primary)
+
+			> .visibleUsers
+				display inline
+				top -1px
+				font-size 14px
+
+				> span
+					margin-left 14px
+
+					> button
+						padding 4px 8px
+						color var(--primaryAlpha04)
+
+						&:hover
+							color var(--primaryAlpha06)
+
+						&:active
+							color var(--primaryDarken30)

 		> .local-only
 			margin 0 0 8px 0
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -1,17 +1,17 @@
 <template>
 <div class="mk-settings">
 	<div class="nav" :class="{ inWindow }">
-		<p :class="{ active: page == 'profile' }" @mousedown="page = 'profile'"><fa icon="user" fixed-width/>{{ $t('@._settings.profile') }}</p>
-		<p :class="{ active: page == 'appearance' }" @mousedown="page = 'appearance'"><fa icon="palette" fixed-width/>{{ $t('@._settings.appearance') }}</p>
-		<p :class="{ active: page == 'behavior' }" @mousedown="page = 'behavior'"><fa icon="desktop" fixed-width/>{{ $t('@._settings.behavior') }}</p>
-		<p :class="{ active: page == 'notification' }" @mousedown="page = 'notification'"><fa :icon="['far', 'bell']" fixed-width/>{{ $t('@._settings.notification') }}</p>
-		<p :class="{ active: page == 'drive' }" @mousedown="page = 'drive'"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</p>
-		<p :class="{ active: page == 'hashtags' }" @mousedown="page = 'hashtags'"><fa icon="hashtag" fixed-width/>{{ $t('@._settings.tags') }}</p>
-		<p :class="{ active: page == 'muteAndBlock' }" @mousedown="page = 'muteAndBlock'"><fa icon="ban" fixed-width/>{{ $t('@._settings.mute-and-block') }}</p>
-		<p :class="{ active: page == 'apps' }" @mousedown="page = 'apps'"><fa icon="puzzle-piece" fixed-width/>{{ $t('@._settings.apps') }}</p>
-		<p :class="{ active: page == 'security' }" @mousedown="page = 'security'"><fa icon="unlock-alt" fixed-width/>{{ $t('@._settings.security') }}</p>
-		<p :class="{ active: page == 'api' }" @mousedown="page = 'api'"><fa icon="key" fixed-width/>API</p>
-		<p :class="{ active: page == 'other' }" @mousedown="page = 'other'"><fa icon="cogs" fixed-width/>{{ $t('@._settings.other') }}</p>
+		<router-link to="/i/settings/profile" active-class="active"><fa icon="user" fixed-width/>{{ $t('@._settings.profile') }}</router-link>
+		<router-link to="/i/settings/appearance" active-class="active"><fa icon="palette" fixed-width/>{{ $t('@._settings.appearance') }}</router-link>
+		<router-link to="/i/settings/behavior" active-class="active"><fa icon="desktop" fixed-width/>{{ $t('@._settings.behavior') }}</router-link>
+		<router-link to="/i/settings/notification" active-class="active"><fa :icon="['far', 'bell']" fixed-width/>{{ $t('@._settings.notification') }}</router-link>
+		<router-link to="/i/settings/drive" active-class="active"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</router-link>
+		<router-link to="/i/settings/hashtags" active-class="active"><fa icon="hashtag" fixed-width/>{{ $t('@._settings.tags') }}</router-link>
+		<router-link to="/i/settings/muteAndBlock" active-class="active"><fa icon="ban" fixed-width/>{{ $t('@._settings.mute-and-block') }}</router-link>
+		<router-link to="/i/settings/apps" active-class="active"><fa icon="puzzle-piece" fixed-width/>{{ $t('@._settings.apps') }}</router-link>
+		<router-link to="/i/settings/security" active-class="active"><fa icon="unlock-alt" fixed-width/>{{ $t('@._settings.security') }}</router-link>
+		<router-link to="/i/settings/api" active-class="active"><fa icon="key" fixed-width/>API</router-link>
+		<router-link to="/i/settings/other" active-class="active"><fa icon="cogs" fixed-width/>{{ $t('@._settings.other') }}</router-link>
 	</div>
 	<div class="pages">
 		<x-settings :page="page"/>
@@ -30,9 +30,9 @@ export default Vue.extend({
 		XSettings,
 	},
 	props: {
-		initialPage: {
+		page: {
 			type: String,
-			required: false
+			required: true,
 		},
 		inWindow: {
 			type: Boolean,
@@ -40,11 +40,6 @@ export default Vue.extend({
 			default: true
 		}
 	},
-	data() {
-		return {
-			page: this.initialPage || 'profile',
-		};
-	},
 });
 </script>

@@ -63,7 +58,7 @@ export default Vue.extend({
 		z-index 1
 		font-size 15px

-		> p
+		> a
 			display block
 			padding 10px 16px
 			margin 0
--- a/src/client/app/desktop/views/components/ui-container.vue
+++ b/src/client/app/desktop/views/components/ui-container.vue
@@ -1,9 +1,9 @@
 <template>
 <div class="kedshtep" :class="{ naked, inNakedDeckColumn, shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners }">
-	<header v-if="showHeader">
+	<header v-if="showHeader" :class="{ bodyTogglable }" @click="toggleContent(!showBody)">
 		<div class="title"><slot name="header"></slot></div>
 		<slot name="func"></slot>
-		<button v-if="bodyTogglable" @click="toggleContent(!showBody)">
+		<button v-if="bodyTogglable">
 			<template v-if="showBody"><fa icon="angle-up"/></template>
 			<template v-else><fa icon="angle-down"/></template>
 		</button>
@@ -47,6 +47,7 @@ export default Vue.extend({
 	},
 	methods: {
 		toggleContent(show: boolean) {
+			if (!this.bodyTogglable) return;
 			this.showBody = show;
 			this.$emit('toggle', show);
 		}
@@ -77,6 +78,9 @@ export default Vue.extend({
 		> header
 			background var(--faceHeader)

+			&.bodyTogglable
+				cursor pointer
+
 			> .title
 				z-index 1
 				margin 0
@@ -120,6 +124,9 @@ export default Vue.extend({
 			color var(--text)
 			background var(--deckColumnBg)

+			&.bodyTogglable
+				cursor pointer
+
 			> button
 				position absolute
 				top 0
--- a/src/client/app/desktop/views/components/user-preview.vue
+++ b/src/client/app/desktop/views/components/user-preview.vue
@@ -21,7 +21,7 @@
 				<p>{{ $t('followers') }}</p><span>{{ u.followersCount }}</span>
 			</div>
 		</div>
-		<mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/>
+		<mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/>
 	</template>
 </div>
 </template>
@@ -156,7 +156,7 @@ export default Vue.extend({
 				font-size 1em
 				color var(--primary)

-	> .follow-button
+	> .koudoku-button
 		position absolute
 		top 8px
 		right 8px
--- a/src/client/app/desktop/views/home/user/user.header.vue
+++ b/src/client/app/desktop/views/home/user/user.header.vue
@@ -25,7 +25,7 @@
 			<p v-else class="empty">{{ $t('no-description') }}</p>
 			<x-integrations :user="user" style="margin-top:16px;"/>
 		</div>
-		<div class="fields" v-if="user.fields">
+		<div class="fields" v-if="user.fields" :key="user.id">
 			<dl class="field" v-for="(field, i) in user.fields" :key="i">
 				<dt class="name">
 					<mfm :text="field.name" :plain="true" :custom-emojis="user.emojis"/>
@@ -106,10 +106,13 @@ export default Vue.extend({
 		},

 		menu() {
-			this.$root.new(XUserMenu, {
+			const w = this.$root.new(XUserMenu, {
 				source: this.$refs.menu,
 				user: this.user
 			});
+			this.$once('hook:beforeDestroy', () => {
+				w.destroyDom();
+			});
 		}
 	}
 });
--- a/src/client/app/desktop/views/pages/settings.vue
+++ b/src/client/app/desktop/views/pages/settings.vue
@@ -1,7 +1,7 @@
 <template>
 <mk-ui>
 	<main>
-		<x-settings :in-window="false"/>
+		<x-settings :in-window="false" :page="$route.params.page" />
 	</main>
 </mk-ui>
 </template>
--- a/src/client/app/mobile/script.ts
+++ b/src/client/app/mobile/script.ts
@@ -140,6 +140,7 @@ init((launch, os) => {
 		]),
 			{ path: '/signup', name: 'signup', component: MkSignup },
 			{ path: '/i/settings', name: 'settings', component: () => import('./views/pages/settings.vue').then(m => m.default) },
+			{ path: '/i/settings/:page', redirect: '/i/settings' },
 			{ path: '/i/favorites', name: 'favorites', component: UI, props: route => ({ component: () => import('../common/views/pages/favorites.vue').then(m => m.default), platform: 'mobile' }) },
 			{ path: '/i/pages', name: 'pages', component: UI, props: route => ({ component: () => import('../common/views/pages/pages.vue').then(m => m.default) }) },
 			{ path: '/i/lists', name: 'user-lists', component: UI, props: route => ({ component: () => import('../common/views/pages/user-lists.vue').then(m => m.default) }) },
--- a/src/client/app/mobile/views/components/drive.file-detail.vue
+++ b/src/client/app/mobile/views/components/drive.file-detail.vue
@@ -57,7 +57,6 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import { gcd } from '../../../../../prelude/math';
-import { appendQuery } from '../../../../../prelude/url';
 import XFileThumbnail from '../../../common/views/components/drive-file-thumbnail.vue';

 export default Vue.extend({
@@ -91,7 +90,7 @@ export default Vue.extend({
 		},

 		dlUrl(): string {
-			return appendQuery(this.file.url, 'download');
+			return this.file.url;
 		}
 	},

@@ -122,7 +121,7 @@ export default Vue.extend({
 			this.$root.api('drive/files/delete', {
 				fileId: this.file.id
 			}).then(() => {
-				this.browser.cd(this.file.folderId, true);
+				this.browser.cd(this.file.folderId);
 			});
 		},

--- a/src/client/app/mobile/views/components/drive.vue
+++ b/src/client/app/mobile/views/components/drive.vue
@@ -163,8 +163,6 @@ export default Vue.extend({
 		},

 		cd(target, silent = false) {
-			this.file = null;
-
 			if (target == null) {
 				this.goRoot(silent);
 				return;
@@ -172,6 +170,7 @@ export default Vue.extend({
 				target = target.id;
 			}

+			this.file = null;
 			this.fetching = true;

 			this.$root.api('drive/folders/show', {
@@ -244,13 +243,14 @@ export default Vue.extend({
 		},

 		goRoot(silent = false) {
-			if (this.folder || this.file) {
-				this.file = null;
-				this.folder = null;
-				this.hierarchyFolders = [];
-				this.$emit('move-root', silent);
-				this.fetch();
-			}
+			// すでにrootにいるなら何もしない
+			if (this.folder == null && this.file == null) return;
+			
+			this.file = null;
+			this.folder = null;
+			this.hierarchyFolders = [];
+			this.$emit('move-root', silent);
+			this.fetch();
 		},

 		fetch() {
--- a/src/client/app/mobile/views/components/post-form-dialog.vue
+++ b/src/client/app/mobile/views/components/post-form-dialog.vue
@@ -1,6 +1,9 @@
 <template>
-<div class="ulveipglmagnxfgvitaxyszerjwiqmwl">
-	<div class="bg" ref="bg"></div>
+<ui-modal
+	ref="modal"
+	:close-on-bg-click="false"
+	:close-anime-duration="300"
+	@before-close="onBeforeClose">
 	<div class="main" ref="main">
 		<x-post-form ref="form"
 			:reply="reply"
@@ -12,7 +15,7 @@
 			@posted="onPosted"
 			@cancel="onCanceled"/>
 	</div>
-</div>
+</ui-modal>
 </template>

 <script lang="ts">
@@ -55,14 +58,6 @@ export default Vue.extend({

 	mounted() {
 		this.$nextTick(() => {
-			(this.$refs.bg as any).style.pointerEvents = 'auto';
-			anime({
-				targets: this.$refs.bg,
-				opacity: 1,
-				duration: 100,
-				easing: 'linear'
-			});
-
 			anime({
 				targets: this.$refs.main,
 				opacity: 1,
@@ -78,26 +73,22 @@ export default Vue.extend({
 			this.$refs.form.focus();
 		},

-		close() {
-			(this.$refs.bg as any).style.pointerEvents = 'none';
-			anime({
-				targets: this.$refs.bg,
-				opacity: 0,
-				duration: 300,
-				easing: 'linear'
-			});
-
+		onBeforeClose() {
 			(this.$refs.main as any).style.pointerEvents = 'none';
+
 			anime({
 				targets: this.$refs.main,
 				opacity: 0,
 				translateY: 16,
 				duration: 300,
-				easing: 'easeOutQuad',
-				complete: () => this.destroyDom()
+				easing: 'easeOutQuad'
 			});
 		},

+		close() {
+			(this.$refs.modal as any).close();
+		},
+
 		onPosted() {
 			this.$emit('posted');
 			this.close();
@@ -112,30 +103,18 @@ export default Vue.extend({
 </script>

 <style lang="stylus" scoped>
-.ulveipglmagnxfgvitaxyszerjwiqmwl
-	> .bg
-		display block
-		position fixed
-		z-index 10000
-		top 0
-		left 0
-		width 100%
-		height 100%
-		background rgba(#000, 0.7)
-		opacity 0
-		pointer-events none

-	> .main
-		display block
-		position fixed
-		z-index 10000
-		top 0
-		left 0
-		right 0
-		height 100%
-		overflow auto
-		margin 0 auto 0 auto
-		opacity 0
-		transform translateY(-16px)
+.main
+	display block
+	position fixed
+	z-index 10000
+	top 0
+	left 0
+	right 0
+	height 100%
+	overflow auto
+	margin 0 auto 0 auto
+	opacity 0
+	transform translateY(-16px)

 </style>
--- a/src/client/app/mobile/views/components/post-form.vue
+++ b/src/client/app/mobile/views/components/post-form.vue
@@ -17,15 +17,18 @@
 		<div class="form">
 			<mk-note-preview class="preview" v-if="reply" :note="reply"/>
 			<mk-note-preview class="preview" v-if="renote" :note="renote"/>
-			<div class="with-quote" v-if="quoteId">{{ $t('@.post-form.quote-attached') }} <a @click="quoteId = null">[x]</a></div>
-			<div v-if="visibility === 'specified'" class="visibleUsers">
-				<span v-for="u in visibleUsers">
-					<mk-user-name :user="u"/>
-					<a @click="removeVisibleUser(u)">[x]</a>
-				</span>
-				<a @click="addVisibleUser">+{{ $t('@.post-form.add-visible-user') }}</a>
+			<div class="with-quote" v-if="quoteId"><fa icon="quote-left"/> {{ $t('@.post-form.quote-attached') }}<button @click="quoteId = null"><fa icon="times"/></button></div>
+			<div v-if="visibility === 'specified'" class="to-specified">
+				<fa icon="envelope"/> {{ $t('@.post-form.specified-recipient') }}
+				<div class="visibleUsers">
+					<span v-for="u in visibleUsers">
+						<mk-user-name :user="u"/>
+						<button @click="removeVisibleUser(u)"><fa icon="times"/></button>
+					</span>
+					<button @click="addVisibleUser">{{ $t('@.post-form.add-visible-user') }}</button>
+				</div>
 			</div>
-			<div class="local-only" v-if="localOnly === true">{{ $t('@.post-form.local-only-message') }}</div>
+			<div class="local-only" v-if="localOnly === true"><fa icon="heart"/> {{ $t('@.post-form.local-only-message') }}</div>
 			<input v-show="useCw" ref="cw" v-model="cw" :placeholder="$t('@.post-form.cw-placeholder')" v-autocomplete="{ model: 'cw' }">
 			<textarea v-model="text" ref="text" :disabled="posting" :placeholder="placeholder" v-autocomplete="{ model: 'text' }" @paste="onPaste"></textarea>
 			<x-post-form-attaches class="attaches" :files="files"/>
@@ -145,13 +148,37 @@ export default Vue.extend({
 				margin 0 0 8px 0
 				color var(--primary)

-			> .visibleUsers
-				margin 5px
-				font-size 14px
+				> button
+					padding 4px 8px
+					color var(--primaryAlpha04)

-				> span
-					margin-right 16px
-					color var(--text)
+					&:hover
+						color var(--primaryAlpha06)
+
+					&:active
+						color var(--primaryDarken30)
+
+			> .to-specified
+				margin 0 0 8px 0
+				color var(--primary)
+
+				> .visibleUsers
+					display inline
+					top -1px
+					font-size 14px
+
+					> span
+						margin-left 14px
+
+						> button
+							padding 4px 8px
+							color var(--primaryAlpha04)
+
+							&:hover
+								color var(--primaryAlpha06)
+
+							&:active
+								color var(--primaryDarken30)

 			> .local-only
 				margin 0 0 8px 0
--- a/src/client/app/mobile/views/components/ui-container.vue
+++ b/src/client/app/mobile/views/components/ui-container.vue
@@ -1,9 +1,9 @@
 <template>
 <div class="ukygtjoj" :class="{ naked, inNakedDeckColumn, hideHeader: !showHeader, shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners }">
-	<header v-if="showHeader">
+	<header v-if="showHeader" @click="() => showBody = !showBody">
 		<div class="title"><slot name="header"></slot></div>
 		<slot name="func"></slot>
-		<button v-if="bodyTogglable" @click="() => showBody = !showBody">
+		<button v-if="bodyTogglable">
 			<template v-if="showBody"><fa icon="angle-up"/></template>
 			<template v-else><fa icon="angle-down"/></template>
 		</button>
@@ -47,6 +47,7 @@ export default Vue.extend({
 	},
 	methods: {
 		toggleContent(show: boolean) {
+			if (!this.bodyTogglable) return;
 			this.showBody = show;
 		}
 	}
--- a/src/client/app/mobile/views/pages/user/index.vue
+++ b/src/client/app/mobile/views/pages/user/index.vue
@@ -25,7 +25,7 @@
 					<mfm v-if="user.description" :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :key="user.id"/>
 					<x-integrations :user="user" style="margin:20px 0;"/>
 				</div>
-				<div class="fields" v-if="user.fields">
+				<div class="fields" v-if="user.fields" :key="user.id">
 					<dl class="field" v-for="(field, i) in user.fields" :key="i">
 						<dt class="name">
 							<mfm :text="field.name" :plain="true" :custom-emojis="user.emojis"/>
--- a/src/client/app/reset.styl
+++ b/src/client/app/reset.styl
@@ -23,6 +23,7 @@ button
 	border none
 	cursor pointer
 	color inherit
+	touch-action manipulation

 	*
 		pointer-events none
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -41,6 +41,7 @@ const defaultSettings = {
 	uploadFolder: null,
 	pastedFileName: 'yyyy-MM-dd HH-mm-ss [{{number}}]',
 	pasteDialog: false,
+	reactions: ['like', 'love', 'laugh', 'hmm', 'surprise', 'congrats', 'angry', 'confused', 'rip', 'pudding']
 };

 const defaultDeviceSettings = {
@@ -78,6 +79,8 @@ const defaultDeviceSettings = {
 	enableMobileQuickNotificationView: false,
 	roomGraphicsQuality: 'medium',
 	roomUseOrthographicCamera: true,
+	activeEmojiCategoryName: undefined,
+	recentEmojis: [],
 };

 export default (os: MiOS) => new Vuex.Store({
--- a/src/client/app/sw.js
+++ b/src/client/app/sw.js
@@ -4,13 +4,53 @@

 import composeNotification from './common/scripts/compose-notification';

+// eslint-disable-next-line no-undef
+const version = _VERSION_;
+const cacheName = `mk-cache-${version}`;
+
+const apiUrl = `${location.origin}/api/`;
+
 // インストールされたとき
 self.addEventListener('install', ev => {
 	console.info('installed');

-	ev.waitUntil(Promise.all([
-		self.skipWaiting(), // Force activate
-	]));
+  ev.waitUntil(
+		caches.open(cacheName)
+			.then(cache => {
+				return cache.addAll([
+					"/",
+					`/assets/desktop.${version}.js`,
+					`/assets/mobile.${version}.js`,
+					"/assets/error.jpg"
+				]);
+			})
+			.then(() => self.skipWaiting())
+  );
+});
+
+self.addEventListener('activate', ev => {
+	ev.waitUntil(
+		caches.keys()
+			.then(cacheNames => Promise.all(
+				cacheNames
+					.filter((v) => v !== cacheName)
+					.map(name => caches.delete(name))
+			))
+			.then(() => self.clients.claim())
+	);
+});
+
+self.addEventListener('fetch', ev => {
+	if (ev.request.method !== 'GET' || ev.request.url.startsWith(apiUrl)) return;
+	ev.respondWith(
+		caches.match(ev.request)
+			.then(response => {
+				return response || fetch(ev.request);
+			})
+			.catch(() => {
+				return caches.match("/");
+			})
+	);
 });

 // プッシュ通知を受け取ったとき
--- a/src/client/assets/fedi.jpg
+++ b/src/client/assets/fedi.jpg
--- a/src/client/assets/room/furnitures/bin/bin.blend
+++ b/src/client/assets/room/furnitures/bin/bin.blend
--- a/src/client/assets/room/furnitures/bin/bin.glb
+++ b/src/client/assets/room/furnitures/bin/bin.glb
--- a/Show More
+++ b/Show More