12.59.0

New Crowdin updates (#6841 )
* New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Arabic) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (English) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (English) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (French)
2020-11-18 13:06:32 +09:00 · 2020-11-18 12:40:40 +09:00 · 2020-11-18 12:19:11 +09:00 · 2020-11-18 12:09:14 +09:00 · 2020-11-18 11:21:35 +09:00 · 2020-11-17 22:52:07 +09:00
631 changed files with 36557 additions and 18237 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -15,7 +15,8 @@ jobs:
    executor: docker
    steps:
      - checkout
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: 19.03.13
      - run:
          name: Build
          command: |
--- a/.config/example.yml
+++ b/.config/example.yml
@ -154,3 +154,6 @@ id: 'aid'

 # Media Proxy
 #mediaProxy: https://example.com/proxy
+
+# Sign to ActivityPub GET request (default: false)
+#signToActivityPubGet: true
--- a/.dockerignore
+++ b/.dockerignore
@ -5,8 +5,10 @@
 .vscode
 Dockerfile
 build/
+built/
 db/
 docker-compose.yml
 elasticsearch/
 node_modules/
 redis/
+files/
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@ -12,7 +12,7 @@ jobs:

    strategy:
      matrix:
-        node-version: [12.x, 14.x]
+        node-version: [12.x, 14.x, 15.x]

    services:
      postgres:
--- a/.gitignore
+++ b/.gitignore
@ -12,7 +12,7 @@ report.*.json
 # config
 /.config/*
 !/.config/example.yml
-!/.config/mongo_initdb_example.js
+!/.config/docker_example.env

 # misskey
 /build
--- a/.node-version
+++ b/.node-version
@ -1 +1 @@
-v12.11.1
+v14.15.0
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,6 +1,12 @@
 # Contribution guide
 :v: Thanks for your contributions :v:

+## When you contribute...
+- 任意のIssueについて、せっかく実装してくださっても、実装方法や設計の認識が揃ってないとマージできない/しないことになりかねないので、初めにそのIssue上で着手することを宣言し、必要に応じて他メンバーと実装方法や設計のすり合わせを行ってください。宣言することは作業が他の人と被るのを防止する効果もあります。
+  - 設計に迷った時はプロジェクトリーダーの判断を仰いでください。
+- 時間や優先度の都合上、提出してくださったPRが長期間放置されることもありますがご理解ください。
+  - 温度感高めで見てほしいものは責付いてください。
+
 ## Issues
 Feature suggestions and bug reports are filed in https://github.com/syuilo/misskey/issues .

--- a/5
+++ b/5
@ -1,9 +1,7 @@
-FROM node:14.2.0-alpine AS base
+FROM node:14.15.0-alpine AS base

 ENV NODE_ENV=production

-RUN npm i -g npm@latest
-
 WORKDIR /misskey

 FROM base AS builder
@ -12,6 +10,7 @@ RUN apk add --no-cache \
    autoconf \
    automake \
    file \
+		git \
    g++ \
    gcc \
    libc-dev \
--- a/README.md
+++ b/README.md
@ -6,8 +6,9 @@
 [![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/syuilo/misskey)
 [![Dependencies](https://img.shields.io/david/syuilo/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/syuilo/misskey)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge&logo=github)](http://makeapullrequest.com)
+[![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)

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

 <p align="justify">
 <a href="https://join.misskey.page/">Misskey</a> is a decentralized microblogging platform born on Earth.
@ -112,7 +113,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><img src="https://c8.patreon.com/2/200/20832595" alt="Roujo " width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/27956229" alt="Oliver Maximilian Seidel" 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/605366/c9dc408fdcbf412fb183ca5b06235f8d/1.jpeg?token-time=2145916800&token-hash=oaqsjLqOFjWN5I9hm2epOaTXaEtKwQUy5OW-EpAz6-g%3D" alt="Jon Leibowitz" 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/27648259" alt="みなしま " width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/24430516/b1964ac5b9f746d2a12ff53dbc9aa40a/1.jpg?token-time=2145916800&token-hash=bmEiMGYpp3bS7hCCbymjGGsHBZM3AXuBOFO3Kro37PU%3D" alt="Eduardo Quiros" width="100"></td>
@ -120,7 +120,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=20832595">Roujo </a></td>
 <td><a href="https://www.patreon.com/user?u=27956229">Oliver Maximilian Seidel</a></td>
 <td><a href="https://www.patreon.com/weepjp">weepjp </a></td>
-<td><a href="https://www.patreon.com/jonleibowitz">Jon Leibowitz</a></td>
 <td><a href="https://www.patreon.com/user?u=19045173">kiritan </a></td>
 <td><a href="https://www.patreon.com/user?u=27648259">みなしま </a></td>
 <td><a href="https://www.patreon.com/user?u=24430516">Eduardo Quiros</a></td>
@ -132,10 +131,9 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <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/23915207/25428766ecd745478e600b3d7f871eb2/1.png?token-time=2145916800&token-hash=urCLLA4KjJZX92Y1CxcBP4d8bVTHGkiaPnQZp-Tqz68%3D" alt="kabo2468y " width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/8249688/4aacf36b6b244ab1bc6653591b6640df/2.png?token-time=2145916800&token-hash=1ZEf2w6L34253cZXS_HlVevLEENWS9QqrnxGUAYblPo%3D" alt="AureoleArk " width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/21285325" alt="Nie(sha) " width="100"></td>
 <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/36813045/29876ea679d443bcbba3c3f16edab8c2/2.jpeg?token-time=2145916800&token-hash=YCKWnIhrV9rjUCV9KqtJnEqjy_uGYF3WMXftjUdpi7o%3D" alt="Wataru Manji (manji0)" width="100"></td>
 </tr><tr>
 <td><a href="https://www.patreon.com/Nesakko">Nesakko</a></td>
 <td><a href="https://www.patreon.com/user?u=776209">Demogrognard</a></td>
@ -143,72 +141,75 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=557245">mkatze </a></td>
 <td><a href="https://www.patreon.com/user?u=23915207">kabo2468y </a></td>
 <td><a href="https://www.patreon.com/AureoleArk">AureoleArk </a></td>
-<td><a href="https://www.patreon.com/user?u=21285325">Nie(sha) </a></td>
 <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/user?u=36813045">Wataru Manji (manji0)</a></td>
 </tr></table>
 <table><tr>
+<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/28779508/3cd4cb7f017f4ee0864341e3464d42f9/1.png?token-time=2145916800&token-hash=eGQtR15be44kgvh8fw2Jx8Db4Bv15YBp2ldxh0EKRxA%3D" alt="S Y" 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/38837364/9421361c54c645ac8f5fc442a40c32e9/1.png?token-time=2145916800&token-hash=TUZB48Nem3BeUPLBH6s3P6WyKBnQOy0xKaDSTBBUNzA%3D" alt="xianon" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/26340354/08834cf767b3449e93098ef73a434e2f/2.png?token-time=2145916800&token-hash=nyM8DnKRL8hR47HQ619mUzsqVRpkWZjgtgBU9RY15Uc%3D" alt="totokoro " 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>
-<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>
 </tr><tr>
+<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/user?u=28779508">S Y</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=38837364">xianon</a></td>
 <td><a href="https://www.patreon.com/user?u=26340354">totokoro </a></td>
-<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>
 </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/20494440/540beaf2445f408ea6597bc61e077bb3/1.png?token-time=2145916800&token-hash=UJ0JQge64Bx9XmN_qYA1inMQhrWf4U91fqz7VAKJeSg%3D" alt="axtuki1 " 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.jpg?token-time=2145916800&token-hash=nVAntpybQrznE0rg05keLrSE6ogPKJXB13rmrJng42c%3D" alt="takimura " width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13100201/fc5be4fa90444f09a9c8a06f72385272/1.png?token-time=2145916800&token-hash=i8PjlgfOB2LPEdbtWyx8ZPsBKhGcNZqcw_FQmH71UGU%3D" alt="aqz tamaina" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/28295158/cd2451bfb94a449dbf705ef4718cd355/2.jpeg?token-time=2145916800&token-hash=MRv3BxufHPuCyiBSxU5UYmLGvD6YZlhtSFRfMWg2k4U%3D" alt="012 " width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/9109588/e3cffc48d20a4e43afe04123e696781d/3.png?token-time=2145916800&token-hash=T_VIUA0IFIbleZv4pIjiszZGnQonwn34sLCYFIhakBo%3D" alt="nafuchoco " 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/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/26144593/9514b10a5c1b42a3af58621aee213d1d/1.png?token-time=2145916800&token-hash=v1PYRsjzu4c_mndN4Hvi_dlispZJsuGRCQeNS82pUSM%3D" alt="EBISUME" 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.jpg?token-time=2145916800&token-hash=7bkMqTwHPRsJPGAq42PYdDXDZBVGLqdgr1ZmBxX8GFQ%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=20494440">axtuki1 </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/aqz">aqz tamaina</a></td>
-<td><a href="https://www.patreon.com/user?u=28295158">012 </a></td>
-<td><a href="https://www.patreon.com/nijimiss">nafuchoco </a></td>
+<td><a href="https://www.patreon.com/user?u=9109588">nafuchoco </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/user?u=4389829">natalie</a></td>
 <td><a href="https://www.patreon.com/user?u=26144593">EBISUME</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/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.jpg?token-time=2145916800&token-hash=7bkMqTwHPRsJPGAq42PYdDXDZBVGLqdgr1ZmBxX8GFQ%3D" alt="Hekovic " width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/24641572/b4fd175424814f15b0ca9178d2d2d2e4/1.png?token-time=2145916800&token-hash=e2fyqdbuJbpCckHcwux7rbuW6OPkKdERcus0u2wIEWU%3D" alt="uroco @99" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/14661394" alt="Chandler " 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/9481273/7fa89168e72943859c3d3c96e424ed31/4.jpeg?token-time=2145916800&token-hash=5w1QV1qXe-NdWbdFmp1H7O_-QBsSiV0haumk3XTHIEg%3D" alt="Efertone " 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/Corset">CG </a></td>
+<td><a href="https://www.patreon.com/hekovic">Hekovic </a></td>
 <td><a href="https://www.patreon.com/user?u=24641572">uroco @99</a></td>
+<td><a href="https://www.patreon.com/user?u=14661394">Chandler </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/efertone">Efertone </a></td>
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>

-**Last updated:** Tue, 02 Jun 2020 00:00:08 UTC
+**Last updated:** Sun, 26 Jul 2020 07:00:10 UTC
 <!-- PATREON_END -->

 [backer-url]: #backers
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -13,6 +13,8 @@ services:
    networks:
      - internal_network
      - external_network
+    volumes:
+      - ./files:/misskey/files

  redis:
    restart: always
--- a/docs/README.md
+++ b/docs/README.md
@ -4,3 +4,30 @@ Docs for users are located in `src/docs`.

 これらのドキュメントはMisskeyの開発者またはMisskeyインスタンス運営者向けです。
 利用者向けのドキュメントは`src/docs`にあります。
+
+这些文档是为 Misskey 的贡献者，或是 Misskey 实例的管理者准备的。
+为用户准备的文档放置在 `src/docs` 文件夹中。
+
+## 日本語版
+
+- [Misskey構築の手引き](./setup.ja.md)
+- [運営ガイド](./manage.ja.md)
+- [Dockerを使ったMisskey構築方法](./docker.ja.md)
+
+## English Version
+
+- [Misskey Setup and Installation Guide](./setup.en.md)
+- [Management guide](./manage.en.md)
+- [Docker Guide](./docker.en.md)
+
+## Française Version
+
+- [Guide d'installation et de configuration de Misskey](./setup.fr.md)
+- [Guide d'administration](./manage.fr.md)
+- [Guide Docker](./docker.fr.md)
+
+## 简体中文版
+
+- [Misskey 设置和安装指南](./setup.zh.md)
+- [运营指南](./manage.zh.md)
+- [Docker 部署指南](./docker.zh.md)
--- a/docs/docker.en.md
+++ b/docs/docker.en.md
@ -3,7 +3,8 @@ Docker Guide

 This guide describes how to install and setup Misskey with Docker.

-[Japanese version also available - 日本語版もあります](./docker.ja.md)
+- [Japanese version also available - 日本語版もあります](./docker.ja.md)
+- [Simplified Chinese version also available - 简体中文版同样可用](./docker.zh.md)

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

--- a/docs/docker.fr.md
+++ b/docs/docker.fr.md
@ -3,8 +3,9 @@ Guide Docker

 Ce guide explique comment installer et configurer Misskey avec Docker.

-[Version japonaise également disponible - Japanese version also available - 日本語版もあります](./docker.ja.md)  
-[Version anglaise également disponible - English version also available - 英語版もあります](./docker.en.md)
+- [Version japonaise également disponible - Japanese version also available - 日本語版もあります](./docker.ja.md)  
+- [Version anglaise également disponible - English version also available - 英語版もあります](./docker.en.md)
+- [Version Chinois simplifié également disponible - Simplified Chinese version also available - 简体中文版同样可用](./docker.zh.md)

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

--- a/docs/docker.ja.md
+++ b/docs/docker.ja.md
@ -3,7 +3,8 @@ Dockerを使ったMisskey構築方法

 このガイドはDockerを使ったMisskeyセットアップ方法について解説します。

-[英語版もあります - English version also available](./docker.en.md)
+- [英語版もあります - English version also available](./docker.en.md)
+- [简体中文版同样可用 - Simplified Chinese version also available](./docker.zh.md)

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

--- a/docs/docker.zh.md
+++ b/docs/docker.zh.md
@ -0,0 +1,96 @@
+Docker 部署指南
+================================================================
+
+这份指南描述了如何使用Docker安装并设置 Misskey 。
+
+- [日本語版もあります - Japanese version also available](./docker.ja.md)
+- [英語版もあります - English version also available](./docker.en.md)
+
+----------------------------------------------------------------
+
+*1.* 下载 Misskey
+----------------------------------------------------------------
+1. 克隆 Misskey 项目的 master 分支。
+
+	`git clone -b master git://github.com/syuilo/misskey.git`
+
+2. 进入 misskey 文件夹。
+
+	`cd misskey`
+
+3. 检查 [最新发布版](https://github.com/syuilo/misskey/releases/latest) 标签。
+
+	`git checkout master`
+
+*2.* 配置 Misskey
+----------------------------------------------------------------
+
+可以按照如下方式创建配置文件：
+
+``` bash
+cd .config
+cp example.yml default.yml
+cp docker_example.env docker.env
+```
+
+### `default.yml`
+
+这个文件的编辑工作基本与非 Docker 环境的版本相同。
+但请注意， Postgresql、 Redis 和 Elasticsearch 的 **主机名(hostname)** 配置不应该是 `localhost` ，它们被设置在 `docker-compose.yml` 文件中。
+以下是默认的主机名：
+
+| 服务          | 主机名   |
+|---------------|----------|
+| Postgresql    | `db`     |
+| Redis         | `redis`  |
+| Elasticsearch | `es`     |
+
+### `docker.env`
+
+在这个文件中配置 Postgresql 。
+至少需要如下这些配置：
+
+| 名称                |  描述         |
+|---------------------|---------------|
+| `POSTGRES_PASSWORD` |  数据库密码   |
+| `POSTGRES_USER`     |  数据库用户名 |
+| `POSTGRES_DB`       |  数据库名     |
+
+*3.* 配置 Docker
+----------------------------------------------------------------
+编辑 `docker-compose.yml` 文件。
+
+*4.* 构建 Misskey
+----------------------------------------------------------------
+使用如下的方式构建Misskey：
+
+`docker-compose build`
+
+*5.* 初始化数据库
+----------------------------------------------------------------
+``` bash
+docker-compose run --rm web yarn run init
+```
+
+*6.* 完成了！
+----------------------------------------------------------------
+干得不错！现在您拥有了一个可以运行Misskey的环境啦。
+
+### 正常启动
+只需要 `docker-compose up -d` 即可。玩得愉快!
+
+### 如何将您的 Misskey 服务器升级至最新版本
+1. `git stash`
+2. `git checkout master`
+3. `git pull`
+4. `git stash pop`
+5. `docker-compose build`
+6. 检查 [更新日志](../CHANGELOG.md) 以获取升级迁移信息。
+7. `docker-compose stop && docker-compose up -d`
+
+### 如何执行 [控制台指令](manage.zh.md):
+`docker-compose run --rm web node built/tools/mark-admin @example`
+
+----------------------------------------------------------------
+
+如果您有任何疑问或是困惑，欢迎与我们联系！
--- a/docs/examples/misskey.nginx
+++ b/docs/examples/misskey.nginx
@ -53,7 +53,6 @@ server {
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto https;
-        proxy_set_header Accept-Encoding "";
        proxy_http_version 1.1;
        proxy_redirect off;

--- a/docs/manage.zh.md
+++ b/docs/manage.zh.md
@ -0,0 +1,14 @@
+# 运营指南
+
+## 检查任务队列的状态
+即将到来……
+
+## 设置用户为管理员
+``` shell
+node built/tools/mark-admin (用户名)
+```
+
+样例
+``` shell
+node built/tools/mark-admin @syuilo
+```
--- a/docs/setup.en.md
+++ b/docs/setup.en.md
@ -4,7 +4,8 @@ Misskey Setup and Installation Guide
 We thank you for your interest in setting up your Misskey server!
 This guide describes how to install and setup Misskey.

-[Japanese version also available - 日本語版もあります](./setup.ja.md)
+- [Japanese version also available - 日本語版もあります](./setup.ja.md)
+- [Simplified Chinese version also available - 简体中文版同样可用](./setup.zh.md)

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

--- a/docs/setup.fr.md
+++ b/docs/setup.fr.md
@ -4,7 +4,9 @@ Guide d'installation et de configuration de Misskey
 Nous vous remerçions de l'intrêt que vous manifestez pour l'installation de votre propre instance Misskey !
 Ce guide décrit les étapes à suivre afin d'installer et de configurer une instance Misskey.

-[La version en japonnais est également disponible sur - 日本語版もあります](./setup.ja.md)
+- [La version en japonnais est également disponible sur - 日本語版もあります](./setup.ja.md)
+- [Version anglaise également disponible - English version also available - 英語版もあります](./setup.en.md)
+- [Version Chinois simplifié également disponible - Simplified Chinese version also available - 简体中文版同样可用](./setup.zh.md)

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

--- a/docs/setup.ja.md
+++ b/docs/setup.ja.md
@ -4,7 +4,8 @@ Misskey構築の手引き
 Misskeyサーバーの構築にご関心をお寄せいただきありがとうございます！
 このガイドではMisskeyのインストール・セットアップ方法について解説します。

-[英語版もあります - English version also available](./setup.en.md)
+- [英語版もあります - English version also available](./setup.en.md)
+- [简体中文版同样可用 - Simplified Chinese version also available](./setup.zh.md)

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

--- a/docs/setup.zh.md
+++ b/docs/setup.zh.md
@ -0,0 +1,146 @@
+Misskey 设置和安装指南
+================================================================
+
+非常感谢您对构建 Misskey 服务器的关注！
+这份指南描述了 Misskey 的安装与设置流程。
+
+- [日本語版もあります - Japanese version also available](./setup.ja.md)
+- [英語版もあります - English version also available](./setup.en.md)
+
+----------------------------------------------------------------
+
+*1.* 创建 Misskey 用户
+----------------------------------------------------------------
+直接使用 root 用户来运行 misskey 也许并不是一个好主意，因此我们有必要创建一个专用的用户。
+以 Debian 为例：
+
+``` bash
+adduser --disabled-password --disabled-login misskey
+```
+
+*2.* 安装依赖
+----------------------------------------------------------------
+请安装并设置如下这些软件：
+
+#### Dependencies :package:
+* **[Node.js](https://nodejs.org/en/)** (12.x, 14.x)
+* **[PostgreSQL](https://www.postgresql.org/)** (>= 10)
+* **[Redis](https://redis.io/)**
+
+##### Optional
+* [Yarn](https://yarnpkg.com/) *可选，但出于安全因素考虑还是推荐安装。如果您没有安装, 您需要使用 `npx yarn` 来代替 `yarn`.*
+* [Elasticsearch](https://www.elastic.co/) - 为了启用搜索功能，这个搜索引擎是有必要的。
+* [FFmpeg](https://www.ffmpeg.org/)
+
+*3.* 安装 Misskey
+----------------------------------------------------------------
+1. 连接至 misskey 用户.
+
+	`su - misskey`
+
+2. 克隆 Misskey 项目的 master 分支。
+
+	`git clone -b master git://github.com/syuilo/misskey.git`
+
+3. 进入 misskey 文件夹。
+
+	`cd misskey`
+
+4. 检查 [最新发布版](https://github.com/syuilo/misskey/releases/latest) 标签。
+
+	`git checkout master`
+
+5. 安装 Misskey 的依赖。
+
+	`yarn`
+
+*4.* 配置 Misskey
+----------------------------------------------------------------
+1. 复制 `.config/example.yml` 并重命名为 `default.yml`。
+
+	`cp .config/example.yml .config/default.yml`
+
+2. 编辑 `default.yml`
+
+*5.* 构建 Misskey
+----------------------------------------------------------------
+
+使用如下的指令构建 Misskey ：
+
+`NODE_ENV=production yarn build`
+
+如果您使用的是 Debian ， 您需要安装 `build-essential`, `python` 环境包。
+
+如果您仍然遇到有关某些模块的错误，您可以使用 node-gyp:
+
+1. `npx node-gyp configure`
+2. `npx node-gyp build`
+3. `NODE_ENV=production yarn build`
+
+*6.* 初始化数据库
+----------------------------------------------------------------
+``` bash
+yarn run init
+```
+
+*7.* 完成了！
+----------------------------------------------------------------
+干得不错！现在您拥有了一个可以运行Misskey的环境啦。
+
+### 正常启动
+只需要 `NODE_ENV=production npm start` 即可。玩得愉快!
+
+### 使用 systemd 来启动
+
+1. 在此处创建一个 systemd 服务：
+
+	`/etc/systemd/system/misskey.service`
+
+2. 编辑它，粘贴如下内容并保存：
+
+	```
+	[Unit]
+	Description=Misskey daemon
+
+	[Service]
+	Type=simple
+	User=misskey
+	ExecStart=/usr/bin/npm start
+	WorkingDirectory=/home/misskey/misskey
+	Environment="NODE_ENV=production"
+	TimeoutSec=60
+	StandardOutput=syslog
+	StandardError=syslog
+	SyslogIdentifier=misskey
+	Restart=always
+
+	[Install]
+	WantedBy=multi-user.target
+	```
+
+3. 重启 systemd 并设置 misskey 服务自动启动：
+
+	`systemctl daemon-reload ; systemctl enable misskey`
+
+4. 启动 misskey 服务：
+
+	`systemctl start misskey`
+
+您可以使用 `systemctl status misskey` 来检查服务是否正在运行。
+
+### 如何将您的 Misskey 服务器升级至最新版本
+1. `git checkout master`
+2. `git pull`
+3. `yarn install`
+4. `NODE_ENV=production yarn build`
+5. `yarn migrate`
+6. 重启您的 Misskey 进程来应用改变。
+7. 尽情享受吧！
+
+如果您在更新时遇到任何问题，请尝试以下操作：
+1. `yarn clean` 或是 `yarn cleanall`
+2. 重试升级 （请不要忘记 `yarn install` ）
+
+----------------------------------------------------------------
+
+如果您有任何疑问或是困惑，欢迎与我们联系！
--- a/gulpfile.ts
+++ b/gulpfile.ts
@ -7,9 +7,6 @@ import * as gulp from 'gulp';
 import * as ts from 'gulp-typescript';
 import * as rimraf from 'rimraf';
 import * as rename from 'gulp-rename';
-const cleanCSS = require('gulp-clean-css');
-const sass = require('gulp-dart-sass');
-const fiber = require('fibers');

 const locales: { [x: string]: any } = require('./locales');
 const meta = require('./package.json');
@ -61,13 +58,6 @@ gulp.task('cleanall', gulp.parallel('clean', cb =>
 	rimraf('./node_modules', cb)
 ));

-gulp.task('build:client:styles', () =>
-	gulp.src('./src/client/style.scss')
-		.pipe(sass({ fiber }))
-		.pipe(cleanCSS())
-		.pipe(gulp.dest('./built/client/assets/'))
-);
-
 gulp.task('copy:client', () =>
 		gulp.src([
 			'./assets/**/*',
@ -87,7 +77,6 @@ gulp.task('copy:docs', () =>
 );

 gulp.task('build:client', gulp.parallel(
-	'build:client:styles',
 	'copy:client',
 	'copy:docs'
 ));
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@ -1,5 +1,6 @@
 ---
 _lang_: "العربية"
+introMisskey: "اهلا بك! ميسكي هو منصة تدوين مصغر لا مركزية ومفتوحة المصدر.\nيمكنك مشاركة \"ملاحظات\" عن ما يجري حولك، وإخبار الجميع عن نفسك 📡\nتسمح لك \"الانفعالات\" بتعبير عن شعورك حول ملاحظات الآخرين 👍\nاكتشف عالمًا جديدًا 🚀"
 monthAndDay: "{day}/{month}"
 search: "البحث"
 notifications: "الإشعارات"
@ -14,8 +15,12 @@ noNotes: "لم يتم العثور على أية ملاحظات"
 noNotifications: "ليس هناك أية اشعارات"
 instance: "مثيل الخادم"
 settings: "الاعدادات"
+basicSettings: "الاعدادات الأساسية"
+otherSettings: "إعدادات أخرى"
+openInWindow: "افتح في نافذة جديدة"
 profile: "الملف التعريفي"
 timeline: "الخيط الزمني"
+noAccountDescription: "لم يكتب هذا المستخدم سيرته بعد."
 login: "لِج"
 loggingIn: "جارٍ تسجيل الدخول"
 logout: "الخروج"
@ -28,85 +33,527 @@ favorite: "إضافة إلى المفضلة"
 favorites: "المفضلات"
 unfavorite: "إزالة من المفضلة"
 pin: "دبّسها على الصفحة الشخصية"
+unpin: "ألغ تثبيتها من ملفك الشخصي"
+copyContent: "انسخ المحتوى"
+copyLink: "انسخ الرابط"
 delete: "حذف"
 deleteAndEdit: "إزالة وإعادة الصياغة"
+deleteAndEditConfirm: "أمتأكد من حذف الملاحظة؟ ستفقد كل مشاركاتها، والتفاعلات، والردود عليها."
 addToList: "أضفه إلى قائمة"
+sendMessage: "أرسل رسالة"
+copyUsername: "انسخ اسم المستخدم"
+searchUser: "ابحث عن مستخدمين"
 reply: "رد"
 loadMore: "عرض المزيد"
 youGotNewFollower: "يتابعك"
+receiveFollowRequest: "تلقيت طلب متابعة"
+followRequestAccepted: "قُبل طلب المتابعة"
+mention: "أشر الى"
+mentions: "الإشارات"
+directNotes: "الملاحظات المباشرة"
+importAndExport: "إستورد / صدر"
+import: "استيراد"
+export: "تصدير"
+files: "الملفات"
+download: "تنزيل"
+driveFileDeleteConfirm: "أمتأكد من حذف ملف {name}؟ كل الملاحظات المُرفق بها هذا الملف ستحذف."
+unfollowConfirm: "أمتأكد من إلغاء متابعة {name}؟"
+lists: "القوائم"
+noLists: "ليس لديك أية قائمة"
 note: "ملاحظة"
 notes: "الملاحظات"
 following: "المتابَعون"
 followers: "المتابِعين"
 followsYou: "يتابعك"
+createList: "إنشاء قائمة"
+manageLists: "إدارة القوائم"
+error: "خطأ"
+somethingHappened: "حدث خطأ"
+retry: "حاول مجددًا"
+pageLoadError: "فشل تحميل الصفحة"
+enterListName: "اسم القائمة"
+privacy: "الخصوصية"
 makeFollowManuallyApprove: "القبول يدويا طلبات الإشتراك"
+defaultNoteVisibility: "مدى الرؤية الافتراضي"
 follow: "تابِع"
 followRequest: "طلب اشتراك"
 followRequests: "طلبات الإشتراك"
 unfollow: "إلغاء الاشتراك"
 followRequestPending: "طلبات الإشتراك المعلّقة"
+enterEmoji: "أدخل إيموجي"
+unrenote: "إلغاء مشاركة الملاحظة"
+quote: "اقتبس"
+pinnedNote: "ملاحظة مدبسة"
+you: "أنت"
+clickToShow: "اضغط للعرض"
+sensitive: "محتوى حساس"
 add: "إضافة"
+reaction: "تفاعل"
+rememberNoteVisibility: "تذكر إعدادت مدى رؤية الملاحظات"
+attachCancel: "أزل المرفق"
+enterFileName: "ادخل اسم الملف"
+mute: "اكتم"
+unmute: "إلغاء الكتم"
+block: "احجب"
+unblock: "إلغاء الحجب"
+suspend: "علِق"
+unsuspend: "ألغ التعليق"
+blockConfirm: "أمتأكد من حجب هذا الحساب؟"
+unblockConfirm: "أمتأكد من إلغاء حجب هذا الحساب؟"
+selectList: "اختر قائمة"
+editWidgetsExit: "تم"
+customEmojis: "إيموجي مخصص"
 addEmoji: "إضافة إيموجي"
+cacheRemoteFiles: "خزن مؤقتا الملفات البعيدة"
+autoAcceptFollowed: "اقبل طلبات المتابعة تلقائيا من الحسابات المتابَعة"
 addAcount: "إضافة حساب"
+loginFailed: "فشل الولوج"
+showOnRemote: "رؤيته على مثيل الخادم البُعدي"
+general: "الرئيسية"
+wallpaper: "خلفية الشاشة"
+setWallpaper: "استخدم خلفية الشاشة"
+removeWallpaper: "إزالة خلفية الشاشة"
 searchWith: "البحث: {q}"
+youHaveNoLists: "لا تمتلك أية قائمة"
+followConfirm: "أتريد متابعة {name}؟"
+proxyAccount: "حساب وكيل البروكسي"
+host: "المضيف"
+selectUser: "حدّد مستخدمًا"
+recipient: "المرسَل إليه·ها"
 annotation: "التعليقات"
+federation: "الفديرالية"
 instances: "مثيل الخادم"
+latestRequestSentAt: "آخر طلب أرسِل في"
+latestRequestReceivedAt: "آخر طلب تُلقي في"
+storageUsage: "مساحة التخزين المستخدمة"
+charts: "المنحنيات البيانية"
+perHour: "في الساعة"
+perDay: "في اليوم"
+stopActivityDelivery: "وقف إرسال النشاط"
+blockThisInstance: "احجب مثيل الخادم هذا"
+operations: "الإجراءات"
+software: "البرنامج"
+version: "الإصدار"
+metadata: "البيانات الوصفية"
+withNFiles: "{n} ملف (ملفات)"
+monitor: "شاشة التحكم"
+jobQueue: "قائمة الانتظار"
+cpuAndMemory: "وحدة المعالجة المركزية والذاكرة"
+network: "الشبكة"
+disk: "قرص التخزين"
+instanceInfo: "معلومات مثيل الخادم"
+statistics: "الإحصائيات"
+clearQueue: "تفريغ قائمة الإنتظار"
+muteAndBlock: "تم كتمها / تم حجبها"
+mutedUsers: "الحسابات التي تم كتمها"
+blockedUsers: "الحسابات التي تم حظرها"
 noUsers: "ليس هناك مستخدمون"
+editProfile: "تعديل الملف التعريفي"
+noteDeleteConfirm: "هل تريد حذف هذه الملاحظة؟"
+pinLimitExceeded: "لا يمكنك تدبيس الملاحظات بعد الآن."
+intro: "لقد انتهت عملية تنصيب Misskey. الرجاء إنشاء حساب إداري."
+done: "تمّ"
+processing: "المعالجة جارية"
+preview: "معاينة"
+default: "افتراضي"
+noCustomEmojis: "ليس هناك إيموجيات"
+federating: "الفديرالية جارية"
+blocked: "محجوب"
+suspended: "مُعلّق"
+all: "الكل"
+notResponding: "لا يستجيب"
+changePassword: "تغيير الكلمة السرية"
+security: "الأمان"
 more: "المزيد!"
+featured: "المتداولة"
+usernameOrUserId: "اسم المستخدم أو معرّفه"
+noSuchUser: "لم يُعثَر على المستخدم"
+lookup: "البحث"
 announcements: "الإعلانات"
+imageUrl: "عنوان URL للصورة"
 remove: "حذف"
+removed: "تم حذفه بنجاح"
+removeAreYouSure: "متأكد من أنك تريد حذف {x}؟"
+deleteAreYouSure: "متأكد من أنك تريد حذف {x}؟"
+saved: "تم حفظه"
+messaging: "الدردشة"
+upload: "تحميل"
+fromDrive: "من المخزن"
+fromUrl: "من عنوان URL"
+uploadFromUrl: "التحميل عبر URL"
 explore: "استكشاف"
+games: "ألعاب Misskey"
+messageRead: "مقروءة"
+startMessaging: "ابدأ الدردشة"
+tos: "شروط الخدمة"
+start: "البداية"
 home: "الرئيسي"
 activity: "النشاط"
 images: "الصور"
+birthday: "تاريخ الميلاد"
+yearsOld: "{age} سنة"
+registeredDate: "انظم في"
+location: "المكان"
+theme: "المظهر"
+themeForLightMode: "الحلة في الوضع الفاتح"
+themeForDarkMode: "الحلة في الوضع الداكن"
+light: "فاتح"
+dark: "داكن"
+lightThemes: "الحلة الفاتحة"
+darkThemes: "الحلة الداكنة"
+drive: "قرص التخرين"
+fileName: "اسم الملف"
+selectFile: "اختر ملفًا"
+selectFiles: "اختر ملفات"
+selectFolder: "اختر مجلدًا"
+selectFolders: "اختر مجلدات"
+renameFile: "إعادة تسمية الملف"
+folderName: "اسم المجلد"
+createFolder: "أنشئ مجلدًا"
+renameFolder: "إعادة تسمية المجلد"
+deleteFolder: "احذف هذا المجلد"
 addFile: "إضافة ملف"
+emptyDrive: "قرص التخزين فارغ"
+emptyFolder: "هذا المجلد فارغ"
+unableToDelete: "لا يمكن حذفه"
+inputNewFileName: "ادخل الإسم الجديد للملف"
+inputNewFolderName: "ادخل الإسم الجديد للمجلد"
+copyUrl: "انسخ عنوان URL"
+rename: "إعادة التسمية"
+avatar: "الصورة الرمزية"
+banner: "الصورة الرأسية"
+nsfw: "محتوى حساس"
+disconnectedFromServer: "قُطِع الإتصال بالخادم"
+reload: "انعش"
+doNothing: "تجاهل"
+watch: "راقب"
+unwatch: "إلغاء المراقبة"
+accept: "السماح"
+reject: "رفض"
+normal: "عادي"
+instanceName: "اسم مثيل الخادم"
+instanceDescription: "وصف مثيل الخادم"
 maintainerName: "المدير"
 maintainerEmail: "عنوان بريد المدير الإلكتروني"
+tosUrl: "عنوان URL لشروط الخدمة"
+thisYear: "هذا العام"
+thisMonth: "هذا الشهر"
+today: "اليوم"
+dayX: "{day}"
+monthX: "{month}"
+yearX: "{year}"
+pages: "الصفحات"
+connectSerice: "أوصل"
 disconnectSerice: "قطع الاتصال"
+enableLocalTimeline: "تفعيل الخيط المحلي"
 enableGlobalTimeline: "تفعيل الخيط الزمني الشامل"
+registration: "إنشاء حساب"
+enableRegistration: "تفعيل إنشاء الحسابات الجديدة"
+invite: "دعوة"
+basicInfo: "المعلومات الأساسية "
+hcaptchaSiteKey: "مفتاح الموقع"
+hcaptchaSecretKey: "المفتاح السري"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "تمكين reCAPTCHA"
+recaptchaSiteKey: "مفتاح الموقع"
+recaptchaSecretKey: "المفتاح السري"
+antennas: "الهوائيات"
+manageAntennas: "إدارة الهوائيات"
+name: "الإسم"
+antennaSource: "مصدر الهوائي"
+antennaKeywords: "الكلمات المفتاحية للإستقبال"
+withReplies: "بالردود"
+notesAndReplies: "الملاحظات والردود"
+withFiles: "بالمرفقات"
+silence: "اكتم"
+unsilence: "إلغاء الكتم"
+popularUsers: "المستخدمون الشائعون"
 exploreFediverse: "استكشف الفديفرس"
+popularTags: "الوسوم الرائجة"
+userList: "القوائم"
+about: "عن"
+aboutMisskey: "عن Misskey"
+patrons: "الداعمون"
+administrator: "المدير"
+token: "الرمز المميز"
+twoStepAuthentication: "الإستيثاق بعاملَيْن"
+moderator: "مشرِف"
+nUsersMentioned: "{n} مستخدمين تمت الإشارة إليهم"
+securityKey: "مفتاح الأمان"
+securityKeyName: "اسم المفتاح"
+lastUsed: "آخر استخدام"
+unregister: "إلغاء التسجيل"
+passwordLessLogin: "لِج مِن دون كلمة سرية"
+resetPassword: "أعد تعيين كلمتك السرية"
+newPasswordIs: "كلمتك السرية الجديدة هي {password}"
+share: "شارِك"
+notFound: "غير موجود"
+help: "المساعدة"
+inputMessageHere: "اكتب رسالتك هنا"
+close: "اغلق"
+group: "الفريق"
+groups: "الفِرَق"
+createGroup: "انشئ فريقًا"
+invites: "دعوة"
+groupName: "اسم الفريق"
+members: "الأعضاء"
+transfer: "نقل"
+messagingWithUser: "الدردشة مع مستخدم آخر"
+messagingWithGroup: "دردشة جماعية"
+title: "العنوان"
+text: "النص"
+enable: "تشغيل"
+next: "التالية"
+retype: "أعد الكتابة"
+noteOf: "ملاحظات {user}"
+inviteToGroup: "دعوة إلى فريق"
+noMessagesYet: "ليس هناك رسائل بعد"
+newMessageExists: "لقد تلقيت رسالة جديدة"
+invitations: "دعوة"
+invitationCode: "رمز الدعوة"
+checking: "التحقق جارٍ"
+available: "متوفر"
+unavailable: "غير متوفر"
+tooShort: "قصير جدًا"
+tooLong: "طويل جدًا"
+weakPassword: "الكلمة السرية ضعيفة"
+normalPassword: "الكلمة السرية جيدة"
+strongPassword: "الكلمة السرية قوية"
+passwordMatched: "التطابق صحيح!"
+passwordNotMatched: "غير متطابقتان"
+signinWith: "الولوج عبر {x}"
+or: "أو"
 uiLanguage: "لغة واجهة المستخدم"
+aboutX: "عن {x}"
+useOsNativeEmojis: "استخدم الإيموجيات الخاصة بنظام التشغيل"
+youHaveNoGroups: "لا تمتلك أية فِرَق"
+noHistory: "السجل فارغ"
+doing: "انتظر لحظة"
+category: "الفئات"
+tags: "الوسوم"
+docSource: "مصدر هذا المستند"
+createAccount: "أنشئ حسابًا"
+existingAcount: "الحسابات الموجودة"
+regenerate: "أعِد التوليد"
+fontSize: "حجم الخط"
+dashboard: "لوحة التحكم"
 local: "المحلي"
-clinetSettings: "إعدادات التطبيق"
+remote: "بُعدي"
+total: "المجموع"
+weekOverWeekChanges: "أسبوعيا"
+dayOverDayChanges: "يوميا"
+appearance: "المظهر"
 accountSettings: "إعدادات الحساب"
+promotion: "ترقية"
+promote: "روِّج"
+numberOfDays: "عدد الأيام"
+hideThisNote: "إخفاء هذه الملاحظة"
+deleteAll: "حذف الكل"
+sounds: "الرنات"
+listen: "استمع"
+none: "لا شيء"
+volume: "مستوى الصوت"
+details: "التفاصيل"
+chooseEmoji: "اختر إيموجي"
+recentUsed: "المستخدمة مؤخرا"
+install: "التثبيت"
+uninstall: "إلغاء التثبيت"
+installedApps: "التطبيقات المُخوّلة"
+lastUsedDate: "آخر استخدام"
+state: "الحالة"
+sort: "ترتيب حسب"
+output: "الخارجة"
+updateRemoteUser: "تحديث المعلومات عن المستخدم البعيد"
+sidebar: "الشريط الجانبي"
+addItem: "إضافة عنصر"
+rooms: "الغرفة"
+relays: "المُرَحلات"
 addRelay: "إضافة مُرحّل"
 addedRelays: "المرحلات التي تم إضافتها"
+deletedNote: "ملاحظة محذوفة"
+invisibleNote: "ملاحظة مخفية"
+poll: "استطلاع رأي"
+themeEditor: "مصمم القوالب"
+plugins: "الإضافات"
+pluginInstallWarn: "يرجى تنصيب إضافات ذات مصدر موثوق منه فقط."
+smtpHost: "المضيف"
+smtpUser: "اسم المستخدم"
+smtpPass: "الكلمة السرية"
+display: "المظهر"
+public: "للعامة"
+_mfm:
+  mention: "أشر الى"
+  quote: "اقتبس"
+  emoji: "إيموجي مخصص"
+  search: "البحث"
+_reversi:
+  total: "المجموع"
+_channel:
+  featured: "المتداوَلة"
+_sidebar:
+  full: "كامل"
+  icon: "الصورة الرمزية"
+  hide: "إخفاء"
 _theme:
  explore: "استكشف قوالب المظهر"
+  install: "تنصيب قالب"
+  manage: "إدارة القوالب"
+  code: "شيفرة القالب"
+  installed: "تم تنصيب {name}"
+  make: "إنشاء قالب"
+  alpha: "الشفافية"
+  keys:
+    mention: "أشر الى"
+    messageBg: "خلفية الدردشة"
 _sfx:
  note: "الملاحظات"
+  noteMy: "ملاحظتي"
  notification: "الإشعارات"
  chat: "الدردشة"
+_ago:
+  unknown: "مجهول"
+  future: "المستقبَل"
+  justNow: "اللحظة"
+  secondsAgo: "منذ {n} ثوانٍ"
+  minutesAgo: "منذ {n} دقائق"
+  hoursAgo: "منذ {n} ساعة"
+  daysAgo: "منذ {n} أيام"
+  weeksAgo: "منذ {n} أسابيع"
+  monthsAgo: "منذ {n} أشهر"
+  yearsAgo: "منذ {n} سنوات"
+_time:
+  second: "ثا"
+  minute: "د"
+  hour: "سا"
+  day: "ي"
+_tutorial:
+  title: "كيف تستخدم Misskey"
+  step1_1: "مرحبًا!"
+_2fa:
+  registerKey: "تسجيل مفتاح أمان جديد"
 _permissions:
  "write:account": "تعديل معلومات حسابك"
+  "read:notifications": "اظهر الإشعارات"
+_weekday:
+  sunday: "الأحد"
+  monday: "الإثنين"
+  tuesday: "الثلاثاء"
+  wednesday: "الأربعاء"
+  thursday: "الخميس"
+  friday: "الجمعة"
+  saturday: "السبت"
 _widgets:
+  memo: "ملاحظة لاصقة"
  notifications: "الإشعارات"
  timeline: "الخيط الزمني"
+  calendar: "التقويم"
  trends: "المتداوَلة"
+  clock: "الساعة"
+  rss: "تدفق RSS"
  activity: "النشاط"
+  photos: "الصور"
+  federation: "الفديرالية"
 _cw:
+  hide: "إخفاء"
  show: "عرض المزيد"
+  chars: "{count} أحرف"
+  files: "{count} ملفات"
+_poll:
+  noOnlyOneChoice: "تحتاج إلى خيارَين على الأقل"
+  choiceN: "الخيار {n}"
+  noMore: "لا يمكنك إضافة خيارات أخرى"
+  canMultipleVote: "السماح بالإجابات المتعددة"
+  expiration: "ينتهي استطلاع الرأي في"
+  infinite: "أبدًا"
+  at: "تاريخ الإنتهاء"
+  after: "ينتهي بعد…"
+  deadlineDate: "تاريخ الانتهاء"
+  deadlineTime: "سا"
+  duration: "المدة"
+  votesCount: "{n} أصوات"
+  totalVotes: "المجموع {n} أصوات"
+  vote: "قم بالتصويت"
+  showResult: "اعرض النتائج"
+  voted: "تم التصويت"
+  closed: "انتهى"
+  remainingDays: "{d} أيام و {h} ساعات متبقية"
+  remainingHours: "{h} ساعات و {m} دقائق متبقية"
+  remainingMinutes: "{m} دقائق و {s} ثوانٍ متبقية"
+  remainingSeconds: "{s} ثوانٍ متبقية"
 _visibility:
+  public: "للعامة"
  home: "الرئيسي"
  followers: "المتابِعين"
+  specified: "مباشرة"
  localOnly: "المحلي فقط"
+_postForm:
+  replyPlaceholder: "رد على هذه الملاحظة…"
+  quotePlaceholder: "اقتبس هذه الملاحظة…"
 _profile:
+  name: "الإسم"
  username: "اسم المستخدم"
+  youCanIncludeHashtags: "يمكنك أيضًا إضافة وسوم إلى نبذتك التعريفية."
 _exportOrImport:
+  allNotes: "كل الملاحظات"
  followingList: "المتابَعون"
+  muteList: "اكتم"
+  blockingList: "احجب"
+  userLists: "القوائم"
+_charts:
+  usersTotal: "مجموع عدد المستخدمين والمستخدمات"
+  activeUsers: "المستخدمون النشطون"
 _timelines:
  home: "الرئيسي"
  local: "المحلي"
  social: "الاجتماعي"
  global: "الشامل"
+_rooms:
+  _roomType:
+    default: "افتراضي"
+  _furnitures:
+    monitor: "شاشة التحكم"
+    banknote: "أوراق نقدية"
 _pages:
  blocks:
    image: "الصور"
  script:
+    categories:
+      list: "القوائم"
    blocks:
+      _strReplace:
+        arg1: "نص"
+        arg3: "استُبدِل بـ"
      _join:
        arg1: "القوائم"
        arg2: "فاصل"
      add: "إضافة"
+      _randomPick:
+        arg1: "القوائم"
+      _dailyRandomPick:
+        arg1: "القوائم"
+      _seedRandomPick:
+        arg2: "القوائم"
+      _pick:
+        arg1: "القوائم"
+      _listLen:
+        arg1: "القوائم"
+    types:
+      array: "القوائم"
 _notification:
+  youGotPoll: "شارك {name} في استطلاع الرأي"
+  youGotMessagingMessageFromUser: "لقد تلقيت رسالة مِن {name}"
+  youGotMessagingMessageFromGroup: "لقد أرسِلَت رسالة إلى الفريق {name}"
  youWereFollowed: "يتابعك"
+  _types:
+    follow: "المتابَعون"
+    mention: "أشر الى"
+    quote: "اقتبس"
+    reaction: "تفاعل"
+_deck:
+  _columns:
+    notifications: "الإشعارات"
+    tl: "الخيط الزمني"
+    antenna: "الهوائيات"
+    list: "القوائم"
+    mentions: "الإشارات"
+    direct: "مباشرة"
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@ -16,6 +16,9 @@ noNotes: "Keine Notizen"
 noNotifications: "Keine Benachrichtigungen"
 instance: "Instanz"
 settings: "Einstellungen"
+basicSettings: "Allgemeine Einstellungen"
+otherSettings: "Andere Einstellungen"
+openInWindow: "In Fenster öffnen"
 profile: "Profil"
 timeline: "Chronik"
 noAccountDescription: "Dieser Nutzer hat seine Profilbeschreibung noch nicht ausgefüllt."
@ -40,11 +43,13 @@ deleteAndEditConfirm: "Möchtest du diese Notiz wirklich löschen und bearbeiten
 addToList: "Zu Liste hinzufügen"
 sendMessage: "Nachricht senden"
 copyUsername: "Benutzernamen kopieren"
+searchUser: "Benutzersuche"
 reply: "Antworten"
 loadMore: "Mehr anzeigen"
 youGotNewFollower: "Du hast einen neuen Follower"
 receiveFollowRequest: "Follow-Anfrage erhalten"
 followRequestAccepted: "Follow-Anfrage akzeptiert"
+mention: "Erwähnung"
 mentions: "Erwähnungen"
 directNotes: "Direktnachrichten"
 importAndExport: "Importieren und Exportieren"
@ -65,8 +70,11 @@ followers: "Gefolgt von"
 followsYou: "Folgt dir"
 createList: "Liste erstellen"
 manageLists: "Listen verwalten"
-error: "Ein Problem ist aufgetreten"
+error: "Fehler"
+somethingHappened: "Ein Fehler ist aufgetreten"
 retry: "Wiederholen"
+pageLoadError: "Laden der Seite fehlgeschlagen."
+pageLoadErrorDescription: "Dieser Fehler wird meist durch Netzwerkfehler oder den Browser-Cache verursacht. Versuche den Browser-Cache zu leeren und es nach kurzer Zeit noch einmal zu probieren."
 enterListName: "Listennamen eingeben"
 privacy: "Privatsphäre"
 makeFollowManuallyApprove: "Follow-Anfragen benötigen Bestätigung"
@ -83,14 +91,15 @@ quote: "Zitieren"
 pinnedNote: "Angepinnte Notiz"
 you: "Du"
 clickToShow: "Klicke, um diesen Inhalt anzusehen"
-sensitive: "Dieser Inhalt ist NSFW"
+sensitive: "NSFW"
 add: "Hinzufügen"
 reaction: "Reaktionen"
 reactionSettingDescription: "Gib deine Lieblingsreaktionen ein, um sie der Reaktionsauswahl hinzuzufügen."
+reactionSettingDescription2: "Ziehen zum Reorganisieren, Klicken zum Löschen."
 rememberNoteVisibility: "Notizsichtbarkeit merken"
 attachCancel: "Anhang entfernen"
-markAsSensitive: "Als sensitiv markieren"
-unmarkAsSensitive: "Markierung als sensitiv zurücknehmen"
+markAsSensitive: "Als NSFW markieren"
+unmarkAsSensitive: "Markierung als NSFW zurücknehmen"
 enterFileName: "Dateinamen eingeben"
 mute: "Stummschalten"
 unmute: "Stummschaltung aufheben"
@ -103,7 +112,12 @@ unblockConfirm: "Möchtest du diese Blockierung wirklich aufheben?"
 suspendConfirm: "Möchtest du diesen Benutzer wirklich sperren?"
 unsuspendConfirm: "Möchtest du die Sperrung dieses Benutzers wirklich aufheben?"
 selectList: "Wähle eine Liste aus"
+selectAntenna: "Antenne auswählen"
+selectWidget: "Widget auswählen"
+editWidgets: "Widgets bearbeiten"
+editWidgetsExit: "Fertig"
 customEmojis: "Benutzerdefinierte Emojis"
+emoji: "Emoji"
 emojiName: "Emojiname"
 emojiUrl: "Emoji-URL"
 addEmoji: "Emoji hinzufügen"
@ -161,7 +175,7 @@ clearCachedFilesConfirm: "Sollen alle im Cache gespeicherten Dateien von anderen
 blockedInstances: "Blockierte Instanzen"
 blockedInstancesDescription: "Gib den Hostnamen der Instanz an, die blockiert werden soll. Blockierte Instanzen können nicht mehr mit dieser kommunizieren."
 muteAndBlock: "Stummgeschaltet / Blockiert"
-mutedUsers: "Stummgestellte Benutzer"
+mutedUsers: "Stummgeschaltete Benutzer"
 blockedUsers: "Blockierte Benutzer"
 noUsers: "Keine Benutzer"
 editProfile: "Profil bearbeiten"
@ -173,7 +187,6 @@ processing: "In Bearbeitung"
 preview: "Vorschau"
 default: "Standard"
 noCustomEmojis: "Es existieren keine Emojis"
-customEmojisOfRemote: "Emojis von anderen Instanzen"
 noJobs: "Es gibt keine Jobs"
 federating: "Föderiert"
 blocked: "Blockiert"
@ -202,8 +215,10 @@ imageUrl: "Bild-URL"
 remove: "Löschen"
 removed: "Erfolgreich gelöscht"
 removeAreYouSure: "Möchtest du \"{x}\" wirklich löschen?"
+deleteAreYouSure: "Möchtest du \"{x}\" wirklich löschen?"
+resetAreYouSure: "Wirklich zurücksetzen?"
 saved: "Gespeichert"
-messaging: "Privatnachrichten"
+messaging: "Chat"
 upload: "Hochladen"
 fromDrive: "Aus Drive"
 fromUrl: "Von einer URL"
@ -215,7 +230,7 @@ explore: "Erkunden"
 games: "Misskey Spiele"
 messageRead: "Gelesen"
 noMoreHistory: "Kein weiterer Verlauf vorhanden"
-startMessaging: "Neue Privatnachricht erstellen"
+startMessaging: "Neuen Chat erstellen"
 nUsersRead: "Von {n} gelesen"
 agreeTo: "Ich stimme {0} zu"
 tos: "Nutzungsbedingungen"
@ -259,7 +274,8 @@ copyUrl: "URL kopieren"
 rename: "Umbenennen"
 avatar: "Profilbild"
 banner: "Banner"
-nsfw: "Dieser Inhalt ist NSFW"
+nsfw: "NSFW"
+whenServerDisconnected: "Bei Verbindungsverlust zum Server"
 disconnectedFromServer: "Verbindung zum Server wurde getrennt"
 reload: "Aktualisieren"
 doNothing: "Ignorieren"
@ -300,6 +316,8 @@ bannerUrl: "Banner-URL"
 basicInfo: "Basisdaten"
 pinnedUsers: "Angepinnte Benutzer"
 pinnedUsersDescription: "Gib einen Benutzernamen pro Zeile ein. Diese werden im \"Erkunden\" Tab angezeigt."
+pinnedPages: "Angepinnte Seiten"
+pinnedPagesDescription: "Gib hier die Pfäde zu den Seiten an, die du an die Spitze dieser Instanz anheften möchtest, getrennt durch neue Zeilen."
 hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptcha aktivieren"
 hcaptchaSiteKey: "Site key"
@ -360,9 +378,6 @@ unregister: "Deaktivieren"
 passwordLessLogin: "Passwortloses Anmelden einrichten"
 resetPassword: "Passwort zurücksetzen"
 newPasswordIs: "Das neue Passwort ist \"{password}\""
-autoReloadWhenDisconnected: "Automatisch aktualisieren wenn die Serververbindung getrennt wird"
-autoNoteWatch: "Notizen automatisch beobachten"
-autoNoteWatchDescription: "Werde über Notizen, auf die du reagiert oder geantwortet hast, informiert"
 reduceUiAnimation: "Animationen der Benutzeroberfläche reduzieren"
 share: "Teilen"
 notFound: "Nicht gefunden"
@ -384,8 +399,8 @@ invites: "Einladungen"
 groupName: "Gruppenname"
 members: "Mitglieder"
 transfer: "Übertragen"
-messagingWithUser: "Privatnachrichten mit einem Benutzer"
-messagingWithGroup: "Privatnachrichten mit einer Gruppe"
+messagingWithUser: "Privatchat"
+messagingWithGroup: "Gruppenchat"
 title: "Betreff"
 text: "Text"
 enable: "Aktivieren"
@ -400,6 +415,7 @@ noMessagesYet: "Noch keine Nachrichten"
 newMessageExists: "Du hast eine neue Nachricht"
 onlyOneFileCanBeAttached: "Es kann pro Nachricht nur eine Datei angehängt werden"
 signinRequired: "Anmeldung erforderlich"
+invitations: "Einladungen"
 invitationCode: "Einladungscode"
 checking: "Wird überprüft..."
 available: "Verfügbar"
@ -440,8 +456,8 @@ remote: "Fremd"
 total: "Gesamt"
 weekOverWeekChanges: "Wöchentlich"
 dayOverDayChanges: "Täglich"
-accessibility: "Barrierefreiheit"
-clinetSettings: "Client-Einstellungen"
+appearance: "Aussehen"
+clientSettings: "Client-Einstellungen"
 accountSettings: "Benutzerkonto-Einstellungen"
 promotion: "Hervorgehoben"
 promote: "Hervorheben"
@ -464,6 +480,7 @@ objectStorageUseSSL: "SSL verwenden"
 objectStorageUseSSLDesc: "Deaktiviere dies falls du für die API-Verbindungen kein HTTPS verwenden wirst"
 objectStorageUseProxy: "Über Proxy verbinden"
 objectStorageUseProxyDesc: "Deaktiviere dies falls du keinen Proxy für den Objektspeicher verwenden wirst"
+objectStorageSetPublicRead: "Bei Upload auf \"public-read\" stellen"
 serverLogs: "Serverprotokolle"
 deleteAll: "Alle löschen"
 showFixedPostForm: "Bereich zum Schreiben neuer Notizen am Anfang der Chronik anzeigen"
@ -471,6 +488,8 @@ newNoteRecived: "Es gibt neue Notizen"
 sounds: "Töne"
 listen: "Anhören"
 none: "Keine"
+showInPage: "In Seite anzeigen"
+popout: "Pop-Up"
 volume: "Lautstärke"
 details: "Details"
 chooseEmoji: "Wähle ein Emoji"
@ -509,21 +528,284 @@ addedRelays: "Hinzugefügte Relays"
 serviceworkerInfo: "Muss für Push-Benachrichtigungen aktiviert sein."
 deletedNote: "Gelöschte Notiz"
 invisibleNote: "Private Notiz"
+enableInfiniteScroll: "Automatisch mehr Notizen laden"
+visibility: "Sichtbarkeit"
+poll: "Umfrage"
+useCw: "Inhalt verstecken"
+enablePlayer: "Video-Player öffnen"
+disablePlayer: "Video-Player schließen"
+expandTweet: "Tweet ausklappen"
+themeEditor: "Farbthemen-Editor"
+description: "Beschreibung"
+author: "Autor"
+leaveConfirm: "Es gibt unspeicherte Änderungen. Möchtest du diese verwerfen?"
+manage: "Verwaltung"
+plugins: "Plugins"
+pluginInstallWarn: "Installiere nur vertrauenswürdige Plugins."
+deck: "Deck"
+undeck: "Deck verlassen"
+useBlurEffectForModal: "Weichzeichnungseffekt für Modals verwenden"
+useFullReactionPicker: "Vollständige Reaktionsauswahl nutzen"
+width: "Breite"
+height: "Höhe"
+generateAccessToken: "Zugriffstoken generieren"
+permission: "Berechtigungen"
+enableAll: "Alle aktivieren"
+disableAll: "Alle deaktivieren"
+tokenRequested: "Benutzerkontozugriff gewähren"
+pluginTokenRequestedDescription: "Dieses Plugin wird die hier konfigurierten Berechtigungen verwenden können."
+notificationType: "Benachrichtigungstyp"
+edit: "Bearbeiten"
+useStarForReactionFallback: "Verwende ★ falls das Reaktions-Emoji unbekannt ist"
+emailConfig: "Email-Server Konfiguration"
+enableEmail: "Email-Versand aktivieren"
+emailConfigInfo: "Zur Email-Bestätigung bei Registrierung und zum Zurücksetzen des Passworts verwendet"
+email: "Email-Adresse"
+smtpConfig: "SMTP-Server Konfiguration"
+smtpHost: "Host"
+smtpPort: "Port"
+smtpUser: "Benutzername"
+smtpPass: "Passwort"
+emptyToDisableSmtpAuth: "Benutzername und Passwort leer lassen um SMTP-Verifizierung zu deaktivieren"
+smtpSecure: "Für SMTP-Verbindungen implizit SSL/TLS verwenden"
+smtpSecureInfo: "Schalte dies aus, falls du STARTTLS verwendest"
+testEmail: "Email-Versand testen"
+wordMute: "Wort-Stummschaltung"
+userSaysSomething: "{name} hat etwas gesagt."
+makeActive: "Aktivieren"
+display: "Anzeige"
+copy: "Kopieren"
+metrics: "Metriken"
+overview: "Übersicht"
+logs: "Logs"
+delayed: "Verzögert"
+database: "Datenbank"
+channel: "Kanäle"
+create: "Erstellen"
+notificationSetting: "Benachrichtigungseinstellungen"
+notificationSettingDesc: "Wähle die Art der anzuzeigenden Benachrichtigung"
+useGlobalSetting: "Globale Einstellung verwenden"
+useGlobalSettingDesc: "Wenn dies eingeschaltet ist, werden die Benachrichtigungseinstellungen deines Benutzerkontos verwendet. Wenn dies ausgeschaltet ist, können individuelle Einstellungen vorgenommen werden."
+other: "Andere"
+regenerateLoginToken: "Login-Token regenerieren"
+regenerateLoginTokenDescription: "Den bei Logins intern verwendeten Token regenerieren. Normalerweise wird dies nicht benötigt. Bei Regeneration werden alle Geräte ausgeloggt."
+setMultipleBySeparatingWithSpace: "Trenne Elemente durch ein Leerzeichen um mehrere Einstellungen zu kofigurieren."
+fileIdOrUrl: "Datei-ID oder URL"
+chatOpenBehavior: "Verhalten des Chatfensters bei Öffnung"
+sample: "Beispiel"
+abuseReports: "Melden"
+reportAbuse: "Melden"
+reportAbuseOf: "{name} melden"
+fillAbuseReportDescription: "Bitte gib Details für diese Meldung an. Falls es sich um eine spezielle Notiz handelt, bitte gib dessen URL an."
+abuseReported: "Die Meldung wurde versendet. Vielen Dank."
+send: "Senden"
+abuseMarkAsResolved: "Meldung als gelöst markieren"
+openInNewTab: "In neuem Tab öffnen"
+openInSideView: "In Seitenansicht öffnen"
+defaultNavigationBehaviour: "Standardnavigationsverhalten"
+editTheseSettingsMayBreakAccount: "Bei Bearbeitung dieser Einstellungen besteht die Gefahr, dein Benutzerkonto zu beschädigen."
+instanceTicker: "Instanz-Informationen von Notizen"
+waitingFor: "Warte auf {x}"
+random: "Zufällig"
+system: "System"
+switchUi: "UI wechseln"
+desktop: "Desktop"
+clip: "Clip"
+createNew: "Neu erstellen"
+optional: "Optional"
+createNewClip: "Neuen Clip erstellen"
+public: "Öffentlich"
+_mfm:
+  cheatSheet: "MFM Spickzettel"
+  intro: "MFM ist eine an vielen Stellen verwendbare und Misskey-exklusive Markup-Sprache. Hier kannst du eine Liste von verfügbarer MFM-Syntax anschauen."
+  dummy: "Misskey erweitert die Welt des Fediverse"
+  mention: "Erwähnung"
+  mentionDescription: "Mit At-Zeichen und Nutzername kann ein individueller Nutzer angegeben werden."
+  hashtag: "Hashtag"
+  hashtagDescription: "Mit einer Raute und Text kann ein Hashtag angegeben werden."
+  url: "URL"
+  urlDescription: "URLs können angezeigt werden."
+  link: "Link"
+  linkDescription: "Ein spezifizierter Textabschnitt kann als URL angezeigt werden."
+  bold: "Fett"
+  boldDescription: "Zeichen zur Betonung dicker erscheinen lassen."
+  small: "Klein"
+  smallDescription: "Inhalt klein und dünn erscheinen lassen."
+  center: "Zentrieren"
+  centerDescription: "Inhalt zentriert anzeigen lassen."
+  inlineCode: "Code (Eingebettet)"
+  inlineCodeDescription: "Syntax-Hervorhebung für (Programm-)Code eingebettet anzeigen lassen."
+  blockCode: "Code (Block)"
+  blockCodeDescription: "Syntax-Hervorhebung für mehrzeiligen (Programm-)Code als Block anzeigen lassen."
+  inlineMath: "Mathe (Eingebettet)"
+  inlineMathDescription: "Mathematische Formeln (KaTeX) eingebettet anzeigen."
+  blockMath: "Mathe (Block)"
+  blockMathDescription: "Mehrzeilige mathematische Formeln (KaTeX) als Block einbetten."
+  quote: "Zitationen"
+  quoteDescription: "Inhalt als Zitat anzeigen lassen."
+  emoji: "Benutzerdefinierte Emojis"
+  emojiDescription: "Emoji-Namen mit Doppelpunkten umschließen, um benutzerdefinierte Emojis anzeigen zu lassen."
+  search: "Suche"
+  searchDescription: "Eine vorgefertige Suchanfragebox anzeigen lassen."
+  flip: "Spiegelung"
+  flipDescription: "Inhalt horizontal oder vertikal gespiegelt anzeigen lassen."
+  jelly: "Animation (Dehnen)"
+  jellyDescription: "Verleiht eine sich dehnende Animation."
+  tada: "Animation (Tada)"
+  tadaDescription: "Verleiht eine Animation mit \"Tada!\"-Gefühl"
+  jump: "Animation (Sprung)"
+  jumpDescription: "Verleiht eine springende Animation."
+  bounce: "Animation (Federn)"
+  bounceDescription: "Erzeugt eine federnde Animation."
+  shake: "Animation (Zittern)"
+  shakeDescription: "Verleiht eine zitternde Animation."
+  twitch: "Animation (Zucken)"
+  twitchDescription: "Verleiht eine sehr stark zuckende Animation."
+  spin: "Animation (Rotieren)"
+  spinDescription: "Verleiht eine rotierende Animation."
+_reversi:
+  reversi: "Reversi"
+  gameSettings: "Spieleinstellungen"
+  chooseBoard: "Spielbrett auswählen"
+  blackOrWhite: "Schwarz/Weiß"
+  blackIs: "{name} spielt Schwarz"
+  rules: "Regeln"
+  botSettings: "Optionen des Computergegners"
+  thisGameIsStartedSoon: "Dieses Spiel beginnt in wenigen Sekunden"
+  waitingForOther: "Warte auf den Zug des Gegenspielers"
+  waitingForMe: "Warte auf deinen Zug"
+  waitingBoth: "Mach dich bereit"
+  ready: "Bereit"
+  cancelReady: "Nicht bereit"
+  opponentTurn: "Zug deines Gegners"
+  myTurn: "Dein Zug"
+  turnOf: "Zug von {name}"
+  pastTurnOf: "Zug von {name}"
+  surrender: "Aufgeben"
+  surrendered: "durch Aufgabe"
+  drawn: "Unentschieden"
+  won: "{name} hat gesiegt"
+  black: "Schwarz"
+  white: "Weiß"
+  total: "Gesamt"
+  turnCount: " Zug {count}"
+  myGames: "Meine Runden"
+  allGames: "Alle Runden"
+  ended: "Beendet"
+  playing: "Laufend"
+  isLlotheo: "Der mit weniger Steinen gewinnt (Llotheo)"
+  loopedMap: "Wiederholendes Spielbrett"
+  canPutEverywhere: "Steine können überall platziert werden"
+_instanceTicker:
+  none: "Nie anzeigen"
+  remote: "Für Benutzer fremder Instanzen anzeigen"
+  always: "Immer anzeigen"
+_serverDisconnectedBehavior:
+  reload: "Automatisch aktualisieren"
+  dialog: "Warnungsfenster zeigen"
+  quiet: "Unaufdringlich warnen"
+_channel:
+  create: "Kanal erstellen"
+  edit: "Kanal bearbeiten"
+  setBanner: "Kanalbanner festlegen"
+  removeBanner: "Kanalbanner entfernen"
+  featured: "Trends"
+  owned: "Besitzt"
+  following: "Gefolgt"
+  usersCount: "{n} Teilnehmer"
+  notesCount: "{n} Notizen"
+_sidebar:
+  full: "Voll"
+  icon: "Symbol"
+  hide: "Ausblenden"
+_wordMute:
+  muteWords: "Wort stummschalten"
+  muteWordsDescription: "Mit Leerzeichen für eine \"UND\"-Verknüpfung trennen, durch Zeilenumbrüche für eine \"ODER\"-Verknüpfung trennen."
+  muteWordsDescription2: "Umgib Schlüsselworter mit Schrägstrichen, um Reguläre Ausdrücke zu verwenden."
+  softDescription: "Notizen, die die eingestellten Konditionen erfüllen, in der Chronik ausblenden"
+  hardDescription: "Verhindern, dass Notizen, die die eingestellten Konditionen erfüllen, der Chronik hinzugefügt werden. Zudem werden diese Notizen auch nicht der Chronik hinzugefügt, falls die Konditionen geändert werden."
+  soft: "Leicht"
+  hard: "Schwer"
+  mutedNotes: "Stummgeschaltete Notizen"
 _theme:
  explore: "Themen erforschen"
  install: "Thema installieren"
  manage: "Themaverwaltung"
-  code: "Themencode"
+  code: "Themen-Code"
  installed: "{name} wurde installiert"
  alreadyInstalled: "Dieses Thema ist bereits installiert"
  invalid: "Themenformat ist ungültig"
+  make: "Farbthema erstellen"
+  base: "Basis"
+  addConstant: "Konstante hinzufügen"
+  constant: "Konstante"
+  defaultValue: "Standardwert"
+  color: "Farbe"
+  refProp: "Eigenschaft referenzieren"
+  refConst: "Konstante referenzieren"
+  key: "Schlüssel"
+  func: "Funktionen"
+  funcKind: "Funktionstyp"
+  argument: "Parameter"
+  basedProp: "Referenzierte Eigenschaft"
+  alpha: "Transparenz"
+  darken: "Verdunkeln"
+  lighten: "Erhellen"
+  inputConstantName: "Name der Konstanten eingeben"
+  importInfo: "Du kannst hier Themen-Code einfügen, um ihn in den Editor zu importieren"
+  deleteConstantConfirm: "Die Konstante {const} wirklich löschen?"
+  keys:
+    accent: "Akzentfarbe"
+    bg: "Hintergrund"
+    fg: "Text"
+    focus: "Fokus"
+    indicator: "Indikator"
+    panel: "Panel"
+    shadow: "Schatten"
+    header: "Kopfzeile"
+    navBg: "Hintergrund der Seitenleiste"
+    navFg: "Text der Seitenleiste"
+    navHoverFg: "Text der Seitenleiste (Mouseover)"
+    navActive: "Text der Seitenleiste (Aktiv)"
+    navIndicator: "Indikator der Seitenleiste"
+    link: "Link"
+    hashtag: "Hashtag"
+    mention: "Erwähnungen"
+    mentionMe: "Erwähnungen (Ich)"
+    renote: "Renote"
+    modalBg: "Hintergrund des Modals"
+    divider: "Trenner"
+    scrollbarHandle: "Griff des Scrollbalkens"
+    scrollbarHandleHover: "Griff des Scrollbalkens (Mouseover)"
+    dateLabelFg: "Text von Datumsbeschriftungen"
+    infoBg: "Hintergrund von Informationen"
+    infoFg: "Text von Informationen"
+    infoWarnBg: "Hintergrund von Warnungen"
+    infoWarnFg: "Text von Informationen"
+    cwBg: "Hintergrund von versteckten Inhalten"
+    cwFg: "Text von versteckten Inhalten"
+    cwHoverBg: "Hintergrund von versteckten Inhalten (Mouseover)"
+    toastBg: "Hintergrund von Benachrichtigungen"
+    toastFg: "Text von Benachrichtigungen"
+    buttonBg: "Hintergrund von Schaltflächen"
+    buttonHoverBg: "Hintergrund von Schaltflächen (Mouseover)"
+    inputBorder: "Rahmen des Eingabefelds"
+    listItemHoverBg: "Hintergrund von Listeneinträgen (Mouseover)"
+    driveFolderBg: "Hintergrund von Drive-Ordnern"
+    wallpaperOverlay: "Hintergrundbild-Overlay"
+    badge: "Wappen"
+    messageBg: "Hintergrund von Chats"
+    accentDarken: "Akzent (Verdunkelt)"
+    accentLighten: "Akzent (Erhellt)"
+    fgHighlighted: "Hervorgehobener Text"
 _sfx:
  note: "Notizen"
  noteMy: "Meine Notizen"
  notification: "Benachrichtigungen"
-  chat: "Privatnachrichten"
+  chat: "Chat"
  chatBg: "Nachrichten (Hintergrund)"
  antenna: "Antennen"
+  channel: "Kanalbenachrichtigung"
 _ago:
  unknown: "Unbekannt"
  future: "Zukunft"
@ -583,15 +865,15 @@ _permissions:
  "write:favorites": "Deine Favoriten-Liste bearbeiten"
  "read:following": "Deine Follower-Liste lesen"
  "write:following": "Anderen Benutzern folgen oder entfolgen"
-  "read:messaging": "Privatnachrichten lesen"
-  "write:messaging": "Privatnachrichten schicken oder löschen"
+  "read:messaging": "Chats lesen"
+  "write:messaging": "Chatnachrichten schicken oder löschen"
  "read:mutes": "Stummschaltungen lesen"
  "write:mutes": "Stummschaltungen bearbeiten"
  "write:notes": "Notizen schreiben oder löschen"
  "read:notifications": "Benachrichtigungen lesen"
-  "write:notifications": "Mit Benachrichtigungen arbeiten"
+  "write:notifications": "Benachrichtigungen bearbeiten"
  "read:reactions": "Reaktionen lesen"
-  "write:reactions": "Reaktionen hinzufügen und bearbeiten"
+  "write:reactions": "Reaktionen hinzufügen und ändern"
  "write:votes": "In Umfragen abstimmen"
  "read:pages": "Deine Seiten lesen"
  "write:pages": "Deine Seiten bearbeiten oder löschen"
@ -599,6 +881,8 @@ _permissions:
  "write:page-likes": "Liste der Seiten, die mir gefallen, bearbeiten"
  "read:user-groups": "Benutzergruppen lesen"
  "write:user-groups": "Benutzergruppen bearbeiten oder löschen"
+  "read:channels": "Kanäle lesen"
+  "write:channels": "Kanäle bearbeiten"
 _auth:
  shareAccess: "Möchtest du \"{name}\" authorisieren, auf dieses Benuzerkonto zugreifen zu können?"
  shareAccessAsk: "Bist du dir sicher, dass du diese Anwendung authorisieren möchtest, auf dein Benutzerkonto zugreifen zu können?"
@ -630,12 +914,14 @@ _widgets:
  rss: "RSS-Reader"
  activity: "Aktivität"
  photos: "Fotos"
+  digitalClock: "Digitaluhr"
+  federation: "Föderation"
+  postForm: "Neue Notiz anfertigen"
 _cw:
  hide: "Ausblenden"
  show: "Mehr anzeigen"
  chars: "{count} Zeichen"
  files: "{count} Dateien"
-  poll: "Umfrage"
 _poll:
  noOnlyOneChoice: "Mindestens zwei Antwortmöglichkeiten werden benötigt."
  choiceN: "Auswahl {n}"
@ -668,9 +954,11 @@ _visibility:
  specified: "Direkt"
  specifiedDescription: "Nur für bestimmte Benutzer sichtbar"
  localOnly: "Nur Lokal"
+  localOnlyDescription: "Unsichtbar für Benutzer anderer Instanzen"
 _postForm:
  replyPlaceholder: "Dieser Notiz antworten..."
  quotePlaceholder: "Diese Notiz zitieren..."
+  channelPlaceholder: "In einen Kanal senden"
  _placeholders:
    a: "Was machst du momentan?"
    b: "Was ist um dich herum los?"
@ -792,6 +1080,7 @@ _pages:
  created: "Seite erfolgreich erstellt"
  updated: "Seite erfolgreich aktualisiert"
  deleted: "Seite erfolgreich gelöscht"
+  pageSetting: "Seiteneinstellungen"
  nameAlreadyExists: "Die angegebene Seiten-URL existiert bereits"
  invalidNameTitle: "Die angegebene Seiten-URL ist ungültig"
  invalidNameText: "Überprüfe, ob der Seitentitel nicht leer ist"
@ -802,7 +1091,9 @@ _pages:
  unlike: "\"Gefällt mir\" entfernen"
  my: "Meine Seiten"
  liked: "Seiten, die mir gefallen"
+  featured: "Beliebt"
  inspector: "Inspektor"
+  contents: "Inhalt"
  content: "Inhalt"
  variables: "Variablen"
  title: "Titel"
@ -826,7 +1117,7 @@ _pages:
    text: "Text"
    textarea: "Textfeld"
    section: "Abschnitt"
-    image: "Bilder"
+    image: "Bild"
    button: "Knopf"
    if: "Falls"
    _if:
@ -841,7 +1132,7 @@ _pages:
      name: "Variablenname"
      text: "Titel"
      default: "Standardwert"
-    textareaInput: "Eingabe des mehrzeiligen Textfelds"
+    textareaInput: "Mehrzeiliges Texteingabefeld"
    _textareaInput:
      name: "Variablenname"
      text: "Titel"
@ -856,6 +1147,11 @@ _pages:
      id: "Leinwand-ID"
      width: "Breite"
      height: "Höhe"
+    note: "Eingebettete Notiz"
+    _note:
+      id: "Notiz ID"
+      idDescription: "Du kannst alternativ auch die Notiz-URL angeben."
+      detailed: "Detailierte Ansicht"
    switch: "Fallunterscheidung"
    _switch:
      name: "Variablenname"
@ -1077,9 +1373,40 @@ _notification:
  youGotQuote: "{name} hat dich zitiert"
  youRenoted: "Renote deiner Notiz von {name}"
  youGotPoll: "{name} hat auf deiner Umfrage abgestimmt"
-  youGotMessagingMessageFromUser: "{name} hat dir eine Privatnachricht gesendet"
-  youGotMessagingMessageFromGroup: "In die Gruppe {name} wurde eine Privatnachricht gesendet"
+  youGotMessagingMessageFromUser: "{name} hat dir eine Chatnachricht gesendet"
+  youGotMessagingMessageFromGroup: "In die Gruppe {name} wurde eine Chatnachricht gesendet"
  youWereFollowed: "Du hast einen neuen Follower"
  youReceivedFollowRequest: "Du hast eine Follow-Anfrage erhalten"
  yourFollowRequestAccepted: "Deine Follow-Anfrage wurde akzeptiert"
  youWereInvitedToGroup: "Du wurdest in eine Gruppe eingeladen"
+  _types:
+    all: "Alle"
+    follow: "Neue Follower"
+    mention: "Erwähnungen"
+    reply: "Antworten"
+    renote: "Renotes"
+    quote: "Zitationen"
+    reaction: "Reaktionen"
+    pollVote: "Antworten auf Umfragen"
+    receiveFollowRequest: "Follow-Anfrage erhalten"
+    followRequestAccepted: "Follow-Anfrage akzeptiert"
+    groupInvited: "Gruppeneinladung erhalten"
+    app: "Benachrichtigungen von Apps"
+_deck:
+  alwaysShowMainColumn: "Hauptspalte immer zeigen"
+  columnAlign: "Spalten ausrichten"
+  addColumn: "Spalte hinzufügen"
+  swapLeft: "Nach links verschieben"
+  swapRight: "Nach rechts verschieben"
+  swapUp: "Nach oben verschieben"
+  swapDown: "Nach unten verschieben"
+  stackLeft: "Nach links stapeln"
+  popRight: "Nach rechts vom Stapel nehmen"
+  _columns:
+    widgets: "Widgets"
+    notifications: "Benachrichtigungen"
+    tl: "Chronik"
+    antenna: "Antennen"
+    list: "Listen"
+    mentions: "Erwähnungen"
+    direct: "Direkt"
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@ -16,6 +16,9 @@ noNotes: "No notes"
 noNotifications: "No notifications"
 instance: "Instance"
 settings: "Settings"
+basicSettings: "Basic Settings"
+otherSettings: "Other Settings"
+openInWindow: "Open in window"
 profile: "Profile"
 timeline: "Timeline"
 noAccountDescription: "This user has not written their bio yet."
@ -29,7 +32,7 @@ users: "Users"
 addUser: "Add a user"
 favorite: "Favorite"
 favorites: "Favorites"
-unfavorite: "Undo favorite"
+unfavorite: "Unfavorite"
 pin: "Pin to profile"
 unpin: "Unpin from profile"
 copyContent: "Copy contents"
@ -40,11 +43,13 @@ deleteAndEditConfirm: "Are you sure you want to delete this note and edit it? Yo
 addToList: "Add to list"
 sendMessage: "Send a message"
 copyUsername: "Copy username"
+searchUser: "User search"
 reply: "Reply"
 loadMore: "Load more"
 youGotNewFollower: "Followed you"
 receiveFollowRequest: "Follow request received"
 followRequestAccepted: "Follow request accepted"
+mention: "Mention"
 mentions: "Mentions"
 directNotes: "Direct notes"
 importAndExport: "Import / Export"
@ -65,8 +70,11 @@ followers: "Followers"
 followsYou: "Follows you"
 createList: "Create list"
 manageLists: "Manage lists"
-error: "Something happened :("
+error: "Error"
+somethingHappened: "An error occurred"
 retry: "Retry"
+pageLoadError: "Failed to load page"
+pageLoadErrorDescription: "This is normally caused by network errors or the browser's cache. Try clearung the cache and then try again after waiting a little while."
 enterListName: "List name"
 privacy: "Privacy"
 makeFollowManuallyApprove: "Follow requests require approval"
@ -87,6 +95,7 @@ sensitive: "NSFW"
 add: "Add"
 reaction: "Reaction"
 reactionSettingDescription: "Assign your favorite reactions which want to pin in reaction picker."
+reactionSettingDescription2: "Drag to reorganize, click to delete."
 rememberNoteVisibility: "Remember note visibility settings"
 attachCancel: "Remove attachment"
 markAsSensitive: "Mark as NSFW"
@ -103,7 +112,12 @@ unblockConfirm: "Are you sure that you want to unblock this account?"
 suspendConfirm: "Are you sure that you want to suspend this account?"
 unsuspendConfirm: "Are you sure you that want to unsuspend this account?"
 selectList: "Select a list"
+selectAntenna: "Select an Antenna"
+selectWidget: "Select a widget"
+editWidgets: "Edit widgets"
+editWidgetsExit: "Done"
 customEmojis: "Custom Emoji"
+emoji: "Emoji"
 emojiName: "Emoji name"
 emojiUrl: "Emoji URL"
 addEmoji: "Add an emoji"
@ -173,7 +187,6 @@ processing: "Processing"
 preview: "Preview"
 default: "Default"
 noCustomEmojis: "There are no emojis"
-customEmojisOfRemote: "Emojis from other instances"
 noJobs: "There are no jobs"
 federating: "Federating"
 blocked: "Blocked"
@ -202,6 +215,8 @@ imageUrl: "Image URL"
 remove: "Delete"
 removed: "Successfully deleted"
 removeAreYouSure: "Are you sure that you want to delete \"{x}\"?"
+deleteAreYouSure: "Are you sure that you want to delete \"{x}\"?"
+resetAreYouSure: "Really reset?"
 saved: "Saved"
 messaging: "Messaging"
 upload: "Upload"
@ -260,6 +275,7 @@ rename: "Rename"
 avatar: "Avatar"
 banner: "Banner"
 nsfw: "NSFW"
+whenServerDisconnected: "When losing connection to the server"
 disconnectedFromServer: "Connection to the server was interrupted."
 reload: "Refresh"
 doNothing: "Ignore"
@ -300,6 +316,8 @@ bannerUrl: "Banner image URL"
 basicInfo: "Basic info"
 pinnedUsers: "Pinned user"
 pinnedUsersDescription: "List one username per line. Users listed here will be pinned under \"Explore\" tab."
+pinnedPages: "Pinned pages"
+pinnedPagesDescription: "Enter the paths of the pages you want to pin to the top page of this instance, separated by new lines."
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Enable hCaptcha"
 hcaptchaSiteKey: "Site key"
@ -360,9 +378,6 @@ unregister: "Unregister"
 passwordLessLogin: "Set up password-less login"
 resetPassword: "Reset password"
 newPasswordIs: "The new password is \"{password}\""
-autoReloadWhenDisconnected: "Auto refresh when disconnected from server"
-autoNoteWatch: "Watch note automatically"
-autoNoteWatchDescription: "Get notified about the notes which you reactioned or replied."
 reduceUiAnimation: "Reduce UI animation"
 share: "Share"
 notFound: "Not found"
@ -393,13 +408,14 @@ next: "Next"
 retype: "Enter again"
 noteOf: "{user}'s notes"
 inviteToGroup: "Invite to group"
-maxNoteTextLength: "Character limit of the note"
+maxNoteTextLength: "Character limit of notes"
 quoteAttached: "Quoted"
 quoteQuestion: "Do you want to append a quote?"
 noMessagesYet: "No messages yet"
 newMessageExists: "You've got a new message"
 onlyOneFileCanBeAttached: "You can only attach one file to a message"
 signinRequired: "Please sign in"
+invitations: "Invitations"
 invitationCode: "Invitation code"
 checking: "Checking"
 available: "Available"
@ -440,8 +456,8 @@ remote: "Remote"
 total: "Total"
 weekOverWeekChanges: "Weekly"
 dayOverDayChanges: "Daily"
-accessibility: "Accessibility"
-clinetSettings: "Client Settings"
+appearance: "Appearance"
+clientSettings: "Client settings"
 accountSettings: "Account Settings"
 promotion: "Promoted"
 promote: "Promote"
@ -464,6 +480,7 @@ objectStorageUseSSL: "Use SSL"
 objectStorageUseSSLDesc: "Turn off this if you are not going to use HTTPS for API connection"
 objectStorageUseProxy: "Connect over Proxy"
 objectStorageUseProxyDesc: "Turn off this if you are not going to use Proxy for ObjectStorage connection"
+objectStorageSetPublicRead: "Set \"public-read\" on upload"
 serverLogs: "Server logs"
 deleteAll: "Delete all"
 showFixedPostForm: "Display the posting form at the top of the timeline"
@ -471,6 +488,8 @@ newNoteRecived: "You've got a new note"
 sounds: "Sounds"
 listen: "Listen"
 none: "None"
+showInPage: "Show in page"
+popout: "Pop-out"
 volume: "Volume"
 details: "Details"
 chooseEmoji: "Choose an emoji"
@ -507,6 +526,207 @@ addRelay: "Add Relay"
 inboxUrl: "Inbox URL"
 addedRelays: "Added Relays"
 serviceworkerInfo: "Must be enabled for push notifications."
+deletedNote: "Deleted note"
+invisibleNote: "Invisible note"
+enableInfiniteScroll: "Enable infinite scrolling"
+visibility: "Visiblility"
+poll: "Poll"
+useCw: "Hide content"
+enablePlayer: "Open video player"
+disablePlayer: "Close video player"
+expandTweet: "Expand tweet"
+themeEditor: "Theme editor"
+description: "Description"
+author: "Author"
+leaveConfirm: "There are unsaved changes. Do you want to discard them?"
+manage: "Management"
+plugins: "Plugins"
+pluginInstallWarn: "Please do not install untrustworthy plugins."
+deck: "Deck"
+undeck: "Leave Deck"
+useBlurEffectForModal: "Use blur effect for modals"
+useFullReactionPicker: "Use full-size reaction picker"
+width: "Width"
+height: "Height"
+generateAccessToken: "Generate access token"
+permission: "Permissions"
+enableAll: "Enable all"
+disableAll: "Disable all"
+tokenRequested: "Grant access to account"
+pluginTokenRequestedDescription: "This plugin will be able to use the permissions set here."
+notificationType: "Notification type"
+edit: "Edit"
+useStarForReactionFallback: "Use ★ as fallback if the reaction emoji is unknown"
+emailConfig: "Email server configuration"
+enableEmail: "Enable email distribution"
+emailConfigInfo: "Used to confirm your email during sign-up and if you forget your password"
+email: "Email Address"
+smtpConfig: "SMTP Server configuration"
+smtpHost: "Host"
+smtpPort: "Port"
+smtpUser: "Username"
+smtpPass: "Password"
+emptyToDisableSmtpAuth: "Leave username and password empty to disable SMTP verification"
+smtpSecure: "Use implicit SSL/TLS for SMTP connections"
+smtpSecureInfo: "Turn this off when using STARTTLS"
+testEmail: "Test email delivery"
+wordMute: "Word mute"
+userSaysSomething: "{name} said something"
+makeActive: "Activate"
+display: "Display"
+copy: "Copy"
+metrics: "Metrics"
+overview: "Overview"
+logs: "Logs"
+delayed: "Delayed"
+database: "Database"
+channel: "Channels"
+create: "Create"
+notificationSetting: "Notification settings"
+notificationSettingDesc: "Select the type of notification to display"
+useGlobalSetting: "Use global setting"
+useGlobalSettingDesc: "If turned on, your account's notification settings will be used. If turned off, individual configurations can be made."
+other: "Other"
+regenerateLoginToken: "Regenerate login token"
+regenerateLoginTokenDescription: "Regenerate the token used internally during login. Normally this action is not necessary. If regenerated, all devices will be logged out."
+setMultipleBySeparatingWithSpace: "You can set multiple by separating them with spaces."
+fileIdOrUrl: "File-ID or URL"
+chatOpenBehavior: "Behavior of the chat window when opened"
+sample: "Sample"
+abuseReports: "Reports"
+reportAbuse: "Report"
+reportAbuseOf: "Report {name}"
+fillAbuseReportDescription: "Please fill in the report details. If it is about a specific note, please include its URL."
+abuseReported: "Your report has been sent. Thank you very much."
+send: "Send"
+abuseMarkAsResolved: "Mark report as resolved"
+openInNewTab: "Open in new tab"
+openInSideView: "Open in side view"
+defaultNavigationBehaviour: "Default navigation behavior"
+editTheseSettingsMayBreakAccount: "Editing these settings may damage your account."
+instanceTicker: "Instance information of notes"
+waitingFor: "Waiting for {x}"
+random: "Random"
+system: "System"
+switchUi: "Switch UI"
+desktop: "Desktop"
+clip: "Clip"
+createNew: "Create new"
+optional: "Optional"
+createNewClip: "Create new clip"
+public: "Public"
+_mfm:
+  cheatSheet: "MFM Cheatsheet"
+  intro: "MFM is a Misskey-exclusive markup language that can be used in many places. Here you can view a list of all available MFM syntax."
+  dummy: "Misskey expands the world of the Fediverse"
+  mention: "Mention"
+  mentionDescription: "Using an At-Symbol and a username, you can specify a specific user."
+  hashtag: "Hashtag"
+  hashtagDescription: "Using a number sign and text, you can specify a hashtag."
+  url: "URL"
+  urlDescription: "URLs can be displayed."
+  link: "Link"
+  linkDescription: "Specific parts of text can be displayed as URL."
+  bold: "Bold"
+  boldDescription: "Highlights letters by making them thicker."
+  small: "Small"
+  smallDescription: "Displays contents small and thinn."
+  center: "Center"
+  centerDescription: "Displays content centered."
+  inlineCode: "Code (Inline)"
+  inlineCodeDescription: "Displays inline syntax highlighting for (program-)code."
+  blockCode: "Code (Block)"
+  blockCodeDescription: "Displays syntax highlighting for multi-line (program-)code in a block."
+  inlineMath: "Math (In-line)"
+  inlineMathDescription: "Display math formulas (KaTeX) in-line"
+  blockMath: "Math (Block)"
+  blockMathDescription: "Display multi-line Math formulas (KaTeX) in a block"
+  quote: "Quote"
+  quoteDescription: "Displays content as quote."
+  emoji: "Custom Emoji"
+  emojiDescription: "By surrounding a custom emoji name with colons, custom emoji can be displayed."
+  search: "Search"
+  searchDescription: "Displays a search box with pre-entered text."
+  flip: "Flip"
+  flipDescription: "Flips content horizontally or vertically."
+  jelly: "Animation (Jelly)"
+  jellyDescription: "Infuses a jelly-like animation."
+  tada: "Animation (Tada)"
+  tadaDescription: "Infuses a \"Tada!\"-like animation."
+  jump: "Animation (Jump)"
+  jumpDescription: "Infuses a jumping animation."
+  bounce: "Animation (Bounce)"
+  bounceDescription: "Causes a bouncy animation."
+  shake: "Animation (Shake)"
+  shakeDescription: "Infuses a shaking animation."
+  twitch: "Animation (Twitch)"
+  twitchDescription: "Infuses a strongly twitching animation."
+  spin: "Animation (Spin)"
+  spinDescription: "Infuses a spinning animation."
+_reversi:
+  reversi: "Reversi"
+  gameSettings: "Game settings"
+  chooseBoard: "Choose a board"
+  blackOrWhite: "Black/White"
+  blackIs: "{name} is playing Black"
+  rules: "Rules"
+  botSettings: "Bot options"
+  thisGameIsStartedSoon: "The game will start in a few seconds"
+  waitingForOther: "Waiting for the opponent's turn"
+  waitingForMe: "Waiting for your turn"
+  waitingBoth: "Get ready"
+  ready: "Ready"
+  cancelReady: "Cancel ready"
+  opponentTurn: "Opponent's turn"
+  myTurn: "Your turn"
+  turnOf: "{name}'s turn"
+  pastTurnOf: "{name}'s turn"
+  surrender: "Surrender"
+  surrendered: "By surrender"
+  drawn: "Draw"
+  won: "{name}'s win"
+  black: "Black"
+  white: "White"
+  total: "Total"
+  turnCount: "Turn {count}"
+  myGames: "My rounds"
+  allGames: "All rounds"
+  ended: "Ended"
+  playing: "Currently playing"
+  isLlotheo: "The one with fewer stones wins (Llotheo)"
+  loopedMap: "Looped map"
+  canPutEverywhere: "Tiles are placeable everywhere"
+_instanceTicker:
+  none: "Never show"
+  remote: "Show for remote users"
+  always: "Always show"
+_serverDisconnectedBehavior:
+  reload: "Automatically reload"
+  dialog: "Show warning dialog"
+  quiet: "Show unobtrusive warning"
+_channel:
+  create: "Create channel"
+  edit: "Edit channel"
+  setBanner: "Set banner"
+  removeBanner: "Remove banner"
+  featured: "Trending"
+  owned: "Owned"
+  following: "Followed"
+  usersCount: "{n} Participants"
+  notesCount: "{n} Notes"
+_sidebar:
+  full: "Full"
+  icon: "Avatar"
+  hide: "Hide"
+_wordMute:
+  muteWords: "Word to mute"
+  muteWordsDescription: "Separate with spaces for AND condition. Separate with line breaks for OR."
+  muteWordsDescription2: "Surround keywords by slashes to use regular expressions."
+  softDescription: "Hide notes fulfilling the set conditions from the timeline."
+  hardDescription: "Prevent notes fulfilling the set conditions from being added to the timeline. In addition, these notes will not be added to the timeline even if the conditions are changed."
+  soft: "Soft"
+  hard: "Hard"
+  mutedNotes: "Muted notes"
 _theme:
  explore: "Explore Themes"
  install: "Install theme"
@ -515,6 +735,69 @@ _theme:
  installed: "{name} has been installed"
  alreadyInstalled: "The theme is already installed"
  invalid: "Theme format is invalid"
+  make: "Make a theme"
+  base: "Base"
+  addConstant: "Add constant"
+  constant: "Constant"
+  defaultValue: "Default value"
+  color: "Color"
+  refProp: "Reference a property"
+  refConst: "Reference a constant"
+  key: "Key"
+  func: "Functions"
+  funcKind: "Function type"
+  argument: "Argument"
+  basedProp: "Referenced property"
+  alpha: "Opacity"
+  darken: "Darken"
+  lighten: "Lighten"
+  inputConstantName: "Enter a name for the constant"
+  importInfo: "If you enter theme code here, you can import it to the theme editor"
+  deleteConstantConfirm: "Do you really want to delete the constant {const}?"
+  keys:
+    accent: "Accent"
+    bg: "Background"
+    fg: "Text"
+    focus: "Focus"
+    indicator: "Indicator"
+    panel: "Panel"
+    shadow: "Shadow"
+    header: "Header"
+    navBg: "Sidebar background"
+    navFg: "Sidebar text"
+    navHoverFg: "Sidebar text (Hover)"
+    navActive: "Sidebar text (Active)"
+    navIndicator: "Sidebar indicator"
+    link: "Link"
+    hashtag: "Hashtag"
+    mention: "Mention"
+    mentionMe: "Mentions (Me)"
+    renote: "Renote"
+    modalBg: "Modal background"
+    divider: "Divider"
+    scrollbarHandle: "Scrollbar handle"
+    scrollbarHandleHover: "Scrollbar handle (Hover)"
+    dateLabelFg: "Text of date labels"
+    infoBg: "Information background"
+    infoFg: "Information text"
+    infoWarnBg: "Warning background"
+    infoWarnFg: "Warning text"
+    cwBg: "CW background"
+    cwFg: "CW text"
+    cwHoverBg: "CW background (Hover)"
+    toastBg: "Notification background"
+    toastFg: "Notification text"
+    buttonBg: "Button background"
+    buttonHoverBg: "Button background (Hover)"
+    inputBorder: "Input field border"
+    listItemHoverBg: "List item background (Hover)"
+    driveFolderBg: "Drive folder background"
+    wallpaperOverlay: "Wallpaper overlay"
+    badge: "Badge"
+    messageBg: "Chat background"
+    accentDarken: "Accent (Darkened)"
+    accentLighten: "Accent (Lightened)"
+    fgHighlighted: "Highlighted Text"
 _sfx:
  note: "New note"
  noteMy: "My note"
@ -522,6 +805,7 @@ _sfx:
  chat: "Messaging"
  chatBg: "Messaging (Background)"
  antenna: "Antenna Reception"
+  channel: "Channel notifications"
 _ago:
  unknown: "Unknown"
  future: "Future"
@ -597,6 +881,8 @@ _permissions:
  "write:page-likes": "Edit likes on pages"
  "read:user-groups": "View user groups"
  "write:user-groups": "Edit or delete user groups"
+  "read:channels": "Read channels"
+  "write:channels": "Modify channels"
 _auth:
  shareAccess: "Would you like to authorize \"{name}\" to access this account?"
  shareAccessAsk: "Are you sure you want to authorize this application to access your account?"
@ -628,12 +914,14 @@ _widgets:
  rss: "RSS reader"
  activity: "Activity"
  photos: "Photos"
+  digitalClock: "Digital clock"
+  federation: "Federation"
+  postForm: "Compose a note"
 _cw:
  hide: "Hide"
  show: "Load more"
  chars: "{count} characters"
  files: "{count} file(s)"
-  poll: "Poll"
 _poll:
  noOnlyOneChoice: "At least two choices are needed"
  choiceN: "Choice {n}"
@ -666,9 +954,11 @@ _visibility:
  specified: "Direct"
  specifiedDescription: "Post to specified users only"
  localOnly: "Local only"
+  localOnlyDescription: "Not visible to remote users"
 _postForm:
  replyPlaceholder: "Reply to this note..."
  quotePlaceholder: "Quote this note..."
+  channelPlaceholder: "Post to channel"
  _placeholders:
    a: "What are you up to?"
    b: "What's happening around you?"
@ -790,6 +1080,7 @@ _pages:
  created: "Successfully created a page!"
  updated: "Successfully updated the page!"
  deleted: "The page has been deleted"
+  pageSetting: "Page settings"
  nameAlreadyExists: "The specified page URL already exists"
  invalidNameTitle: "The specified page URL is invalid"
  invalidNameText: "Check whether that is not a blank"
@ -800,7 +1091,9 @@ _pages:
  unlike: "Undo like"
  my: "My pages"
  liked: "Liked pages"
+  featured: "Featured"
  inspector: "Inspector"
+  contents: "Content"
  content: "Page block"
  variables: "Variables"
  title: "Title"
@ -854,6 +1147,11 @@ _pages:
      id: "Canvas ID"
      width: "Width"
      height: "Height"
+    note: "Embedded note"
+    _note:
+      id: "Note ID"
+      idDescription: "You can also paste the Note's URL to set it instead."
+      detailed: "Detailed view"
    switch: "Switch"
    _switch:
      name: "Variable name"
@ -1069,5 +1367,46 @@ _relayStatus:
  accepted: "Accepted"
  rejected: "Rejected"
 _notification:
+  fileUploaded: "File successfully uploaded"
+  youGotMention: "{name} mentioned you"
+  youGotReply: "{name} replied to you"
+  youGotQuote: "{name} quoted you"
+  youRenoted: "{name} renoted you"
+  youGotPoll: "{name} voted on your poll"
+  youGotMessagingMessageFromUser: "{name} sent you a message"
+  youGotMessagingMessageFromGroup: "A message was sent to the {name} group"
  youWereFollowed: "Followed you"
+  youReceivedFollowRequest: "You've received a follow request"
+  yourFollowRequestAccepted: "Your follow request was accepted"
  youWereInvitedToGroup: "Invited to group"
+  _types:
+    all: "All"
+    follow: "Follows"
+    mention: "Mentions"
+    reply: "Replies"
+    renote: "Renotes"
+    quote: "Quotes"
+    reaction: "Reactions"
+    pollVote: "Votes on polls"
+    receiveFollowRequest: "Follow request received"
+    followRequestAccepted: "Follow request accepted"
+    groupInvited: "Invited to groups"
+    app: "Notifications from apps"
+_deck:
+  alwaysShowMainColumn: "Always show main column"
+  columnAlign: "Align columns"
+  addColumn: "Add column"
+  swapLeft: "Swap to left"
+  swapRight: "Swap to right"
+  swapUp: "Swap with above"
+  swapDown: "Swap with below"
+  stackLeft: "Stack on the left"
+  popRight: "Pop to the right"
+  _columns:
+    widgets: "Widgets"
+    notifications: "Notifications"
+    tl: "Timeline"
+    antenna: "Antennas"
+    list: "Lists"
+    mentions: "Mentions"
+    direct: "Direct"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@ -16,6 +16,9 @@ noNotes: "No hay notas"
 noNotifications: "No hay notificaciones"
 instance: "Instancia"
 settings: "Configuración"
+basicSettings: "Configuración Básica"
+otherSettings: "Configuración avanzada"
+openInWindow: "Abrir en una ventana"
 profile: "Perfil"
 timeline: "Linea de tiempo"
 noAccountDescription: "Este usuario no tiene una descripción"
@ -26,7 +29,7 @@ signup: "Registrarse"
 uploading: "Cargando"
 save: "Guardar"
 users: "Usuarios"
-addUser: "Añadir usuario"
+addUser: "Agregar usuario"
 favorite: "Favorito"
 favorites: "Favoritos"
 unfavorite: "Quitar de favoritos"
@ -40,11 +43,13 @@ deleteAndEditConfirm: "¿Quieres borrar y editar este nota? Las reacciones, reno
 addToList: "Agregar a lista"
 sendMessage: "Énviar mensaje"
 copyUsername: "Copiar nombre de usuario"
+searchUser: "Búsqueda de usuarios"
 reply: "Responder"
 loadMore: "Ver más"
 youGotNewFollower: "te ha seguido"
 receiveFollowRequest: "Recibiste una solicitud de seguimiento"
 followRequestAccepted: "La solicitud de seguimiento fue aceptada"
+mention: "Menciones"
 mentions: "Menciones"
 directNotes: "Notas directas"
 importAndExport: "Importar y Exportar"
@ -65,8 +70,11 @@ followers: "Seguidores"
 followsYou: "Te sigue"
 createList: "Crear lista"
 manageLists: "Administrar listas"
-error: "Ocurrió un problema"
+error: "Error"
+somethingHappened: "Ocurrió un error"
 retry: "Reintentar"
+pageLoadError: "Error al leer la página"
+pageLoadErrorDescription: "Normalmente es debido a la red o al caché del navegador. Por favor limpie el caché o intente más tarde."
 enterListName: "Ingrese nombre de lista"
 privacy: "Privacidad"
 makeFollowManuallyApprove: "Aprobar manualmente las solicitudes de seguimiento"
@ -84,7 +92,7 @@ pinnedNote: "Nota fijada"
 you: "Tú"
 clickToShow: "Click para ver"
 sensitive: "Marcado como sensible"
-add: "Añadir"
+add: "Agregar"
 reaction: "Reacción"
 reactionSettingDescription: "Asigne sus reacción favoritas que desean anclar en el selector de reacciones."
 rememberNoteVisibility: "Recordar visibilidad"
@ -103,17 +111,22 @@ unblockConfirm: "¿Quiere dejar de bloquear esta cuenta?"
 suspendConfirm: "¿Quiere suspender esta cuenta?"
 unsuspendConfirm: "¿Quiere dejar de suspender esta cuenta?"
 selectList: "Seleccione una lista"
+selectAntenna: "Seleccionar antena"
+selectWidget: "Seleccionar widget"
+editWidgets: "Editar widgets"
+editWidgetsExit: "Terminar edición"
 customEmojis: "Emojis personalizados"
+emoji: "Emoji"
 emojiName: "Nombre del emoji"
 emojiUrl: "URL de la imágen del emoji"
-addEmoji: "Añadir emoji"
+addEmoji: "Agregar emoji"
 settingGuide: "Configuración sugerida"
 cacheRemoteFiles: "Mantener en cache los archivos remotos"
 cacheRemoteFilesDescription: "Si desactiva esta configuración, Los archivos remotos se cargarán desde el link directo sin usar la caché. Con eso se puede ahorrar almacenamiento del servidor, pero eso aumentará el tráfico al no crear miniaturas."
 flagAsBot: "Esta cuenta es un bot"
 flagAsCat: "Esta cuenta es un gato"
 autoAcceptFollowed: "Aceptar automáticamente las solicitudes de seguimiento de los usuarios que sigues"
-addAcount: "Añadir cuenta"
+addAcount: "Agregar cuenta"
 loginFailed: "Error al iniciar sesión."
 showOnRemote: "Ver en una instancia remota"
 general: "General"
@ -173,7 +186,6 @@ processing: "Procesando"
 preview: "Vista previa"
 default: "Predeterminado"
 noCustomEmojis: "No hay emojis personalizados"
-customEmojisOfRemote: "Emojis remotos"
 noJobs: "No hay trabajos"
 federating: "Federando"
 blocked: "Bloqueando"
@ -202,6 +214,7 @@ imageUrl: "URL de la imágen"
 remove: "Borrar"
 removed: "Borrado"
 removeAreYouSure: "¿Desea borrar \"{x}\"?"
+deleteAreYouSure: "¿Desea borrar \"{x}\"?"
 saved: "Guardado"
 messaging: "Chat"
 upload: "Subir"
@ -247,7 +260,7 @@ folderName: "Nombre de la carpeta"
 createFolder: "Crear carpeta"
 renameFolder: "Renombrar carpeta"
 deleteFolder: "Borrar carpeta"
-addFile: "Añadir archivo"
+addFile: "Agregar archivo"
 emptyDrive: "El drive está vacío"
 emptyFolder: "La carpeta está vacía"
 unableToDelete: "No se puede borrar"
@ -260,6 +273,7 @@ rename: "Renombrar"
 avatar: "Avatar"
 banner: "Banner"
 nsfw: "Marcado como sensible"
+whenServerDisconnected: "Cuando se pierda la conexión con el servidor"
 disconnectedFromServer: "Desconectado del servidor"
 reload: "Recargar"
 doNothing: "No hacer nada"
@ -360,9 +374,6 @@ unregister: "Cancelar registro"
 passwordLessLogin: "Iniciar sesión sin contraseña"
 resetPassword: "Resetear contraseña"
 newPasswordIs: "La nueva contraseña es \"{password}\""
-autoReloadWhenDisconnected: "Recargar automáticamente cuando el servidor está desconectado"
-autoNoteWatch: "Ver nota automáticamente"
-autoNoteWatchDescription: "Recibe notificaciones sobre las notas de otros usuarios que a los que respondiste y reaccionaste"
 reduceUiAnimation: "Reducir la animación de la UI"
 share: "Compartir"
 notFound: "No se encuentra"
@ -400,6 +411,7 @@ noMessagesYet: "Aún no hay chat"
 newMessageExists: "Tienes un mensaje nuevo"
 onlyOneFileCanBeAttached: "Solo se puede añadir un archivo al mensaje"
 signinRequired: "Iniciar sesión"
+invitations: "Invitar"
 invitationCode: "Código de invitación"
 checking: "Comprobando"
 available: "Disponible"
@ -440,8 +452,8 @@ remote: "Remoto"
 total: "Total"
 weekOverWeekChanges: "Dif semanal"
 dayOverDayChanges: "Dif diaria"
-accessibility: "Accesibilidad"
-clinetSettings: "Ajustes del cliente"
+appearance: "Apariencia"
+clientSettings: "Configuración del cliente"
 accountSettings: "Ajustes de cuenta"
 promotion: "Promovido"
 promote: "Promover"
@ -464,6 +476,7 @@ objectStorageUseSSL: "Usar SSL"
 objectStorageUseSSLDesc: "Desactive esto si no va a usar HTTPS para la conexión API"
 objectStorageUseProxy: "Conectarse a través de Proxy"
 objectStorageUseProxyDesc: "Desactive esto si no va a usar Proxy para la conexión de Almacenamiento de objetos"
+objectStorageSetPublicRead: "Seleccionar \"public-read\" al subir "
 serverLogs: "Registros del servidor"
 deleteAll: "Eliminar todos"
 showFixedPostForm: "Mostrar el formulario de las entradas encima de la línea de tiempo"
@ -471,6 +484,8 @@ newNoteRecived: "Tienes una nota nuevo"
 sounds: "Sonidos"
 listen: "Escuchar"
 none: "Ninguna"
+showInPage: "Mostrar en la página"
+popout: "Popout"
 volume: "Volumen"
 details: "Detalles"
 chooseEmoji: "Elije un emoji"
@ -506,6 +521,173 @@ relays: "Relés"
 addRelay: "Agregar relé"
 inboxUrl: "Inbox URL"
 addedRelays: "Relés añadidos"
+serviceworkerInfo: "Se necesita activar para usar las notificaciones push"
+deletedNote: "Nota eliminada"
+invisibleNote: "Nota oculta"
+enableInfiniteScroll: "Activar scroll infinito"
+visibility: "Visibilidad"
+poll: "Encuesta"
+useCw: "Esconder contenidos"
+enablePlayer: "Abrir reproductor"
+disablePlayer: "Cerrar reproductor"
+expandTweet: "Expandir tweet"
+themeEditor: "Editor de temas"
+description: "Descripción"
+author: "Autor"
+leaveConfirm: "Hay modificaciones sin guardar. ¿Desea descartarlas?"
+manage: "Administrar"
+plugins: "Plugins"
+pluginInstallWarn: "Por favor no instale plugins que no son de confianza"
+deck: "Deck"
+undeck: "Quitar deck"
+useBlurEffectForModal: "Usar efecto borroso en modales"
+useFullReactionPicker: "Reacción"
+width: "Ancho"
+height: "Altura"
+generateAccessToken: "Generar token de acceso"
+permission: "Permisos"
+enableAll: "Activar todo"
+disableAll: "Desactivar todo"
+tokenRequested: "Permiso de acceso a la cuenta"
+pluginTokenRequestedDescription: "Este plugin podrá usar los permisos descritos aquí"
+notificationType: "Tipo de notificación"
+edit: "Editar"
+useStarForReactionFallback: "En caso de que los emojis de reacciones no sean claros, usar en su lugar una estrella"
+emailConfig: "Configuración del servidor de correos"
+enableEmail: "Activar el envío de correos electrónicos"
+emailConfigInfo: "Usar en caso de validación de correo electrónico y pedido de contraseña"
+email: "Correo electrónico"
+smtpConfig: "Configuración del servidor SMTP"
+smtpHost: "Host"
+smtpPort: "Puerto"
+smtpUser: "Nombre de usuario"
+smtpPass: "Contraseña"
+emptyToDisableSmtpAuth: "Deje el nombre del usuario y la contraseña en blanco para deshabilitar la autenticación SMTP"
+smtpSecure: "Usar SSL/TLS implícito en la conexión SMTP"
+smtpSecureInfo: "Apagar cuando se use STARTTLS"
+testEmail: "Prueba de envío"
+wordMute: "Silenciar palabras"
+userSaysSomething: "{name} dijo algo"
+makeActive: "Activar"
+display: "Apariencia"
+copy: "Copiar"
+metrics: "Métricas"
+overview: "Resumen"
+logs: "Registros"
+delayed: "atrasado"
+database: "Base de datos"
+channel: "Canal"
+create: "Crear"
+notificationSetting: "Ajustes de Notificaciones"
+notificationSettingDesc: "Por favor elija el tipo de notificación a mostrar"
+useGlobalSetting: "Usar ajustes globales"
+useGlobalSettingDesc: "Al activarse, se usará la configuración de notificaciones de la cuenta, al desactivarse se pueden hacer configuraciones particulares."
+other: "Otro"
+regenerateLoginToken: "Regenerar token de login"
+regenerateLoginTokenDescription: "Regenerar el token usado internamente durante el login. No siempre es necesario hacerlo. Al hacerlo de nuevo, se deslogueará en todos los dispositivos."
+setMultipleBySeparatingWithSpace: "Puedes añadir mas de uno, separado por espacios."
+fileIdOrUrl: "Id del archivo o URL"
+chatOpenBehavior: "Comportamiento al abrir el chat"
+sample: "Muestra"
+abuseReports: "Reportes"
+reportAbuse: "Reportar"
+reportAbuseOf: "Reportar a {name}"
+fillAbuseReportDescription: "Ingrese los detalles del reporte. Si hay una nota en particular, ingrese la URL de esta."
+abuseReported: "Se ha enviado el reporte. Muchas gracias."
+send: "Enviar"
+abuseMarkAsResolved: "Marcar reporte como resuelto"
+openInNewTab: "Abrir en una Nueva Pestaña"
+openInSideView: "Abrir en una vista al costado"
+defaultNavigationBehaviour: "Navegación por defecto"
+editTheseSettingsMayBreakAccount: "Editar estas configuraciones puede dañar su cuenta."
+instanceTicker: "Información de notas de la instancia"
+waitingFor: "Esperando a {x}"
+random: "Aleatorio"
+system: "Sistema"
+switchUi: "Cambiar interfaz de usuario"
+desktop: "Escritorio"
+public: "Público"
+_mfm:
+  cheatSheet: "Hoja de referencia de MFM"
+  intro: "MFM es un lenguaje de marcado dedicado que se puede usar en varios lugares dentro de Misskey. Aquí puede ver una lista de sintaxis disponibles en MFM."
+  mention: "Menciones"
+  mentionDescription: "El signo @ seguido de un nombre de usuario se puede utilizar para notificar a un usuario en particular."
+  hashtag: "Hashtag"
+  url: "URL"
+  link: "Vínculo"
+  bold: "Negrita"
+  center: "Centrar"
+  blockCode: "Código (bloque)"
+  blockCodeDescription: "Código de resaltado de sintaxis, como programas de varias líneas con bloques."
+  quote: "Citar"
+  emoji: "Emojis personalizados"
+  search: "Buscar"
+  flip: "Echar de un capirotazo"
+  flipDescription: "Voltea el contenido hacia arriba / abajo o hacia la izquierda / derecha."
+_reversi:
+  reversi: "Reversi"
+  gameSettings: "Configuración del juego"
+  chooseBoard: "Elegir tablero"
+  blackOrWhite: "Blancas/Negras"
+  blackIs: "{name} juega con fichas negras"
+  rules: "Reglas"
+  botSettings: "Opciones del bot"
+  thisGameIsStartedSoon: "El juego empezará en segundos"
+  waitingForOther: "Esperando el turno del adversario"
+  waitingForMe: "Esperando mi turno"
+  waitingBoth: "Prepárate"
+  ready: "Listo"
+  cancelReady: "No estoy listo"
+  opponentTurn: "Turno del adversario"
+  myTurn: "Mi turno"
+  turnOf: "Turno de {name}"
+  pastTurnOf: "Turno de {name}"
+  surrender: "Rendirse"
+  surrendered: "Por rendirse"
+  drawn: "Empate"
+  won: "{name} ha ganado"
+  black: "Negro"
+  white: "Blanco"
+  total: "Total"
+  turnCount: "Turno {count}"
+  myGames: "Mis juegos"
+  allGames: "Todos los juegos"
+  ended: "Finalizado"
+  playing: "Jugando"
+  isLlotheo: "El que tenga menos fichas gana (LLoTheO)"
+  loopedMap: "Mapa en bucle"
+  canPutEverywhere: "Puedes colocar donde quieras"
+_instanceTicker:
+  none: "No mostrar"
+  remote: "Mostrar a usuarios remotos"
+  always: "Mostrar siempre"
+_serverDisconnectedBehavior:
+  reload: "Recargar automáticamente"
+  dialog: "Mostrar diálogo de advertencia"
+  quiet: "Advertencia discreta"
+_channel:
+  create: "Crear canal"
+  edit: "Editar canal"
+  setBanner: "Elegir banner"
+  removeBanner: "Borrar banner"
+  featured: "Tendencias"
+  owned: "Dueño"
+  following: "Siguiendo"
+  usersCount: "{n} participantes"
+  notesCount: "{n} notas"
+_sidebar:
+  full: "Completo"
+  icon: "Avatar"
+  hide: "Ocultar"
+_wordMute:
+  muteWords: "Palabras que silenciar"
+  muteWordsDescription: "Separar con espacios indica una declaracion And, separar con lineas nuevas indica una declaracion Or。"
+  muteWordsDescription2: "Encerrar las palabras clave entre numerales para usar expresiones regulares"
+  softDescription: "Ocultar en la linea de tiempo las notas que cumplen las condiciones"
+  hardDescription: "Evitar que se agreguen a la linea de tiempo las notas que cumplen las condiciones. Las notas no agregadas seguirán quitadas aunque cambien las condiciones."
+  soft: "Suave"
+  hard: "Duro"
+  mutedNotes: "Notas silenciadas"
 _theme:
  explore: "Explorar temas"
  install: "Instalar tema"
@ -514,6 +696,69 @@ _theme:
  installed: "{name} ha sido instalado"
  alreadyInstalled: "Este tema ya está instalado"
  invalid: "El formato del tema no es válido"
+  make: "Crear tema"
+  base: "Base"
+  addConstant: "Agregar constante"
+  constant: "Constante"
+  defaultValue: "Valor predeterminado"
+  color: "Color"
+  refProp: "Hacer referencia a propiedad"
+  refConst: "Hacer referencia a constante"
+  key: "Clave"
+  func: "funciones"
+  funcKind: "Tipo de función"
+  argument: "Argumento"
+  basedProp: "Nombre de la propiedad referenciada"
+  alpha: "Opacidad"
+  darken: "Oscuridad"
+  lighten: "Brillo"
+  inputConstantName: "Por favor ingrese el nombre de la constante"
+  importInfo: "Pegando el código del tema aquí, puede importarlo al editor"
+  deleteConstantConfirm: "¿Desea borrar la constante {const}?"
+  keys:
+    accent: "Acento"
+    bg: "Fondo"
+    fg: "Texto"
+    focus: "Enfoque"
+    indicator: "Indicador"
+    panel: "Panel"
+    shadow: "Sombra"
+    header: "Cabezal"
+    navBg: "Fondo de la barra lateral"
+    navFg: "Texto de la barra lateral"
+    navHoverFg: "Texto de la barra lateral (hover)"
+    navActive: "Texto de la barra lateral (activo)"
+    navIndicator: "Indicador de la barra lateral"
+    link: "Vínculo"
+    hashtag: "Hashtag"
+    mention: "Menciones"
+    mentionMe: "Menciones (yo)"
+    renote: "Renotar"
+    modalBg: "Fondo modal"
+    divider: "Divisor"
+    scrollbarHandle: "Cuadro de la barra de desplazamiento"
+    scrollbarHandleHover: "Cuadro de la barra de desplazamiento (hover)"
+    dateLabelFg: "Texto de la etiqueta de fecha"
+    infoBg: "Fondo de información"
+    infoFg: "Texto de información"
+    infoWarnBg: "Fondo de advertencias"
+    infoWarnFg: "Texto de advertencias"
+    cwBg: "Fondo del botón CW"
+    cwFg: "Texto del botón CW"
+    cwHoverBg: "Fondo del botón CW (hover)"
+    toastBg: "Fondo de notificaciones"
+    toastFg: "Texto de notificaciones"
+    buttonBg: "Fondo de botón"
+    buttonHoverBg: "Fondo de botón (hover)"
+    inputBorder: "Borde de los campos de entrada"
+    listItemHoverBg: "Fondo de elemento de listas (hover)"
+    driveFolderBg: "Fondo de capeta del drive"
+    wallpaperOverlay: "Transparencia del fondo de pantalla"
+    badge: "Medalla"
+    messageBg: "Fondo de chat"
+    accentDarken: "Acento (oscuro)"
+    accentLighten: "Acento (claro)"
+    fgHighlighted: "Texto resaltado"
 _sfx:
  note: "Notas"
  noteMy: "Nota (a mí mismo)"
@ -521,6 +766,7 @@ _sfx:
  chat: "Chat"
  chatBg: "Chat (Fondo)"
  antenna: "Antena receptora"
+  channel: "Notificaciones del canal"
 _ago:
  unknown: "Desconocido"
  future: "Futuro"
@ -596,6 +842,8 @@ _permissions:
  "write:page-likes": "Administrar páginas que te gustan"
  "read:user-groups": "Ver grupos de usuarios"
  "write:user-groups": "Administrar grupos de usuarios"
+  "read:channels": "Ver canal"
+  "write:channels": "Modificar canal"
 _auth:
  shareAccess: "¿Desea permitir el acceso a la cuenta \"{name}\"?"
  shareAccessAsk: "¿Está seguro de que desea autorizar esta aplicación para acceder a su cuenta?"
@ -627,12 +875,14 @@ _widgets:
  rss: "Lector RSS"
  activity: "Actividad"
  photos: "Fotos"
+  digitalClock: "Reloj digital"
+  federation: "Federación"
+  postForm: "Formulario"
 _cw:
  hide: "Ocultar"
  show: "Ver más"
  chars: "{count} caracteres"
  files: "{count} archivos"
-  poll: "Encuesta"
 _poll:
  noOnlyOneChoice: "Se necesitan al menos 2 opciones"
  choiceN: "Opción {n}"
@ -665,9 +915,11 @@ _visibility:
  specified: "Mensaje directo"
  specifiedDescription: "Visible sólo para los usuarios elegidos"
  localOnly: "Solo local"
+  localOnlyDescription: "Oculto para usuarios remotos"
 _postForm:
  replyPlaceholder: "Responder a esta nota"
  quotePlaceholder: "Citar esta nota"
+  channelPlaceholder: "Postear en el canal"
  _placeholders:
    a: "¿Qué haces?"
    b: "¿Te pasó algo?"
@ -780,6 +1032,8 @@ _rooms:
    cup-noodle: "Taza de sopa de fideos"
    holo-display: "Poster holográfico"
    energy-drink: "Bebida energética"
+    doll-ai: "Muñeca"
+    banknote: "Billetes"
 _pages:
  newPage: "Crear página"
  editPage: "Editar página"
@ -798,6 +1052,7 @@ _pages:
  my: "Mis páginas"
  liked: "Páginas que me gustan"
  inspector: "Inspector"
+  contents: "Contenido"
  content: "Bloque de página"
  variables: "Variables"
  title: "Título"
@ -1066,5 +1321,46 @@ _relayStatus:
  accepted: "Aceptar"
  rejected: "Rechazada"
 _notification:
+  fileUploaded: "Archivo subido"
+  youGotMention: "Mención de {name}"
+  youGotReply: "Respuesta de {name}"
+  youGotQuote: "Citado por {name}"
+  youRenoted: "Renotado por {name}"
+  youGotPoll: "Encuestado por {name}"
+  youGotMessagingMessageFromUser: "{name} comenzó un chat contigo"
+  youGotMessagingMessageFromGroup: "Tienes un chat de {name}"
  youWereFollowed: "te ha seguido"
+  youReceivedFollowRequest: "Has mandado una solicitud de seguimiento"
+  yourFollowRequestAccepted: "Tu solicitud de seguimiento fue aceptada"
  youWereInvitedToGroup: "Invitado al grupo"
+  _types:
+    all: "Todo"
+    follow: "Siguiendo"
+    mention: "Menciones"
+    reply: "Respuestas"
+    renote: "Renotar"
+    quote: "Citar"
+    reaction: "Reacción"
+    pollVote: "Votado en la encuesta"
+    receiveFollowRequest: "Recibió una solicitud de seguimiento"
+    followRequestAccepted: "El seguimiento fue aceptado"
+    groupInvited: "Invitado al grupo"
+    app: "Notificaciones desde aplicaciones"
+_deck:
+  alwaysShowMainColumn: "Siempre mostrar la columna principal"
+  columnAlign: "Alinear columnas"
+  addColumn: "Agregar columna"
+  swapLeft: "Mover a la izquierda"
+  swapRight: "Mover a la derecha"
+  swapUp: "Mover arriba"
+  swapDown: "Mover abajo"
+  stackLeft: "Apilar a la izquierda"
+  popRight: "Sacar a la derecha"
+  _columns:
+    widgets: "Widgets"
+    notifications: "Notificaciones"
+    tl: "Linea de tiempo"
+    antenna: "Antenas"
+    list: "Listas"
+    mentions: "Menciones"
+    direct: "Mensaje directo"
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@ -16,6 +16,9 @@ noNotes: "Aucune note"
 noNotifications: "Aucune notification"
 instance: "Instance"
 settings: "Paramètres"
+basicSettings: "Paramètres basiques"
+otherSettings: "Autres paramètres"
+openInWindow: "Ouvrir dans une nouvelle fenêtre"
 profile: "Profil"
 timeline: "Fil"
 noAccountDescription: "L’utilisateur·rice n’a pas encore renseigné de biographie de présentation sur son profil."
@ -40,11 +43,13 @@ deleteAndEditConfirm: "Êtes-vous sûr·e de vouloir supprimer cette note et la
 addToList: "Ajouter à une liste"
 sendMessage: "Envoyer un message"
 copyUsername: "Copier le nom d’utilisateur·rice"
+searchUser: "Chercher un·e utilisateur·rice"
 reply: "Répondre"
 loadMore: "Afficher plus …"
 youGotNewFollower: "Vous suit"
 receiveFollowRequest: "Demande d’abonnement reçue"
 followRequestAccepted: "La demande d’abonnement a été acceptée"
+mention: "Mentionner"
 mentions: "Mentions"
 directNotes: "Notes directes"
 importAndExport: "Import et export"
@ -65,8 +70,10 @@ followers: "Abonné·e·s"
 followsYou: "Vous suit"
 createList: "Créer une liste"
 manageLists: "Gérer les listes"
-error: "Une erreur est survenue"
+error: "Erreur"
+somethingHappened: "Une erreur est survenue"
 retry: "Réessayer"
+pageLoadError: "Le chargement de la page a échoué"
 enterListName: "Nom de la liste"
 privacy: "Confidentialité"
 makeFollowManuallyApprove: "Accepter manuellement les demandes d’abonnement"
@ -103,7 +110,12 @@ unblockConfirm: "Êtes-vous sûr·e de vouloir débloquer ce compte ?"
 suspendConfirm: "Êtes-vous sûr·e de vouloir suspendre ce compte ?"
 unsuspendConfirm: "Êtes-vous sûr·e de vouloir annuler la suspension de ce compte ?"
 selectList: "Sélectionner une liste"
+selectAntenna: "Sélectionner une antenne"
+selectWidget: "Sélectionner un widget"
+editWidgets: "Modifier les widgets"
+editWidgetsExit: "Fait"
 customEmojis: "Émojis personnalisés"
+emoji: "Émoji"
 emojiName: "Nom de l’émoji"
 emojiUrl: "URL de l’émoji"
 addEmoji: "Ajouter un émoji"
@ -121,7 +133,7 @@ wallpaper: "Fond d’écran"
 setWallpaper: "Définir le fond d’écran"
 removeWallpaper: "Supprimer le fond d’écran"
 searchWith: "Recherche : {q}"
-youHaveNoLists: "Vous n'avez aucune liste"
+youHaveNoLists: "Vous n’avez aucune liste"
 followConfirm: "Êtes-vous sûr·e de vouloir suivre {name} ?"
 proxyAccount: "Compte proxy"
 proxyAccountDescription: "Un compte proxy se comporte, dans certaines conditions, comme un·e abonné·e distant·e pour les utilisateurs d'autres instances. Par exemple, quand un·e utilisateur·rice ajoute un·e utilisateur·rice distant·e à une liste, ses notes ne seront pas visibles sur l'instance si personne ne suit cet·te utilisateur·rice. Le compte proxy va donc suivre cet·te utilisateur·rice pour que ses notes soient acheminées."
@ -153,8 +165,8 @@ network: "Réseau"
 disk: "Disque"
 instanceInfo: "Informations sur l’instance"
 statistics: "Statistiques"
-clearQueue: "Vider la file d'attente"
-clearQueueConfirmTitle: "Êtes-vous sûr·e de vouloir vider la file d'attente ?"
+clearQueue: "Vider la file d’attente"
+clearQueueConfirmTitle: "Êtes-vous sûr·e de vouloir vider la file d’attente ?"
 clearQueueConfirmText: "Les notes non distribuées ne seront pas livrées. Normalement, vous n'avez PAS besoin d'effectuer cette opération."
 clearCachedFiles: "Vider le cache"
 clearCachedFilesConfirm: "Êtes-vous sûr·e de vouloir vider le cache de fichiers distants ?"
@ -166,15 +178,14 @@ blockedUsers: "Utilisateur·rice·s bloqué·e·s"
 noUsers: "Il n’y a pas d’utilisateur·rice·s"
 editProfile: "Modifier votre profil"
 noteDeleteConfirm: "Êtes-vous sûr·e de vouloir supprimer cette note ?"
-pinLimitExceeded: "Vous ne pouvez plus épingler d'autres notes."
+pinLimitExceeded: "Vous ne pouvez plus épingler d’autres notes."
 intro: "L’installation de Misskey est terminée ! Veuillez créer un compte administrateur."
 done: "Terminé"
 processing: "Traitement en cours"
 preview: "Prévisualisation"
 default: "Par défaut"
 noCustomEmojis: "Il n'y a pas d’émoji"
-customEmojisOfRemote: "Émojis venant des autres instances"
-noJobs: "Il n'y a aucune tâche planifiée"
+noJobs: "Il n’y a aucune tâche planifiée"
 federating: "En cours de fédération"
 blocked: "Bloqué·e"
 suspended: "Suspendu·e"
@ -194,7 +205,7 @@ newPasswordRetype: "Répéter le nouveau mot de passe"
 attachFile: "Joindre un fichier"
 more: "Plus !"
 featured: "Tendances"
-usernameOrUserId: "Nom d'utilisateur ou ID utilisateur"
+usernameOrUserId: "Nom d’utilisateur·rice ou ID utilisateur"
 noSuchUser: "Utilisateur·rice non trouvé"
 lookup: "Recherche"
 announcements: "Annonces"
@ -202,6 +213,7 @@ imageUrl: "URL de l’image"
 remove: "Supprimer"
 removed: "Supprimé"
 removeAreYouSure: "Supprimer «{x}» ?"
+deleteAreYouSure: "Supprimer «{x}» ?"
 saved: "Enregistré"
 messaging: "Discuter"
 upload: "Téléverser"
@ -214,14 +226,14 @@ uploadFromUrlMayTakeTime: "Le téléversement de votre fichier peut prendre un c
 explore: "Découvrir"
 games: "Jeux de Misskey"
 messageRead: "Lus"
-noMoreHistory: "Il n'y a plus d'historique"
+noMoreHistory: "Il n’y a plus d’historique"
 startMessaging: "Commencer à discuter"
 nUsersRead: "Lu par {n} personnes"
-agreeTo: "J'accepte {0}"
+agreeTo: "J’accepte {0}"
 tos: "les conditions d’utilisation"
 start: "Commencer"
 home: "Principal"
-remoteUserCaution: "Les informations peuvent être incomplètes, parce que l’utilisateur·rice vient d’une instance distante."
+remoteUserCaution: "Les informations de ce compte risqueraient d’être incomplètes du fait que l’utilisateur·rice provient d’une instance distante."
 activity: "Activité"
 images: "Images"
 birthday: "Date de naissance"
@ -260,6 +272,7 @@ rename: "Renommer"
 avatar: "Avatar"
 banner: "Bannière"
 nsfw: "Contenu sensible"
+whenServerDisconnected: "Lorsque la connexion au serveur est perdue"
 disconnectedFromServer: "Déconnecté·e du serveur"
 reload: "Rafraîchir"
 doNothing: "Ignorer"
@ -287,7 +300,7 @@ disconnectSerice: "Déconnecter"
 enableLocalTimeline: "Activer le fil local"
 enableGlobalTimeline: "Activer le fil global"
 disablingTimelinesInfo: "Si vous désactivez ces fils, les administrateurs et les modérateurs pourront toujours y accéder."
-registration: "S'inscrire"
+registration: "S’inscrire"
 enableRegistration: "Autoriser les nouvelles inscriptions"
 invite: "Inviter"
 proxyRemoteFiles: "Proxy fichiers distants"
@ -360,9 +373,6 @@ unregister: "Se désinscrire"
 passwordLessLogin: "Connectez-vous sans mot de passe"
 resetPassword: "Réinitialiser mot de passe"
 newPasswordIs: "Votre nouveau mot de passe est \"{password}\""
-autoReloadWhenDisconnected: "Rechargement automatique lorsque le serveur se déconnecte"
-autoNoteWatch: "Surveiller les notes automatiquement"
-autoNoteWatchDescription: "Soyez informé des notes auxquelles vous avez réagi ou répondu."
 reduceUiAnimation: "Réduire les animations dans l’interface"
 share: "Partager"
 notFound: "Non trouvé"
@ -398,8 +408,9 @@ quoteAttached: "Avec citation"
 quoteQuestion: "Souhaitez-vous ajoutez une citation ?"
 noMessagesYet: "Pas encore discuté"
 newMessageExists: "Vous avez un nouveau message"
-onlyOneFileCanBeAttached: "Vous ne pouvez joindre qu'un seul fichier au message"
+onlyOneFileCanBeAttached: "Vous ne pouvez joindre qu’un seul fichier au message"
 signinRequired: "Veuillez vous connecter"
+invitations: "Inviter"
 invitationCode: "Code d’invitation"
 checking: "Vérification"
 available: "Disponible"
@ -414,13 +425,13 @@ passwordMatched: "Combinaison correcte !"
 passwordNotMatched: "Ne correspond pas"
 signinWith: "Connectez-vous avec {x}"
 signinFailed: "Échec d’authentification. Veuillez vérifier que votre nom d’utilisateur et mot de passe sont corrects."
-tapSecurityKey: "Touchez la clé de sécurité"
+tapSecurityKey: "Appuyez sur votre clé de sécurité"
 or: "OU"
 uiLanguage: "Langue d’affichage de l’interface"
 groupInvited: "Invité au groupe"
 aboutX: "À propos de {x}"
 useOsNativeEmojis: "Utiliser les émojis natifs du système"
-youHaveNoGroups: "Vous n'avez aucune groupe"
+youHaveNoGroups: "Vous n’avez aucun groupe"
 joinOrCreateGroup: "Soyez invité à rejoindre les groupes ou vous pouvez créer votre propre groupe."
 noHistory: "Pas d'historique"
 disableAnimatedMfm: "Désactiver MFM ayant des animations"
@ -440,8 +451,8 @@ remote: "Distant"
 total: "Total"
 weekOverWeekChanges: "Diff hebdo"
 dayOverDayChanges: "Diff quotidien"
-accessibility: "Accessibilité"
-clinetSettings: "Paramètres du client"
+appearance: "Aspect"
+clientSettings: "Paramètres du client"
 accountSettings: "Paramètres du compte"
 promotion: "Promu"
 promote: "Promouvoir"
@ -471,6 +482,7 @@ newNoteRecived: "Vous avez une nouvelle note"
 sounds: "Sons"
 listen: "Écouter"
 none: "Rien"
+popout: "Fenêtre contextuelle"
 volume: "Volume"
 details: "Détails"
 chooseEmoji: "Choisissez un émoji"
@ -507,6 +519,98 @@ addRelay: "Ajouter un relais"
 inboxUrl: "Inbox URL"
 addedRelays: "Relais ajoutés"
 serviceworkerInfo: "Devrait être activé pour les notifications push."
+deletedNote: "Note supprimée"
+invisibleNote: "Note invisible"
+enableInfiniteScroll: "Activer le défilement infini"
+visibility: "Visibilité"
+poll: "Sondage"
+useCw: "Masquer le contenu"
+enablePlayer: "Activer le lecteur vidéo"
+disablePlayer: "Désactiver le lecteur vidéo"
+expandTweet: "Étendre le tweet"
+themeEditor: "Éditeur de thèmes"
+description: "Description"
+author: "Auteur·rice"
+leaveConfirm: "Vous avez des modifications non-sauvegardées. Voulez-vous les ignorer ?"
+manage: "Gestion"
+plugins: "Extensions"
+pluginInstallWarn: "N’installez que des extensions provenant de sources de confiance."
+deck: "Deck"
+undeck: "Quitter le deck"
+useBlurEffectForModal: "Utiliser un effet de flou pour les modals"
+width: "Largeur"
+height: "Hauteur"
+generateAccessToken: "Générer un jeton d'accès"
+permission: "Autorisations "
+enableAll: "Tout activer"
+disableAll: "Tout désactiver"
+tokenRequested: "Autoriser l'accès au compte"
+pluginTokenRequestedDescription: "Ce plugin pourra utiliser les autorisations définies ici."
+notificationType: "Type de notifications"
+edit: "Editer"
+useStarForReactionFallback: "Utiliser ★ comme alternative si l’émoji de réaction est inconnu"
+emailConfig: "Configuration du serveur email"
+enableEmail: "Activer la distribution de courriel"
+emailConfigInfo: "Utilisé pour confirmer votre adresse de courriel et la réinitialisation de votre mot de passe en cas d’oubli."
+email: "Adresse de courrier électronique"
+smtpConfig: "Paramètres du serveur SMTP"
+smtpHost: "Hôte"
+smtpPort: "Port"
+smtpUser: "Nom d’utilisateur·rice"
+smtpPass: "Mot de passe"
+emptyToDisableSmtpAuth: "Laisser le nom d’utilisateur et le mot de passe vides pour désactiver la vérification SMTP"
+smtpSecure: "Utiliser SSL/TLS implicitement dans les connexions SMTP"
+smtpSecureInfo: "Désactiver cette option lorsque STARTTLS est utilisé"
+testEmail: "Tester la distribution de courriel"
+wordMute: "Filtre de mots"
+userSaysSomething: "{name} a dit quelque chose"
+makeActive: "Activer"
+display: "Affichage"
+copy: "Copier"
+metrics: "Métriques"
+overview: "Aperçu"
+logs: "Journaux"
+delayed: "en retard"
+database: "Base de données"
+channel: "Canaux"
+create: "Créer"
+notificationSetting: "Paramètres des notifications "
+notificationSettingDesc: "Sélectionnez le type de notification à afficher"
+useGlobalSetting: "Utiliser paramètre général"
+other: "Autre"
+regenerateLoginToken: "Régénérer le jeton de connexion"
+setMultipleBySeparatingWithSpace: "Vous pouvez définir plus d’un, séparés par des espaces."
+fileIdOrUrl: "ID du fichier ou URL"
+chatOpenBehavior: "Comportement de la fenêtre de discussion lors de son ouverture"
+random: "Aléatoire"
+public: "Public"
+_mfm:
+  mention: "Mentionner"
+  hashtag: "Hashtags"
+  link: "Lien"
+  center: "Centrée"
+  quote: "Citer"
+  emoji: "Émojis personnalisés"
+  search: "Rechercher"
+_reversi:
+  total: "Total"
+_serverDisconnectedBehavior:
+  reload: "Rechargement automatique"
+_channel:
+  create: "Créer un canal"
+  edit: "Éditer le canal"
+  removeBanner: "Supprimer la bannière"
+  featured: "Tendances"
+  usersCount: "{n} Participants"
+  notesCount: "{n} Notes"
+_sidebar:
+  full: "Complet"
+  icon: "Avatar"
+  hide: "Masquer"
+_wordMute:
+  muteWords: "Mot à mettre en sourdine"
+  muteWordsDescription: "Séparer avec des espaces pour la condition AND. Séparer avec un saut de ligne pour une condition OR."
+  mutedNotes: "Notes mises en sourdine"
 _theme:
  explore: "Explorer les thèmes"
  install: "Installer un thème"
@ -515,6 +619,38 @@ _theme:
  installed: "{name} a été installé"
  alreadyInstalled: "Ce thème est déjà installé"
  invalid: "Le format du thème n'est pas valide"
+  make: "Créer un thème"
+  base: "Base"
+  addConstant: "Ajouter une constante"
+  constant: "Constante"
+  defaultValue: "Valeur par défaut"
+  color: "Couleur"
+  key: "Clé "
+  func: "Fonction"
+  argument: "Argument"
+  alpha: "Transparence"
+  darken: "Assombrir"
+  importInfo: "Vous pouvez importer un thème vers l’éditeur de thèmes en saisissant son code ici."
+  keys:
+    bg: "Arrière-plan"
+    fg: "Texte"
+    focus: "Mise au point"
+    indicator: "Indicateur"
+    panel: "Panneau"
+    shadow: "Ombre"
+    header: "Entête"
+    navBg: "Fond de la barre latérale"
+    navFg: "Texte de la barre latérale"
+    link: "Lien"
+    hashtag: "Hashtags"
+    mention: "Mentionner"
+    mentionMe: "Mentions (Moi)"
+    renote: "Renote"
+    divider: "Séparateur"
+    infoWarnFg: "Texte d’avertissement"
+    cwBg: "Arrière-plan du CW"
+    badge: "Badge"
+    messageBg: "Arrière plan de la discussion"
 _sfx:
  note: "Nouvelle note"
  noteMy: "Ma note"
@ -597,6 +733,8 @@ _permissions:
  "write:page-likes": "Mettre à jour les favoris sur les Pages"
  "read:user-groups": "Voir les groupes d'utilisateur·rice·s"
  "write:user-groups": "Éditer les groupes des utilisateur·rice·s"
+  "read:channels": "Lire les canaux"
+  "write:channels": "Modifier les canaux"
 _auth:
  shareAccess: "Autoriser \"{name}\" à accéder à votre compte ?"
  shareAccessAsk: "Voulez-vous vraiment autoriser cette application à accéder à votre compte?"
@ -628,12 +766,14 @@ _widgets:
  rss: "Lecteur de flux RSS"
  activity: "Activité"
  photos: "Photos"
+  digitalClock: "Horloge numérique"
+  federation: "Fédération"
+  postForm: "Formulaire à publier"
 _cw:
  hide: "Masquer"
  show: "Afficher plus …"
  chars: "{count} caractères"
  files: "{count} fichiers"
-  poll: "Sondage"
 _poll:
  noOnlyOneChoice: "Au moins 2 réponses nécéssaires"
  choiceN: "Choix {n}"
@ -642,7 +782,7 @@ _poll:
  expiration: "Fin du sondage"
  infinite: "Illimité"
  at: "Choisir une date"
-  after: "Chosir une durée"
+  after: "Choisir la durée"
  deadlineDate: "Date de fin"
  deadlineTime: "Heure de fin"
  duration: "Durée"
@ -666,11 +806,13 @@ _visibility:
  specified: "Direct"
  specifiedDescription: "Publier uniquement aux utilisateur·rice·s mentionné·e·s"
  localOnly: "Local seulement"
+  localOnlyDescription: "Caché pour les utilisateurs distant"
 _postForm:
  replyPlaceholder: "Répondre à cette note ..."
  quotePlaceholder: "Citez cette note ..."
+  channelPlaceholder: "Publier vers le canal"
  _placeholders:
-    a: "Qu'est-ce qu'il se passe ?"
+    a: "Quoi de neuf ?"
    b: "Quoi de neuf ?"
    c: "Qu’avez-vous en tête ?"
    d: "Désirez-vous publier quelques mots ?"
@ -691,15 +833,15 @@ _exportOrImport:
  blockingList: "Bloquer"
  userLists: "Listes"
 _charts:
-  federationInstancesIncDec: "Variation du nombre d'instances"
-  federationInstancesTotal: "Nombre d'instances au total"
+  federationInstancesIncDec: "Variation du nombre des instances fédérées"
+  federationInstancesTotal: "Nombre total des instances fédérées"
  usersIncDec: "Variation du nombre d'utilisateur·rice·s"
-  usersTotal: "Nombre d'utilisateur·rice·s au total"
+  usersTotal: "Nombre des utilisateur·rice·s au total"
  activeUsers: "Utilisateur·rice·s actif·ve·s"
-  notesIncDec: "Variation du nombre d'notes"
+  notesIncDec: "Variation du nombre des notes"
  localNotesIncDec: "Variation du nombre de notes local"
  remoteNotesIncDec: "Variation du nombre d’notes distant"
-  notesTotal: "Nombre d'notes au total"
+  notesTotal: "Nombre total des notes"
  filesIncDec: "Variation du nombre de fichiers"
  filesTotal: "Nombre de fichiers au total"
  storageUsageIncDec: "Variation de l'utilisation du stockage"
@ -708,8 +850,8 @@ _instanceCharts:
  requests: "Requêtes"
  users: "Variation du nombre d'utilisateur·rice·s"
  usersTotal: "Nombre d'utilisateur·rice·s au total cumulé"
-  notes: "Variation du nombre d'notes"
-  notesTotal: "Nombre d'notes au total cumulé"
+  notes: "Variation du nombre des notes"
+  notesTotal: "Nombre total cumulé des notes"
  ff: "Variation des abonné·e·s"
  ffTotal: "Nombre d'abonné·e·s au total cumulé"
  cacheSize: "Variation de la taille du cache"
@ -792,7 +934,7 @@ _pages:
  deleted: "La page a bien été supprimée"
  nameAlreadyExists: "La URL de page spécifiée existe déjà"
  invalidNameTitle: "La URL de la page spécifiée n’est pas valide"
-  invalidNameText: "Assurez-vous qu'il n'est pas vide"
+  invalidNameText: "Assurez-vous qu’il n’est pas vide"
  editThisPage: "Éditer cette page"
  viewSource: "Afficher la source"
  viewPage: "Afficher la page"
@ -801,6 +943,7 @@ _pages:
  my: "Mes pages"
  liked: "Pages favorites"
  inspector: "Inspecteur"
+  contents: "Contenu"
  content: "Bloc de page"
  variables: "Variables"
  title: "Titre"
@ -876,7 +1019,7 @@ _pages:
        pushEvent: "Envoyer un évènement"
        _pushEvent:
          event: "Nom de l’évènement"
-          message: "Message à afficher lorsque appuyé"
+          message: "Message à afficher lorsqu’il est activé"
          variable: "Variable à envoyer"
          no-variable: "Rien"
        callAiScript: "Appeler AiScript"
@ -906,7 +1049,7 @@ _pages:
      textList: "Liste de texte"
      _textList:
        info: "Veuillez séparer chaque entrée avec un saut de ligne"
-      strLen: "Longueur d'un texte"
+      strLen: "Longueur du texte"
      _strLen:
        arg1: "Texte"
      strPick: "Extraire un caractère"
@ -1069,5 +1212,40 @@ _relayStatus:
  accepted: "Accepté"
  rejected: "Refusée"
 _notification:
+  fileUploaded: "Le fichier a été téléversé !"
+  youGotMention: "{name} vous a mentionné"
+  youGotReply: "Réponse de {name}"
+  youGotQuote: "Cité·e par {name}"
+  youRenoted: "{name} vous a Renoté"
+  youGotPoll: "{name} a participé à votre sondage"
+  youGotMessagingMessageFromUser: "{name} vous envoyé un message"
+  youGotMessagingMessageFromGroup: "Un message a été envoyé au groupe {name}"
  youWereFollowed: "Vous suit"
+  youReceivedFollowRequest: "Vous avez reçu une demande d’abonnement"
+  yourFollowRequestAccepted: "Votre demande d’abonnement a été accepté"
  youWereInvitedToGroup: "Invité au groupe"
+  _types:
+    all: "Toutes"
+    follow: "Abonnements"
+    mention: "Mentionner"
+    reply: "Réponses"
+    renote: "Renote"
+    quote: "Citer"
+    reaction: "Réactions"
+    groupInvited: "Invité aux groupes"
+    app: "Notifications provenant des apps"
+_deck:
+  alwaysShowMainColumn: "Toujours afficher la colonne principale"
+  columnAlign: "Aligner les colonnes"
+  addColumn: "Ajouter une colonne"
+  swapLeft: "Déplacer à gauche"
+  swapRight: "Déplacer à droite"
+  stackLeft: "Empiler à gauche"
+  _columns:
+    widgets: "Widgets"
+    notifications: "Notifications"
+    tl: "Fil"
+    antenna: "Antennes"
+    list: "Listes"
+    mentions: "Mentions"
+    direct: "Direct"
--- a/locales/index.js
+++ b/locales/index.js
@ -15,17 +15,24 @@ const merge = (...args) => args.reduce((a, c) => ({

 const languages = [
 	'ar-SA',
-	//'cs-CZ',
-	//'da-DK',
+	'cs-CZ',
+	'da-DK',
 	'de-DE',
 	'en-US',
 	'es-ES',
 	'fr-FR',
 	'ja-JP',
 	'ja-KS',
+	'kab-KAB',
+	'kn-IN',
 	'ko-KR',
-	//'nl-NL',
-	//'pl-PL',
+	'nl-NL',
+	'no-NO',
+	'pl-PL',
+	'pt-PT',
+	'ru-RU',
+	'ug-CN',
+	'uk-UA',
 	'zh-CN',
 	'zh-TW',
 ];
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@ -16,6 +16,9 @@ noNotes: "ノートはありません"
 noNotifications: "通知はありません"
 instance: "インスタンス"
 settings: "設定"
+basicSettings: "基本設定"
+otherSettings: "その他の設定"
+openInWindow: "ウィンドウで開く"
 profile: "プロフィール"
 timeline: "タイムライン"
 noAccountDescription: "自己紹介はありません"
@ -40,6 +43,7 @@ deleteAndEditConfirm: "このノートを削除してもう一度編集します
 addToList: "リストに追加"
 sendMessage: "メッセージを送信"
 copyUsername: "ユーザー名をコピー"
+searchUser: "ユーザーを検索"
 reply: "返信"
 loadMore: "もっと見る"
 youGotNewFollower: "フォローされました"
@ -66,8 +70,11 @@ followers: "フォロワー"
 followsYou: "フォローされています"
 createList: "リスト作成"
 manageLists: "リストの管理"
-error: "問題が発生しました"
+error: "エラー"
+somethingHappened: "問題が発生しました"
 retry: "再試行"
+pageLoadError: "ページの読み込みに失敗しました。"
+pageLoadErrorDescription: "これは通常、ネットワークまたはブラウザキャッシュが原因です。キャッシュをクリアするか、しばらく待ってから再度試してください。"
 enterListName: "リスト名を入力"
 privacy: "プライバシー"
 makeFollowManuallyApprove: "フォローを承認制にする"
@ -88,6 +95,7 @@ sensitive: "閲覧注意"
 add: "追加"
 reaction: "リアクション"
 reactionSettingDescription: "リアクションピッカーに表示するリアクションを設定します。"
+reactionSettingDescription2: "ドラッグして並び替えます。クリックして削除します。"
 rememberNoteVisibility: "公開範囲を記憶する"
 attachCancel: "添付取り消し"
 markAsSensitive: "閲覧注意にする"
@ -104,6 +112,10 @@ unblockConfirm: "ブロック解除しますか？"
 suspendConfirm: "凍結しますか？"
 unsuspendConfirm: "解凍しますか？"
 selectList: "リストを選択"
+selectAntenna: "アンテナを選択"
+selectWidget: "ウィジェットを選択"
+editWidgets: "ウィジェットを編集"
+editWidgetsExit: "編集を終了"
 customEmojis: "カスタム絵文字"
 emoji: "絵文字"
 emojiName: "絵文字名"
@ -175,7 +187,6 @@ processing: "処理中"
 preview: "プレビュー"
 default: "デフォルト"
 noCustomEmojis: "絵文字はありません"
-customEmojisOfRemote: "リモートの絵文字"
 noJobs: "ジョブはありません"
 federating: "連合中"
 blocked: "ブロック中"
@ -204,6 +215,8 @@ imageUrl: "画像URL"
 remove: "削除"
 removed: "削除しました"
 removeAreYouSure: "「{x}」を削除しますか？"
+deleteAreYouSure: "「{x}」を削除しますか？"
+resetAreYouSure: "リセットしますか？"
 saved: "保存しました"
 messaging: "チャット"
 upload: "アップロード"
@ -262,6 +275,7 @@ rename: "名前を変更"
 avatar: "アイコン"
 banner: "バナー"
 nsfw: "閲覧注意"
+whenServerDisconnected: "サーバーとの接続が失われたとき"
 disconnectedFromServer: "サーバーから切断されました"
 reload: "リロード"
 doNothing: "なにもしない"
@ -302,6 +316,8 @@ bannerUrl: "バナー画像のURL"
 basicInfo: "基本情報"
 pinnedUsers: "ピン留めユーザー"
 pinnedUsersDescription: "「みつける」ページなどにピン留めしたいユーザーを改行で区切って記述します。"
+pinnedPages: "ピン留めページ"
+pinnedPagesDescription: "インスタンスのトップページにピン留めしたいページのパスを改行で区切って記述します。"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptchaを有効にする"
 hcaptchaSiteKey: "サイトキー"
@ -362,9 +378,6 @@ unregister: "登録を解除"
 passwordLessLogin: "パスワード無しログイン"
 resetPassword: "パスワードをリセット"
 newPasswordIs: "新しいパスワードは「{password}」です"
-autoReloadWhenDisconnected: "サーバー切断時に自動リロード"
-autoNoteWatch: "ノートの自動ウォッチ"
-autoNoteWatchDescription: "あなたがリアクションしたり返信したりした他のユーザーのノートに関する通知を受け取るようにします。"
 reduceUiAnimation: "UIのアニメーションを減らす"
 share: "共有"
 notFound: "見つかりません"
@ -402,6 +415,7 @@ noMessagesYet: "まだチャットはありません"
 newMessageExists: "新しいメッセージがあります"
 onlyOneFileCanBeAttached: "メッセージに添付できるファイルはひとつです"
 signinRequired: "ログインしてください"
+invitations: "招待"
 invitationCode: "招待コード"
 checking: "確認しています"
 available: "利用できます"
@ -442,8 +456,8 @@ remote: "リモート"
 total: "合計"
 weekOverWeekChanges: "前週比"
 dayOverDayChanges: "前日比"
-accessibility: "アクセシビリティ"
-clinetSettings: "クライアント設定"
+appearance: "アピアランス"
+clientSettings: "クライアント設定"
 accountSettings: "アカウント設定"
 promotion: "プロモーション"
 promote: "プロモート"
@ -466,6 +480,7 @@ objectStorageUseSSL: "SSLを使用する"
 objectStorageUseSSLDesc: "API接続にhttpsを使用しない場合はオフにしてください"
 objectStorageUseProxy: "Proxyを利用する"
 objectStorageUseProxyDesc: "API接続にproxyを利用しない場合はオフにしてください"
+objectStorageSetPublicRead: "アップロード時に'public-read'を設定する"
 serverLogs: "サーバーログ"
 deleteAll: "全て削除"
 showFixedPostForm: "タイムライン上部に投稿フォームを表示する"
@ -473,6 +488,8 @@ newNoteRecived: "新しいノートがあります"
 sounds: "サウンド"
 listen: "聴く"
 none: "なし"
+showInPage: "ページで表示"
+popout: "ポップアウト"
 volume: "音量"
 details: "詳細"
 chooseEmoji: "絵文字を選択"
@ -515,6 +532,211 @@ enableInfiniteScroll: "自動でもっと見る"
 visibility: "公開範囲"
 poll: "アンケート"
 useCw: "内容を隠す"
+enablePlayer: "プレイヤーを開く"
+disablePlayer: "プレイヤーを閉じる"
+expandTweet: "ツイートを展開する"
+themeEditor: "テーマエディター"
+description: "説明"
+author: "作者"
+leaveConfirm: "未保存の変更があります。破棄しますか？"
+manage: "管理"
+plugins: "プラグイン"
+pluginInstallWarn: "信頼できないプラグインはインストールしないでください。"
+deck: "デッキ"
+undeck: "デッキ解除"
+useBlurEffectForModal: "モーダルにぼかし効果を使用"
+useFullReactionPicker: "フル機能リアクションピッカーを使用"
+width: "幅"
+height: "高さ"
+large: "大"
+medium: "中"
+small: "小"
+generateAccessToken: "アクセストークンの発行"
+permission: "権限"
+enableAll: "全て有効にする"
+disableAll: "全て無効にする"
+tokenRequested: "アカウントへのアクセス許可"
+pluginTokenRequestedDescription: "このプラグインはここで設定した権限を行使できるようになります。"
+notificationType: "通知の種類"
+edit: "編集"
+useStarForReactionFallback: "リアクション絵文字が不明な場合、代わりに★を使う"
+emailConfig: "メールサーバー設定"
+enableEmail: "メール配信機能を有効化する"
+emailConfigInfo: "メールアドレスの確認やパスワードリセットの際に使います"
+email: "メールアドレス"
+smtpConfig: "SMTP サーバーの設定"
+smtpHost: "ホスト"
+smtpPort: "ポート"
+smtpUser: "ユーザー名"
+smtpPass: "パスワード"
+emptyToDisableSmtpAuth: "ユーザー名とパスワードを空欄にすることで、SMTP認証を無効化出来ます"
+smtpSecure: "SMTP 接続に暗黙的なSSL/TLSを使用する"
+smtpSecureInfo: "STARTTLS使用時はオフにします。"
+testEmail: "配信テスト"
+wordMute: "ワードミュート"
+userSaysSomething: "{name}が何かを言いました"
+makeActive: "アクティブにする"
+display: "表示"
+copy: "コピー"
+metrics: "メトリクス"
+overview: "概要"
+logs: "ログ"
+delayed: "遅延"
+database: "データベース"
+channel: "チャンネル"
+create: "作成"
+notificationSetting: "通知設定"
+notificationSettingDesc: "表示する通知の種別を選択してください。"
+useGlobalSetting: "グローバル設定を使う"
+useGlobalSettingDesc: "オンにすると、アカウントの通知設定が使用されます。オフにすると、個別に設定できるようになります。"
+other: "その他"
+regenerateLoginToken: "ログイントークンを再生成"
+regenerateLoginTokenDescription: "ログインに使用される内部トークンを再生成します。通常この操作を行う必要はありません。再生成すると、全てのデバイスでログアウトされます。"
+setMultipleBySeparatingWithSpace: "スペースで区切って複数設定できます。"
+fileIdOrUrl: "ファイルIDまたはURL"
+chatOpenBehavior: "チャットを開くときの動作"
+sample: "サンプル"
+abuseReports: "通報"
+reportAbuse: "通報"
+reportAbuseOf: "{name}を通報する"
+fillAbuseReportDescription: "通報理由の詳細を記入してください。対象のノートがある場合はそのURLも記入してください。"
+abuseReported: "内容が送信されました。ご報告ありがとうございました。"
+send: "送信"
+abuseMarkAsResolved: "対応済みにする"
+openInNewTab: "新しいタブで開く"
+openInSideView: "サイドビューで開く"
+defaultNavigationBehaviour: "デフォルトのナビゲーション"
+editTheseSettingsMayBreakAccount: "これらの設定を編集するとアカウントが破損する可能性があります。"
+instanceTicker: "ノートのインスタンス情報"
+waitingFor: "{x}を待っています"
+random: "ランダム"
+system: "システム"
+switchUi: "UI切り替え"
+desktop: "デスクトップ"
+clip: "クリップ"
+createNew: "新規作成"
+optional: "任意"
+createNewClip: "新しいクリップを作成"
+public: "パブリック"
+
+_mfm:
+  cheatSheet: "MFMチートシート"
+  intro: "MFMは、Misskey内の様々な場所で使用できる専用のマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。"
+  dummy: "MisskeyでFediverseの世界が広がります"
+  mention: "メンション"
+  mentionDescription: "アットマーク + ユーザー名で、特定のユーザーを示すことができます。"
+  hashtag: "ハッシュタグ"
+  hashtagDescription: "ナンバーサイン + タグで、ハッシュタグを示すことができます。"
+  url: "URL"
+  urlDescription: "URLを示すことができます。"
+  link: "リンク"
+  linkDescription: "文章の特定の範囲を、URLに紐づけることができます。"
+  bold: "太字"
+  boldDescription: "文字を太く表示して強調することができます。"
+  small: "目立たなく"
+  smallDescription: "内容を小さく・薄く表示させることができます。"
+  center: "中央寄せ"
+  centerDescription: "内容を中央寄せで表示させることができます。"
+  inlineCode: "コード(インライン)"
+  inlineCodeDescription: "プログラムなどのコードをインラインでシンタックスハイライトします。"
+  blockCode: "コード(ブロック)"
+  blockCodeDescription: "複数行のプログラムなどのコードをブロックでシンタックスハイライトします。"
+  inlineMath: "数式(インライン)"
+  inlineMathDescription: "数式(KaTeX)をインラインで表示します。"
+  blockMath: "数式(ブロック)"
+  blockMathDescription: "複数行の数式(KaTeX)をブロックで表示します。"
+  quote: "引用"
+  quoteDescription: "内容が引用であることを示すことができます。"
+  emoji: "カスタム絵文字"
+  emojiDescription: "コロンでカスタム絵文字名を囲むと、カスタム絵文字を表示させることができます。"
+  search: "検索"
+  searchDescription: "入力済み検索ボックスを表示させることができます。"
+  flip: "反転"
+  flipDescription: "内容を上下または左右に反転させます。"
+  jelly: "アニメーション(びよんびよん)"
+  jellyDescription: "びよんびよんするアニメーションを与えます。"
+  tada: "アニメーション(じゃーん)"
+  tadaDescription: "ジャーン！という感じのアニメーションを与えます。"
+  jump: "アニメーション(ジャンプ)"
+  jumpDescription: "飛び跳ねるようなアニメーションを与えます。"
+  bounce: "アニメーション(バウンド)"
+  bounceDescription: "ぽよんぽよん弾むようなアニメーションを与えます。"
+  shake: "アニメーション(ぶるぶる)"
+  shakeDescription: "ぶるぶるするアニメーションを与えます。"
+  twitch: "アニメーション(ブレ)"
+  twitchDescription: "激しくブレるアニメーションを与えます。"
+  spin: "アニメーション(回転)"
+  spinDescription: "回転するアニメーションを与えます。"
+
+_reversi:
+  reversi: "リバーシ"
+  gameSettings: "対局の設定"
+  chooseBoard: "ボードを選択"
+  blackOrWhite: "先行/後攻"
+  blackIs: "{name}が黒(先行)"
+  rules: "ルール"
+  botSettings: "Botのオプション"
+  thisGameIsStartedSoon: "対局は数秒後に開始されます"
+  waitingForOther: "相手の準備が完了するのを待っています"
+  waitingForMe: "あなたの準備が完了するのを待っています"
+  waitingBoth: "準備してください"
+  ready: "準備完了"
+  cancelReady: "準備を再開"
+  opponentTurn: "相手のターンです"
+  myTurn: "あなたのターンです"
+  turnOf: "{name}のターンです"
+  pastTurnOf: "{name}のターン"
+  surrender: "投了"
+  surrendered: "投了により"
+  drawn: "引き分け"
+  won: "{name}の勝ち"
+  black: "黒"
+  white: "白"
+  total: "合計"
+  turnCount: "{count}ターン目"
+  myGames: "自分の対局"
+  allGames: "みんなの対局"
+  ended: "終了"
+  playing: "対局中"
+  isLlotheo: "石の少ない方が勝ち(ロセオ)"
+  loopedMap: "ループマップ"
+  canPutEverywhere: "どこでも置けるモード"
+
+_instanceTicker:
+  none: "表示しない"
+  remote: "リモートユーザーに表示"
+  always: "常に表示"
+
+_serverDisconnectedBehavior:
+  reload: "自動でリロード"
+  dialog: "ダイアログで警告"
+  quiet: "控えめに警告"
+
+_channel:
+  create: "チャンネルを作成"
+  edit: "チャンネルを編集"
+  setBanner: "バナーを設定"
+  removeBanner: "バナーを削除"
+  featured: "トレンド"
+  owned: "管理中"
+  following: "フォロー中"
+  usersCount: "{n}人が参加中"
+  notesCount: "{n}投稿があります"
+
+_sidebar:
+  full: "フル"
+  icon: "アイコン"
+  hide: "隠す"
+
+_wordMute:
+  muteWords: "ミュートするワード"
+  muteWordsDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。"
+  muteWordsDescription2: "キーワードをスラッシュで囲むと正規表現になります。"
+  softDescription: "指定した条件のノートをタイムラインから隠します。"
+  hardDescription: "指定した条件のノートをタイムラインに追加しないようにします。追加されなかったノートは、条件を変更しても除外されたままになります。"
+  soft: "ソフト"
+  hard: "ハード"
+  mutedNotes: "ミュートされたノート"

 _theme:
  explore: "テーマを探す"
@ -524,6 +746,70 @@ _theme:
  installed: "{name}をインストールしました"
  alreadyInstalled: "そのテーマは既にインストールされています"
  invalid: "テーマの形式が間違っています"
+  make: "テーマを作る"
+  base: "ベース"
+  addConstant: "定数を追加"
+  constant: "定数"
+  defaultValue: "デフォルト値"
+  color: "色"
+  refProp: "プロパティを参照"
+  refConst: "定数を参照"
+  key: "キー"
+  func: "関数"
+  funcKind: "関数の種類"
+  argument: "引数"
+  basedProp: "元にするプロパティの名前"
+  alpha: "不透明度"
+  darken: "暗さ"
+  lighten: "明るさ"
+  inputConstantName: "定数名を入力してください"
+  importInfo: "ここにテーマコードを貼り付けて、エディターにインポートできます"
+  deleteConstantConfirm: "定数 {const} を削除しても良いですか？"
+
+  keys:
+    accent: "アクセント"
+    bg: "背景"
+    fg: "文字"
+    focus: "フォーカス"
+    indicator: "インジケーター"
+    panel: "パネル"
+    shadow: "影"
+    header: "ヘッダー"
+    navBg: "サイドバーの背景"
+    navFg: "サイドバーの文字"
+    navHoverFg: "サイドバー文字(ホバー)"
+    navActive: "サイドバー文字(アクティブ)"
+    navIndicator: "サイドバーのインジケーター"
+    link: "リンク"
+    hashtag: "ハッシュタグ"
+    mention: "メンション"
+    mentionMe: "あなた宛てメンション"
+    renote: "Renote"
+    modalBg: "モーダルの背景"
+    divider: "分割線"
+    scrollbarHandle: "スクロールバーの取っ手"
+    scrollbarHandleHover: "スクロールバーの取っ手（ホバー)"
+    dateLabelFg: "日付ラベルの文字"
+    infoBg: "情報の背景"
+    infoFg: "情報の文字"
+    infoWarnBg: "警告の背景"
+    infoWarnFg: "警告の文字"
+    cwBg: "CW ボタンの背景"
+    cwFg: "CW ボタンの文字"
+    cwHoverBg: "CW ボタンの背景 (ホバー)"
+    toastBg: "通知トーストの背景"
+    toastFg: "通知トーストの文字"
+    buttonBg: "ボタンの背景"
+    buttonHoverBg: "ボタンの背景 (ホバー)"
+    inputBorder: "入力ボックスの縁取り"
+    listItemHoverBg: "リスト項目の背景 (ホバー)"
+    driveFolderBg: "ドライブフォルダーの背景"
+    wallpaperOverlay: "壁紙のオーバーレイ"
+    badge: "バッジ"
+    messageBg: "チャットの背景"
+    accentDarken: "アクセント (暗め)"
+    accentLighten: "アクセント (明るめ)"
+    fgHighlighted: "強調された文字"

 _sfx:
  note: "ノート"
@ -532,6 +818,7 @@ _sfx:
  chat: "チャット"
  chatBg: "チャット(バックグラウンド)"
  antenna: "アンテナ受信"
+  channel: "チャンネル通知"

 _ago:
  unknown: "謎"
@ -612,6 +899,8 @@ _permissions:
  "write:page-likes": "ページのいいねを操作する"
  "read:user-groups": "ユーザーグループを見る"
  "write:user-groups": "ユーザーグループを操作する"
+  "read:channels": "チャンネルを見る"
+  "write:channels": "チャンネルを操作する"

 _auth:
  shareAccess: "「{name}」がアカウントにアクセスすることを許可しますか？"
@ -647,6 +936,9 @@ _widgets:
  rss: "RSSリーダー"
  activity: "アクティビティ"
  photos: "フォト"
+  digitalClock: "デジタル時計"
+  federation: "連合"
+  postForm: "投稿フォーム"

 _cw:
  hide: "隠す"
@ -692,6 +984,7 @@ _visibility:
 _postForm:
  replyPlaceholder: "このノートに返信..."
  quotePlaceholder: "このノートを引用..."
+  channelPlaceholder: "チャンネルに投稿..."
  _placeholders:
    a: "いまどうしてる？"
    b: "何かありましたか？"
@ -820,6 +1113,7 @@ _pages:
  created: "ページを作成しました"
  updated: "ページを更新しました"
  deleted: "ページを削除しました"
+  pageSetting: "ページ設定"
  nameAlreadyExists: "指定されたページURLは既に存在しています"
  invalidNameTitle: "不正なページURLです"
  invalidNameText: "空白でないか確認してください"
@ -830,7 +1124,9 @@ _pages:
  unlike: "いいね解除"
  my: "自分のページ"
  liked: "いいねしたページ"
+  featured: "人気"
  inspector: "インスペクター"
+  contents: "コンテンツ"
  content: "ページブロック"
  variables: "変数"
  title: "タイトル"
@ -891,6 +1187,12 @@ _pages:
      width: "幅"
      height: "高さ"

+    note: "ノート埋め込み"
+    _note:
+      id: "ノートID"
+      idDescription: "ノートURLをペーストして設定することもできます。"
+      detailed: "詳細な表示"
+
    switch: "スイッチ"
    _switch:
      name: "変数名"
@ -1125,3 +1427,36 @@ _notification:
  yourFollowRequestAccepted: "フォローリクエストが承認されました"
  youWereInvitedToGroup: "グループに招待されました"

+  _types:
+    all: "すべて"
+    follow: "フォロー"
+    mention: "メンション"
+    reply: "リプライ"
+    renote: "Renote"
+    quote: "引用"
+    reaction: "リアクション"
+    pollVote: "アンケートに投票された"
+    receiveFollowRequest: "フォロー申請を受け取った"
+    followRequestAccepted: "フォローが受理された"
+    groupInvited: "グループに招待された"
+    app: "連携アプリからの通知"
+
+_deck:
+  alwaysShowMainColumn: "常にメインカラムを表示"
+  columnAlign: "カラムの寄せ"
+  addColumn: "カラムを追加"
+  swapLeft: "左に移動"
+  swapRight: "右に移動"
+  swapUp: "上に移動"
+  swapDown: "下に移動"
+  stackLeft: "左に重ねる"
+  popRight: "右に出す"
+
+  _columns:
+    widgets: "ウィジェット"
+    notifications: "通知"
+    tl: "タイムライン"
+    antenna: "アンテナ"
+    list: "リスト"
+    mentions: "あなた宛て"
+    direct: "ダイレクト"
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@ -1,12 +1,12 @@
 ---
 _lang_: "日本語 (関西弁)"
-introMisskey: "ようこそ！Misskeyは、オープンソースの分散型マイクロブログサービスやねん。\n「ノート」を作成しぃ、いま起こっとることを共有したり、あんたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素はよ反応を追加することもできます✌\n新しい世界を探検しよう🚀"
+introMisskey: "ようこそ！Misskeyってのは、オープンソースの分散型マイクロブログサービスやねん。\n「ノート」を作成し、いま起こっとることを共有したり、あんたんこととか皆に伝えていこう📡\n「リアクション」機能で、皆のノートに素はよ反応を追加することもできるんやで✌\n新しい世界を探検してみらん？🚀"
 monthAndDay: "{month}月 {day}日"
 search: "探す"
 notifications: "通知"
 username: "ユーザー名"
 password: "パスワード"
-fetchingAsApObject: "連合に照会中"
+fetchingAsApObject: "今ちと連合に照会しとるで"
 ok: "おっけー"
 gotIt: "ほい"
 cancel: "やめとくわ"
@ -16,35 +16,40 @@ noNotes: "ノートはあらへん"
 noNotifications: "通知はあらへん"
 instance: "インスタンス"
 settings: "設定"
+basicSettings: "基本設定"
+otherSettings: "その他の設定"
+openInWindow: "ウィンドウで開いてや"
 profile: "プロフィール"
 timeline: "タイムライン"
 noAccountDescription: "自己紹介はあらへん"
 login: "ログイン"
-loggingIn: "ログインしとります"
+loggingIn: "ログインしよるで"
 logout: "ログアウト"
 signup: "新規登録"
-uploading: "アップロードしとります"
-save: "保存"
+uploading: "アップロードしよるで"
+save: "とっとく"
 users: "ユーザー"
-addUser: "ユーザー増やす"
+addUser: "ユーザーを追加や"
 favorite: "お気に入り"
 favorites: "お気に入り"
-unfavorite: "お気に入りやめる"
-pin: "ピン留め"
-unpin: "ピン留めやめる"
+unfavorite: "やっぱ気に入らん"
+pin: "ピン留めしとく"
+unpin: "やっぱピン留めせん"
 copyContent: "内容をコピー"
 copyLink: "リンクをコピー"
 delete: "ほかす"
 deleteAndEdit: "ほかして直す"
-deleteAndEditConfirm: "このノートをほかしてもっかい直す？このノートへのリアクション、Remote、返信も全部消えんで"
+deleteAndEditConfirm: "このノートをほかしてもっかい直す？このノートへのリアクション、Renote、返信も全部消えるんやけどそれでもええん？"
 addToList: "リストに入れたる"
 sendMessage: "メッセージを送る"
 copyUsername: "ユーザー名をコピー"
+searchUser: "ユーザーを検索"
 reply: "返す"
 loadMore: "もっとあるやろ！"
 youGotNewFollower: "フォローされたで"
 receiveFollowRequest: "フォローリクエストされたで"
 followRequestAccepted: "フォローが承認されたで"
+mention: "メンション"
 mentions: "あんた宛て"
 directNotes: "ダイレクト投稿"
 importAndExport: "インポートとエクスポート"
@ -57,7 +62,7 @@ unfollowConfirm: "{name}のフォローを解除してもええんか？"
 exportRequested: "エクスポートしてな、ってリクエストしたけど、これ多分めっちゃ時間かかるで。エクスポート終わったら「ドライブ」に突っ込んどくで。"
 importRequested: "インポートしてな、ってリクエストしたけど、これ多分めっちゃ時間かかるで。"
 lists: "リスト"
-noLists: "リストはあらへん"
+noLists: "リストなんてあらへんで"
 note: "ノート"
 notes: "ノート"
 following: "フォロー"
@ -65,32 +70,35 @@ followers: "フォロワー"
 followsYou: "フォローされとるで"
 createList: "リスト作る"
 manageLists: "リストの管理"
-error: "問題が発生してん"
-retry: "もっぺんやってみる"
+error: "エラー"
+somethingHappened: "なんかアカンことが起こったで"
+retry: "もっぺんやる？"
+pageLoadError: "ページの読み込みに失敗してしもうたで…"
+pageLoadErrorDescription: "これは普通、ネットワークかブラウザキャッシュが原因やからね。キャッシュをクリアするか、もうちっとだけ待ってくれへんか？"
 enterListName: "リスト名を入れてや"
-privacy: "プライバシーってなんや？オカンの年齢か？"
-makeFollowManuallyApprove: "他人のフォローは許可してからや！"
+privacy: "プライバシーってなんぞや？"
+makeFollowManuallyApprove: "他人からのフォローは自分が決める"
 defaultNoteVisibility: "もとからの公開範囲"
 follow: "フォロー"
-followRequest: "フォロー許してくれや！言うてみる"
-followRequests: "フォロー許してくれや！"
+followRequest: "フォローを頼む"
+followRequests: "フォローを頼む"
 unfollow: "フォローやめる"
 followRequestPending: "フォロー許してくれるん待っとる"
 enterEmoji: "絵文字を入れてや"
 renote: "Renote"
 unrenote: "Renoteやめる"
 quote: "引用"
-pinnedNote: "ピン留めされたノート"
+pinnedNote: "ピン留めされとるノート"
 you: "あんた"
-clickToShow: "押してみ、見せたるわ"
-sensitive: "見たらあかんで"
+clickToShow: "押したら見えるようになるで"
+sensitive: "ちょっとアカンやつやで"
 add: "増やす"
 reaction: "リアクション"
 reactionSettingDescription: "リアクションピッカーに出しとくリアクションを選んでや。"
 rememberNoteVisibility: "公開範囲覚えといて"
-attachCancel: "くっつけるのやめよか"
-markAsSensitive: "ちょっと見せられへんわ"
-unmarkAsSensitive: "別にええんじゃね？"
+attachCancel: "やっぱ添付やめてくれん？"
+markAsSensitive: "ちょっとこれはアカン"
+unmarkAsSensitive: "そこまでアカンことないやろ"
 enterFileName: "ファイル名を入れてや"
 mute: "ミュート"
 unmute: "ミュートやめたる"
@ -98,30 +106,35 @@ block: "ブロック"
 unblock: "ブロックやめたる"
 suspend: "凍結"
 unsuspend: "溶かす"
-blockConfirm: "ブロックしてしもうてええか？"
-unblockConfirm: "ブロックすんのやめるけどええか？"
+blockConfirm: "ブロックしてもええんか？"
+unblockConfirm: "ブロックやめたるってほんまか？"
 suspendConfirm: "凍結してしもうてええか？"
 unsuspendConfirm: "解凍するけどええか？"
 selectList: "リストを選ぶ"
+selectAntenna: "アンテナを選ぶ"
+selectWidget: "ウィジェットを選ぶ"
+editWidgets: "ウィジェットをいじる"
+editWidgetsExit: "編集終ったで"
 customEmojis: "カスタム絵文字"
+emoji: "絵文字"
 emojiName: "絵文字名"
 emojiUrl: "絵文字画像URL"
 addEmoji: "絵文字を追加"
 settingGuide: "ええ感じの設定"
 cacheRemoteFiles: "リモートのファイルをキャッシュする"
-cacheRemoteFilesDescription: "この設定をチャラにすると、リモートファイルをキャッシュせず直リンクするようになります。サーバーのストレージを節約できますが、サムネイルが生成されへんので通信量が増加します。"
-flagAsBot: "Botやでと言っとく"
-flagAsCat: "Catやでと言っとく"
-autoAcceptFollowed: "フォローしとるユーザーからのフォロリクは全部勝手にええでって言うで"
+cacheRemoteFilesDescription: "この設定を切っとくと、リモートファイルをキャッシュせず直リンクするようになってしまうんやで？　サーバーのストレージは節約できるんやけど、かわりにサムネイルが作られんくなるから通信量が増えるで？"
+flagAsBot: "Botやで"
+flagAsCat: "Catやで"
+autoAcceptFollowed: "フォローしとるユーザーからのフォローリクエストには勝手に許可しとくで。"
 addAcount: "アカウント追加"
-loginFailed: "ログインに失敗してん"
+loginFailed: "ログインに失敗してしもうた…"
 showOnRemote: "リモートで見る"
 general: "全般"
 wallpaper: "壁紙"
 setWallpaper: "壁紙を設定"
-removeWallpaper: "壁紙ほかす"
+removeWallpaper: "壁紙を削除"
 searchWith: "検索: {q}"
-youHaveNoLists: "リストはあらへん"
+youHaveNoLists: "リストがあらへんで？"
 followConfirm: "{name}をフォローしてええか？"
 proxyAccount: "プロキシアカウント"
 proxyAccountDescription: "プロキシアカウントは、代わりにフォローしてくれるアカウントや。例えば、551に豚まんが無いときやったり、ユーザーがリモートユーザーをアカウントに入れたとき、リストに入れられたユーザーが誰からもフォローされてないと寂しいやん。寂しいし、アクティビティも配達されへんから、プロキシアカウントがフォローしてくれるで。ええやつやん…"
@ -131,7 +144,7 @@ recipient: "宛先"
 annotation: "注釈"
 federation: "連合"
 instances: "インスタンス"
-registeredAt: "一見さんになった日"
+registeredAt: "初観測"
 latestRequestSentAt: "ちょっと前のリクエスト送信"
 latestRequestReceivedAt: "ちょっと前のリクエスト受信"
 latestStatus: "ちょっと前のステータス"
@ -173,7 +186,6 @@ processing: "処理しとる"
 preview: "プレビュー"
 default: "デフォルト"
 noCustomEmojis: "絵文字はあらへん"
-customEmojisOfRemote: "リモートの絵文字"
 noJobs: "ジョブはあらへん"
 federating: "連合しとる"
 blocked: "ブロックしとる"
@ -202,6 +214,7 @@ imageUrl: "画像URL"
 remove: "ほかす"
 removed: "削除したで！"
 removeAreYouSure: "「{x}」はなおしてしもてええか？"
+deleteAreYouSure: "「{x}」はなおしてしもてええか？"
 saved: "保存したで！"
 messaging: "チャット"
 upload: "アップロード"
@ -259,7 +272,8 @@ copyUrl: "URLをコピー"
 rename: "名前を変えるで"
 avatar: "アイコン"
 banner: "バナー"
-nsfw: "見たらあかんで"
+nsfw: "ちょっとアカンやつやで"
+whenServerDisconnected: "サーバーとの接続が失くなってしもうたとき"
 disconnectedFromServer: "サーバーが機嫌悪いねん"
 reload: "リロード"
 doNothing: "何もせんとく"
@ -295,6 +309,19 @@ proxyRemoteFilesDescription: "この設定を入れると、保存しとらん
 driveCapacityPerLocalAccount: "ローカルユーザーひとりあたりのドライブ容量"
 driveCapacityPerRemoteAccount: "リモートユーザーひとりあたりのドライブ容量"
 inMb: "メガバイト単位"
+iconUrl: "アイコン画像のURL"
+bannerUrl: "バナー画像のURL"
+basicInfo: "基本情報"
+pinnedUsers: "ピン留めしたユーザー"
+pinnedUsersDescription: "「みつける」ページとかにピン留めしたいユーザーをここに書けばええんやで。他ん人との名前は改行で区切ればええんやで。"
+hcaptcha: "hCaptcha（キャプチャ）"
+enableHcaptcha: "hCaptcha（キャプチャ）をつけとく"
+hcaptchaSiteKey: "サイトキー"
+hcaptchaSecretKey: "シークレットキー"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "reCAPTCHA（リキャプチャ）を有効にする"
+recaptchaSiteKey: "サイトキー"
+recaptchaSecretKey: "シークレットキー"
 avoidMultiCaptchaConfirm: "ぎょうさんのCaptchaをつこてしまうと、仲良うせんことがあるんや。他のCaptchaをなおしとこか？別にキャンセルしてもろうたらCaptchaは消されへんで済むけど知らんで。"
 antennas: "アンテナ"
 manageAntennas: "アンテナいじる"
@ -347,11 +374,59 @@ unregister: "登録やめる"
 passwordLessLogin: "パスワード無くてもログインできるようにする"
 resetPassword: "パスワードをリセット"
 newPasswordIs: "今度のパスワードは「{password}」や"
-autoReloadWhenDisconnected: "サーバーが調子悪いときには自動でリロードしたる"
+reduceUiAnimation: "UIの動きやアニメーションを減らしてくれや。"
+share: "わけわけ"
+notFound: "見つからへんね"
 notFoundDescription: "指定されたURLに該当するページはあらへんやった。"
+uploadFolder: "とりあえずここへアップロード"
+cacheClear: "キャッシュをほかす"
+markAsReadAllNotifications: "通知はもう全て読んだわっ"
+markAsReadAllUnreadNotes: "投稿は全て読んだわっ"
+markAsReadAllTalkMessages: "チャットはもうぜんぶ読んだわっ"
+help: "ヘルプ"
+inputMessageHere: "ここにメッセージ書いてや"
 close: "さいなら"
+group: "グループ"
+groups: "グループ"
+createGroup: "グループを作るで"
+ownedGroups: "所有しとるグループ"
 joinedGroups: "参加しとるグループ"
 invites: "来てや"
+groupName: "グループ名"
+members: "メンバー"
+transfer: "譲渡"
+messagingWithUser: "ユーザーとチャット"
+messagingWithGroup: "グループでチャット"
+title: "タイトル"
+text: "テキスト"
+enable: "有効にするで"
+next: "次"
+retype: "もっかい入力"
+noteOf: "{user}のノート"
+inviteToGroup: "グループに招く"
+maxNoteTextLength: "ノートの文字数制限"
+quoteAttached: "引用付いとるで"
+quoteQuestion: "引用として添付してもええか？"
+noMessagesYet: "まだチャットはあらへんで"
+newMessageExists: "新しいメッセージがきたで"
+onlyOneFileCanBeAttached: "すまん、メッセージに添付できるファイルはひとつだけなんや。"
+invitations: "来てや"
+invitationCode: "招待コード"
+checking: "確認しとるで"
+smtpHost: "ホスト"
+smtpUser: "ユーザー名"
+smtpPass: "パスワード"
+_mfm:
+  mention: "メンション"
+  quote: "引用"
+  emoji: "カスタム絵文字"
+  search: "探す"
+_sidebar:
+  icon: "アイコン"
+_theme:
+  keys:
+    mention: "メンション"
+    renote: "Renote"
 _sfx:
  note: "ノート"
  notification: "通知"
@ -383,6 +458,7 @@ _widgets:
  notifications: "通知"
  timeline: "タイムライン"
  activity: "アクティビティ"
+  federation: "連合"
 _cw:
  show: "もっとあるやろ！"
 _poll:
@ -431,3 +507,16 @@ _pages:
      array: "リスト"
 _notification:
  youWereFollowed: "フォローされたで"
+  _types:
+    follow: "フォロー"
+    mention: "メンション"
+    renote: "Renote"
+    quote: "引用"
+    reaction: "リアクション"
+_deck:
+  _columns:
+    notifications: "通知"
+    tl: "タイムライン"
+    antenna: "アンテナ"
+    list: "リスト"
+    mentions: "あんた宛て"
--- a/locales/kab-KAB.yml
+++ b/locales/kab-KAB.yml
@ -0,0 +1,95 @@
+---
+_lang_: "Taqbaylit"
+monthAndDay: "{day}/{month}"
+search: "Nadi"
+notifications: "Ilɣuyen"
+username: "Isem n umseqdac"
+password: "Awal uffir"
+ok: "IH"
+settings: "Iɣewwaṛen"
+profile: "Amaɣnu"
+save: "Sekles"
+delete: "Kkes"
+addToList: "Rnu ɣer tebdart"
+reply: "Err"
+loadMore: "Wali ugar"
+youGotNewFollower: "Yeṭṭafaṛ-ik·em-id"
+mention: "Bder"
+import: "Kter"
+export: "Sifeḍ"
+files: "Ifuyla"
+download: "Sider"
+lists: "Tibdarin"
+noLists: "Ulac ɣur-k·m ula d yiwet n tabdart"
+following: "Ig ṭṭafaṛ"
+followers: "Imeḍfaṛen"
+followsYou: "Yeṭṭafaṛ-ik·em-id"
+createList: "Snulfu-d tabdart"
+enterListName: "Isem n tebdart"
+follow: "Ḍfeṛ"
+you: "Kečči·mmi"
+selectList: "Fren tabdart"
+youHaveNoLists: "Ulac ɣur-k·m ula d yiwet n tabdart"
+remove: "Kkes"
+userList: "Tibdarin"
+uiLanguage: "Tutlayt n wegrudem"
+smtpUser: "Isem n umseqdac"
+smtpPass: "Awal uffir"
+_mfm:
+  mention: "Bder"
+  search: "Nadi"
+_theme:
+  keys:
+    mention: "Bder"
+_sfx:
+  notification: "Ilɣuyen"
+_widgets:
+  notifications: "Ilɣuyen"
+_cw:
+  show: "Wali ugar"
+_visibility:
+  followers: "Imeḍfaṛen"
+_profile:
+  username: "Isem n umseqdac"
+_exportOrImport:
+  followingList: "Ig ṭṭafaṛ"
+  muteList: "Sgugem"
+  blockingList: "Seḥbes"
+  userLists: "Tibdarin"
+_pages:
+  contents: "Agbur"
+  font: "Tasefsit"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  eyeCatchingImageRemove: "Kkes tugna i d-ijebden"
+  selectType: "Fren anaw"
+  contentBlocks: "Agbur"
+  inputBlocks: "Anekcum"
+  specialBlocks: "Uzzig"
+  script:
+    categories:
+      list: "Tibdarin"
+    blocks:
+      _join:
+        arg1: "Tibdarin"
+      _randomPick:
+        arg1: "Tibdarin"
+      _dailyRandomPick:
+        arg1: "Tibdarin"
+      _seedRandomPick:
+        arg2: "Tibdarin"
+      _pick:
+        arg1: "Tibdarin"
+      _listLen:
+        arg1: "Tibdarin"
+    types:
+      array: "Tibdarin"
+_notification:
+  youWereFollowed: "Yeṭṭafaṛ-ik·em-id"
+  _types:
+    follow: "Ig ṭṭafaṛ"
+    mention: "Bder"
+_deck:
+  _columns:
+    notifications: "Ilɣuyen"
+    list: "Tibdarin"
--- a/locales/kn-IN.yml
+++ b/locales/kn-IN.yml
@ -54,6 +54,10 @@ driveFileDeleteConfirm: "\"{name}\" ಕಡತವನ್ನು ಅಳಿಸಲು
 unfollowConfirm: "{name}ಅನ್ನು ಹಿಂಬಾಲಿಸದಿರುವುದೇ?"
 instances: "ನಿದರ್ಶನ"
 remove: "ಅಳಿಸು"
+smtpUser: "ಬಳಕೆಹೆಸರು"
+smtpPass: "ಗುಪ್ತಪದ"
+_mfm:
+  search: "ಹುಡುಕು"
 _sfx:
  notification: "ಅಧಿಸೂಚನೆಗಳು"
 _widgets:
@ -65,3 +69,8 @@ _profile:
  username: "ಬಳಕೆಹೆಸರು"
 _notification:
  youWereFollowed: "ಹಿಂಬಾಲಿಸಿದರು"
+_deck:
+  _columns:
+    notifications: "ಅಧಿಸೂಚನೆಗಳು"
+    tl: "ಸಮಯಸಾಲು"
+    mentions: "ಹೆಸರಿಸಿದ"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@ -45,6 +45,7 @@ loadMore: "더 보기"
 youGotNewFollower: "새로운 팔로워가 있습니다"
 receiveFollowRequest: "새로운 팔로우 요청이 있습니다"
 followRequestAccepted: "팔로우가 수락되었습니다"
+mention: "멘션"
 mentions: "받은 멘션"
 directNotes: "다이렉트 노트"
 importAndExport: "가져오기와 내보내기"
@ -65,7 +66,6 @@ followers: "팔로워"
 followsYou: "당신을 팔로우합니다"
 createList: "리스트 만들기"
 manageLists: "리스트 관리"
-error: "오류가 발생했습니다"
 retry: "다시 시도"
 enterListName: "리스트 이름을 입력"
 privacy: "프라이버시"
@ -103,7 +103,10 @@ unblockConfirm: "이 계정의 차단을 해제하시겠습니까?"
 suspendConfirm: "이 계정을 정지하시겠습니까?"
 unsuspendConfirm: "이 계정의 정지를 해제하시겠습니까?"
 selectList: "리스트 선택"
+selectAntenna: "안테나 선택"
+selectWidget: "위젯 선택"
 customEmojis: "커스텀 이모지"
+emoji: "이모지"
 emojiName: "이모지 이름"
 emojiUrl: "이모지 URL"
 addEmoji: "이모지 추가"
@ -173,7 +176,6 @@ processing: "처리중"
 preview: "미리보기"
 default: "기본값"
 noCustomEmojis: "이모지가 없습니다"
-customEmojisOfRemote: "다른 인스턴스들의 이모지"
 noJobs: "작업이 없습니다"
 federating: "연합 중"
 blocked: "차단됨"
@ -202,6 +204,7 @@ imageUrl: "이미지 URL"
 remove: "삭제"
 removed: "삭제하였습니다"
 removeAreYouSure: "\"{x}\" 을(를) 삭제하시겠습니까?"
+deleteAreYouSure: "\"{x}\" 을(를) 삭제하시겠습니까?"
 saved: "저장하였습니다"
 messaging: "대화"
 upload: "업로드"
@ -360,9 +363,6 @@ unregister: "등록 해제"
 passwordLessLogin: "비밀번호 없이 로그인"
 resetPassword: "비밀번호 재설정"
 newPasswordIs: "새로운 비밀번호는 \"{password}\" 입니다"
-autoReloadWhenDisconnected: "서버와의 연결이 끊기면 자동 새로고침"
-autoNoteWatch: "노트를 자동으로 지켜보기"
-autoNoteWatchDescription: "리액션하거나 답글을 남긴 다른 유저의 노트에 대한 알림을 받습니다."
 reduceUiAnimation: "UI의 애니메이션을 줄이기"
 share: "공유"
 notFound: "찾을 수 없습니다"
@ -400,6 +400,7 @@ noMessagesYet: "아직 대화가 없습니다"
 newMessageExists: "새 메시지가 있습니다"
 onlyOneFileCanBeAttached: "메시지에 첨부할 수 있는 파일은 하나까지입니다"
 signinRequired: "로그인 해주세요"
+invitations: "초대"
 invitationCode: "초대 코드"
 checking: "확인하는 중입니다"
 available: "사용 가능합니다"
@ -430,7 +431,7 @@ tags: "태그"
 docSource: "이 문서의 소스"
 createAccount: "계정 만들기"
 existingAcount: "기존 계정"
-regenerate: "다시 생성"
+regenerate: "재생성"
 fontSize: "글자 크기"
 noFollowRequests: "처리되지 않은 팔로우 요청이 없습니다"
 openImageInNewTab: "새 탭에서 이미지 열기"
@ -440,8 +441,6 @@ remote: "리모트"
 total: "합계"
 weekOverWeekChanges: "지난주보다"
 dayOverDayChanges: "어제보다"
-accessibility: "접근성"
-clinetSettings: "클라이언트 설정"
 accountSettings: "계정 설정"
 promotion: "프로모션"
 promote: "프로모션하기"
@ -506,6 +505,77 @@ relays: "릴레이"
 addRelay: "릴레이 추가"
 inboxUrl: "Inbox 주소"
 addedRelays: "추가된 릴레이"
+serviceworkerInfo: "푸시 알림을 수행하려면 활성화해야 합니다."
+deletedNote: "삭제된 노트"
+invisibleNote: "비공개 노트"
+enableInfiniteScroll: "자동으로 좀 더 보기"
+visibility: "공개 범위"
+poll: "투표"
+useCw: "내용 숨기기"
+enablePlayer: "플레이어 열기"
+disablePlayer: "플레이어 닫기"
+expandTweet: "트윗 확장하기"
+themeEditor: "테마 에디터"
+description: "설명"
+author: "작성자"
+leaveConfirm: "저장하지 않은 변경사항이 있습니다. 취소하시겠습니까?"
+manage: "관리"
+plugins: "플러그인"
+pluginInstallWarn: "신뢰할 수 없는 플러그인은 설치하지 마십시오."
+deck: "덱"
+undeck: "덱 해제"
+width: "폭"
+height: "높이"
+generateAccessToken: "액세스 토큰 생성"
+permission: "권한"
+enableAll: "전체 선택"
+disableAll: "전체 해제"
+tokenRequested: "계정 접근 허용"
+edit: "편집"
+useStarForReactionFallback: "알 수 없는 리액션 이모지 대신 ★ 사용"
+emailConfig: "메일 서버 설정"
+emailConfigInfo: "가입 시 메일 주소 확인이나 비밀번호 초기화 시에 사용합니다."
+email: "메일 주소"
+smtpConfig: "SMTP 서버 설정"
+smtpHost: "호스트"
+smtpPort: "포트"
+smtpUser: "유저명"
+smtpPass: "비밀번호"
+emptyToDisableSmtpAuth: "SMTP 인증을 사용하지 않으려면 공란으로 비워둡니다."
+smtpSecure: "SMTP 연결에 Implicit SSL/TTS 사용"
+smtpSecureInfo: "STARTTLS 사용 시에는 해제합니다."
+wordMute: "단어 뮤트"
+makeActive: "활성화"
+copy: "복사"
+logs: "로그"
+database: "데이터베이스"
+channel: "채널"
+random: "랜덤"
+public: "공개"
+_mfm:
+  mention: "멘션"
+  hashtag: "해시태그"
+  link: "링크"
+  center: "가운데 정렬"
+  quote: "인용"
+  emoji: "커스텀 이모지"
+  search: "검색"
+_reversi:
+  total: "합계"
+_channel:
+  create: "채널 생성"
+  setBanner: "배너 설정"
+  removeBanner: "배너 삭제"
+  featured: "트렌드"
+  following: "팔로잉"
+  usersCount: "{n}명 참여 중"
+  notesCount: "{n}노트"
+_sidebar:
+  icon: "아바타"
+  hide: "숨기기"
+_wordMute:
+  muteWords: "뮤트할 단어"
+  mutedNotes: "뮤트된 노트"
 _theme:
  explore: "테마 찾아보기"
  install: "테마 설치"
@ -514,6 +584,25 @@ _theme:
  installed: "{name} 테마가 설치되었습니다"
  alreadyInstalled: "이미 설치된 테마입니다"
  invalid: "테마 형식이 올바르지 않습니다"
+  make: "테마 만들기"
+  base: "베이스"
+  addConstant: "상수 추가"
+  constant: "상수"
+  defaultValue: "기본값"
+  color: "색"
+  refProp: "프로퍼티를 참조"
+  refConst: "상수를 참조"
+  key: "키"
+  func: "함수"
+  funcKind: "함수 종류"
+  argument: "매개변수"
+  importInfo: "여기에 테마 코드를 붙여 넣어 에디터로 불러올 수 있습니다."
+  keys:
+    link: "링크"
+    hashtag: "해시태그"
+    mention: "멘션"
+    renote: "Renote"
+    divider: "구분선"
 _sfx:
  note: "새 노트"
  noteMy: "내 노트"
@ -627,12 +716,14 @@ _widgets:
  rss: "RSS 리더"
  activity: "활동"
  photos: "사진"
+  digitalClock: "디지털 시계"
+  federation: "연합"
+  postForm: "글 입력란"
 _cw:
  hide: "숨기기"
  show: "더 보기"
  chars: "{count} 문자"
  files: "{count} 파일"
-  poll: "투표"
 _poll:
  noOnlyOneChoice: "투표 항목이 최소 2개 필요합니다"
  choiceN: "선택지 {n}"
@ -665,6 +756,7 @@ _visibility:
  specified: "다이렉트"
  specifiedDescription: "지정한 유저에게만 공개"
  localOnly: "로컬에만"
+  localOnlyDescription: "리모트 유저에게 보이지 않기"
 _postForm:
  replyPlaceholder: "이 노트에 답글..."
  quotePlaceholder: "이 노트를 인용..."
@ -800,6 +892,7 @@ _pages:
  my: "내 페이지"
  liked: "좋아요한 페이지"
  inspector: "인스펙터"
+  contents: "콘텐츠"
  content: "페이지 블록"
  variables: "변수"
  title: "제목"
@ -1068,5 +1161,37 @@ _relayStatus:
  accepted: "승인됨"
  rejected: "거절됨"
 _notification:
+  fileUploaded: "파일이 업로드되었습니다"
+  youGotMention: "{name}님이 멘션함"
+  youGotReply: "{name}님이 답글함"
+  youGotQuote: "{name}님이 인용함"
+  youRenoted: "{name}님이 Renote"
+  youGotPoll: "{name}님이 투표함"
  youWereFollowed: "새로운 팔로워가 있습니다"
+  youReceivedFollowRequest: "새로운 팔로우 요청이 있습니다"
+  yourFollowRequestAccepted: "팔로우 요청이 수락되었습니다"
  youWereInvitedToGroup: "그룹에 초대되었습니다"
+  _types:
+    follow: "팔로잉"
+    mention: "멘션"
+    renote: "Renote"
+    quote: "인용"
+    reaction: "리액션"
+_deck:
+  alwaysShowMainColumn: "메인 칼럼 항상 표시"
+  columnAlign: "칼럼 정렬"
+  addColumn: "칼럼 추가"
+  swapLeft: "왼쪽으로 이동"
+  swapRight: "오른쪽으로 이동"
+  swapUp: "위로 이동"
+  swapDown: "아래로 이동"
+  stackLeft: "왼쪽에 쌓기"
+  popRight: "오른쪽으로 빼기"
+  _columns:
+    widgets: "위젯"
+    notifications: "알림"
+    tl: "타임라인"
+    antenna: "안테나"
+    list: "리스트"
+    mentions: "받은 멘션"
+    direct: "다이렉트"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@ -1,2 +1,23 @@
 ---
 _lang_: "język polski"
+search: "Szukaj"
+notifications: "Powiadomienia"
+username: "Nazwa użytkownika"
+password: "Hasło"
+ok: "OK"
+gotIt: "Rozumiem!"
+cancel: "Anuluj"
+enterUsername: "Wprowadź nazwę użytkownika"
+smtpUser: "Nazwa użytkownika"
+smtpPass: "Hasło"
+_mfm:
+  search: "Szukaj"
+_sfx:
+  notification: "Powiadomienia"
+_widgets:
+  notifications: "Powiadomienia"
+_profile:
+  username: "Nazwa użytkownika"
+_deck:
+  _columns:
+    notifications: "Powiadomienia"
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
--- a/locales/ug-CN.yml
+++ b/locales/ug-CN.yml
@ -1,3 +1,5 @@
 ---
 _lang_: "ياپونچە"
 search: "ئىزدەش"
+_mfm:
+  search: "ئىزدەش"
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@ -0,0 +1,546 @@
+---
+_lang_: "Українська"
+monthAndDay: "{month}/{day}"
+search: "Пошук"
+notifications: "Сповіщення"
+username: "Ім'я користувача"
+password: "Пароль"
+fetchingAsApObject: "Отримуємо з федіверсу..."
+ok: "OK"
+gotIt: "Зрозуміло!"
+cancel: "Скасувати"
+enterUsername: "Введіть ім'я користувача"
+renotedBy: "Поширено {user}"
+noNotes: "Немає дописів"
+noNotifications: "Немає сповіщень"
+instance: "Інстанс"
+settings: "Налаштування"
+basicSettings: "Основні налаштування"
+otherSettings: "Інші налаштування"
+openInWindow: "Відкрити у вікні"
+profile: "Профіль"
+timeline: "Стрічка"
+noAccountDescription: "Цей користувач ще нічого не написав про себе"
+login: "Увійти"
+loggingIn: "Здійснюємо вхід..."
+logout: "Вийти"
+signup: "Реєстрація"
+uploading: "Завантаження..."
+save: "Зберегти"
+users: "Користувачі"
+addUser: "Додати користувача"
+favorite: "Обране"
+favorites: "Обране"
+unfavorite: "Видалити з обраного"
+pin: "Закріпити"
+unpin: "Відкріпити"
+copyContent: "Скопіювати контент"
+copyLink: "Скопіювати посилання"
+delete: "Видалити"
+deleteAndEdit: "Видалити й редагувати"
+addToList: "Додати до списку"
+sendMessage: "Надіслати повідомлення"
+copyUsername: "Скопіювати ім’я користувача"
+searchUser: "Пошук користувачів"
+reply: "Відповісти"
+loadMore: "Показати більше"
+youGotNewFollower: "У вас новий підписник"
+receiveFollowRequest: "Отримано запит на підписку"
+followRequestAccepted: "Запит на підписку прийнято"
+mention: "Згадка"
+mentions: "Згадки"
+directNotes: "Прямі повідомлення"
+importAndExport: "Імпорт та експорт"
+import: "Імпорт"
+export: "Експорт"
+files: "Файли"
+download: "Завантажити"
+unfollowConfirm: "Ви впевнені, що хочете відписатися від {name}?"
+lists: "Списки"
+noLists: "Немає списків"
+note: "Дописи"
+notes: "Дописи"
+following: "Підписки"
+followers: "Підписники"
+followsYou: "Підписаний(-а) на вас"
+createList: "Створити список"
+manageLists: "Управління списками"
+error: "Помилка"
+somethingHappened: "Щось пішло не так"
+retry: "Спробувати знову"
+pageLoadError: "Помилка при завантаженні сторінки"
+enterListName: "Введіть назву списку"
+privacy: "Приватність"
+makeFollowManuallyApprove: "Підтверджувати підписників уручну"
+defaultNoteVisibility: "Видимість допису за замовчуванням"
+follow: "Підписка"
+followRequest: "Запит на підписку"
+followRequests: "Запити на підписку"
+unfollow: "Відписатися"
+followRequestPending: "Очікуючі запити на підписку"
+enterEmoji: "Введіть емодзі"
+renote: "Поширити"
+unrenote: "Відміна поширення"
+quote: "Цитата"
+pinnedNote: "Закріплений допис"
+you: "Ви"
+clickToShow: "Натисніть для перегляду"
+sensitive: "NSFW"
+add: "Додати"
+reaction: "Реакції"
+rememberNoteVisibility: "Пам’ятати видимість дописів"
+attachCancel: "Видалити вкладення"
+markAsSensitive: "Позначити як NSFW"
+unmarkAsSensitive: "Зняти позначку NSFW"
+enterFileName: "Введіть ім'я файлу"
+mute: "Ігнорувати"
+unmute: "Показувати"
+block: "Заблокувати"
+unblock: "Розблокувати"
+suspend: "Призупинити"
+unsuspend: "Відновити"
+blockConfirm: "Ви впевнені, що хочете заблокувати цей акаунт?"
+unblockConfirm: "Ви впевнені, що хочете розблокувати цей акаунт?"
+suspendConfirm: "Ви впевнені, що хочете призупинити цей акаунт?"
+unsuspendConfirm: "Ви впевнені, що хочете відновити цей акаунт?"
+selectList: "Виберіть список"
+selectAntenna: "Виберіть антену"
+selectWidget: "Виберіть віджет"
+editWidgets: "Редагувати віджети"
+editWidgetsExit: "Готово"
+customEmojis: "Кастомні емоджі"
+emoji: "Емоджі"
+emojiName: "Назва емоджі"
+emojiUrl: "URL емодзі"
+addEmoji: "Додати емодзі"
+settingGuide: "Рекомендована конфігурація"
+cacheRemoteFiles: "Кешувати дані з інших інстансів"
+flagAsBot: "Акаунт бота"
+flagAsCat: "Акаунт кота"
+autoAcceptFollowed: "Автоматично приймати запити на підписку від користувачів, на яких ви підписані"
+addAcount: "Додати акаунт"
+loginFailed: "Не вдалося увійти"
+showOnRemote: "Переглянути в оригіналі"
+general: "Загальне"
+wallpaper: "Шпалери"
+setWallpaper: "Встановити шпалери"
+removeWallpaper: "Прибрати шпалери"
+searchWith: "Шукати з {q}"
+youHaveNoLists: "У вас немає списків"
+followConfirm: "Підписатися на {name}?"
+proxyAccount: "Проксі-акаунт"
+host: "Хост"
+selectUser: "Виберіть користувача"
+recipient: "Кому"
+annotation: "Коментар"
+federation: "Федіверс"
+instances: "Інстанс"
+registeredAt: "Приєднався(-лась)"
+latestRequestSentAt: "Останній запит надіслано"
+latestRequestReceivedAt: "Останній запит прийнято"
+latestStatus: "Останній статус"
+storageUsage: "Використання простіру"
+charts: "Графіки"
+perHour: "Щогодинно"
+perDay: "Щоденно"
+stopActivityDelivery: "Припинити розсилання активності"
+blockThisInstance: "Заблокувати цей інстанс"
+operations: "Операції"
+software: "Програмне забезпечення"
+version: "Версія"
+metadata: "Метадані"
+withNFiles: "файли: {n}"
+monitor: "Монітор"
+jobQueue: "Черга завдань"
+cpuAndMemory: "ЦП та пам'ять"
+network: "Мережа"
+disk: "Диск"
+instanceInfo: "Про цей інстанс"
+statistics: "Статистика"
+clearQueue: "Очистити чергу"
+clearQueueConfirmTitle: "Ви впевнені, що хочете очистити чергу?"
+clearCachedFiles: "Очистити кеш"
+clearCachedFilesConfirm: "Ви впевнені, що хочете видалити всі кешовані файли?"
+blockedInstances: "Заблоковані інстанси"
+muteAndBlock: "Ігнор і блокування"
+mutedUsers: "Ігноровані користувачі"
+blockedUsers: "Заблоковані користувачі"
+noUsers: "Немає користувачів"
+editProfile: "Редагувати профіль"
+noteDeleteConfirm: "Ви дійсно хочете видалити цей допис?"
+pinLimitExceeded: "Більше дописів не можна закріпити"
+done: "Готово"
+processing: "Обробка"
+preview: "Передогляд"
+default: "За умовчанням"
+noCustomEmojis: "Немає кастомних емоджі"
+noJobs: "Немає завдань"
+federating: "Федерується"
+blocked: "Заблоковано"
+suspended: "Призупинено"
+notResponding: "Не відповідає"
+changePassword: "Змінити пароль"
+security: "Безпека"
+currentPassword: "Поточний пароль"
+newPassword: "Новий пароль"
+newPasswordRetype: "Новий пароль (повторно)"
+attachFile: "Вкласти файл"
+more: "Бiльше!"
+featured: "Виділено"
+noSuchUser: "Користувача не знайдено"
+lookup: "Пошук"
+announcements: "Оголошення"
+imageUrl: "URL зображення"
+remove: "Видалити"
+removed: "Видалено"
+saved: "Збережено"
+messaging: "Чати"
+upload: "Завантажити"
+fromDrive: "З диска"
+fromUrl: "З URL"
+uploadFromUrl: "Завантажити з URL"
+explore: "Огляд"
+games: "Ігри Misskey"
+noMoreHistory: "Подальшої історії немає"
+start: "Розпочати"
+home: "Домівка"
+activity: "Активність"
+images: "Зображення"
+birthday: "День народження"
+yearsOld: "{age} років"
+registeredDate: "Приєднався(-лась)"
+location: "Локація"
+theme: "Тема"
+themeForLightMode: "Світла тема"
+themeForDarkMode: "Темна тема"
+light: "Світла"
+dark: "Темна"
+lightThemes: "Світлі теми"
+darkThemes: "Темні теми"
+drive: "Диск"
+fileName: "Ім'я файлу"
+selectFile: "Вибрати файл"
+selectFiles: "Вибрати файли"
+selectFolder: "Вибрати теку"
+selectFolders: "Вибрати теки"
+renameFile: "Перейменувати файл"
+folderName: "Ім'я теки"
+createFolder: "Створити теку"
+renameFolder: "Перейменувати теку"
+deleteFolder: "Видалити теку"
+addFile: "Додати файл"
+emptyDrive: "Диск порожній"
+emptyFolder: "Тека порожня"
+unableToDelete: "Видалення неможливе"
+inputNewFileName: "Введіть ім'я нового файлу"
+inputNewFolderName: "Введіть ім'я нової теки"
+hasChildFilesOrFolders: "Ця тека не порожня і не може бути видалена"
+copyUrl: "Копіювати URL"
+rename: "Перейменувати"
+avatar: "Аватар"
+banner: "Банер"
+nsfw: "NSFW"
+disconnectedFromServer: "Підключення до сервера було перервано"
+reload: "Оновити"
+doNothing: "Нічого не робити"
+reloadConfirm: "Перезавантажити стрічку?"
+watch: "Стежити"
+unwatch: "Не стежити"
+accept: "Прийняти"
+reject: "Відхилити"
+instanceName: "Назва інстансу"
+instanceDescription: "Описання інстансу"
+maintainerName: "Ім'я адміністратора"
+maintainerEmail: "Email адміністратора"
+tosUrl: "URL умов використання"
+thisYear: "Рік"
+thisMonth: "Місяць"
+today: "День"
+dayX: "{day}"
+monthX: "{month}"
+yearX: "{year}"
+pages: "Сторінки"
+integration: "Інтеграція"
+connectSerice: "Під’єднати"
+disconnectSerice: "Відключитися"
+enableLocalTimeline: "Увімкнути локальну стрічку"
+enableGlobalTimeline: "Увімкнути глобальну стрічку"
+registration: "Реєстрація"
+enableRegistration: "Дозволити реєстрацію"
+invite: "Запрошення"
+proxyRemoteFiles: "Проксувати файли з інших інстансів"
+iconUrl: "URL аватара"
+bannerUrl: "URL банера"
+basicInfo: "Основна інформація"
+pinnedUsers: "Закріплені користувачі"
+hcaptcha: "hCaptcha"
+enableHcaptcha: "Увімкнути hCaptcha"
+hcaptchaSiteKey: "Ключ сайту"
+hcaptchaSecretKey: "Секретний ключ"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "Увімкнути reCAPTCHA"
+recaptchaSiteKey: "Ключ сайту"
+recaptchaSecretKey: "Секретний ключ"
+antennas: "Антени"
+manageAntennas: "Налаштування антен"
+name: "Ім'я"
+antennaSource: "Джерело антени"
+antennaKeywords: "Ключові слова антени"
+antennaExcludeKeywords: "Винятки"
+serviceworker: "ServiceWorker"
+enableServiceworker: "Ввімкнути ServiceWorker"
+caseSensitive: "З урахуванням регістру"
+notesAndReplies: "Дописи та відповіді"
+popularUsers: "Популярні користувачі"
+recentlyUpdatedUsers: "Нещодавно активні користувачі"
+recentlyRegisteredUsers: "Нещодавно зареєстровані користувачі"
+recentlyDiscoveredUsers: "Нещодавно знайдені користувачі"
+exploreUsersCount: "{count} користувачів"
+exploreFediverse: "Огляд федіверсу"
+popularTags: "Популярні теги"
+userList: "Списки"
+about: "Інформація"
+aboutMisskey: "Про Misskey"
+administrator: "Адмін"
+token: "Токен"
+twoStepAuthentication: "Двохфакторна аутентифікація"
+moderator: "Модератор"
+securityKey: "Ключ захисту"
+securityKeyName: "Назва ключа"
+registerSecurityKey: "Зареєструвати ключ захисту"
+lastUsed: "Востаннє використано"
+unregister: "Скасувати реєстрацію"
+passwordLessLogin: "Налаштувати вхід без пароля"
+resetPassword: "Скинути пароль"
+newPasswordIs: "Новий пароль: {password}"
+share: "Поділитись"
+notFound: "Не знайдено"
+cacheClear: "Очистити кеш"
+help: "Допомога"
+inputMessageHere: "Введіть повідомлення тут"
+close: "Закрити"
+group: "Група"
+groups: "Групи"
+createGroup: "Створити групу"
+ownedGroups: "Власні групи"
+invites: "Запрошення"
+groupName: "Назва групи"
+transfer: "Передача"
+messagingWithUser: "Чат з користувачами"
+messagingWithGroup: "Чат з групою"
+title: "Тема"
+text: "Текст"
+next: "Далі"
+retype: "Введіть ще раз"
+noteOf: "Допис {user}"
+inviteToGroup: "Запрошення до групи"
+maxNoteTextLength: "Максимальна довжина допису"
+quoteAttached: "Цитата"
+quoteQuestion: "Ви хочете додати цитату?"
+noMessagesYet: "Ще немає повідомлень"
+newMessageExists: "Є нові повідомлення"
+onlyOneFileCanBeAttached: "До повідомлення можна вкласти лише один файл"
+signinRequired: "Будь ласка, авторизуйтесь"
+invitations: "Запрошення"
+invitationCode: "Код запрошення"
+checking: "Перевірка…"
+available: "Доступно"
+unavailable: "Недоступно"
+usernameInvalidFormat: "літери, цифри та _ є прийнятними"
+tooShort: "Занадто короткий"
+tooLong: "Занадто довгий"
+weakPassword: "Слабкий пароль"
+strongPassword: "Міцний пароль"
+passwordMatched: "Все вірно"
+passwordNotMatched: "Паролі не співпадають"
+signinWith: "Увійти за допомогою {x}"
+uiLanguage: "Мова інтерфейсу"
+aboutX: "Про {x}"
+useOsNativeEmojis: "Використовувати емодзі ОС"
+youHaveNoGroups: "Немає груп"
+noHistory: "Історія порожня"
+disableAnimatedMfm: "Відключити анімації MFM"
+doing: "Виконується"
+category: "Категорія"
+tags: "Теги"
+docSource: "Джерело цього документа"
+createAccount: "Створити акаунт"
+existingAcount: "Існуючий акаунт"
+regenerate: "Оновити"
+fontSize: "Розмір шрифту"
+noFollowRequests: "Немає запитів на підписку"
+dashboard: "Панель приладів"
+local: "Локальні"
+remote: "Віддалені"
+total: "Всього"
+weekOverWeekChanges: "За тиждень"
+dayOverDayChanges: "За добу"
+appearance: "Вигляд"
+clientSettings: "Налаштування клієнта"
+accountSettings: "Налаштування акаунта"
+promotion: "Просування"
+promote: "Просунути"
+numberOfDays: "Кількість днів"
+hideThisNote: "Сховати цей допис"
+showFeaturedNotesInTimeline: "Показувати рекомендовані дописи у стрічці"
+objectStorageBaseUrl: "Base URL"
+objectStorageBucket: "Bucket"
+objectStoragePrefix: "Prefix"
+objectStorageEndpoint: "Endpoint"
+objectStorageRegion: "Region"
+objectStorageUseSSL: "Використовувати SSL"
+objectStorageUseProxy: "Використовувати Proxy"
+deleteAll: "Видалити все"
+newNoteRecived: "Є нові дописи"
+sounds: "Звуки"
+listen: "Слухати"
+none: "Відсутній"
+showInPage: "Показати на сторінці"
+popout: "Розгорнути"
+volume: "Гучність"
+details: "Детальніше"
+chooseEmoji: "Виберіть емодзі"
+recentUsed: "Нещодавні"
+install: "Встановити"
+uninstall: "Видалити"
+installedApps: "Встановлені аплікації"
+nothing: "Тут нічого немає"
+installedDate: "Дата встановлення"
+lastUsedDate: "Дата використання"
+state: "Стан"
+sort: "Сортування"
+ascendingOrder: "За зростанням"
+descendingOrder: "За спаданням"
+scratchpad: "Чернетка"
+output: "Вихід"
+script: "Скрипт"
+deleteAllFiles: "Видалити всі файли"
+deleteAllFilesConfirm: "Ви дійсно хочете видалити всі файли?"
+removeAllFollowing: "Скасувати всі підписки"
+sidebar: "Бокова панель"
+addItem: "Додати елемент"
+rooms: "Кімнати"
+relays: "Ретранслятори"
+addRelay: "Додати ретранслятор"
+addedRelays: "Додані ретранслятори"
+deletedNote: "Допис видалено"
+visibility: "Видимість"
+poll: "Опитування"
+expandTweet: "Розгорнути твіт"
+themeEditor: "Редактор тем"
+description: "Опис"
+author: "Автор"
+manage: "Управління"
+plugins: "Плагіни"
+generateAccessToken: "Згенерувати токен доступу"
+permission: "Права"
+enableAll: "Ввімкути все"
+disableAll: "Вимкнути все"
+tokenRequested: "Надати доступ до акаунту"
+notificationType: "Тип сповіщення"
+edit: "Редагувати"
+useStarForReactionFallback: "Використовувати ★ як запасний варіант, якщо емодзі реакції невідомий"
+emailConfig: "Налаштування email сервера"
+email: "E-mail адреса"
+smtpHost: "Хост"
+smtpPort: "Порт"
+smtpUser: "Ім'я користувача"
+smtpPass: "Пароль"
+testEmail: "Тестовий email"
+wordMute: "Ігнор слів"
+copy: "Скопіювати"
+metrics: "Показники"
+database: "База даних"
+channel: "Канал"
+regenerateLoginToken: "Оновити Login Token"
+_mfm:
+  cheatSheet: " Довідка MFM"
+  mention: "Згадка"
+  quote: "Цитата"
+  emoji: "Кастомні емоджі"
+  search: "Пошук"
+_reversi:
+  total: "Всього"
+_sidebar:
+  icon: "Аватар"
+_theme:
+  keys:
+    mention: "Згадка"
+    renote: "Поширити"
+_sfx:
+  note: "Дописи"
+  notification: "Сповіщення"
+  chat: "Чати"
+_antennaSources:
+  homeTimeline: "Дописи тих, на кого ви підписані"
+_widgets:
+  notifications: "Сповіщення"
+  timeline: "Стрічка"
+  activity: "Активність"
+  federation: "Федіверс"
+_cw:
+  show: "Показати більше"
+_visibility:
+  home: "Домівка"
+  followers: "Підписники"
+  localOnly: "Лише локально"
+_postForm:
+  replyPlaceholder: "Відповідь на допис..."
+_profile:
+  name: "Ім'я"
+  username: "Ім'я користувача"
+_exportOrImport:
+  followingList: "Підписки"
+  muteList: "Ігнорувати"
+  blockingList: "Заблокувати"
+  userLists: "Списки"
+_timelines:
+  home: "Домівка"
+_rooms:
+  _roomType:
+    default: "За умовчанням"
+  _furnitures:
+    monitor: "Монітор"
+_pages:
+  blocks:
+    image: "Зображення"
+  script:
+    categories:
+      list: "Списки"
+    blocks:
+      _join:
+        arg1: "Списки"
+      _randomPick:
+        arg1: "Списки"
+      _dailyRandomPick:
+        arg1: "Списки"
+      _seedRandomPick:
+        arg2: "Списки"
+      _pick:
+        arg1: "Списки"
+      _listLen:
+        arg1: "Списки"
+      _fn:
+        arg1: "Вихід"
+    types:
+      array: "Списки"
+_relayStatus:
+  requesting: "Очікує затвердження"
+  accepted: "Затверджено"
+  rejected: "Відхилено"
+_notification:
+  youRenoted: "{name} поширив(ла) ваш допис"
+  youWereFollowed: "Новий підписник"
+  _types:
+    follow: "Підписки"
+    mention: "Згадка"
+    renote: "Поширити"
+    quote: "Цитата"
+    reaction: "Реакції"
+_deck:
+  _columns:
+    notifications: "Сповіщення"
+    tl: "Стрічка"
+    antenna: "Антени"
+    list: "Списки"
+    mentions: "Згадки"
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@ -1,6 +1,6 @@
 ---
 _lang_: "中文(简体)"
-introMisskey: "欢迎！Misskey是一个开源的分散型SNS服务。\n通过「帖子」来分享现在发生的事情吧！📡\n「反应」功能，可以让你快速的对大家的「帖子」来表达感情👍\n一起来探索新的世界吧！🚀"
+introMisskey: "欢迎！Misskey是一个开源的、去中心化的“微博客”服务。\n通过编写「帖文」来和大家分享你的以及你周围的事情吧！📡\n通过「回应」功能，可以让你快速地对大家的帖文表达反馈👍\n来探索新的世界吧！🚀"
 monthAndDay: "{month}月 {day}日"
 search: "搜索"
 notifications: "通知"
@ -11,11 +11,14 @@ ok: "OK"
 gotIt: "我明白了"
 cancel: "取消"
 enterUsername: "输入用户名"
-renotedBy: "由 {user} 转贴"
-noNotes: "没有投稿"
+renotedBy: "{user} 转贴了"
+noNotes: "没有帖文"
 noNotifications: "无通知"
 instance: "实例"
 settings: "设置"
+basicSettings: "基本设置"
+otherSettings: "其他设置"
+openInWindow: "在新窗口中打开"
 profile: "个人资料"
 timeline: "时间线"
 noAccountDescription: "这个人很懒，没有写自我介绍"
@ -35,18 +38,20 @@ unpin: "取消置顶"
 copyContent: "复制内容"
 copyLink: "复制链接"
 delete: "删除"
-deleteAndEdit: "删除和编辑"
-deleteAndEditConfirm: "要删除此帖并再次编辑吗？对此帖的所有回应，转发和回复也将被删除。"
+deleteAndEdit: "删除并编辑"
+deleteAndEditConfirm: "要删除此帖并再次编辑吗？对此帖的所有回应、转发和回复也将被删除。"
 addToList: "添加至列表"
 sendMessage: "发送"
 copyUsername: "复制用户名"
+searchUser: "搜索用户"
 reply: "回复"
 loadMore: "查看更多"
 youGotNewFollower: "你有新的关注者"
-receiveFollowRequest: "收到关注请求"
-followRequestAccepted: "同意关注请求"
+receiveFollowRequest: "您收到了关注请求"
+followRequestAccepted: "您的关注请求被通过了"
+mention: "提及"
 mentions: "提及"
-directNotes: "指定用户可见"
+directNotes: "私信"
 importAndExport: "导入和导出"
 import: "导入"
 export: "导出"
@ -65,8 +70,11 @@ followers: "关注者"
 followsYou: "关注了你"
 createList: "创建列表"
 manageLists: "管理列表"
-error: "有点小问题"
+error: "错误"
+somethingHappened: "出现了问题"
 retry: "重试"
+pageLoadError: "页面加载失败。"
+pageLoadErrorDescription: "这通常是由于网络或浏览器缓存的原因。请清除缓存或等待片刻后重试。"
 enterListName: "输入列表名称"
 privacy: "隐私"
 makeFollowManuallyApprove: "关注者请求需要批准"
@ -76,7 +84,7 @@ followRequest: "关注申请"
 followRequests: "关注申请"
 unfollow: "取消关注"
 followRequestPending: "发送关注申请"
-enterEmoji: "输入Emoji"
+enterEmoji: "输入表情符号"
 renote: "转发"
 unrenote: "取消转发"
 quote: "引用"
@ -85,8 +93,9 @@ you: "您"
 clickToShow: "点击以显示"
 sensitive: "阅读注意"
 add: "添加"
-reaction: "反应"
-reactionSettingDescription: "选择您想要固定在反应选择器中的反应。"
+reaction: "回应"
+reactionSettingDescription: "选择您想要置顶的回应。"
+reactionSettingDescription2: "通过拖动来重新排列。单击即可删除。"
 rememberNoteVisibility: "记录公开范围"
 attachCancel: "删除附件"
 markAsSensitive: "阅读注意"
@ -103,10 +112,15 @@ unblockConfirm: "确定要解除屏蔽吗？"
 suspendConfirm: "要冻结吗？"
 unsuspendConfirm: "要解除冻结吗？"
 selectList: "选择列表"
+selectAntenna: "天线选择"
+selectWidget: "选择小工具"
+editWidgets: "编辑小工具"
+editWidgetsExit: "完成编辑"
 customEmojis: "自定义Emoji"
-emojiName: "Emoji 名称"
-emojiUrl: "emoji 地址"
-addEmoji: "添加Emoji"
+emoji: "表情符号"
+emojiName: "表情符号名称"
+emojiUrl: "表情符号地址"
+addEmoji: "添加表情符号"
 settingGuide: "推荐配置"
 cacheRemoteFiles: "远程文件缓存"
 cacheRemoteFilesDescription: "当禁用此设定时远程文件将直接从远程实例载入。禁用后会减小储存空间需求，但是会增加流量，因为缩略图不会被生成。"
@ -151,7 +165,7 @@ jobQueue: "作业队列"
 cpuAndMemory: "CPU使用量"
 network: "网络"
 disk: "存储"
-instanceInfo: "实例情报"
+instanceInfo: "实例信息"
 statistics: "统计"
 clearQueue: "清除队列"
 clearQueueConfirmTitle: "确定清除队列？"
@ -172,8 +186,7 @@ done: "完成"
 processing: "处理中"
 preview: "预览"
 default: "默认"
-noCustomEmojis: "无自定义Emoji"
-customEmojisOfRemote: "远程Emoji"
+noCustomEmojis: "没有自定义表情符号"
 noJobs: "没有任务"
 federating: "联合中"
 blocked: "已拦截"
@ -202,6 +215,8 @@ imageUrl: "图片URL"
 remove: "删除"
 removed: "已删除"
 removeAreYouSure: "要删掉「{x}」吗？"
+deleteAreYouSure: "要删掉「{x}」吗？"
+resetAreYouSure: "恢复默认设置？"
 saved: "已保存"
 messaging: "聊天"
 upload: "上传"
@ -260,6 +275,7 @@ rename: "重命名"
 avatar: "头像"
 banner: "Banner"
 nsfw: "阅读注意"
+whenServerDisconnected: "与服务器连接中断时"
 disconnectedFromServer: "已从服务器断开连接"
 reload: "重新加载"
 doNothing: "什么都不做"
@ -281,7 +297,7 @@ dayX: "{day}日"
 monthX: "{month}月"
 yearX: "{year}年"
 pages: "页面"
-integration: "连携"
+integration: "关联"
 connectSerice: "已连接"
 disconnectSerice: "断开连接"
 enableLocalTimeline: "启用本地时间线功能"
@ -300,6 +316,8 @@ bannerUrl: "Banner URL"
 basicInfo: "基本信息"
 pinnedUsers: "置顶用户"
 pinnedUsersDescription: "在「发现」页面中使用换行标记想要置顶的用户。"
+pinnedPages: "固定页面"
+pinnedPagesDescription: "输入您要固定到实例首页的页面路径，以换行符分隔。"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "启用 hCaptcha"
 hcaptchaSiteKey: "网站密钥"
@ -340,7 +358,7 @@ popularTags: "热门标签"
 userList: "列表"
 about: "关于"
 aboutMisskey: "关于 Misskey"
-aboutMisskeyText: "Misskey是由syuilo于2014年开发的开放源代码软件。"
+aboutMisskeyText: "Misskey是由syuilo于2014年开发的开源软件。"
 misskeyMembers: "现在由以下成员进行开发和维护："
 misskeySource: "源代码在这里公开："
 misskeyTranslation: "与我们一同进行Misskey的翻译工作："
@ -354,15 +372,12 @@ moderator: "版主"
 nUsersMentioned: "{n} 被提到"
 securityKey: "安全密钥"
 securityKeyName: "密钥名称"
-registerSecurityKey: "注册安全密钥"
+registerSecurityKey: "注册硬件安全密钥"
 lastUsed: "最后使用："
 unregister: "删除账户"
 passwordLessLogin: "无密码登录"
 resetPassword: "重置密码"
 newPasswordIs: "新的密码是「{password}」"
-autoReloadWhenDisconnected: "断开连接时自动重新加载"
-autoNoteWatch: "自动关注帖子"
-autoNoteWatchDescription: "让您能够收到关于「反应」和回复其他用户的帖子的通知。"
 reduceUiAnimation: "减少UI动画"
 share: "分享"
 notFound: "未找到"
@ -400,6 +415,7 @@ noMessagesYet: "现在没有新的聊天"
 newMessageExists: "新信息"
 onlyOneFileCanBeAttached: "只能添加一个附件"
 signinRequired: "请先登录"
+invitations: "邀请"
 invitationCode: "邀请码"
 checking: "正在确认"
 available: "可用"
@ -419,7 +435,7 @@ or: "或者"
 uiLanguage: "显示语言"
 groupInvited: "群组招待"
 aboutX: "关于 {x}"
-useOsNativeEmojis: "使用OS原生Emoji"
+useOsNativeEmojis: "使用OS原生表情符号"
 youHaveNoGroups: "没有群组"
 joinOrCreateGroup: "请加入一个现有的群组，或者创建新群组。"
 noHistory: "没有历史记录"
@ -440,8 +456,8 @@ remote: "远程"
 total: "总计"
 weekOverWeekChanges: "与前一周相比"
 dayOverDayChanges: "与前一日相比"
-accessibility: "辅助功能"
-clinetSettings: "客户端设置"
+appearance: "外观"
+clientSettings: "客户端设置"
 accountSettings: "账户设置"
 promotion: "推广"
 promote: "推广"
@ -451,19 +467,20 @@ showFeaturedNotesInTimeline: "在时间线上显示热门推荐"
 objectStorage: "对象存储"
 useObjectStorage: "使用对象存储"
 objectStorageBaseUrl: "基本网址"
-objectStorageBaseUrlDesc: "供参考的URL。如果使用CDN或Proxy，则其URL为S3：\"https://<bucket>.s3.amazonaws.com\"、GCS等：\"https://storage-googleapis.proxy.ustclug.org/<bucket>\"。"
+objectStorageBaseUrlDesc: "URL前缀，用于构造URL到对象（媒体）的引用，如果您使用的是CDN或反向代理，请指定其URL，否则请根据您使用的服务指定可公开访问的地址。例如“https://<bucket>.s3.amazonaws.com”用于AWS S3，“https://storage.googleapis.com/<bucket>”用于GCS"
 objectStorageBucket: "存储桶"
 objectStorageBucketDesc: "请指定使用的对象存储服务的存储桶名称。"
 objectStoragePrefix: "前缀"
 objectStoragePrefixDesc: "文件将存储在此前缀的目录下。"
 objectStorageEndpoint: "端点"
-objectStorageEndpointDesc: "S3默认情况下为空，否则请为每个服务指定端点。 指定为“<host>”或“<host>:<port>”。"
+objectStorageEndpointDesc: "如果你希望使用AWS S3请留空。否则请根据你使用的服务来进行设置，指定端点形式为“<host>”或“<host>:<port>”。"
 objectStorageRegion: "可用区"
 objectStorageRegionDesc: "指定一个可用区，例如“xx-east-1”。 如果您的对象存储服务没有可用区概念，请将其留空或填写“us-east-1”。"
 objectStorageUseSSL: "使用SSL"
 objectStorageUseSSLDesc: "如果不使用https进行API连接，请关闭。"
 objectStorageUseProxy: "使用代理"
 objectStorageUseProxyDesc: "如果您不使用代理进行API连接，请将其关闭。"
+objectStorageSetPublicRead: "上传时设置为public-read"
 serverLogs: "服务器日志"
 deleteAll: "删除全部"
 showFixedPostForm: "在时间线顶部显示帖子表单"
@ -471,6 +488,8 @@ newNoteRecived: "有新的帖子"
 sounds: "声音"
 listen: "听"
 none: "空"
+showInPage: "在页面中显示"
+popout: "弹窗"
 volume: "音量"
 details: "详情"
 chooseEmoji: "选择表情符号"
@ -486,8 +505,8 @@ state: "状态"
 sort: "排序"
 ascendingOrder: "升序"
 descendingOrder: "降序"
-scratchpad: "暂存器"
-scratchpadDescription: "暂存器为AiScript提供了实验环境。您可以编写代码以与Misskey交互，运行它并查看结果。"
+scratchpad: "便签本"
+scratchpadDescription: "便签本为AiScript提供了实验环境。您可以编写代码以与Misskey交互，运行它并查看结果。"
 output: "输出"
 script: "脚本"
 disablePagesScript: "禁用页面脚本"
@ -509,6 +528,205 @@ addedRelays: "已添加的中继"
 serviceworkerInfo: "您需要启用推送通知"
 deletedNote: "已删除的帖子"
 invisibleNote: "隐藏的帖子"
+enableInfiniteScroll: "启用自动滚动页面模式"
+visibility: "可见性"
+poll: "调查问卷"
+useCw: "隐藏内容"
+enablePlayer: "打开播放器"
+disablePlayer: "关闭播放器"
+expandTweet: "展开推文"
+themeEditor: "主题编辑器"
+description: "描述"
+author: "作者"
+leaveConfirm: "存在未保存的更改。要放弃更改吗？"
+manage: "管理"
+plugins: "插件"
+pluginInstallWarn: "请不要安装不明来源的插件"
+deck: "Deck"
+undeck: "取消Deck"
+useBlurEffectForModal: "模态框使用模糊效果"
+useFullReactionPicker: "使用全功能的回应工具栏"
+width: "宽度"
+height: "高度"
+generateAccessToken: "生成访问令牌"
+permission: "权限"
+enableAll: "启用全部"
+disableAll: "禁用全部"
+tokenRequested: "允许访问账户"
+pluginTokenRequestedDescription: "此插件将能够拥有此处设置的权限"
+notificationType: "通知类型"
+edit: "编辑"
+useStarForReactionFallback: "如果回应的是未知表情符号，则使用★作为代替"
+emailConfig: "邮件服务器设置"
+enableEmail: "启用发送邮件功能"
+emailConfigInfo: "用于确认电子邮件和密码重置"
+email: "邮件地址"
+smtpConfig: "SMTP服务器设置"
+smtpHost: "主机名"
+smtpPort: "端口"
+smtpUser: "用户名"
+smtpPass: "密码"
+emptyToDisableSmtpAuth: "用户名和密码留空可以禁用SMTP验证"
+smtpSecure: "在 SMTP 连接中使用隐式 SSL / TLS"
+smtpSecureInfo: "使用STARTTLS时关闭。"
+testEmail: "邮件发送测试"
+wordMute: "文字屏蔽"
+userSaysSomething: "{name}说了什么"
+makeActive: "激活"
+display: "显示"
+copy: "复制"
+metrics: "指标"
+overview: "概述"
+logs: "日志"
+delayed: "延迟"
+database: "数据库"
+channel: "频道"
+create: "创建"
+notificationSetting: "通知设置"
+notificationSettingDesc: "选择要显示的通知类型。"
+useGlobalSetting: "使用全局设置"
+useGlobalSettingDesc: "启用时，将使用帐户通知设置。关闭时，则可以单独设置。"
+other: "其他"
+regenerateLoginToken: "重新生成登录令牌"
+regenerateLoginTokenDescription: "重新生成用于登录的内部令牌。通常您不需要这样做。重新生成后，您将在所有设备上登出。"
+setMultipleBySeparatingWithSpace: "您可以使用空格分隔多个项目。"
+fileIdOrUrl: "文件ID或者URL"
+chatOpenBehavior: "聊天窗口打开时的行为"
+sample: "示例"
+abuseReports: "举报"
+reportAbuse: "举报"
+reportAbuseOf: "举报{name}"
+fillAbuseReportDescription: "请填写举报的详细原因。如果有对方发的帖子，请同时填写URL地址。"
+abuseReported: "内容已发送。感谢您的报告。"
+send: "发送"
+abuseMarkAsResolved: "处理完毕"
+openInNewTab: "在新标签页中打开"
+openInSideView: "在侧边栏中打开"
+defaultNavigationBehaviour: "默认导航"
+editTheseSettingsMayBreakAccount: "编辑这些设置可以会损坏您的账号"
+instanceTicker: "帖子的实例信息"
+waitingFor: "等待{x}"
+random: "随机"
+system: "系统"
+switchUi: "切换界面"
+desktop: "桌面"
+clip: "片段"
+createNew: "新建"
+optional: "可选"
+createNewClip: "新建片段"
+public: "公开"
+_mfm:
+  cheatSheet: "MFM代码速查表"
+  intro: "MFM是一种在Misskey中的各个位置使用的专用标记语言。在这里您可以看到MFM中可用的语法列表。"
+  dummy: "通过Misskey扩展Fediverse的世界"
+  mention: "提及"
+  mentionDescription: "可以使用 @+用户名 来指示特定用户"
+  hashtag: "话题标签"
+  hashtagDescription: "可以使用井号+文字来表示话题标签。"
+  url: "URL"
+  urlDescription: "可以表示URL地址。"
+  link: "链接"
+  linkDescription: "可以将部分文字和URL关联起来。"
+  bold: "粗体"
+  boldDescription: "可以将文字显示为粗体来表示强调。"
+  small: "缩小"
+  smallDescription: "可以使内容文字变小、变淡。"
+  center: "居中"
+  centerDescription: "可以将内容居中显示。"
+  inlineCode: "代码(内嵌)"
+  inlineCodeDescription: "将文字中的程序代码语法高亮显示。"
+  blockCode: "代码(块)"
+  blockCodeDescription: "语法高亮显示整块程序代码。"
+  inlineMath: "数学公式(内嵌)"
+  inlineMathDescription: "显示内嵌的KaTex公式。"
+  blockMath: "数学公式(块)"
+  blockMathDescription: "显示整块的多行KaTex数学公式。"
+  quote: "引用"
+  quoteDescription: "可以用来表示引用的内容。"
+  emoji: "自定义表情符号"
+  emojiDescription: "可以将自定义表情符号使用冒号括起来，就可以显示自定义表情符号了。"
+  search: "搜索"
+  searchDescription: "显示含有搜索内容示例的搜索框。"
+  flip: "翻转"
+  flipDescription: "将内容上下或左右翻转。"
+  jelly: "动画(果冻)"
+  jellyDescription: "显示果冻一样的动画效果。"
+  tada: "动画(锵锵)"
+  tadaDescription: "显示\"锵锵！\"的动画效果。"
+  jump: "动画(跳动)"
+  jumpDescription: "显示跳动的动画效果。"
+  bounce: "动画(弹性)"
+  bounceDescription: "显示弹性一样的动画效果。"
+  shake: "动画(摇晃)"
+  shakeDescription: "显示摇晃的动画效果。"
+  twitch: "动画(颤抖)"
+  twitchDescription: "显示强烈颤抖的动画效果。"
+  spin: "动画(回转)"
+  spinDescription: "显示回转的动画效果。"
+_reversi:
+  reversi: "黑白棋"
+  gameSettings: "对局设置"
+  chooseBoard: "棋盘选择"
+  blackOrWhite: "先手/后手"
+  blackIs: "{name}执黑(先走)"
+  rules: "规则"
+  botSettings: "机器人设置"
+  thisGameIsStartedSoon: "对局在几秒后开始"
+  waitingForOther: "等待对手准备"
+  waitingForMe: "等待您的准备"
+  waitingBoth: "请准备"
+  ready: "准备就绪"
+  cancelReady: "重新准备"
+  opponentTurn: "对手的会合"
+  myTurn: "您的回合"
+  turnOf: "{name}的回合"
+  pastTurnOf: "{name}的回合"
+  surrender: "认输 "
+  surrendered: "对手认输"
+  drawn: "平局"
+  won: "{name}获胜"
+  black: "黑"
+  white: "白"
+  total: "总计"
+  turnCount: "{count}回合"
+  myGames: "我的对局"
+  allGames: "所有对局"
+  ended: "结束"
+  playing: "对局中"
+  isLlotheo: "棋子较少一方获胜(LLoTheO规则)"
+  loopedMap: "循环棋盘"
+  canPutEverywhere: "可以下在任意位置"
+_instanceTicker:
+  none: "不显示"
+  remote: "显示给远程用户"
+  always: "始终显示"
+_serverDisconnectedBehavior:
+  reload: "自动重载"
+  dialog: "对话框警告"
+  quiet: "安静警告"
+_channel:
+  create: "创建频道"
+  edit: "编辑频道"
+  setBanner: "设置横幅"
+  removeBanner: "删除横幅"
+  featured: "热点"
+  owned: "管理中"
+  following: "正在关注"
+  usersCount: "有{n}人参与"
+  notesCount: "有{n}个帖子"
+_sidebar:
+  full: "全部"
+  icon: "图标"
+  hide: "隐藏"
+_wordMute:
+  muteWords: "禁用词"
+  muteWordsDescription: "使用空格分隔表示AND逻辑，使用换行符分隔表示OR逻辑。"
+  muteWordsDescription2: "将关键字用斜线括起来表示正则表达式。"
+  softDescription: "隐藏时间轴中指定条件的帖文。"
+  hardDescription: "防止将具有指定条件的帖文添加到时间线。 即使您更改条件，未添加的帖文也会被排除在外。"
+  soft: "软屏蔽"
+  hard: "硬屏蔽"
+  mutedNotes: "被屏蔽的帖文"
 _theme:
  explore: "寻找主题"
  install: "安装主题"
@ -517,6 +735,69 @@ _theme:
  installed: "{name} 已安装"
  alreadyInstalled: "此主题已经安装"
  invalid: "主题格式错误"
+  make: "制作主题"
+  base: "基于"
+  addConstant: "添加常量"
+  constant: "常量"
+  defaultValue: "默认值"
+  color: "颜色"
+  refProp: "查看属性"
+  refConst: "查看常量"
+  key: "主要"
+  func: "函数"
+  funcKind: "功能类型"
+  argument: "参数"
+  basedProp: "基于的属性名称"
+  alpha: "不透明度"
+  darken: "暗色"
+  lighten: "亮色"
+  inputConstantName: "请输入常量名称"
+  importInfo: "您可以在此处粘贴主题代码，将其导入到编辑器中"
+  deleteConstantConfirm: "确定要删除常量{const}吗?"
+  keys:
+    accent: "强调色"
+    bg: "背景"
+    fg: "文本"
+    focus: "聚焦"
+    indicator: "标记"
+    panel: "面板"
+    shadow: "阴影"
+    header: "顶栏"
+    navBg: "侧边栏背景"
+    navFg: "侧栏文本"
+    navHoverFg: "侧栏文本（悬停）"
+    navActive: "侧栏文本（活动）"
+    navIndicator: "侧栏标记"
+    link: "链接"
+    hashtag: "话题标签"
+    mention: "提及"
+    mentionMe: "提及"
+    renote: "转发"
+    modalBg: "模态框背景"
+    divider: "分割线"
+    scrollbarHandle: "滚动条"
+    scrollbarHandleHover: "滚动条（悬停）"
+    dateLabelFg: "日期标签文字"
+    infoBg: "信息背景"
+    infoFg: "信息文本"
+    infoWarnBg: "警告背景"
+    infoWarnFg: "警告文本"
+    cwBg: "CW 按钮背景"
+    cwFg: "CW 按钮文本"
+    cwHoverBg: "CW 按钮背景（悬停）"
+    toastBg: "吐司提示背景"
+    toastFg: "吐司提示文本"
+    buttonBg: "按钮背景"
+    buttonHoverBg: "按钮背景（悬停）"
+    inputBorder: "输入框边框"
+    listItemHoverBg: "下拉列表项目背景（悬停）"
+    driveFolderBg: "驱动器文件夹背景"
+    wallpaperOverlay: "壁纸叠加层"
+    badge: "徽章"
+    messageBg: "聊天背景"
+    accentDarken: "强调色(暗)"
+    accentLighten: "强调色(亮)"
+    fgHighlighted: "高亮显示文本"
 _sfx:
  note: "帖子"
  noteMy: "我的帖子"
@ -524,6 +805,7 @@ _sfx:
  chat: "聊天"
  chatBg: "聊天背景"
  antenna: "天线接收"
+  channel: "频道通知"
 _ago:
  unknown: "未知"
  future: "未来"
@ -545,7 +827,7 @@ _tutorial:
  step1_1: "欢迎！"
  step1_2: "这个页面叫做「时间线」，它会按照时间顺序显示所有你「关注」的人所发的「帖子」。"
  step1_3: "如果你并没有发布任何帖子，也没有关注其他的人，你的时间线页面应当什么都没有显示。"
-  step2_1: "在你想发布一些帖子之前，让我们先进行一下个人资料设置。"
+  step2_1: "在您想要发帖或关注其他人之前，请先设置一下个人资料吧。"
  step2_2: "如果别人能够更加的了解你，关注你的概率也会得到提升。"
  step3_1: "已经设置完个人资料了吗？"
  step3_2: "那么接下来，试着写一些什么东西来发布吧。你可以通过点击屏幕上的铅笔图标来打开投稿页面。"
@ -558,9 +840,9 @@ _tutorial:
  step5_3: "要关注其他用户，请单击他的头像，然后在他的个人资料上按下“关注”按钮。"
  step5_4: "如果用户的名称旁边有锁定图标，则该用户需要手动批准您的关注请求。"
  step6_1: "现在，您将可以在时间线上看到其他用户的帖子。"
-  step6_2: "您还可以在其他人的帖子上进行「反应」，以快速做出简单回复。"
-  step6_3: "在他人的贴子上按下「+」图标，即可选择想要的表情来进行「反应」。"
-  step7_1: "对Misskey基本操作的简单介绍，到此结束了。 辛苦了！"
+  step6_2: "您还可以在其他人的帖子上进行「回应」，以快速做出简单回复。"
+  step6_3: "在他人的贴子上按下「+」图标，即可选择想要的表情来进行「回应」。"
+  step7_1: "对Misskey基本操作的简单介绍，就到此结束了。 辛苦了！"
  step7_2: "如果你想了解更多有关Misskey的信息，请参见{help}。"
  step7_3: "接下来，享受Misskey带来的乐趣吧🚀"
 _2fa:
@ -571,7 +853,7 @@ _2fa:
  step2: "然后，扫描屏幕上显示的二维码。"
  step3: "输入您的应用提供的动态口令以完成设置。"
  step4: "从现在开始，任何登录操作都将要求您提供动态口令。"
-  securityKeyInfo: "您可以设置使用支持FIDO2的硬件安全密钥、指纹或设备上的PIN来保护您的登录过程。"
+  securityKeyInfo: "您可以设置使用支持FIDO2的硬件安全密钥、设备上的指纹或PIN来保护您的登录过程。"
 _permissions:
  "read:account": "查看账户信息"
  "write:account": "更改帐户信息"
@ -599,6 +881,8 @@ _permissions:
  "write:page-likes": "操作喜欢的页面"
  "read:user-groups": "查看用户组"
  "write:user-groups": "操作用户组"
+  "read:channels": "查看频道"
+  "write:channels": "管理频道"
 _auth:
  shareAccess: "您要授权允许“{name}”访问您的帐户吗？"
  shareAccessAsk: "您确定要授权此应用程序访问您的帐户吗？"
@ -630,12 +914,14 @@ _widgets:
  rss: "RSS阅读器"
  activity: "活动"
  photos: "照片"
+  digitalClock: "数字时钟"
+  federation: "联邦宇宙"
+  postForm: "投稿窗口"
 _cw:
  hide: "隐藏"
  show: "查看更多"
  chars: "{count}个字符"
  files: "{count} 个文件"
-  poll: "投票"
 _poll:
  noOnlyOneChoice: "需要至少两个选项"
  choiceN: "选择{n}"
@ -668,9 +954,11 @@ _visibility:
  specified: "指定用户"
  specifiedDescription: "仅发送至指定用户"
  localOnly: "仅限本地"
+  localOnlyDescription: "对远程用户不可见"
 _postForm:
  replyPlaceholder: "回复这个帖子..."
  quotePlaceholder: "引用这个帖子..."
+  channelPlaceholder: "发布到频道…"
  _placeholders:
    a: "现在如何？"
    b: "发生了什么？"
@ -792,6 +1080,7 @@ _pages:
  created: "页面已创建"
  updated: "页面已更新"
  deleted: "该页面已被删除"
+  pageSetting: "页面设置"
  nameAlreadyExists: "该页面URL已存在"
  invalidNameTitle: "无效的页面URL"
  invalidNameText: "请确认该项不为空"
@ -802,7 +1091,9 @@ _pages:
  unlike: "取消赞"
  my: "我的页面"
  liked: "喜欢的页面"
+  featured: "热门"
  inspector: "检查器"
+  contents: "内容"
  content: "页面内容"
  variables: "变量"
  title: "标题"
@ -856,6 +1147,11 @@ _pages:
      id: "画布ID"
      width: "宽度"
      height: "高度"
+    note: "嵌入的帖子"
+    _note:
+      id: "帖子ID"
+      idDescription: "您也可以通过粘贴帖子的URL来进行设置。"
+      detailed: "显示详细信息"
    switch: "开关"
    _switch:
      name: "变量名"
@ -1079,7 +1375,38 @@ _notification:
  youGotPoll: "来自{name}的投票"
  youGotMessagingMessageFromUser: "来自{name}的聊天"
  youGotMessagingMessageFromGroup: "来自{name}的群聊"
-  youWereFollowed: "您有新的关注者"
+  youWereFollowed: "关注了你。"
  youReceivedFollowRequest: "您有新的关注请求"
  yourFollowRequestAccepted: "您的关注请求已通过"
  youWereInvitedToGroup: "您有新的群组邀请"
+  _types:
+    all: "全部"
+    follow: "关注中"
+    mention: "提及"
+    reply: "回复"
+    renote: "转发"
+    quote: "引用"
+    reaction: "回应"
+    pollVote: "问卷调查已投票"
+    receiveFollowRequest: "收到关注请求"
+    followRequestAccepted: "关注请求已接受"
+    groupInvited: "加入群组邀请"
+    app: "关联应用的通知"
+_deck:
+  alwaysShowMainColumn: "总是显示主列"
+  columnAlign: "列对齐"
+  addColumn: "添加列"
+  swapLeft: "向左移动"
+  swapRight: "向右移动"
+  swapUp: "向上移动"
+  swapDown: "向下移动"
+  stackLeft: "向左折叠"
+  popRight: "向右弹出"
+  _columns:
+    widgets: "小工具"
+    notifications: "通知"
+    tl: "时间线"
+    antenna: "天线"
+    list: "列表"
+    mentions: "提及"
+    direct: "指定用户"
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
--- a/migration/1595075960584-blurhash.ts
+++ b/migration/1595075960584-blurhash.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class blurhash1595075960584 implements MigrationInterface {
+    name = 'blurhash1595075960584'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "drive_file" ADD "blurhash" character varying(128)`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "blurhash"`);
+    }
+
+}
--- a/migration/1595077605646-blurhash-for-avatar-banner.ts
+++ b/migration/1595077605646-blurhash-for-avatar-banner.ts
@ -0,0 +1,20 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class blurhashForAvatarBanner1595077605646 implements MigrationInterface {
+    name = 'blurhashForAvatarBanner1595077605646'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarColor"`);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "bannerColor"`);
+        await queryRunner.query(`ALTER TABLE "user" ADD "avatarBlurhash" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "user" ADD "bannerBlurhash" character varying(128)`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "bannerBlurhash"`);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarBlurhash"`);
+        await queryRunner.query(`ALTER TABLE "user" ADD "bannerColor" character varying(32)`);
+        await queryRunner.query(`ALTER TABLE "user" ADD "avatarColor" character varying(32)`);
+    }
+
+}
--- a/migration/1595676934834-instance-icon-url.ts
+++ b/migration/1595676934834-instance-icon-url.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class instanceIconUrl1595676934834 implements MigrationInterface {
+    name = 'instanceIconUrl1595676934834'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "instance" ADD "iconUrl" character varying(256) DEFAULT null`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "iconUrl"`);
+    }
+
+}
--- a/migration/1595771249699-word-mute.ts
+++ b/migration/1595771249699-word-mute.ts
@ -0,0 +1,30 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class wordMute1595771249699 implements MigrationInterface {
+    name = 'wordMute1595771249699'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "muted_note" ("id" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, CONSTRAINT "PK_897e2eff1c0b9b64e55ca1418a4" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_70ab9786313d78e4201d81cdb8" ON "muted_note" ("noteId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_d8e07aa18c2d64e86201601aec" ON "muted_note" ("userId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_a8c6bfd637d3f1d67a27c48e27" ON "muted_note" ("noteId", "userId") `);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "enableWordMute" boolean NOT NULL DEFAULT false`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "mutedWords" jsonb NOT NULL DEFAULT '[]'`);
+        await queryRunner.query(`CREATE INDEX "IDX_3befe6f999c86aff06eb0257b4" ON "user_profile" ("enableWordMute") `);
+        await queryRunner.query(`ALTER TABLE "muted_note" ADD CONSTRAINT "FK_70ab9786313d78e4201d81cdb89" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "muted_note" ADD CONSTRAINT "FK_d8e07aa18c2d64e86201601aec1" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "muted_note" DROP CONSTRAINT "FK_d8e07aa18c2d64e86201601aec1"`);
+        await queryRunner.query(`ALTER TABLE "muted_note" DROP CONSTRAINT "FK_70ab9786313d78e4201d81cdb89"`);
+        await queryRunner.query(`DROP INDEX "IDX_3befe6f999c86aff06eb0257b4"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "mutedWords"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "enableWordMute"`);
+        await queryRunner.query(`DROP INDEX "IDX_a8c6bfd637d3f1d67a27c48e27"`);
+        await queryRunner.query(`DROP INDEX "IDX_d8e07aa18c2d64e86201601aec"`);
+        await queryRunner.query(`DROP INDEX "IDX_70ab9786313d78e4201d81cdb8"`);
+        await queryRunner.query(`DROP TABLE "muted_note"`);
+    }
+
+}
--- a/migration/1595782306083-word-mute2.ts
+++ b/migration/1595782306083-word-mute2.ts
@ -0,0 +1,18 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class wordMute21595782306083 implements MigrationInterface {
+    name = 'wordMute21595782306083'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TYPE "muted_note_reason_enum" AS ENUM('word', 'manual', 'spam', 'other')`);
+        await queryRunner.query(`ALTER TABLE "muted_note" ADD "reason" "muted_note_reason_enum" NOT NULL`);
+        await queryRunner.query(`CREATE INDEX "IDX_636e977ff90b23676fb5624b25" ON "muted_note" ("reason") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_636e977ff90b23676fb5624b25"`);
+        await queryRunner.query(`ALTER TABLE "muted_note" DROP COLUMN "reason"`);
+        await queryRunner.query(`DROP TYPE "muted_note_reason_enum"`);
+    }
+
+}
--- a/migration/1596548170836-channel.ts
+++ b/migration/1596548170836-channel.ts
@ -0,0 +1,58 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class channel1596548170836 implements MigrationInterface {
+    name = 'channel1596548170836'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "channel" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "lastNotedAt" TIMESTAMP WITH TIME ZONE, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "description" character varying(2048), "bannerId" character varying(32), "notesCount" integer NOT NULL DEFAULT 0, "usersCount" integer NOT NULL DEFAULT 0, CONSTRAINT "PK_590f33ee6ee7d76437acf362e39" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_71cb7b435b7c0d4843317e7e16" ON "channel" ("createdAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_29ef80c6f13bcea998447fce43" ON "channel" ("lastNotedAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_823bae55bd81b3be6e05cff438" ON "channel" ("userId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_0f58c11241e649d2a638a8de94" ON "channel" ("notesCount") `);
+        await queryRunner.query(`CREATE INDEX "IDX_094b86cd36bb805d1aa1e8cc9a" ON "channel" ("usersCount") `);
+        await queryRunner.query(`CREATE TABLE "channel_following" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "followeeId" character varying(32) NOT NULL, "followerId" character varying(32) NOT NULL, CONSTRAINT "PK_8b104be7f7415113f2a02cd5bdd" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_11e71f2511589dcc8a4d3214f9" ON "channel_following" ("createdAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_0e43068c3f92cab197c3d3cd86" ON "channel_following" ("followeeId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_6d8084ec9496e7334a4602707e" ON "channel_following" ("followerId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_2e230dd45a10e671d781d99f3e" ON "channel_following" ("followerId", "followeeId") `);
+        await queryRunner.query(`CREATE TABLE "channel_note_pining" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "channelId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, CONSTRAINT "PK_44f7474496bcf2e4b741681146d" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_8125f950afd3093acb10d2db8a" ON "channel_note_pining" ("channelId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_f36fed37d6d4cdcc68c803cd9c" ON "channel_note_pining" ("channelId", "noteId") `);
+        await queryRunner.query(`ALTER TABLE "note" ADD "channelId" character varying(32) DEFAULT null`);
+        await queryRunner.query(`CREATE INDEX "IDX_f22169eb10657bded6d875ac8f" ON "note" ("channelId") `);
+        await queryRunner.query(`ALTER TABLE "channel" ADD CONSTRAINT "FK_823bae55bd81b3be6e05cff4383" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "channel" ADD CONSTRAINT "FK_999da2bcc7efadbfe0e92d3bc19" FOREIGN KEY ("bannerId") REFERENCES "drive_file"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_f22169eb10657bded6d875ac8f9" FOREIGN KEY ("channelId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "channel_following" ADD CONSTRAINT "FK_0e43068c3f92cab197c3d3cd86e" FOREIGN KEY ("followeeId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "channel_following" ADD CONSTRAINT "FK_6d8084ec9496e7334a4602707e1" FOREIGN KEY ("followerId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "channel_note_pining" ADD CONSTRAINT "FK_8125f950afd3093acb10d2db8a8" FOREIGN KEY ("channelId") REFERENCES "channel"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "channel_note_pining" ADD CONSTRAINT "FK_10b19ef67d297ea9de325cd4502" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "channel_note_pining" DROP CONSTRAINT "FK_10b19ef67d297ea9de325cd4502"`);
+        await queryRunner.query(`ALTER TABLE "channel_note_pining" DROP CONSTRAINT "FK_8125f950afd3093acb10d2db8a8"`);
+        await queryRunner.query(`ALTER TABLE "channel_following" DROP CONSTRAINT "FK_6d8084ec9496e7334a4602707e1"`);
+        await queryRunner.query(`ALTER TABLE "channel_following" DROP CONSTRAINT "FK_0e43068c3f92cab197c3d3cd86e"`);
+        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_f22169eb10657bded6d875ac8f9"`);
+        await queryRunner.query(`ALTER TABLE "channel" DROP CONSTRAINT "FK_999da2bcc7efadbfe0e92d3bc19"`);
+        await queryRunner.query(`ALTER TABLE "channel" DROP CONSTRAINT "FK_823bae55bd81b3be6e05cff4383"`);
+        await queryRunner.query(`DROP INDEX "IDX_f22169eb10657bded6d875ac8f"`);
+        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "channelId"`);
+        await queryRunner.query(`DROP INDEX "IDX_f36fed37d6d4cdcc68c803cd9c"`);
+        await queryRunner.query(`DROP INDEX "IDX_8125f950afd3093acb10d2db8a"`);
+        await queryRunner.query(`DROP TABLE "channel_note_pining"`);
+        await queryRunner.query(`DROP INDEX "IDX_2e230dd45a10e671d781d99f3e"`);
+        await queryRunner.query(`DROP INDEX "IDX_6d8084ec9496e7334a4602707e"`);
+        await queryRunner.query(`DROP INDEX "IDX_0e43068c3f92cab197c3d3cd86"`);
+        await queryRunner.query(`DROP INDEX "IDX_11e71f2511589dcc8a4d3214f9"`);
+        await queryRunner.query(`DROP TABLE "channel_following"`);
+        await queryRunner.query(`DROP INDEX "IDX_094b86cd36bb805d1aa1e8cc9a"`);
+        await queryRunner.query(`DROP INDEX "IDX_0f58c11241e649d2a638a8de94"`);
+        await queryRunner.query(`DROP INDEX "IDX_823bae55bd81b3be6e05cff438"`);
+        await queryRunner.query(`DROP INDEX "IDX_29ef80c6f13bcea998447fce43"`);
+        await queryRunner.query(`DROP INDEX "IDX_71cb7b435b7c0d4843317e7e16"`);
+        await queryRunner.query(`DROP TABLE "channel"`);
+    }
+
+}
--- a/migration/1596786425167-channel2.ts
+++ b/migration/1596786425167-channel2.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class channel21596786425167 implements MigrationInterface {
+    name = 'channel21596786425167'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "channel_following" ADD "readCursor" TIMESTAMP WITH TIME ZONE NOT NULL`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "channel_following" DROP COLUMN "readCursor"`);
+    }
+
+}
--- a/migration/1597230137744-objectStorageSetPublicRead.ts
+++ b/migration/1597230137744-objectStorageSetPublicRead.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class objectStorageSetPublicRead1597230137744 implements MigrationInterface {
+    name = 'objectStorageSetPublicRead1597230137744'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "objectStorageSetPublicRead" boolean NOT NULL DEFAULT false`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "objectStorageSetPublicRead"`);
+    }
+
+}
--- a/migration/1597236229720-IncludingNotificationTypes.ts
+++ b/migration/1597236229720-IncludingNotificationTypes.ts
@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class IncludingNotificationTypes1597236229720 implements MigrationInterface {
+    name = 'IncludingNotificationTypes1597236229720'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TYPE "user_profile_includingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "includingNotificationTypes" "user_profile_includingnotificationtypes_enum" array`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "includingNotificationTypes"`);
+        await queryRunner.query(`DROP TYPE "user_profile_includingnotificationtypes_enum"`);
+    }
+
+}
--- a/migration/1597385880794-add-sensitive-index.ts
+++ b/migration/1597385880794-add-sensitive-index.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class addSensitiveIndex1597385880794 implements MigrationInterface {
+    name = 'addSensitiveIndex1597385880794'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE INDEX "IDX_a7eba67f8b3fa27271e85d2e26" ON "drive_file" ("isSensitive") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_a7eba67f8b3fa27271e85d2e26"`);
+    }
+
+}
--- a/migration/1597459042300-channel-unread.ts
+++ b/migration/1597459042300-channel-unread.ts
@ -0,0 +1,27 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class channelUnread1597459042300 implements MigrationInterface {
+    name = 'channelUnread1597459042300'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+				await queryRunner.query(`TRUNCATE TABLE "note_unread"`, undefined);
+        await queryRunner.query(`ALTER TABLE "channel_following" DROP COLUMN "readCursor"`);
+        await queryRunner.query(`ALTER TABLE "note_unread" ADD "isMentioned" boolean NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "note_unread" ADD "noteChannelId" character varying(32)`);
+        await queryRunner.query(`CREATE INDEX "IDX_25b1dd384bec391b07b74b861c" ON "note_unread" ("isMentioned") `);
+        await queryRunner.query(`CREATE INDEX "IDX_89a29c9237b8c3b6b3cbb4cb30" ON "note_unread" ("isSpecified") `);
+        await queryRunner.query(`CREATE INDEX "IDX_29e8c1d579af54d4232939f994" ON "note_unread" ("noteUserId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_6a57f051d82c6d4036c141e107" ON "note_unread" ("noteChannelId") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_6a57f051d82c6d4036c141e107"`);
+        await queryRunner.query(`DROP INDEX "IDX_29e8c1d579af54d4232939f994"`);
+        await queryRunner.query(`DROP INDEX "IDX_89a29c9237b8c3b6b3cbb4cb30"`);
+        await queryRunner.query(`DROP INDEX "IDX_25b1dd384bec391b07b74b861c"`);
+        await queryRunner.query(`ALTER TABLE "note_unread" DROP COLUMN "noteChannelId"`);
+        await queryRunner.query(`ALTER TABLE "note_unread" DROP COLUMN "isMentioned"`);
+        await queryRunner.query(`ALTER TABLE "channel_following" ADD "readCursor" TIMESTAMP WITH TIME ZONE NOT NULL`);
+    }
+
+}
--- a/migration/1597893996136-ChannelNoteIdDescIndex.ts
+++ b/migration/1597893996136-ChannelNoteIdDescIndex.ts
@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class ChannelNoteIdDescIndex1597893996136 implements MigrationInterface {
+    name = 'ChannelNoteIdDescIndex1597893996136'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+				await queryRunner.query(`DROP INDEX "IDX_f22169eb10657bded6d875ac8f"`);
+				await queryRunner.query(`CREATE INDEX "IDX_note_on_channelId_and_id_desc" ON "note" ("channelId", "id" desc)`);
+		}
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+				await queryRunner.query(`DROP INDEX "IDX_note_on_channelId_and_id_desc"`);
+        await queryRunner.query(`CREATE INDEX "IDX_f22169eb10657bded6d875ac8f" ON "note" ("channelId") `);
+    }
+
+}
--- a/migration/1600353287890-mutingNotificationTypes.ts
+++ b/migration/1600353287890-mutingNotificationTypes.ts
@ -0,0 +1,20 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class mutingNotificationTypes1600353287890 implements MigrationInterface {
+    name = 'mutingNotificationTypes1600353287890'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "includingNotificationTypes"`);
+        await queryRunner.query(`DROP TYPE "public"."user_profile_includingnotificationtypes_enum"`);
+        await queryRunner.query(`CREATE TYPE "user_profile_mutingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "mutingNotificationTypes" "user_profile_mutingnotificationtypes_enum" array NOT NULL DEFAULT '{}'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "mutingNotificationTypes"`);
+        await queryRunner.query(`DROP TYPE "user_profile_mutingnotificationtypes_enum"`);
+        await queryRunner.query(`CREATE TYPE "public"."user_profile_includingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "includingNotificationTypes" "user_profile_includingnotificationtypes_enum" array`);
+    }
+
+}
--- a/migration/1603094348345-refine-abuse-user-report.ts
+++ b/migration/1603094348345-refine-abuse-user-report.ts
@ -0,0 +1,32 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class refineAbuseUserReport1603094348345 implements MigrationInterface {
+    name = 'refineAbuseUserReport1603094348345'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_d049123c413e68ca52abe734203"`);
+        await queryRunner.query(`DROP INDEX "IDX_d049123c413e68ca52abe73420"`);
+        await queryRunner.query(`DROP INDEX "IDX_5cd442c3b2e74fdd99dae20243"`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" RENAME COLUMN "userId" TO "targetUserId"`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "assigneeId" character varying(32)`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "resolved" boolean NOT NULL DEFAULT false`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "comment"`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "comment" character varying(2048) NOT NULL DEFAULT '{}'::varchar[]`);
+        await queryRunner.query(`CREATE INDEX "IDX_2b15aaf4a0dc5be3499af7ab6a" ON "abuse_user_report" ("resolved") `);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_08b883dd5fdd6f9c4c1572b36de" FOREIGN KEY ("assigneeId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP CONSTRAINT "FK_08b883dd5fdd6f9c4c1572b36de"`);
+        await queryRunner.query(`DROP INDEX "IDX_2b15aaf4a0dc5be3499af7ab6a"`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "comment"`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "comment" character varying(512) NOT NULL DEFAULT '{}'::varchar[]`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "resolved"`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "assigneeId"`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" RENAME COLUMN "targetUserId" TO "userId"`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_5cd442c3b2e74fdd99dae20243" ON "abuse_user_report" ("userId", "reporterId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_d049123c413e68ca52abe73420" ON "abuse_user_report" ("userId") `);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_d049123c413e68ca52abe734203" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+}
--- a/migration/1603095701770-refine-abuse-user-report2.ts
+++ b/migration/1603095701770-refine-abuse-user-report2.ts
@ -0,0 +1,20 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class refineAbuseUserReport21603095701770 implements MigrationInterface {
+    name = 'refineAbuseUserReport21603095701770'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "targetUserHost" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "reporterHost" character varying(128)`);
+        await queryRunner.query(`CREATE INDEX "IDX_4ebbf7f93cdc10e8d1ef2fc6cd" ON "abuse_user_report" ("targetUserHost") `);
+        await queryRunner.query(`CREATE INDEX "IDX_f8d8b93740ad12c4ce8213a199" ON "abuse_user_report" ("reporterHost") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_f8d8b93740ad12c4ce8213a199"`);
+        await queryRunner.query(`DROP INDEX "IDX_4ebbf7f93cdc10e8d1ef2fc6cd"`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "reporterHost"`);
+        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "targetUserHost"`);
+    }
+
+}
--- a/migration/1603776877564-instance-theme-color.ts
+++ b/migration/1603776877564-instance-theme-color.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class instanceThemeColor1603776877564 implements MigrationInterface {
+    name = 'instanceThemeColor1603776877564'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "instance" ADD "themeColor" character varying(64) DEFAULT null`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "themeColor"`);
+    }
+
+}
--- a/migration/1603781553011-instance-favicon.ts
+++ b/migration/1603781553011-instance-favicon.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class instanceFavicon1603781553011 implements MigrationInterface {
+    name = 'instanceFavicon1603781553011'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "instance" ADD "faviconUrl" character varying(256) DEFAULT null`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "faviconUrl"`);
+    }
+
+}
--- a/migration/1604821689616-delete-auto-watch.ts
+++ b/migration/1604821689616-delete-auto-watch.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class deleteAutoWatch1604821689616 implements MigrationInterface {
+    name = 'deleteAutoWatch1604821689616'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "autoWatch"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "autoWatch" boolean NOT NULL DEFAULT false`);
+    }
+
+}
--- a/migration/1605408848373-clip-description.ts
+++ b/migration/1605408848373-clip-description.ts
@ -0,0 +1,15 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class clipDescription1605408848373 implements MigrationInterface {
+    name = 'clipDescription1605408848373'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "clip" ADD "description" character varying(2048) DEFAULT null`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+
+        await queryRunner.query(`ALTER TABLE "clip" DROP COLUMN "description"`);
+    }
+
+}
--- a/migration/1605408971051-comments.ts
+++ b/migration/1605408971051-comments.ts
@ -0,0 +1,434 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class comments1605408971051 implements MigrationInterface {
+    name = 'comments1605408971051'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`COMMENT ON COLUMN "log"."createdAt" IS 'The created date of the Log.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."createdAt" IS 'The created date of the DriveFolder.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."name" IS 'The name of the DriveFolder.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."userId" IS 'The owner ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."parentId" IS 'The parent folder ID. If null, it means the DriveFolder is located in root.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."createdAt" IS 'The created date of the DriveFile.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."userId" IS 'The owner ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."userHost" IS 'The host of owner. It will be null if the user in local.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."md5" IS 'The MD5 hash of the DriveFile.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."name" IS 'The file name of the DriveFile.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."type" IS 'The content type (MIME) of the DriveFile.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."size" IS 'The file size (bytes) of the DriveFile.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."comment" IS 'The comment of the DriveFile.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."blurhash" IS 'The BlurHash string.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."properties" IS 'The any properties of the DriveFile. For example, it includes image width/height.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."url" IS 'The URL of the DriveFile.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."thumbnailUrl" IS 'The URL of the thumbnail of the DriveFile.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."webpublicUrl" IS 'The URL of the webpublic of the DriveFile.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."uri" IS 'The URI of the DriveFile. it will be null when the DriveFile is local.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."folderId" IS 'The parent folder ID. If null, it means the DriveFile is located in root.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."isSensitive" IS 'Whether the DriveFile is NSFW.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."isLink" IS 'Whether the DriveFile is direct link to remote server.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."createdAt" IS 'The created date of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."updatedAt" IS 'The updated date of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."username" IS 'The username of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."usernameLower" IS 'The username (lowercased) of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."name" IS 'The name of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."followersCount" IS 'The count of followers.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."followingCount" IS 'The count of following.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."notesCount" IS 'The count of notes.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."avatarId" IS 'The ID of avatar DriveFile.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."bannerId" IS 'The ID of banner DriveFile.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isSuspended" IS 'Whether the User is suspended.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isSilenced" IS 'Whether the User is silenced.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isLocked" IS 'Whether the User is locked.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isBot" IS 'Whether the User is a bot.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isCat" IS 'Whether the User is a cat.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isAdmin" IS 'Whether the User is the admin.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isModerator" IS 'Whether the User is a moderator.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."host" IS 'The host of the User. It will be null if the origin of the user is local.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."inbox" IS 'The inbox URL of the User. It will be null if the origin of the user is local.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."sharedInbox" IS 'The sharedInbox URL of the User. It will be null if the origin of the user is local.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."featured" IS 'The featured URL of the User. It will be null if the origin of the user is local.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."uri" IS 'The URI of the User. It will be null if the origin of the user is local.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."token" IS 'The native access token of the User. It will be null if the origin of the user is local.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."createdAt" IS 'The created date of the App.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."userId" IS 'The owner ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."secret" IS 'The secret key of the App.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."name" IS 'The name of the App.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."description" IS 'The description of the App.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."permission" IS 'The permission of the App.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."callbackUrl" IS 'The callbackUrl of the App.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."createdAt" IS 'The created date of the AccessToken.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."lastUsedAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."session" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."appId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."description" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."iconUrl" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."createdAt" IS 'The created date of the Channel.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."userId" IS 'The owner ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."name" IS 'The name of the Channel.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."description" IS 'The description of the Channel.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."bannerId" IS 'The ID of banner Channel.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."notesCount" IS 'The count of notes.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."usersCount" IS 'The count of users.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."createdAt" IS 'The created date of the Note.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."replyId" IS 'The ID of reply target.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteId" IS 'The ID of renote target.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."userId" IS 'The ID of author.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."uri" IS 'The URI of a note. it will be null when the note is local.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."url" IS 'The human readable url of a note. it will be null when the note is local.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."channelId" IS 'The ID of source channel.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."userHost" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."replyUserId" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."replyUserHost" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteUserId" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteUserHost" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "poll_vote"."createdAt" IS 'The created date of the PollVote.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_reaction"."createdAt" IS 'The created date of the NoteReaction.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."createdAt" IS 'The created date of the NoteWatching.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."userId" IS 'The watcher ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."noteId" IS 'The target Note ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."noteUserId" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_unread"."noteUserId" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_unread"."noteChannelId" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."createdAt" IS 'The created date of the FollowRequest.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeId" IS 'The followee user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerId" IS 'The follower user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."requestId" IS 'id of Follow Activity.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerHost" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerInbox" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerSharedInbox" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeHost" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeInbox" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeSharedInbox" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group"."createdAt" IS 'The created date of the UserGroup.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group"."userId" IS 'The ID of owner.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."createdAt" IS 'The created date of the UserGroupInvitation.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."userId" IS 'The user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."userGroupId" IS 'The group ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."createdAt" IS 'The created date of the Notification.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."notifieeId" IS 'The ID of recipient user of the Notification.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS 'Whether the Notification is read.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "meta"."localDriveCapacityMb" IS 'Drive capacity of a local user (MB)'`);
+        await queryRunner.query(`COMMENT ON COLUMN "meta"."remoteDriveCapacityMb" IS 'Drive capacity of a remote user (MB)'`);
+        await queryRunner.query(`COMMENT ON COLUMN "meta"."maxNoteTextLength" IS 'Max allowed note text length in characters'`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."createdAt" IS 'The created date of the Following.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeId" IS 'The followee user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followerId" IS 'The follower user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followerHost" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followerInbox" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followerSharedInbox" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeHost" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeInbox" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeSharedInbox" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."caughtAt" IS 'The caught date of the Instance.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."host" IS 'The host of the Instance.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."usersCount" IS 'The count of the users of the Instance.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."notesCount" IS 'The count of the notes of the Instance.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."softwareName" IS 'The software of the Instance.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."softwareVersion" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."openRegistrations" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."description" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."maintainerName" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."maintainerEmail" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."iconUrl" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."faviconUrl" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."themeColor" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "muting"."createdAt" IS 'The created date of the Muting.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "muting"."muteeId" IS 'The mutee user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "muting"."muterId" IS 'The muter user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "blocking"."createdAt" IS 'The created date of the Blocking.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "blocking"."blockeeId" IS 'The blockee user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "blocking"."blockerId" IS 'The blocker user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list"."createdAt" IS 'The created date of the UserList.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list"."userId" IS 'The owner ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list"."name" IS 'The name of the UserList.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."createdAt" IS 'The created date of the UserListJoining.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."userId" IS 'The user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."userListId" IS 'The list ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."createdAt" IS 'The created date of the UserGroupJoining.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."userId" IS 'The user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."userGroupId" IS 'The group ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_favorite"."createdAt" IS 'The created date of the NoteFavorite.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."createdAt" IS 'The created date of the AbuseUserReport.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."targetUserHost" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."reporterHost" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."createdAt" IS 'The created date of the MessagingMessage.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."userId" IS 'The sender user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."groupId" IS 'The recipient group ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "signin"."createdAt" IS 'The created date of the Signin.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "auth_session"."createdAt" IS 'The created date of the AuthSession.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."createdAt" IS 'The created date of the ReversiGame.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."startedAt" IS 'The started date of the ReversiGame.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form1" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form2" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_matching"."createdAt" IS 'The created date of the ReversiMatching.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_note_pining"."createdAt" IS 'The created date of the UserNotePinings.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "poll"."noteId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "poll"."noteVisibility" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "poll"."userId" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "poll"."userHost" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_keypair"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_publickey"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "page"."createdAt" IS 'The created date of the Page.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "page"."updatedAt" IS 'The updated date of the Page.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "page"."userId" IS 'The ID of author.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."location" IS 'The location of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."birthday" IS 'The birthday (YYYY-MM-DD) of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."description" IS 'The description (bio) of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."url" IS 'Remote URL of the user.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."email" IS 'The email address of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."password" IS 'The password hash of the User. It will be null if the origin of the user is local.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."clientData" IS 'The client-specific data of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."room" IS 'The room data of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."userHost" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."id" IS 'Variable-length id given to navigator.credentials.get()'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."publicKey" IS 'Variable-length public key used to verify attestations (hex-encoded).'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."lastUsed" IS 'The date of the last time the UserSecurityKey was successfully validated.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."name" IS 'User-defined name for this key'`);
+        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."challenge" IS 'Hex-encoded sha256 hash of the challenge.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."createdAt" IS 'The date challenge was created for expiry purposes.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."registrationChallenge" IS 'Indicates that the challenge is only for registration purposes if true to prevent the challenge for being used as authentication.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "moderation_log"."createdAt" IS 'The created date of the ModerationLog.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "announcement"."createdAt" IS 'The created date of the Announcement.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "announcement"."updatedAt" IS 'The updated date of the Announcement.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "announcement_read"."createdAt" IS 'The created date of the AnnouncementRead.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip"."createdAt" IS 'The created date of the Clip.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip"."userId" IS 'The owner ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip"."name" IS 'The name of the Clip.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip"."description" IS 'The description of the Clip.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip_note"."noteId" IS 'The note ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip_note"."clipId" IS 'The clip ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "antenna"."createdAt" IS 'The created date of the Antenna.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "antenna"."userId" IS 'The owner ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "antenna"."name" IS 'The name of the Antenna.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "antenna_note"."noteId" IS 'The note ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "antenna_note"."antennaId" IS 'The antenna ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "promo_note"."noteId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "promo_note"."userId" IS '[Denormalized]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "promo_read"."createdAt" IS 'The created date of the PromoRead.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."noteId" IS 'The note ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."userId" IS 'The user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."reason" IS 'The reason of the MutedNote.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."createdAt" IS 'The created date of the ChannelFollowing.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."followeeId" IS 'The followee channel ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."followerId" IS 'The follower user ID.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel_note_pining"."createdAt" IS 'The created date of the ChannelNotePining.'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`COMMENT ON COLUMN "channel_note_pining"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."followerId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."followeeId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel_following"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."reason" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "muted_note"."noteId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "promo_read"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "promo_note"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "promo_note"."noteId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "antenna_note"."antennaId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "antenna_note"."noteId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "antenna"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "antenna"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "antenna"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip_note"."clipId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip_note"."noteId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip"."description" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "clip"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "announcement_read"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "announcement"."updatedAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "announcement"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "moderation_log"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."registrationChallenge" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "attestation_challenge"."challenge" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."lastUsed" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."publicKey" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_security_key"."id" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."userHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."room" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."clientData" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."password" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."email" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."url" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."description" IS 'The description (bio) of the User.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."birthday" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."location" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_profile"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "page"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "page"."updatedAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "page"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_publickey"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_keypair"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "poll"."userHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "poll"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "poll"."noteVisibility" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "poll"."noteId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_note_pining"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_matching"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form2" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."form1" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."startedAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "auth_session"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "signin"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."groupId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "messaging_message"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."reporterHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."targetUserHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "abuse_user_report"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_favorite"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."userGroupId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_joining"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."userListId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list_joining"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_list"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "blocking"."blockerId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "blocking"."blockeeId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "blocking"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "muting"."muterId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "muting"."muteeId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "muting"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."themeColor" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."faviconUrl" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."iconUrl" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."maintainerEmail" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."maintainerName" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."description" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."openRegistrations" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."softwareVersion" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."softwareName" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."notesCount" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."usersCount" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."host" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "instance"."caughtAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeSharedInbox" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeInbox" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followerSharedInbox" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followerInbox" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followerHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followerId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."followeeId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "following"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "meta"."maxNoteTextLength" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "meta"."remoteDriveCapacityMb" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "meta"."localDriveCapacityMb" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."isRead" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."notifieeId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "notification"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."userGroupId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group_invitation"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user_group"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeSharedInbox" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeInbox" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerSharedInbox" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerInbox" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."requestId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followerId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."followeeId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "follow_request"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_unread"."noteChannelId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_unread"."noteUserId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."noteUserId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."noteId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_watching"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note_reaction"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "poll_vote"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteUserHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteUserId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."replyUserHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."replyUserId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."userHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."channelId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."url" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."uri" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."renoteId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."replyId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "note"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."usersCount" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."notesCount" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."bannerId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."description" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "channel"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."iconUrl" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."description" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."appId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."session" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."lastUsedAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "access_token"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."callbackUrl" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."permission" IS 'The permission of the App.'`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."description" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."secret" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."token" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."uri" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."featured" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."sharedInbox" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."inbox" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."host" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isModerator" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isAdmin" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isCat" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isBot" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isLocked" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isSilenced" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isSuspended" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."bannerId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."avatarId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."notesCount" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."followingCount" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."followersCount" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."usernameLower" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."username" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."updatedAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."isLink" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."isSensitive" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."folderId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."uri" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."webpublicUrl" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."thumbnailUrl" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."url" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."properties" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."blurhash" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."comment" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."size" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."type" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."md5" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."userHost" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."parentId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."userId" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."name" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_folder"."createdAt" IS NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "log"."createdAt" IS NULL`);
+    }
+
+}
--- a/migration/1605585339718-instance-pinned-pages.ts
+++ b/migration/1605585339718-instance-pinned-pages.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class instancePinnedPages1605585339718 implements MigrationInterface {
+    name = 'instancePinnedPages1605585339718'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{"/announcements", "/featured", "/channels", "/pages", "/explore", "/games/reversi", "/about-misskey"}'::varchar[]`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedPages"`);
+    }
+
+}
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.39.0",
+	"version": "12.59.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@ -30,36 +30,35 @@
 	"resolutions": {
 		"chokidar": "^3.3.1",
 		"constantinople": "^4.0.1",
-		"core-js": "^3.6.5",
-		"lodash": "^4.17.15",
-		"mocha": "^7.1.1"
+		"gulp/gulp-cli/yargs/yargs-parser": "5.0.0-security.0",
+		"jsonld/rdf-canonize/node-forge": "0.10.0",
+		"lodash": "^4.17.20"
 	},
 	"dependencies": {
-		"@babel/plugin-transform-runtime": "7.9.6",
-		"@elastic/elasticsearch": "7.7.1",
-		"@fortawesome/fontawesome-svg-core": "1.2.28",
-		"@fortawesome/free-brands-svg-icons": "5.13.0",
-		"@fortawesome/free-regular-svg-icons": "5.13.0",
-		"@fortawesome/free-solid-svg-icons": "5.13.0",
-		"@fortawesome/vue-fontawesome": "0.1.9",
-		"@juggle/resize-observer": "3.1.3",
+		"@babel/plugin-transform-runtime": "7.11.0",
+		"@elastic/elasticsearch": "7.8.0",
+		"@fortawesome/fontawesome-svg-core": "1.2.32",
+		"@fortawesome/free-brands-svg-icons": "5.15.1",
+		"@fortawesome/free-regular-svg-icons": "5.15.1",
+		"@fortawesome/free-solid-svg-icons": "5.15.1",
+		"@fortawesome/vue-fontawesome": "3.0.0-2",
 		"@koa/cors": "3.1.0",
-		"@koa/multer": "2.0.2",
-		"@koa/router": "8.0.8",
+		"@koa/multer": "3.0.0",
+		"@koa/router": "9.0.1",
 		"@sinonjs/fake-timers": "6.0.1",
-		"@syuilo/aiscript": "0.6.1",
+		"@syuilo/aiscript": "0.11.1",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.13.0",
-		"@types/cbor": "5.0.0",
+		"@types/bull": "3.14.0",
+		"@types/cbor": "5.0.1",
 		"@types/dateformat": "3.0.1",
 		"@types/double-ended-queue": "2.1.1",
 		"@types/escape-regexp": "0.0.0",
-		"@types/glob": "7.1.1",
+		"@types/glob": "7.1.3",
 		"@types/gulp": "4.0.6",
 		"@types/gulp-rename": "0.0.33",
 		"@types/gulp-replace": "0.0.31",
 		"@types/is-url": "1.2.28",
-		"@types/js-yaml": "3.12.4",
+		"@types/js-yaml": "3.12.5",
 		"@types/jsdom": "16.2.3",
 		"@types/jsonld": "1.5.1",
 		"@types/katex": "0.11.0",
@ -76,7 +75,7 @@
 		"@types/koa__router": "8.0.2",
 		"@types/markdown-it": "10.0.1",
 		"@types/mocha": "7.0.2",
-		"@types/node": "14.0.5",
+		"@types/node": "14.0.22",
 		"@types/node-fetch": "2.5.7",
 		"@types/nodemailer": "6.4.0",
 		"@types/nprogress": "0.2.0",
@ -88,182 +87,175 @@
 		"@types/qrcode": "1.3.4",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.21",
+		"@types/redis": "2.8.25",
 		"@types/rename": "1.0.1",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "3.0.0",
 		"@types/seedrandom": "2.4.28",
-		"@types/sharp": "0.25.0",
+		"@types/sharp": "0.26.0",
 		"@types/sinonjs__fake-timers": "6.0.1",
 		"@types/speakeasy": "2.0.5",
 		"@types/tinycolor2": "1.4.2",
 		"@types/tmp": "0.2.0",
-		"@types/uuid": "8.0.0",
+		"@types/uuid": "8.3.0",
 		"@types/web-push": "3.3.0",
-		"@types/webpack": "4.41.13",
+		"@types/webpack": "4.41.24",
 		"@types/webpack-stream": "3.2.11",
-		"@types/websocket": "1.0.0",
-		"@types/ws": "7.2.4",
-		"@typescript-eslint/parser": "2.33.0",
+		"@types/websocket": "1.0.1",
+		"@types/ws": "7.2.7",
+		"@typescript-eslint/parser": "4.6.1",
+		"@vue/compiler-sfc": "3.0.2",
 		"abort-controller": "3.0.0",
-		"apexcharts": "3.19.2",
+		"apexcharts": "3.22.1",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.683.0",
+		"aws-sdk": "2.787.0",
 		"bcryptjs": "2.4.3",
-		"bull": "3.14.0",
+		"blurhash": "1.1.3",
+		"bull": "3.18.1",
 		"cafy": "15.2.1",
-		"cbor": "5.0.2",
-		"chalk": "4.0.0",
-		"chart.js": "2.9.3",
+		"cbor": "5.1.0",
+		"chalk": "4.1.0",
+		"chart.js": "2.9.4",
 		"cli-highlight": "2.1.4",
 		"commander": "4.1.1",
 		"content-disposition": "0.5.3",
-		"core-js": "3.6.5",
+		"core-js": "3.7.0",
 		"crc-32": "1.2.0",
-		"css-loader": "3.5.3",
+		"css-loader": "5.0.1",
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
 		"deep-entries": "3.1.0",
 		"diskusage": "1.1.3",
 		"double-ended-queue": "2.1.0-0",
 		"escape-regexp": "0.0.1",
-		"eslint": "6.8.0",
-		"eslint-plugin-vue": "6.2.2",
-		"eventemitter3": "4.0.4",
-		"feed": "4.1.0",
+		"eslint": "7.12.1",
+		"eslint-plugin-vue": "7.1.0",
+		"eventemitter3": "4.0.7",
+		"feed": "4.2.1",
 		"fibers": "5.0.0",
-		"file-type": "14.5.0",
+		"file-type": "16.0.1",
 		"fluent-ffmpeg": "2.1.2",
 		"glob": "7.1.6",
+		"got": "11.8.0",
 		"gulp": "4.0.2",
-		"gulp-clean-css": "4.3.0",
-		"gulp-dart-sass": "1.0.2",
 		"gulp-rename": "2.0.0",
 		"gulp-replace": "1.0.0",
 		"gulp-sourcemaps": "2.6.5",
-		"gulp-terser": "1.2.0",
 		"gulp-tslint": "8.1.4",
 		"gulp-typescript": "6.0.0-alpha.1",
 		"hard-source-webpack-plugin": "0.13.1",
-		"hcaptcha": "0.0.1",
+		"hcaptcha": "0.0.2",
 		"html-minifier": "4.0.0",
 		"http-proxy-agent": "4.0.1",
-		"http-signature": "1.3.4",
+		"http-signature": "1.3.5",
 		"https-proxy-agent": "5.0.0",
 		"idb-keyval": "3.2.0",
 		"insert-text-at-cursor": "0.3.0",
 		"is-root": "2.1.0",
 		"is-svg": "4.2.1",
 		"js-yaml": "3.14.0",
-		"jsdom": "16.2.2",
+		"jsdom": "16.4.0",
 		"json5": "2.1.3",
-		"json5-loader": "4.0.0",
-		"jsonld": "3.1.1",
-		"jsrsasign": "8.0.15",
-		"katex": "0.11.1",
-		"koa": "2.12.0",
+		"json5-loader": "4.0.1",
+		"jsonld": "3.2.0",
+		"jsrsasign": "8.0.20",
+		"katex": "0.12.0",
+		"koa": "2.13.0",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
 		"koa-json-body": "5.3.0",
 		"koa-logger": "3.2.1",
 		"koa-mount": "4.0.0",
-		"koa-send": "5.0.0",
+		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
-		"koa-views": "6.2.2",
+		"koa-views": "6.3.1",
 		"langmap": "0.0.16",
 		"lookup-dns-cache": "2.1.0",
-		"markdown-it": "11.0.0",
-		"markdown-it-anchor": "5.3.0",
-		"mocha": "7.2.0",
+		"markdown-it": "11.0.1",
+		"markdown-it-anchor": "6.0.0",
+		"mocha": "8.2.1",
 		"moji": "0.5.1",
 		"ms": "2.1.2",
 		"multer": "1.4.2",
-		"nested-property": "2.0.0",
-		"node-fetch": "2.6.0",
-		"nodemailer": "6.4.6",
-		"nprogress": "0.2.0",
+		"nested-property": "4.0.0",
+		"node-fetch": "2.6.1",
+		"nodemailer": "6.4.15",
 		"object-assign-deep": "0.4.0",
 		"os-utils": "0.0.14",
-		"parse5": "6.0.0",
-		"parsimmon": "1.13.0",
-		"pg": "8.2.1",
-		"portal-vue": "2.1.7",
+		"p-cancelable": "2.0.0",
+		"parse5": "6.0.1",
+		"parsimmon": "1.16.0",
+		"pg": "8.4.2",
 		"portscanner": "2.2.0",
-		"postcss-loader": "3.0.0",
-		"prismjs": "1.20.0",
-		"probe-image-size": "5.0.0",
+		"postcss": "8.1.6",
+		"postcss-loader": "4.0.4",
+		"prismjs": "1.22.0",
+		"probe-image-size": "6.0.0",
 		"promise-limit": "2.7.0",
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.4",
 		"punycode": "2.1.1",
-		"pureimage": "0.2.1",
+		"pureimage": "0.2.5",
 		"qrcode": "1.4.4",
 		"random-seed": "0.3.0",
-		"randomcolor": "0.5.4",
 		"ratelimiter": "3.4.1",
-		"recaptcha-promise": "0.1.3",
+		"re2": "1.15.8",
+		"recaptcha-promise": "1.0.0",
 		"reconnecting-websocket": "4.4.0",
 		"redis": "3.0.2",
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
-		"regenerator-runtime": "0.13.5",
+		"regenerator-runtime": "0.13.7",
 		"rename": "1.0.4",
 		"request-stats": "3.0.0",
 		"require-all": "3.0.0",
 		"rimraf": "3.0.2",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass": "1.26.5",
-		"sass-loader": "8.0.2",
+		"sass": "1.29.0",
+		"sass-loader": "10.0.5",
 		"seedrandom": "3.0.5",
-		"sharp": "0.25.3",
+		"sharp": "0.26.2",
 		"speakeasy": "2.0.0",
 		"stringz": "2.1.0",
-		"style-loader": "1.2.1",
+		"style-loader": "2.0.0",
 		"summaly": "2.4.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "4.26.4",
+		"systeminformation": "4.28.1",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
-		"three": "0.116.1",
-		"tinycolor2": "1.4.1",
+		"three": "0.117.1",
+		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
-		"ts-loader": "7.0.4",
-		"ts-node": "8.10.1",
-		"tslint": "6.1.2",
+		"ts-loader": "8.0.9",
+		"ts-node": "9.0.0",
+		"tslint": "6.1.3",
 		"tslint-sonarts": "1.9.0",
-		"typeorm": "0.2.25",
-		"typescript": "3.9.3",
+		"typeorm": "0.2.29",
+		"typescript": "4.0.5",
 		"ulid": "2.3.0",
-		"url-loader": "4.1.0",
-		"uuid": "8.1.0",
-		"v-animate-css": "0.0.3",
+		"url-loader": "4.1.1",
+		"uuid": "8.3.1",
 		"v-debounce": "0.1.2",
-		"vue": "2.6.11",
+		"vue": "3.0.2",
 		"vue-color": "2.7.1",
-		"vue-content-loading": "1.6.0",
-		"vue-cropperjs": "4.1.0",
-		"vue-i18n": "8.17.7",
-		"vue-json-pretty": "1.6.3",
-		"vue-loader": "15.9.2",
-		"vue-marquee-text-component": "1.1.1",
-		"vue-meta": "2.3.3",
-		"vue-prism-component": "1.2.0",
-		"vue-prism-editor": "0.6.1",
-		"vue-router": "3.2.0",
+		"vue-draggable-next": "1.0.8",
+		"vue-i18n": "9.0.0-beta.7",
+		"vue-json-pretty": "1.7.1",
+		"vue-loader": "16.0.0-beta.8",
+		"vue-prism-editor": "1.2.2",
+		"vue-router": "4.0.0-rc.2",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader-corejs3": "1.5.0",
-		"vue-template-compiler": "2.6.11",
-		"vuedraggable": "2.23.2",
-		"vuex": "3.4.0",
-		"vuex-persistedstate": "3.0.1",
+		"vue-template-compiler": "2.6.12",
+		"vuex": "4.0.0-rc.1",
+		"vuex-persistedstate": "3.1.0",
 		"web-push": "3.4.4",
-		"webpack": "5.0.0-beta.16",
-		"webpack-cli": "3.3.11",
-		"websocket": "1.0.31",
-		"ws": "7.3.0",
+		"webpack": "5.5.0",
+		"webpack-cli": "4.2.0",
+		"websocket": "1.0.32",
+		"ws": "7.3.1",
 		"xev": "2.0.1"
 	},
 	"devDependencies": {
--- a/src/@types/nested-property.d.ts
+++ b/src/@types/nested-property.d.ts
@ -1,21 +0,0 @@
-type Obj = { [key: string]: any };
-
-declare module 'nested-property' {
-	interface IHasNestedPropertyOptions {
-		own?: boolean;
-	}
-
-	interface IIsInNestedPropertyOptions {
-		validPath?: boolean;
-	}
-
-	export function set<T>(object: T, property: string, value: any): T;
-
-	export function get(object: Obj, property: string): any;
-
-	export function has(object: Obj, property: string, options?: IHasNestedPropertyOptions): boolean;
-
-	export function hasOwn(object: Obj, property: string, options?: IHasNestedPropertyOptions): boolean;
-
-	export function isIn(object: Obj, property: string, objectInPath: Obj, options?: IIsInNestedPropertyOptions): boolean;
-}
--- a/src/client/.eslintrc
+++ b/src/client/.eslintrc
@ -0,0 +1,12 @@
+{
+	"globals": {
+		"_DEV_": false,
+		"_LANGS_": false,
+		"_VERSION_": false,
+		"_ENV_": false,
+		"_PERF_PREFIX_": false,
+		"_DATA_TRANSFER_DRIVE_FILE_": false,
+		"_DATA_TRANSFER_DRIVE_FOLDER_": false,
+		"_DATA_TRANSFER_DECK_COLUMN_": false
+	}
+}
--- a/src/client/@types/global.d.ts
+++ b/src/client/@types/global.d.ts
@ -0,0 +1,8 @@
+declare const _LANGS_: string[];
+declare const _VERSION_: string;
+declare const _ENV_: string;
+declare const _DEV_: boolean;
+declare const _PERF_PREFIX_: string;
+declare const _DATA_TRANSFER_DRIVE_FILE_: string;
+declare const _DATA_TRANSFER_DRIVE_FOLDER_: string;
+declare const _DATA_TRANSFER_DECK_COLUMN_: string;
--- a/src/client/@types/vue.d.ts
+++ b/src/client/@types/vue.d.ts
--- a/src/client/@types/vuex-shim.d.ts
+++ b/src/client/@types/vuex-shim.d.ts
@ -0,0 +1,12 @@
+import { ComponentCustomProperties } from 'vue';
+import { Store } from 'vuex';
+
+declare module '@vue/runtime-core' {
+	// tslint:disable-next-line:no-empty-interface
+	interface State {
+	}
+
+	interface ComponentCustomProperties {
+		$store: Store<State>;
+	}
+}
--- a/src/client/app.vue
+++ b/src/client/app.vue
--- a/src/client/assets/sounds/noizenecio/kick_gaba2.mp3
+++ b/src/client/assets/sounds/noizenecio/kick_gaba2.mp3
--- a/src/client/assets/sounds/syuilo/pirori-square-wet.mp3
+++ b/src/client/assets/sounds/syuilo/pirori-square-wet.mp3
--- a/src/client/assets/sounds/syuilo/pirori-wet.mp3
+++ b/src/client/assets/sounds/syuilo/pirori-wet.mp3
--- a/src/client/assets/sounds/syuilo/pirori.mp3
+++ b/src/client/assets/sounds/syuilo/pirori.mp3
--- a/src/client/assets/sounds/syuilo/reverved.mp3
+++ b/src/client/assets/sounds/syuilo/reverved.mp3
--- a/src/client/assets/sounds/syuilo/ryukyu.mp3
+++ b/src/client/assets/sounds/syuilo/ryukyu.mp3
--- a/src/client/assets/sounds/syuilo/square-pico.mp3
+++ b/src/client/assets/sounds/syuilo/square-pico.mp3
--- a/src/client/components/abuse-report-window.vue
+++ b/src/client/components/abuse-report-window.vue
@ -0,0 +1,85 @@
+<template>
+<XWindow ref="window" :initial-width="400" :initial-height="500" :can-resize="true" @closed="$emit('closed')">
+	<template #header>
+		<Fa :icon="faExclamationCircle" style="margin-right: 0.5em;"/>
+		<i18n-t keypath="reportAbuseOf" tag="span">
+			<template #name>
+				<b><MkAcct :user="user"/></b>
+			</template>
+		</i18n-t>
+	</template>
+	<div class="dpvffvvy">
+		<div class="_section">
+			<div class="_content">
+				<MkTextarea v-model:value="comment">
+					<span>{{ $t('details') }}</span>
+					<template #desc>{{ $t('fillAbuseReportDescription') }}</template>
+				</MkTextarea>
+			</div>
+		</div>
+		<div class="_section">
+			<div class="_content">
+				<MkButton @click="send" primary full :disabled="comment.length === 0">{{ $t('send') }}</MkButton>
+			</div>
+		</div>
+	</div>
+</XWindow>
+</template>
+
+<script lang="ts">
+import { defineComponent, markRaw } from 'vue';
+import { faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
+import XWindow from '@/components/ui/window.vue';
+import MkTextarea from '@/components/ui/textarea.vue';
+import MkButton from '@/components/ui/button.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		XWindow,
+		MkTextarea,
+		MkButton,
+	},
+
+	props: {
+		user: {
+			type: Object,
+			required: true,
+		},
+		initialComment: {
+			type: String,
+			required: false,
+		},
+	},
+
+	emits: ['closed'],
+
+	data() {
+		return {
+			comment: this.initialComment || '',
+			faExclamationCircle,
+		};
+	},
+
+	methods: {
+		send() {
+			os.apiWithDialog('users/report-abuse', {
+				userId: this.user.id,
+				comment: this.comment,
+			}, undefined, res => {
+				os.dialog({
+					type: 'success',
+					text: this.$t('abuseReported')
+				});
+				this.$refs.window.close();
+			});
+		}
+	},
+});
+</script>
+
+<style lang="scss" scoped>
+.dpvffvvy {
+	--section-padding: 16px;
+}
+</style>
--- a/src/client/components/acct.vue
+++ b/src/client/components/acct.vue
@ -6,11 +6,11 @@
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { toUnicode } from 'punycode';
-import { host } from '../config';
+import { host } from '@/config';

-export default Vue.extend({
+export default defineComponent({
 	props: ['user', 'detail'],
 	data() {
 		return {
--- a/src/client/components/analog-clock.vue
+++ b/src/client/components/analog-clock.vue
@ -34,10 +34,11 @@
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import * as tinycolor from 'tinycolor2';
+import * as os from '@/os';

-export default Vue.extend({
+export default defineComponent({
 	data() {
 		return {
 			now: new Date(),
@ -127,7 +128,7 @@ export default Vue.extend({
 		});
 	},

-	beforeDestroy() {
+	beforeUnmount() {
 		this.enabled = false;
 	},

--- a/src/client/components/autocomplete.vue
+++ b/src/client/components/autocomplete.vue
@ -1,12 +1,12 @@
 <template>
-<div class="swhvrteh" @contextmenu.prevent="() => {}">
+<div class="swhvrteh _popup _shadow" @contextmenu.prevent="() => {}">
 	<ol class="users" ref="suggests" v-if="type === 'user'">
 		<li v-for="user in users" @click="complete(type, user)" @keydown="onKeydown" tabindex="-1" class="user">
 			<img class="avatar" :src="user.avatarUrl"/>
 			<span class="name">
-				<mk-user-name :user="user" :key="user.id"/>
+				<MkUserName :user="user" :key="user.id"/>
 			</span>
-			<span class="username">@{{ user | acct }}</span>
+			<span class="username">@{{ acct(user) }}</span>
 		</li>
 		<li @click="chooseUser()" @keydown="onKeydown" tabindex="-1" class="choose">{{ $t('selectUser') }}</li>
 	</ol>
@ -28,12 +28,13 @@
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent, markRaw } from 'vue';
 import { emojilist } from '../../misc/emojilist';
-import contains from '../scripts/contains';
+import contains from '@/scripts/contains';
 import { twemojiSvgBase } from '../../misc/twemoji-base';
-import { getStaticImageUrl } from '../scripts/get-static-image-url';
-import MkUserSelect from './user-select.vue';
+import { getStaticImageUrl } from '@/scripts/get-static-image-url';
+import { acct } from '@/filters/user';
+import * as os from '@/os';

 type EmojiDef = {
 	emoji: string;
@ -74,7 +75,7 @@ for (const x of lib) {

 emjdb.sort((a, b) => a.name.length - b.name.length);

-export default Vue.extend({
+export default defineComponent({
 	props: {
 		type: {
 			type: String,
@ -91,11 +92,6 @@ export default Vue.extend({
 			required: true,
 		},

-		complete: {
-			type: Function,
-			required: true,
-		},
-
 		close: {
 			type: Function,
 			required: true,
@ -110,7 +106,14 @@ export default Vue.extend({
 			type: Number,
 			required: true,
 		},
+
+		showing: {
+			type: Boolean,
+			required: true
 		},
+	},
+
+	emits: ['done', 'closed'],

 	data() {
 		return {
@ -119,24 +122,29 @@ export default Vue.extend({
 			users: [],
 			hashtags: [],
 			emojis: [],
+			items: [],
 			select: -1,
-			emojilist,
 			emojiDb: [] as EmojiDef[]
 		}
 	},

 	computed: {
-		items(): HTMLCollection {
-			return (this.$refs.suggests as Element).children;
-		},
-
 		useOsNativeEmojis(): boolean {
 			return this.$store.state.device.useOsNativeEmojis;
 		}
 	},

+	watch: {
+		showing() {
+			if (!this.showing) {
+				this.$emit('closed');
+			}
+		}
+	},
+
 	updated() {
 		this.setPosition();
+		this.items = (this.$refs.suggests as Element | undefined)?.children || [];
 	},

 	mounted() {
@ -169,7 +177,7 @@ export default Vue.extend({

 		emojiDefinitions.sort((a, b) => a.name.length - b.name.length);

-		this.emojiDb = emojiDefinitions.concat(emjdb);
+		this.emojiDb = markRaw(emojiDefinitions.concat(emjdb));
 		//#endregion

 		this.textarea.addEventListener('keydown', this.onKeydown);
@ -189,7 +197,7 @@ export default Vue.extend({
 		});
 	},

-	beforeDestroy() {
+	beforeUnmount() {
 		this.textarea.removeEventListener('keydown', this.onKeydown);

 		for (const el of Array.from(document.querySelectorAll('body *'))) {
@ -198,6 +206,11 @@ export default Vue.extend({
 	},

 	methods: {
+		complete(type, value) {
+			this.$emit('done', { type, value });
+			this.$emit('closed');
+		},
+
 		setPosition() {
 			if (this.x + this.$el.offsetWidth > window.innerWidth) {
 				this.$el.style.left = (window.innerWidth - this.$el.offsetWidth) + 'px';
@ -236,8 +249,8 @@ export default Vue.extend({
 					this.users = users;
 					this.fetching = false;
 				} else {
-					this.$root.api('users/search', {
-						query: this.q,
+					os.api('users/search-by-username-and-host', {
+						username: this.q,
 						limit: 10,
 						detail: false
 					}).then(users => {
@ -260,7 +273,7 @@ export default Vue.extend({
 						this.hashtags = hashtags;
 						this.fetching = false;
 					} else {
-						this.$root.api('hashtags/search', {
+						os.api('hashtags/search', {
 							query: this.q,
 							limit: 30
 						}).then(hashtags => {
@ -355,6 +368,7 @@ export default Vue.extend({

 		selectNext() {
 			if (++this.select >= this.items.length) this.select = 0;
+			if (this.items.length === 0) this.select = -1;
 			this.applySelect();
 		},

@ -368,20 +382,21 @@ export default Vue.extend({
 				el.removeAttribute('data-selected');
 			}

+			if (this.select !== -1) {
 				this.items[this.select].setAttribute('data-selected', 'true');
 				(this.items[this.select] as any).focus();
+			}
 		},

 		chooseUser() {
 			this.close();
-			const vm = this.$root.new(MkUserSelect, {});
-			vm.$once('selected', user => {
+			os.selectUser().then(user => {
 				this.complete('user', user);
-			});
-			vm.$once('closed', () => {
 				this.textarea.focus();
 			});
-		}
+		},
+
+		acct
 	}
 });
 </script>
@ -393,9 +408,6 @@ export default Vue.extend({
 	max-width: 100%;
 	margin-top: calc(1em + 8px);
 	overflow: hidden;
-	background: var(--panel);
-	border: solid 1px rgba(#000, 0.1);
-	border-radius: 4px;
 	transition: top 0.1s ease, left 0.1s ease;

 	> ol {
@ -426,7 +438,7 @@ export default Vue.extend({
 			}

 			&:hover {
-				background: var(--yrnqrguo);
+				background: var(--X3);
 			}

 			&[data-selected='true'] {
--- a/src/client/components/avatar.vue
+++ b/src/client/components/avatar.vue
@ -1,23 +1,19 @@
 <template>
-<span class="eiwwqkts" :class="{ cat }" :title="user | acct" v-if="disableLink && !disablePreview" v-user-preview="user.id" @click="onClick">
-	<span class="inner" :style="icon"></span>
+<span class="eiwwqkts" :class="{ cat }" :title="acct(user)" v-if="disableLink" v-user-preview="disablePreview ? undefined : user.id" @click="onClick">
+	<img class="inner" :src="url"/>
 </span>
-<span class="eiwwqkts" :class="{ cat }" :title="user | acct" v-else-if="disableLink && disablePreview" @click="onClick">
-	<span class="inner" :style="icon"></span>
-</span>
-<router-link class="eiwwqkts" :class="{ cat }" :to="user | userPage" :title="user | acct" :target="target" v-else-if="!disableLink && !disablePreview" v-user-preview="user.id">
-	<span class="inner" :style="icon"></span>
-</router-link>
-<router-link class="eiwwqkts" :class="{ cat }" :to="user | userPage" :title="user | acct" :target="target" v-else-if="!disableLink && disablePreview">
-	<span class="inner" :style="icon"></span>
-</router-link>
+<MkA class="eiwwqkts" :class="{ cat }" :to="userPage(user)" :title="acct(user)" :target="target" v-else v-user-preview="disablePreview ? undefined : user.id">
+	<img class="inner" :src="url"/>
+</MkA>
 </template>

 <script lang="ts">
-import Vue from 'vue';
-import { getStaticImageUrl } from '../scripts/get-static-image-url';
+import { defineComponent } from 'vue';
+import { getStaticImageUrl } from '@/scripts/get-static-image-url';
+import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash';
+import { acct, userPage } from '../filters/user';

-export default Vue.extend({
+export default defineComponent({
 	props: {
 		user: {
 			type: Object,
@ -36,6 +32,7 @@ export default Vue.extend({
 			default: false
 		}
 	},
+	emits: ['click'],
 	computed: {
 		cat(): boolean {
 			return this.user.isCat;
@ -45,27 +42,22 @@ export default Vue.extend({
 				? getStaticImageUrl(this.user.avatarUrl)
 				: this.user.avatarUrl;
 		},
-		icon(): any {
-			return {
-				backgroundColor: this.user.avatarColor,
-				backgroundImage: `url(${this.url})`,
-			};
-		}
 	},
 	watch: {
-		'user.avatarColor'() {
-			this.$el.style.color = this.user.avatarColor;
+		'user.avatarBlurhash'() {
+			if (this.$el == null) return;
+			this.$el.style.color = extractAvgColorFromBlurhash(this.user.avatarBlurhash);
 		}
 	},
 	mounted() {
-		if (this.user.avatarColor) {
-			this.$el.style.color = this.user.avatarColor;
-		}
+		this.$el.style.color = extractAvgColorFromBlurhash(this.user.avatarBlurhash);
 	},
 	methods: {
 		onClick(e) {
 			this.$emit('click', e);
-		}
+		},
+		acct,
+		userPage
 	}
 });
 </script>
@ -102,15 +94,17 @@ export default Vue.extend({
 	}

 	.inner {
-		background-position: center center;
-		background-size: cover;
+		position: absolute;
 		bottom: 0;
 		left: 0;
-		position: absolute;
 		right: 0;
 		top: 0;
 		border-radius: 100%;
 		z-index: 1;
+		overflow: hidden;
+		object-fit: cover;
+		width: 100%;
+		height: 100%;
 	}
 }
 </style>
--- a/src/client/components/avatars.vue
+++ b/src/client/components/avatars.vue
@ -1,15 +1,16 @@
 <template>
 <div>
 	<div v-for="user in us" :key="user.id" style="display:inline-block;width:32px;height:32px;margin-right:8px;">
-		<mk-avatar :user="user" style="width:32px;height:32px;"/>
+		<MkAvatar :user="user" style="width:32px;height:32px;"/>
 	</div>
 </div>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
+import * as os from '@/os';

-export default Vue.extend({
+export default defineComponent({
 	props: {
 		userIds: {
 			required: true
@ -21,7 +22,7 @@ export default Vue.extend({
 		};
 	},
 	async created() {
-		this.us = await this.$root.api('users/show', {
+		this.us = await os.api('users/show', {
 			userIds: this.userIds
 		});
 	}
--- a/src/client/components/captcha.vue
+++ b/src/client/components/captcha.vue
@ -1,12 +1,12 @@
 <template>
 <div>
-	<span v-if="!available">{{ $t('waiting') }}<mk-ellipsis/></span>
+	<span v-if="!available">{{ $t('waiting') }}<MkEllipsis/></span>
 	<div ref="captcha"></div>
 </div>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';

 type Captcha = {
 	render(container: string | Node, options: {
@ -28,8 +28,9 @@ declare global {
 	interface Window extends CaptchaContainer {
 	}
 }
+import * as os from '@/os';

-export default Vue.extend({
+export default defineComponent({
 	props: {
 		provider: {
 			type: String,
@ -88,7 +89,7 @@ export default Vue.extend({
 		}
 	},

-	beforeDestroy() {
+	beforeUnmount() {
 		this.reset();
 	},

@ -110,7 +111,7 @@ export default Vue.extend({
 			}
 		},
 		callback(response?: string) {
-			this.$emit('input', typeof response == 'string' ? response : null);
+			this.$emit('update:value', typeof response == 'string' ? response : null);
 		},
 	},
 });
--- a/src/client/components/channel-follow-button.vue
+++ b/src/client/components/channel-follow-button.vue
@ -0,0 +1,142 @@
+<template>
+<button class="hdcaacmi _button"
+	:class="{ wait, active: isFollowing, full }"
+	@click="onClick"
+	:disabled="wait"
+>
+	<template v-if="!wait">
+		<template v-if="isFollowing">
+			<span v-if="full">{{ $t('unfollow') }}</span><Fa :icon="faMinus"/>
+		</template>
+		<template v-else>
+			<span v-if="full">{{ $t('follow') }}</span><Fa :icon="faPlus"/>
+		</template>
+	</template>
+	<template v-else>
+		<span v-if="full">{{ $t('processing') }}</span><Fa :icon="faSpinner" pulse fixed-width/>
+	</template>
+</button>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { faSpinner, faPlus, faMinus, } from '@fortawesome/free-solid-svg-icons';
+import * as os from '@/os';
+
+export default defineComponent({
+	props: {
+		channel: {
+			type: Object,
+			required: true
+		},
+		full: {
+			type: Boolean,
+			required: false,
+			default: false,
+		},
+	},
+
+	data() {
+		return {
+			isFollowing: this.channel.isFollowing,
+			wait: false,
+			faSpinner, faPlus, faMinus,
+		};
+	},
+
+	methods: {
+		async onClick() {
+			this.wait = true;
+
+			try {
+				if (this.isFollowing) {
+					await os.api('channels/unfollow', {
+						channelId: this.channel.id
+					});
+					this.isFollowing = false;
+				} else {
+					await os.api('channels/follow', {
+						channelId: this.channel.id
+					});
+					this.isFollowing = true;
+				}
+			} catch (e) {
+				console.error(e);
+			} finally {
+				this.wait = false;
+			}
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.hdcaacmi {
+	position: relative;
+	display: inline-block;
+	font-weight: bold;
+	color: var(--accent);
+	background: transparent;
+	border: solid 1px var(--accent);
+	padding: 0;
+	height: 31px;
+	font-size: 16px;
+	border-radius: 32px;
+	background: #fff;
+
+	&.full {
+		padding: 0 8px 0 12px;
+		font-size: 14px;
+	}
+
+	&:not(.full) {
+		width: 31px;
+	}
+
+	&:focus {
+		&:after {
+			content: "";
+			pointer-events: none;
+			position: absolute;
+			top: -5px;
+			right: -5px;
+			bottom: -5px;
+			left: -5px;
+			border: 2px solid var(--focus);
+			border-radius: 32px;
+		}
+	}
+
+	&:hover {
+		//background: mix($primary, #fff, 20);
+	}
+
+	&:active {
+		//background: mix($primary, #fff, 40);
+	}
+
+	&.active {
+		color: #fff;
+		background: var(--accent);
+
+		&:hover {
+			background: var(--accentLighten);
+			border-color: var(--accentLighten);
+		}
+
+		&:active {
+			background: var(--accentDarken);
+			border-color: var(--accentDarken);
+		}
+	}
+
+	&.wait {
+		cursor: wait !important;
+		opacity: 0.7;
+	}
+
+	> span {
+		margin-right: 6px;
+	}
+}
+</style>
--- a/src/client/components/channel-preview.vue
+++ b/src/client/components/channel-preview.vue
@ -0,0 +1,167 @@
+<template>
+<MkA :to="`/channels/${channel.id}`" class="eftoefju _panel" tabindex="-1">
+	<div class="banner" :style="bannerStyle">
+		<div class="fade"></div>
+		<div class="name"><Fa :icon="faSatelliteDish"/> {{ channel.name }}</div>
+		<div class="status">
+			<div>
+				<Fa :icon="faUsers" fixed-width/>
+				<i18n-t keypath="_channel.usersCount" tag="span" style="margin-left: 4px;">
+					<template #n>
+						<b>{{ channel.usersCount }}</b>
+					</template>
+				</i18n-t>
+			</div>
+			<div>
+				<Fa :icon="faPencilAlt" fixed-width/>
+				<i18n-t keypath="_channel.notesCount" tag="span" style="margin-left: 4px;">
+					<template #n>
+						<b>{{ channel.notesCount }}</b>
+					</template>
+				</i18n-t>
+			</div>
+		</div>
+	</div>
+	<article v-if="channel.description">
+		<p :title="channel.description">{{ channel.description.length > 85 ? channel.description.slice(0, 85) + '…' : channel.description }}</p>
+	</article>
+	<footer>
+		<span v-if="channel.lastNotedAt">
+			{{ $t('updatedAt') }}: <MkTime :time="channel.lastNotedAt"/>
+		</span>
+	</footer>
+</MkA>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { faSatelliteDish, faUsers, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
+
+export default defineComponent({
+	props: {
+		channel: {
+			type: Object,
+			required: true
+		},
+	},
+
+	computed: {
+		bannerStyle() {
+			if (this.channel.bannerUrl) {
+				return { backgroundImage: `url(${this.channel.bannerUrl})` };
+			} else {
+				return { backgroundColor: '#4c5e6d' };
+			}
+		}
+	},
+
+	data() {
+		return {
+			faSatelliteDish, faUsers, faPencilAlt,
+		};
+	},
+});
+</script>
+
+<style lang="scss" scoped>
+.eftoefju {
+	display: block;
+	overflow: hidden;
+	width: 100%;
+
+	&:hover {
+		text-decoration: none;
+	}
+
+	> .banner {
+		position: relative;
+		width: 100%;
+		height: 200px;
+		background-position: center;
+		background-size: cover;
+
+		> .fade {
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			height: 64px;
+			background: linear-gradient(0deg, var(--panel), var(--X15));
+		}
+
+		> .name {
+			position: absolute;
+			top: 16px;
+			left: 16px;
+			padding: 12px 16px;
+			background: rgba(0, 0, 0, 0.7);
+			color: #fff;
+			font-size: 1.2em;
+		}
+
+		> .status {
+			position: absolute;
+			z-index: 1;
+			bottom: 16px;
+			right: 16px;
+			padding: 8px 12px;
+			font-size: 80%;
+			background: rgba(0, 0, 0, 0.7);
+			border-radius: 6px;
+			color: #fff;
+		}
+	}
+
+	> article {
+		padding: 16px;
+
+		> p {
+			margin: 0;
+			font-size: 1em;
+		}
+	}
+
+	> footer {
+		padding: 12px 16px;
+		border-top: solid 1px var(--divider);
+
+		> span {
+			opacity: 0.7;
+			font-size: 0.9em;
+		}
+	}
+
+	@media (max-width: 550px) {
+		font-size: 0.9em;
+
+		> .banner {
+			height: 80px;
+
+			> .status {
+				display: none;
+			}
+		}
+
+		> article {
+			padding: 12px;
+		}
+
+		> footer {
+			display: none;
+		}
+	}
+
+	@media (max-width: 500px) {
+		font-size: 0.8em;
+
+		> .banner {
+			height: 70px;
+		}
+
+		> article {
+			padding: 8px;
+		}
+	}
+}
+
+</style>
--- a/src/client/components/code-core.vue
+++ b/src/client/components/code-core.vue
@ -1,16 +1,14 @@
 <template>
-<x-prism :inline="inline" :language="prismLang">{{ code }}</x-prism>
+<code v-if="inline" v-html="html" :class="`language-${prismLang}`"></code>
+<pre v-else :class="`language-${prismLang}`"><code v-html="html" :class="`language-${prismLang}`"></code></pre>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import 'prismjs';
 import 'prismjs/themes/prism-okaidia.css';
-import XPrism from 'vue-prism-component';
-export default Vue.extend({
-	components: {
-		XPrism
-	},
+
+export default defineComponent({
 	props: {
 		code: {
 			type: String,
@ -28,6 +26,9 @@ export default Vue.extend({
 	computed: {
 		prismLang() {
 			return Prism.languages[this.lang] ? this.lang : 'js';
+		},
+		html() {
+			return Prism.highlight(this.code, Prism.languages[this.prismLang], this.prismLang);
 		}
 	}
 });
--- a/src/client/components/code.vue
+++ b/src/client/components/code.vue
@ -1,12 +1,13 @@
 <template>
-<x-code :code="code" :lang="lang" :inline="inline"/>
+<XCode :code="code" :lang="lang" :inline="inline"/>
 </template>

 <script lang="ts">
-import Vue from 'vue';
-export default Vue.extend({
+import { defineComponent, defineAsyncComponent } from 'vue';
+
+export default defineComponent({
 	components: {
-		XCode: () => import('./code-core.vue').then(m => m.default)
+		XCode: defineAsyncComponent(() => import('./code-core.vue'))
 	},
 	props: {
 		code: {
--- a/src/client/components/cw-button.vue
+++ b/src/client/components/cw-button.vue
@ -1,16 +1,16 @@
 <template>
-<button class="nrvgflfuaxwgkxoynpnumyookecqrrvh _button" @click="toggle">
-	<b>{{ value ? this.$t('_cw.hide') : this.$t('_cw.show') }}</b>
-	<span v-if="!value">{{ this.label }}</span>
+<button class="nrvgflfu _button" @click="toggle">
+	<b>{{ value ? $t('_cw.hide') : $t('_cw.show') }}</b>
+	<span v-if="!value">{{ label }}</span>
 </button>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { length } from 'stringz';
 import { concat } from '../../prelude/array';

-export default Vue.extend({
+export default defineComponent({
 	props: {
 		value: {
 			type: Boolean,
@ -36,14 +36,14 @@ export default Vue.extend({
 		length,

 		toggle() {
-			this.$emit('input', !this.value);
+			this.$emit('update:value', !this.value);
 		}
 	}
 });
 </script>

 <style lang="scss" scoped>
-.nrvgflfuaxwgkxoynpnumyookecqrrvh {
+.nrvgflfu {
 	display: inline-block;
 	padding: 4px 8px;
 	font-size: 0.7em;
--- a/src/client/components/date-separated-list.vue
+++ b/src/client/components/date-separated-list.vue
@ -1,22 +1,22 @@
 <template>
-<component :is="$store.state.device.animation ? 'transition-group' : 'div'" class="sqadhkmv" name="list" tag="div" :data-direction="direction" :data-reversed="reversed ? 'true' : 'false'">
+<transition-group class="sqadhkmv _list_" name="list" tag="div" :data-direction="direction" :data-reversed="reversed ? 'true' : 'false'">
 	<template v-for="(item, i) in items">
 		<slot :item="item"></slot>
 		<div class="separator" v-if="showDate(i, item)" :key="item.id + '_date'">
 			<p class="date">
-				<span><fa class="icon" :icon="faAngleUp"/>{{ getDateText(item.createdAt) }}</span>
-				<span>{{ getDateText(items[i + 1].createdAt) }}<fa class="icon" :icon="faAngleDown"/></span>
+				<span><Fa class="icon" :icon="faAngleUp"/>{{ getDateText(item.createdAt) }}</span>
+				<span>{{ getDateText(items[i + 1].createdAt) }}<Fa class="icon" :icon="faAngleDown"/></span>
 			</p>
 		</div>
 	</template>
-</component>
+</transition-group>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { faAngleUp, faAngleDown } from '@fortawesome/free-solid-svg-icons';

-export default Vue.extend({
+export default defineComponent({
 	props: {
 		items: {
 			type: Array,
@ -69,6 +69,10 @@ export default Vue.extend({

 <style lang="scss">
 .sqadhkmv {
+	> *:not(:last-child) {
+		margin-bottom: var(--margin);
+	}
+
 	> .list-move {
 		transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1);
 	}
@ -78,14 +82,14 @@ export default Vue.extend({
 	}

 	&[data-direction="up"] {
-		> .list-enter {
+		> .list-enter-from {
 			opacity: 0;
 			transform: translateY(64px);
 		}
 	}

 	&[data-direction="down"] {
-		> .list-enter {
+		> .list-enter-from {
 			opacity: 0;
 			transform: translateY(-64px);
 		}
--- a/src/client/components/dialog.vue
+++ b/src/client/components/dialog.vue
@ -1,31 +1,21 @@
 <template>
-<div class="mk-dialog" :class="{ iconOnly }">
-	<transition :name="$store.state.device.animation ? 'bg-fade' : ''" appear>
-		<div class="bg" ref="bg" @click="onBgClick" v-if="show"></div>
-	</transition>
-	<transition :name="$store.state.device.animation ? 'dialog' : ''" appear @after-leave="() => { destroyDom(); }">
-		<div class="main" ref="main" v-if="show">
-			<template v-if="type == 'signin'">
-				<mk-signin/>
-			</template>
-			<template v-else>
+<MkModal ref="modal" @click="done(true)" @closed="$emit('closed')">
+	<div class="mk-dialog">
 		<div class="icon" v-if="icon">
-					<fa :icon="icon"/>
+			<Fa :icon="icon"/>
 		</div>
-				<div class="icon" v-else-if="!input && !select && !user" :class="type">
-					<fa :icon="faCheck" v-if="type === 'success'"/>
-					<fa :icon="faTimesCircle" v-if="type === 'error'"/>
-					<fa :icon="faExclamationTriangle" v-if="type === 'warning'"/>
-					<fa :icon="faInfoCircle" v-if="type === 'info'"/>
-					<fa :icon="faQuestionCircle" v-if="type === 'question'"/>
-					<fa :icon="faSpinner" pulse v-if="type === 'waiting'"/>
+		<div class="icon" v-else-if="!input && !select" :class="type">
+			<Fa :icon="faCheck" v-if="type === 'success'"/>
+			<Fa :icon="faTimesCircle" v-if="type === 'error'"/>
+			<Fa :icon="faExclamationTriangle" v-if="type === 'warning'"/>
+			<Fa :icon="faInfoCircle" v-if="type === 'info'"/>
+			<Fa :icon="faQuestionCircle" v-if="type === 'question'"/>
+			<Fa :icon="faSpinner" pulse v-if="type === 'waiting'"/>
 		</div>
-				<header v-if="title" v-html="title"></header>
-				<header v-if="title == null && user">{{ $t('enterUsername') }}</header>
-				<div class="body" v-if="text" v-html="text"></div>
-				<mk-input v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder" @keydown="onInputKeydown"></mk-input>
-				<mk-input v-if="user" v-model="userInputValue" autofocus @keydown="onInputKeydown"><template #prefix>@</template></mk-input>
-				<mk-select v-if="select" v-model="selectedValue" autofocus>
+		<header v-if="title"><Mfm :text="title"/></header>
+		<div class="body" v-if="text"><Mfm :text="text"/></div>
+		<MkInput v-if="input" v-model:value="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder" @keydown="onInputKeydown"></MkInput>
+		<MkSelect v-if="select" v-model:value="selectedValue" autofocus>
 			<template v-if="select.items">
 				<option v-for="item in select.items" :value="item.value">{{ item.text }}</option>
 			</template>
@ -34,36 +24,33 @@
 					<option v-for="item in groupedItem.items" :value="item.value">{{ item.text }}</option>
 				</optgroup>
 			</template>
-				</mk-select>
-				<div class="buttons" v-if="!iconOnly && (showOkButton || showCancelButton) && !actions">
-					<mk-button inline @click="ok" v-if="showOkButton" primary :autofocus="!input && !select && !user" :disabled="!canOk">{{ (showCancelButton || input || select || user) ? $t('ok') : $t('gotIt') }}</mk-button>
-					<mk-button inline @click="cancel" v-if="showCancelButton || input || select || user">{{ $t('cancel') }}</mk-button>
+		</MkSelect>
+		<div class="buttons" v-if="(showOkButton || showCancelButton) && !actions">
+			<MkButton inline @click="ok" v-if="showOkButton" primary :autofocus="!input && !select">{{ (showCancelButton || input || select) ? $t('ok') : $t('gotIt') }}</MkButton>
+			<MkButton inline @click="cancel" v-if="showCancelButton || input || select">{{ $t('cancel') }}</MkButton>
 		</div>
 		<div class="buttons" v-if="actions">
-					<mk-button v-for="action in actions" inline @click="() => { action.callback(); close(); }" :primary="action.primary" :key="action.text">{{ action.text }}</mk-button>
+			<MkButton v-for="action in actions" inline @click="() => { action.callback(); close(); }" :primary="action.primary" :key="action.text">{{ action.text }}</MkButton>
 		</div>
-			</template>
 	</div>
-	</transition>
-</div>
+</MkModal>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { faSpinner, faInfoCircle, faExclamationTriangle, faCheck } from '@fortawesome/free-solid-svg-icons';
 import { faTimesCircle, faQuestionCircle } from '@fortawesome/free-regular-svg-icons';
-import MkButton from './ui/button.vue';
-import MkInput from './ui/input.vue';
-import MkSelect from './ui/select.vue';
-import MkSignin from './signin.vue';
-import parseAcct from '../../misc/acct/parse';
+import MkModal from '@/components/ui/modal.vue';
+import MkButton from '@/components/ui/button.vue';
+import MkInput from '@/components/ui/input.vue';
+import MkSelect from '@/components/ui/select.vue';

-export default Vue.extend({
+export default defineComponent({
 	components: {
+		MkModal,
 		MkButton,
 		MkInput,
 		MkSelect,
-		MkSignin,
 	},

 	props: {
@ -86,9 +73,6 @@ export default Vue.extend({
 		select: {
 			required: false
 		},
-		user: {
-			required: false
-		},
 		icon: {
 			required: false
 		},
@ -107,87 +91,44 @@ export default Vue.extend({
 			type: Boolean,
 			default: true
 		},
-		iconOnly: {
-			type: Boolean,
-			default: false
-		},
-		autoClose: {
-			type: Boolean,
-			default: false
-		}
 	},

+	emits: ['done', 'closed'],
+
 	data() {
 		return {
-			show: true,
 			inputValue: this.input && this.input.default ? this.input.default : null,
-			userInputValue: null,
 			selectedValue: this.select ? this.select.default ? this.select.default : this.select.items ? this.select.items[0].value : this.select.groupedItems[0].items[0].value : null,
-			canOk: true,
 			faTimesCircle, faQuestionCircle, faSpinner, faInfoCircle, faExclamationTriangle, faCheck
 		};
 	},

-	watch: {
-		userInputValue() {
-			if (this.user) {
-				this.$root.api('users/show', parseAcct(this.userInputValue)).then(u => {
-					this.canOk = u != null;
-				}).catch(() => {
-					this.canOk = false;
-				});
-			}
-		}
-	},
-
 	mounted() {
-		if (this.user) this.canOk = false;
-
-		if (this.autoClose) {
-			setTimeout(() => {
-				this.close();
-			}, 1000);
-		}
-
 		document.addEventListener('keydown', this.onKeydown);
 	},

-	beforeDestroy() {
+	beforeUnmount() {
 		document.removeEventListener('keydown', this.onKeydown);
 	},

 	methods: {
+		done(canceled, result?) {
+			this.$emit('done', { canceled, result });
+			this.$refs.modal.close();
+		},
+
 		async ok() {
-			if (!this.canOk) return;
 			if (!this.showOkButton) return;

-			if (this.user) {
-				const user = await this.$root.api('users/show', parseAcct(this.userInputValue));
-				if (user) {
-					this.$emit('ok', user);
-					this.close();
-				}
-			} else {
 			const result =
 				this.input ? this.inputValue :
 				this.select ? this.selectedValue :
 				true;
-				this.$emit('ok', result);
-				this.close();
-			}
+			this.done(false, result);
 		},

 		cancel() {
-			this.$emit('cancel');
-			this.close();
-		},
-
-		close() {
-			if (!this.show) return;
-			this.show = false;
-			this.$el.style.pointerEvents = 'none';
-			(this.$refs.bg as any).style.pointerEvents = 'none';
-			(this.$refs.main as any).style.pointerEvents = 'none';
+			this.done(true);
 		},

 		onBgClick() {
@ -214,56 +155,12 @@ export default Vue.extend({
 </script>

 <style lang="scss" scoped>
-.dialog-enter-active, .dialog-leave-active {
-	transition: opacity 0.3s, transform 0.3s !important;
-}
-.dialog-enter, .dialog-leave-to {
-	opacity: 0;
-	transform: scale(0.9);
-}
-
-.bg-fade-enter-active, .bg-fade-leave-active {
-	transition: opacity 0.3s !important;
-}
-.bg-fade-enter, .bg-fade-leave-to {
-	opacity: 0;
-}
-
 .mk-dialog {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	position: fixed;
-	z-index: 30000;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-
-	&.iconOnly > .main {
-		min-width: 0;
-		width: initial;
-	}
-
-	> .bg {
-		display: block;
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(0,0,0,0.7);
-	}
-
-	> .main {
-		display: block;
-		position: fixed;
-		margin: auto;
+	position: relative;
 	padding: 32px;
 	min-width: 320px;
 	max-width: 480px;
 	box-sizing: border-box;
-		width: calc(100% - 32px);
 	text-align: center;
 	background: var(--panel);
 	border-radius: var(--radius);
@ -272,15 +169,15 @@ export default Vue.extend({
 		font-size: 32px;

 		&.success {
-				color: var(--accent);
+			color: var(--success);
 		}

 		&.error {
-				color: #ec4137;
+			color: var(--error);
 		}

 		&.warning {
-				color: #ecb637;
+			color: var(--warn);
 		}

 		> * {
@ -314,6 +211,5 @@ export default Vue.extend({
 			margin: 0 8px;
 		}
 	}
-	}
 }
 </style>
--- a/src/client/components/drive-file-thumbnail.vue
+++ b/src/client/components/drive-file-thumbnail.vue
@ -1,41 +1,20 @@
 <template>
-<div class="zdjebgpv" :class="{ detail }" ref="thumbnail" :style="`background-color: ${ background }`">
-	<img
-		:src="file.url"
-		:alt="file.name"
-		:title="file.name"
-		@load="onThumbnailLoaded"
-		v-if="detail && is === 'image'"/>
-	<video
-		:src="file.url"
-		ref="volumectrl"
-		preload="metadata"
-		controls
-		v-else-if="detail && is === 'video'"/>
-	<img :src="file.thumbnailUrl" @load="onThumbnailLoaded" :style="`object-fit: ${ fit }`" v-else-if="isThumbnailAvailable"/>
-	<fa :icon="faFileImage" class="icon" v-else-if="is === 'image'"/>
-	<fa :icon="faFileVideo" class="icon" v-else-if="is === 'video'"/>
-
-	<audio
-		:src="file.url"
-		ref="volumectrl"
-		preload="metadata"
-		controls
-		v-else-if="detail && is === 'audio'"/>
-	<fa :icon="faMusic" class="icon" v-else-if="is === 'audio' || is === 'midi'"/>
-
-	<fa :icon="faFileCsv" class="icon" v-else-if="is === 'csv'"/>
-	<fa :icon="faFilePdf" class="icon" v-else-if="is === 'pdf'"/>
-	<fa :icon="faFileAlt" class="icon" v-else-if="is === 'textfile'"/>
-	<fa :icon="faFileArchive" class="icon" v-else-if="is === 'archive'"/>
-	<fa :icon="faFile" class="icon" v-else/>
-
-	<fa :icon="faFilm" class="icon-sub" v-if="!detail && isThumbnailAvailable && is === 'video'"/>
+<div class="zdjebgpv" ref="thumbnail">
+	<ImgWithBlurhash v-if="isThumbnailAvailable" :hash="file.blurhash" :src="file.thumbnailUrl" :alt="file.name" :title="file.name" :style="`object-fit: ${ fit }`"/>
+	<Fa :icon="faFileImage" class="icon" v-else-if="is === 'image'"/>
+	<Fa :icon="faFileVideo" class="icon" v-else-if="is === 'video'"/>
+	<Fa :icon="faMusic" class="icon" v-else-if="is === 'audio' || is === 'midi'"/>
+	<Fa :icon="faFileCsv" class="icon" v-else-if="is === 'csv'"/>
+	<Fa :icon="faFilePdf" class="icon" v-else-if="is === 'pdf'"/>
+	<Fa :icon="faFileAlt" class="icon" v-else-if="is === 'textfile'"/>
+	<Fa :icon="faFileArchive" class="icon" v-else-if="is === 'archive'"/>
+	<Fa :icon="faFile" class="icon" v-else/>
+	<Fa :icon="faFilm" class="icon-sub" v-if="isThumbnailAvailable && is === 'video'"/>
 </div>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import {
 	faFile,
 	faFileAlt,
@ -47,8 +26,12 @@ import {
 	faFileArchive,
 	faFilm
 	} from '@fortawesome/free-solid-svg-icons';
+import ImgWithBlurhash from './img-with-blurhash.vue';

-export default Vue.extend({
+export default defineComponent({
+	components: {
+		ImgWithBlurhash
+	},
 	props: {
 		file: {
 			type: Object,
@ -59,11 +42,6 @@ export default Vue.extend({
 			required: false,
 			default: 'cover'
 		},
-		detail: {
-			type: Boolean,
-			required: false,
-			default: false
-		}
 	},
 	data() {
 		return {
@ -108,20 +86,12 @@ export default Vue.extend({
 				? (this.is === 'image' || this.is === 'video')
 				: false;
 		},
-		background(): string {
-			return this.file.properties.avgColor || 'transparent';
-		}
 	},
 	mounted() {
 		const audioTag = this.$refs.volumectrl as HTMLAudioElement;
 		if (audioTag) audioTag.volume = this.$store.state.device.mediaVolume;
 	},
 	methods: {
-		onThumbnailLoaded() {
-			if (this.file.properties.avgColor) {
-				this.$refs.thumbnail.style.backgroundColor = 'transparent';
-			}
-		},
 		volumechange() {
 			const audioTag = this.$refs.volumectrl as HTMLAudioElement;
 			this.$store.commit('device/set', { key: 'mediaVolume', value: audioTag.volume });
@ -132,14 +102,8 @@ export default Vue.extend({

 <style lang="scss" scoped>
 .zdjebgpv {
-	display: flex;
 	position: relative;

-	> img,
-	> .icon {
-		pointer-events: none;
-	}
-
 	> .icon-sub {
 		position: absolute;
 		width: 30%;
@ -153,37 +117,10 @@ export default Vue.extend({
 		margin: auto;
 	}

-	&:not(.detail) {
-		> img {
-			height: 100%;
-			width: 100%;
-			object-fit: cover;
-		}
-
 	> .icon {
+		pointer-events: none;
 		height: 65%;
 		width: 65%;
 	}
-
-		> video,
-		> audio {
-			width: 100%;
-		}
-	}
-
-	&.detail {
-		> .icon {
-			height: 100px;
-			width: 100px;
-			margin: 16px;
-		}
-
-		> *:not(.icon) {
-			max-height: 300px;
-			max-width: 100%;
-			height: 100%;
-			object-fit: contain;
-		}
-	}
 }
 </style>
--- a/src/client/components/drive-select-dialog.vue
+++ b/src/client/components/drive-select-dialog.vue
@ -0,0 +1,70 @@
+<template>
+<XModalWindow ref="dialog"
+	:width="800"
+	:height="500"
+	:with-ok-button="true"
+	:ok-button-disabled="(type === 'file') && (selected.length === 0)"
+	@click="cancel()"
+	@close="cancel()"
+	@ok="ok()"
+	@closed="$emit('closed')"
+>
+	<template #header>
+		{{ multiple ? ((type === 'file') ? $t('selectFiles') : $t('selectFolders')) : ((type === 'file') ? $t('selectFile') : $t('selectFolder')) }}
+		<span v-if="selected.length > 0" style="margin-left: 8px; opacity: 0.5;">({{ number(selected.length) }})</span>
+	</template>
+	<XDrive :multiple="multiple" @changeSelection="onChangeSelection" @selected="ok()" :select="type"/>
+</XModalWindow>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import XDrive from './drive.vue';
+import XModalWindow from '@/components/ui/modal-window.vue';
+import number from '@/filters/number';
+
+export default defineComponent({
+	components: {
+		XDrive,
+		XModalWindow,
+	},
+
+	props: {
+		type: {
+			type: String,
+			required: false,
+			default: 'file'
+		},
+		multiple: {
+			type: Boolean,
+			default: false
+		}
+	},
+
+	emits: ['done', 'closed'],
+
+	data() {
+		return {
+			selected: []
+		};
+	},
+
+	methods: {
+		ok() {
+			this.$emit('done', this.selected);
+			this.$refs.dialog.close();
+		},
+
+		cancel() {
+			this.$emit('done');
+			this.$refs.dialog.close();
+		},
+
+		onChangeSelection(xs) {
+			this.selected = xs;
+		},
+
+		number
+	}
+});
+</script>
--- a/src/client/components/drive-window.vue
+++ b/src/client/components/drive-window.vue
@ -1,53 +1,44 @@
 <template>
-<x-window ref="window" :width="800" :height="500" @closed="() => { $emit('closed'); destroyDom(); }" :with-ok-button="true" :ok-button-disabled="(type === 'file') && (selected.length === 0)" @ok="ok()">
+<XWindow ref="window"
+	:initial-width="800"
+	:initial-height="500"
+	:can-resize="true"
+	@closed="$emit('closed')"
+>
 	<template #header>
-		{{ multiple ? ((type === 'file') ? $t('selectFiles') : $t('selectFolders')) : ((type === 'file') ? $t('selectFile') : $t('selectFolder')) }}
-		<span v-if="selected.length > 0" style="margin-left: 8px; opacity: 0.5;">({{ selected.length | number }})</span>
+		{{ $t('drive') }}
 	</template>
-	<div>
-		<x-drive :multiple="multiple" @change-selection="onChangeSelection" :select="type"/>
-	</div>
-</x-window>
+	<XDrive :initial-folder="initialFolder"/>
+</XWindow>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import XDrive from './drive.vue';
-import XWindow from './window.vue';
+import XWindow from '@/components/ui/window.vue';

-export default Vue.extend({
+export default defineComponent({
 	components: {
 		XDrive,
 		XWindow,
 	},

 	props: {
-		type: {
-			type: String,
-			required: false,
-			default: 'file' 
+		initialFolder: {
+			type: Object,
+			required: false
 		},
-		multiple: {
-			type: Boolean,
-			default: false
-		}
 	},

+	emits: ['closed'],
+
 	data() {
 		return {
-			selected: []
 		};
 	},

 	methods: {
-		ok() {
-			this.$emit('selected', this.selected);
-			this.$refs.window.close();
-		},

-		onChangeSelection(xs) {
-			this.selected = xs;
-		}
 	}
 });
 </script>
--- a/src/client/components/drive.file.vue
+++ b/src/client/components/drive.file.vue
@ -1,7 +1,8 @@
 <template>
 <div class="ncvczrfv"
-	:data-is-selected="isSelected"
+	:class="{ isSelected }"
 	@click="onClick"
+	@contextmenu.stop="onContextmenu"
 	draggable="true"
 	@dragstart="onDragstart"
 	@dragend="onDragend"
@ -20,7 +21,7 @@
 		<p>{{ $t('nsfw') }}</p>
 	</div>

-	<x-file-thumbnail class="thumbnail" :file="file" fit="contain"/>
+	<MkDriveFileThumbnail class="thumbnail" :file="file" fit="contain"/>

 	<p class="name">
 		<span>{{ file.name.lastIndexOf('.') != -1 ? file.name.substr(0, file.name.lastIndexOf('.')) : file.name }}</span>
@ -30,17 +31,17 @@
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons';
-import copyToClipboard from '../scripts/copy-to-clipboard';
-//import updateAvatar from '../api/update-avatar';
-//import updateBanner from '../api/update-banner';
-import XFileThumbnail from './drive-file-thumbnail.vue';
 import { faDownload, faLink, faICursor, faTrashAlt } from '@fortawesome/free-solid-svg-icons';
+import copyToClipboard from '@/scripts/copy-to-clipboard';
+import MkDriveFileThumbnail from './drive-file-thumbnail.vue';
+import bytes from '../filters/bytes';
+import * as os from '@/os';

-export default Vue.extend({
+export default defineComponent({
 	components: {
-		XFileThumbnail
+		MkDriveFileThumbnail
 	},

 	props: {
@ -60,6 +61,8 @@ export default Vue.extend({
 		}
 	},

+	emits: ['chosen'],
+
 	data() {
 		return {
 			isDragging: false
@ -72,17 +75,13 @@ export default Vue.extend({
 			return this.$parent;
 		},
 		title(): string {
-			return `${this.file.name}\n${this.file.type} ${Vue.filter('bytes')(this.file.size)}`;
+			return `${this.file.name}\n${this.file.type} ${bytes(this.file.size)}`;
 		}
 	},

 	methods: {
-		onClick(ev) {
-			if (this.selectMode) {
-				this.$emit('chosen', this.file);
-			} else {
-				this.$root.menu({
-					items: [{
+		getMenu() {
+			return [{
 				text: this.$t('rename'),
 				icon: faICursor,
 				action: this.rename
@ -104,16 +103,26 @@ export default Vue.extend({
 			}, null, {
 				text: this.$t('delete'),
 				icon: faTrashAlt,
+				danger: true,
 				action: this.deleteFile
-					}],
-					source: ev.currentTarget || ev.target,
-				});
+			}];
+		},
+
+		onClick(ev) {
+			if (this.selectMode) {
+				this.$emit('chosen', this.file);
+			} else {
+				os.modalMenu(this.getMenu(), ev.currentTarget || ev.target);
 			}
 		},

+		onContextmenu(e) {
+			os.contextMenu(this.getMenu(), e);
+		},
+
 		onDragstart(e) {
 			e.dataTransfer.effectAllowed = 'move';
-			e.dataTransfer.setData('mk_drive_file', JSON.stringify(this.file));
+			e.dataTransfer.setData(_DATA_TRANSFER_DRIVE_FILE_, JSON.stringify(this.file));
 			this.isDragging = true;

 			// 親ブラウザに対して、ドラッグが開始されたフラグを立てる
@ -126,19 +135,8 @@ export default Vue.extend({
 			this.browser.isDragSource = false;
 		},

-		onThumbnailLoaded() {
-			if (this.file.properties.avgColor) {
-				anime({
-					targets: this.$refs.thumbnail,
-					backgroundColor: 'transparent', // TODO fade
-					duration: 100,
-					easing: 'linear'
-				});
-			}
-		},
-
 		rename() {
-			this.$root.dialog({
+			os.dialog({
 				title: this.$t('renameFile'),
 				input: {
 					placeholder: this.$t('inputNewFileName'),
@ -147,7 +145,7 @@ export default Vue.extend({
 				}
 			}).then(({ canceled, result: name }) => {
 				if (canceled) return;
-				this.$root.api('drive/files/update', {
+				os.api('drive/files/update', {
 					fileId: this.file.id,
 					name: name
 				});
@ -155,7 +153,7 @@ export default Vue.extend({
 		},

 		toggleSensitive() {
-			this.$root.api('drive/files/update', {
+			os.api('drive/files/update', {
 				fileId: this.file.id,
 				isSensitive: !this.file.isSensitive
 			});
@ -163,18 +161,15 @@ export default Vue.extend({

 		copyUrl() {
 			copyToClipboard(this.file.url);
-			this.$root.dialog({
-				type: 'success',
-				iconOnly: true, autoClose: true
-			});
+			os.success();
 		},

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

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

 		addApp() {
@ -182,17 +177,19 @@ export default Vue.extend({
 		},

 		async deleteFile() {
-			const { canceled } = await this.$root.dialog({
+			const { canceled } = await os.dialog({
 				type: 'warning',
 				text: this.$t('driveFileDeleteConfirm', { name: this.file.name }),
 				showCancelButton: true
 			});
 			if (canceled) return;

-			this.$root.api('drive/files/delete', {
+			os.api('drive/files/delete', {
 				fileId: this.file.id
 			});
-		}
+		},
+
+		bytes
 	}
 });
 </script>
@ -208,6 +205,10 @@ export default Vue.extend({
 		cursor: pointer;
 	}

+	> * {
+		pointer-events: none;
+	}
+
 	&:hover {
 		background: rgba(#000, 0.05);

@ -244,7 +245,7 @@ export default Vue.extend({
 		}
 	}

-	&[data-is-selected] {
+	&.isSelected {
 		background: var(--accent);

 		&:hover {
@ -332,7 +333,6 @@ export default Vue.extend({
 		width: 128px;
 		height: 128px;
 		margin: auto;
-		color: var(--driveFileIcon);
 	}

 	> .name {
--- a/src/client/components/drive.folder.vue
+++ b/src/client/components/drive.folder.vue
@ -1,7 +1,8 @@
 <template>
 <div class="rghtznwe"
-	:data-draghover="draghover"
+	:class="{ draghover }"
 	@click="onClick"
+	@contextmenu.stop="onContextmenu"
 	@mouseover="onMouseover"
 	@mouseout="onMouseout"
 	@dragover.prevent.stop="onDragover"
@ -14,8 +15,8 @@
 	:title="title"
 >
 	<p class="name">
-		<template v-if="hover"><fa :icon="faFolderOpen" fixed-width/></template>
-		<template v-if="!hover"><fa :icon="faFolder" fixed-width/></template>
+		<template v-if="hover"><Fa :icon="faFolderOpen" fixed-width/></template>
+		<template v-if="!hover"><Fa :icon="faFolder" fixed-width/></template>
 		{{ folder.name }}
 	</p>
 	<p class="upload" v-if="$store.state.settings.uploadFolder == folder.id">
@ -26,10 +27,12 @@
 </template>

 <script lang="ts">
-import Vue from 'vue';
-import { faFolder, faFolderOpen } from '@fortawesome/free-regular-svg-icons';
+import { defineComponent } from 'vue';
+import { faFolder, faFolderOpen, faTrashAlt, faWindowRestore } from '@fortawesome/free-regular-svg-icons';
+import * as os from '@/os';
+import { faICursor } from '@fortawesome/free-solid-svg-icons';

-export default Vue.extend({
+export default defineComponent({
 	props: {
 		folder: {
 			type: Object,
@ -47,6 +50,8 @@ export default Vue.extend({
 		}
 	},

+	emits: ['chosen'],
+
 	data() {
 		return {
 			hover: false,
@ -91,8 +96,8 @@ export default Vue.extend({
 			}

 			const isFile = e.dataTransfer.items[0].kind == 'file';
-			const isDriveFile = e.dataTransfer.types[0] == 'mk_drive_file';
-			const isDriveFolder = e.dataTransfer.types[0] == 'mk_drive_folder';
+			const isDriveFile = e.dataTransfer.types[0] == _DATA_TRANSFER_DRIVE_FILE_;
+			const isDriveFolder = e.dataTransfer.types[0] == _DATA_TRANSFER_DRIVE_FOLDER_;

 			if (isFile || isDriveFile || isDriveFolder) {
 				e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed == 'all' ? 'copy' : 'move';
@ -121,11 +126,11 @@ export default Vue.extend({
 			}

 			//#region ドライブのファイル
-			const driveFile = e.dataTransfer.getData('mk_drive_file');
+			const driveFile = e.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
 			if (driveFile != null && driveFile != '') {
 				const file = JSON.parse(driveFile);
 				this.browser.removeFile(file.id);
-				this.$root.api('drive/files/update', {
+				os.api('drive/files/update', {
 					fileId: file.id,
 					folderId: this.folder.id
 				});
@ -133,7 +138,7 @@ export default Vue.extend({
 			//#endregion

 			//#region ドライブのフォルダ
-			const driveFolder = e.dataTransfer.getData('mk_drive_folder');
+			const driveFolder = e.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FOLDER_);
 			if (driveFolder != null && driveFolder != '') {
 				const folder = JSON.parse(driveFolder);

@ -141,7 +146,7 @@ export default Vue.extend({
 				if (folder.id == this.folder.id) return;

 				this.browser.removeFolder(folder.id);
-				this.$root.api('drive/folders/update', {
+				os.api('drive/folders/update', {
 					folderId: folder.id,
 					parentId: this.folder.id
 				}).then(() => {
@ -149,15 +154,15 @@ export default Vue.extend({
 				}).catch(err => {
 					switch (err) {
 						case 'detected-circular-definition':
-							this.$root.dialog({
+							os.dialog({
 								title: this.$t('unableToProcess'),
 								text: this.$t('circularReferenceFolder')
 							});
 							break;
 						default:
-							this.$root.dialog({
+							os.dialog({
 								type: 'error',
-								text: this.$t('error')
+								text: this.$t('somethingHappened')
 							});
 					}
 				});
@ -167,7 +172,7 @@ export default Vue.extend({

 		onDragstart(e) {
 			e.dataTransfer.effectAllowed = 'move';
-			e.dataTransfer.setData('mk_drive_folder', JSON.stringify(this.folder));
+			e.dataTransfer.setData(_DATA_TRANSFER_DRIVE_FOLDER_, JSON.stringify(this.folder));
 			this.isDragging = true;

 			// 親ブラウザに対して、ドラッグが開始されたフラグを立てる
@ -189,7 +194,7 @@ export default Vue.extend({
 		},

 		rename() {
-			this.$root.dialog({
+			os.dialog({
 				title: this.$t('renameFolder'),
 				input: {
 					placeholder: this.$t('inputNewFolderName'),
@ -197,7 +202,7 @@ export default Vue.extend({
 				}
 			}).then(({ canceled, result: name }) => {
 				if (canceled) return;
-				this.$root.api('drive/folders/update', {
+				os.api('drive/folders/update', {
 					folderId: this.folder.id,
 					name: name
 				});
@ -205,7 +210,7 @@ export default Vue.extend({
 		},

 		deleteFolder() {
-			this.$root.api('drive/folders/delete', {
+			os.api('drive/folders/delete', {
 				folderId: this.folder.id
 			}).then(() => {
 				if (this.$store.state.settings.uploadFolder === this.folder.id) {
@ -217,14 +222,14 @@ export default Vue.extend({
 			}).catch(err => {
 				switch(err.id) {
 					case 'b0fc8a17-963c-405d-bfbc-859a487295e1':
-						this.$root.dialog({
+						os.dialog({
 							type: 'error',
 							title: this.$t('unableToDelete'),
 							text: this.$t('hasChildFilesOrFolders')
 						});
 						break;
 					default:
-						this.$root.dialog({
+						os.dialog({
 							type: 'error',
 							text: this.$t('unableToDelete')
 						});
@ -238,6 +243,28 @@ export default Vue.extend({
 				value: this.folder.id
 			});
 		},
+
+		onContextmenu(e) {
+			os.contextMenu([{
+				text: this.$t('openInWindow'),
+				icon: faWindowRestore,
+				action: () => {
+					os.popup(import('./drive-window.vue'), {
+						initialFolder: this.folder
+					}, {
+					}, 'closed');
+				}
+			}, null, {
+				text: this.$t('rename'),
+				icon: faICursor,
+				action: this.rename
+			}, null, {
+				text: this.$t('delete'),
+				icon: faTrashAlt,
+				danger: true,
+				action: this.deleteFolder
+			}], e);
+		},
 	}
 });
 </script>
@ -272,7 +299,7 @@ export default Vue.extend({
 		}
 	}

-	&[data-draghover] {
+	&.draghover {
 		&:after {
 			content: "";
 			pointer-events: none;
--- a/src/client/components/drive.nav-folder.vue
+++ b/src/client/components/drive.nav-folder.vue
@ -1,22 +1,23 @@
 <template>
 <div class="drylbebk"
-	:data-draghover="draghover"
+	:class="{ draghover }"
 	@click="onClick"
 	@dragover.prevent.stop="onDragover"
 	@dragenter="onDragenter"
 	@dragleave="onDragleave"
 	@drop.stop="onDrop"
 >
-	<i v-if="folder == null"><fa :icon="faCloud"/></i>
+	<i v-if="folder == null"><Fa :icon="faCloud"/></i>
 	<span>{{ folder == null ? $t('drive') : folder.name }}</span>
 </div>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { faCloud } from '@fortawesome/free-solid-svg-icons';
+import * as os from '@/os';

-export default Vue.extend({
+export default defineComponent({
 	props: {
 		folder: {
 			type: Object,
@ -58,8 +59,8 @@ export default Vue.extend({
 			}

 			const isFile = e.dataTransfer.items[0].kind == 'file';
-			const isDriveFile = e.dataTransfer.types[0] == 'mk_drive_file';
-			const isDriveFolder = e.dataTransfer.types[0] == 'mk_drive_folder';
+			const isDriveFile = e.dataTransfer.types[0] == _DATA_TRANSFER_DRIVE_FILE_;
+			const isDriveFolder = e.dataTransfer.types[0] == _DATA_TRANSFER_DRIVE_FOLDER_;

 			if (isFile || isDriveFile || isDriveFolder) {
 				e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed == 'all' ? 'copy' : 'move';
@ -90,11 +91,11 @@ export default Vue.extend({
 			}

 			//#region ドライブのファイル
-			const driveFile = e.dataTransfer.getData('mk_drive_file');
+			const driveFile = e.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
 			if (driveFile != null && driveFile != '') {
 				const file = JSON.parse(driveFile);
 				this.browser.removeFile(file.id);
-				this.$root.api('drive/files/update', {
+				os.api('drive/files/update', {
 					fileId: file.id,
 					folderId: this.folder ? this.folder.id : null
 				});
@ -102,13 +103,13 @@ export default Vue.extend({
 			//#endregion

 			//#region ドライブのフォルダ
-			const driveFolder = e.dataTransfer.getData('mk_drive_folder');
+			const driveFolder = e.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FOLDER_);
 			if (driveFolder != null && driveFolder != '') {
 				const folder = JSON.parse(driveFolder);
 				// 移動先が自分自身ならreject
 				if (this.folder && folder.id == this.folder.id) return;
 				this.browser.removeFolder(folder.id);
-				this.$root.api('drive/folders/update', {
+				os.api('drive/folders/update', {
 					folderId: folder.id,
 					parentId: this.folder ? this.folder.id : null
 				});
@ -125,7 +126,7 @@ export default Vue.extend({
 		pointer-events: none;
 	}

-	&[data-draghover] {
+	&.draghover {
 		background: #eee;
 	}

--- a/src/client/components/drive.vue
+++ b/src/client/components/drive.vue
@ -2,34 +2,35 @@
 <div class="yfudmmck">
 	<nav>
 		<div class="path" @contextmenu.prevent.stop="() => {}">
-			<x-nav-folder :class="{ current: folder == null }"/>
+			<XNavFolder :class="{ current: folder == null }"/>
 			<template v-for="f in hierarchyFolders">
-				<span class="separator" :key="f.id + ':separator'"><fa :icon="faAngleRight"/></span>
-				<x-nav-folder :folder="f" :key="f.id"/>
+				<span class="separator"><Fa :icon="faAngleRight"/></span>
+				<XNavFolder :folder="f"/>
 			</template>
-			<span class="separator" v-if="folder != null"><fa :icon="faAngleRight"/></span>
+			<span class="separator" v-if="folder != null"><Fa :icon="faAngleRight"/></span>
 			<span class="folder current" v-if="folder != null">{{ folder.name }}</span>
 		</div>
 	</nav>
-	<div class="main" :class="{ uploading: uploadings.length > 0, fetching }"
+	<div class="main _section" :class="{ uploading: uploadings.length > 0, fetching }"
 		ref="main"
 		@dragover.prevent.stop="onDragover"
 		@dragenter="onDragenter"
 		@dragleave="onDragleave"
 		@drop.prevent.stop="onDrop"
+		@contextmenu="onContextmenu"
 	>
 		<div class="contents" ref="contents">
 			<div class="folders" ref="foldersContainer" v-show="folders.length > 0">
-				<x-folder v-for="f in folders" :key="f.id" class="folder" :folder="f" :select-mode="select === 'folder'" :is-selected="selectedFolders.some(x => x.id === f.id)" @chosen="chooseFolder"/>
+				<XFolder v-for="f in folders" :key="f.id" class="folder" :folder="f" :select-mode="select === 'folder'" :is-selected="selectedFolders.some(x => x.id === f.id)" @chosen="chooseFolder"/>
 				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
 				<div class="padding" v-for="(n, i) in 16" :key="i"></div>
-				<mk-button ref="moreFolders" v-if="moreFolders">{{ $t('loadMore') }}</mk-button>
+				<MkButton ref="moreFolders" v-if="moreFolders">{{ $t('loadMore') }}</MkButton>
 			</div>
 			<div class="files" ref="filesContainer" v-show="files.length > 0">
-				<x-file v-for="file in files" :key="file.id" class="file" :file="file" :select-mode="select === 'file'" :is-selected="selectedFiles.some(x => x.id === file.id)" @chosen="chooseFile"/>
+				<XFile v-for="file in files" :key="file.id" class="file" :file="file" :select-mode="select === 'file'" :is-selected="selectedFiles.some(x => x.id === file.id)" @chosen="chooseFile"/>
 				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
 				<div class="padding" v-for="(n, i) in 16" :key="i"></div>
-				<mk-button ref="loadMoreFiles" @click="fetchMoreFiles" v-show="moreFiles">{{ $t('loadMore') }}</mk-button>
+				<MkButton ref="loadMoreFiles" @click="fetchMoreFiles" v-show="moreFiles">{{ $t('loadMore') }}</MkButton>
 			</div>
 			<div class="empty" v-if="files.length == 0 && folders.length == 0 && !fetching">
 				<p v-if="draghover">{{ $t('empty-draghover') }}</p>
@ -37,34 +38,33 @@
 				<p v-if="!draghover && folder != null">{{ $t('emptyFolder') }}</p>
 			</div>
 		</div>
-		<mk-loading v-if="fetching"/>
+		<MkLoading v-if="fetching"/>
 	</div>
 	<div class="dropzone" v-if="draghover"></div>
-	<x-uploader ref="uploader" @change="onChangeUploaderUploads" @uploaded="onUploaderUploaded"/>
 	<input ref="fileInput" type="file" accept="*/*" multiple="multiple" tabindex="-1" @change="onChangeFileInput"/>
 </div>
 </template>

 <script lang="ts">
-import Vue from 'vue';
-import { faAngleRight } from '@fortawesome/free-solid-svg-icons';
+import { defineComponent } from 'vue';
+import { faAngleRight, faFolderPlus, faICursor, faLink, faUpload } from '@fortawesome/free-solid-svg-icons';
 import XNavFolder from './drive.nav-folder.vue';
 import XFolder from './drive.folder.vue';
 import XFile from './drive.file.vue';
-import XUploader from './uploader.vue';
 import MkButton from './ui/button.vue';
+import * as os from '@/os';
+import { faTrashAlt } from '@fortawesome/free-regular-svg-icons';

-export default Vue.extend({
+export default defineComponent({
 	components: {
 		XNavFolder,
 		XFolder,
 		XFile,
-		XUploader,
 		MkButton,
 	},

 	props: {
-		initFolder: {
+		initialFolder: {
 			type: Object,
 			required: false
 		},
@ -85,6 +85,8 @@ export default Vue.extend({
 		}
 	},

+	emits: ['selected', 'change-selection', 'move-root', 'cd', 'open-folder'],
+
 	data() {
 		return {
 			/**
@ -100,7 +102,7 @@ export default Vue.extend({
 			hierarchyFolders: [],
 			selectedFiles: [],
 			selectedFolders: [],
-			uploadings: [],
+			uploadings: os.uploads,
 			connection: null,

 			/**
@ -140,7 +142,7 @@ export default Vue.extend({
 			});
 		}

-		this.connection = this.$root.stream.useSharedConnection('drive');
+		this.connection = os.stream.useSharedConnection('drive');

 		this.connection.on('fileCreated', this.onStreamDriveFileCreated);
 		this.connection.on('fileUpdated', this.onStreamDriveFileUpdated);
@ -149,8 +151,8 @@ export default Vue.extend({
 		this.connection.on('folderUpdated', this.onStreamDriveFolderUpdated);
 		this.connection.on('folderDeleted', this.onStreamDriveFolderDeleted);

-		if (this.initFolder) {
-			this.move(this.initFolder);
+		if (this.initialFolder) {
+			this.move(this.initialFolder);
 		} else {
 			this.fetch();
 		}
@ -164,7 +166,7 @@ export default Vue.extend({
 		}
 	},

-	beforeDestroy() {
+	beforeUnmount() {
 		this.connection.dispose();
 		this.ilFilesObserver.disconnect();
 	},
@ -204,14 +206,6 @@ export default Vue.extend({
 			this.removeFolder(folderId);
 		},

-		onChangeUploaderUploads(uploads) {
-			this.uploadings = uploads;
-		},
-
-		onUploaderUploaded(file) {
-			this.addFile(file, true);
-		},
-
 		onDragover(e): any {
 			// ドラッグ元が自分自身の所有するアイテムだったら
 			if (this.isDragSource) {
@ -221,8 +215,8 @@ export default Vue.extend({
 			}

 			const isFile = e.dataTransfer.items[0].kind == 'file';
-			const isDriveFile = e.dataTransfer.types[0] == 'mk_drive_file';
-			const isDriveFolder = e.dataTransfer.types[0] == 'mk_drive_folder';
+			const isDriveFile = e.dataTransfer.types[0] == _DATA_TRANSFER_DRIVE_FILE_;
+			const isDriveFolder = e.dataTransfer.types[0] == _DATA_TRANSFER_DRIVE_FOLDER_;

 			if (isFile || isDriveFile || isDriveFolder) {
 				e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed == 'all' ? 'copy' : 'move';
@ -253,12 +247,12 @@ export default Vue.extend({
 			}

 			//#region ドライブのファイル
-			const driveFile = e.dataTransfer.getData('mk_drive_file');
+			const driveFile = e.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_);
 			if (driveFile != null && driveFile != '') {
 				const file = JSON.parse(driveFile);
 				if (this.files.some(f => f.id == file.id)) return;
 				this.removeFile(file.id);
-				this.$root.api('drive/files/update', {
+				os.api('drive/files/update', {
 					fileId: file.id,
 					folderId: this.folder ? this.folder.id : null
 				});
@ -266,7 +260,7 @@ export default Vue.extend({
 			//#endregion

 			//#region ドライブのフォルダ
-			const driveFolder = e.dataTransfer.getData('mk_drive_folder');
+			const driveFolder = e.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FOLDER_);
 			if (driveFolder != null && driveFolder != '') {
 				const folder = JSON.parse(driveFolder);

@ -274,7 +268,7 @@ export default Vue.extend({
 				if (this.folder && folder.id == this.folder.id) return false;
 				if (this.folders.some(f => f.id == folder.id)) return false;
 				this.removeFolder(folder.id);
-				this.$root.api('drive/folders/update', {
+				os.api('drive/folders/update', {
 					folderId: folder.id,
 					parentId: this.folder ? this.folder.id : null
 				}).then(() => {
@ -282,15 +276,15 @@ export default Vue.extend({
 				}).catch(err => {
 					switch (err) {
 						case 'detected-circular-definition':
-							this.$root.dialog({
+							os.dialog({
 								title: this.$t('unableToProcess'),
 								text: this.$t('circularReferenceFolder')
 							});
 							break;
 						default:
-							this.$root.dialog({
+							os.dialog({
 								type: 'error',
-								text: this.$t('error')
+								text: this.$t('somethingHappened')
 							});
 					}
 				});
@ -303,19 +297,19 @@ export default Vue.extend({
 		},

 		urlUpload() {
-			this.$root.dialog({
+			os.dialog({
 				title: this.$t('uploadFromUrl'),
 				input: {
 					placeholder: this.$t('uploadFromUrlDescription')
 				}
 			}).then(({ canceled, result: url }) => {
 				if (canceled) return;
-				this.$root.api('drive/files/upload_from_url', {
+				os.api('drive/files/upload_from_url', {
 					url: url,
 					folderId: this.folder ? this.folder.id : undefined
 				});

-				this.$root.dialog({
+				os.dialog({
 					title: this.$t('uploadFromUrlRequested'),
 					text: this.$t('uploadFromUrlMayTakeTime')
 				});
@ -323,14 +317,14 @@ export default Vue.extend({
 		},

 		createFolder() {
-			this.$root.dialog({
+			os.dialog({
 				title: this.$t('createFolder'),
 				input: {
 					placeholder: this.$t('folderName')
 				}
 			}).then(({ canceled, result: name }) => {
 				if (canceled) return;
-				this.$root.api('drive/folders/create', {
+				os.api('drive/folders/create', {
 					name: name,
 					parentId: this.folder ? this.folder.id : undefined
 				}).then(folder => {
@ -340,7 +334,7 @@ export default Vue.extend({
 		},

 		renameFolder(folder) {
-			this.$root.dialog({
+			os.dialog({
 				title: this.$t('renameFolder'),
 				input: {
 					placeholder: this.$t('inputNewFolderName'),
@ -348,7 +342,7 @@ export default Vue.extend({
 				}
 			}).then(({ canceled, result: name }) => {
 				if (canceled) return;
-				this.$root.api('drive/folders/update', {
+				os.api('drive/folders/update', {
 					folderId: folder.id,
 					name: name
 				}).then(folder => {
@ -359,7 +353,7 @@ export default Vue.extend({
 		},

 		deleteFolder(folder) {
-			this.$root.api('drive/folders/delete', {
+			os.api('drive/folders/delete', {
 				folderId: folder.id
 			}).then(() => {
 				// 削除時に親フォルダに移動
@ -367,14 +361,14 @@ export default Vue.extend({
 			}).catch(err => {
 				switch(err.id) {
 					case 'b0fc8a17-963c-405d-bfbc-859a487295e1':
-						this.$root.dialog({
+						os.dialog({
 							type: 'error',
 							title: this.$t('unableToDelete'),
 							text: this.$t('hasChildFilesOrFolders')
 						});
 						break;
 					default:
-						this.$root.dialog({
+						os.dialog({
 							type: 'error',
 							text: this.$t('unableToDelete')
 						});
@ -390,7 +384,9 @@ export default Vue.extend({

 		upload(file, folder) {
 			if (folder && typeof folder == 'object') folder = folder.id;
-			(this.$refs.uploader as any).upload(file, folder);
+			os.upload(file, folder).then(res => {
+				this.addFile(res, true);
+			});
 		},

 		chooseFile(file) {
@ -441,7 +437,7 @@ export default Vue.extend({

 			this.fetching = true;

-			this.$root.api('drive/folders/show', {
+			os.api('drive/folders/show', {
 				folderId: target
 			}).then(folder => {
 				this.folder = folder;
@ -465,7 +461,7 @@ export default Vue.extend({

 			if (this.folders.some(f => f.id == folder.id)) {
 				const exist = this.folders.map(f => f.id).indexOf(folder.id);
-				Vue.set(this.folders, exist, folder);
+				this.folders[exist] = folder;
 				return;
 			}

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

 			if (this.files.some(f => f.id == file.id)) {
 				const exist = this.files.map(f => f.id).indexOf(file.id);
-				Vue.set(this.files, exist, file);
+				this.files[exist] = file;
 				return;
 			}

@ -543,7 +539,7 @@ export default Vue.extend({
 			const filesMax = 30;

 			// フォルダ一覧取得
-			this.$root.api('drive/folders', {
+			os.api('drive/folders', {
 				folderId: this.folder ? this.folder.id : null,
 				limit: foldersMax + 1
 			}).then(folders => {
@ -556,7 +552,7 @@ export default Vue.extend({
 			});

 			// ファイル一覧取得
-			this.$root.api('drive/files', {
+			os.api('drive/files', {
 				folderId: this.folder ? this.folder.id : null,
 				type: this.type,
 				limit: filesMax + 1
@ -587,7 +583,7 @@ export default Vue.extend({
 			const max = 30;

 			// ファイル一覧取得
-			this.$root.api('drive/files', {
+			os.api('drive/files', {
 				folderId: this.folder ? this.folder.id : null,
 				type: this.type,
 				untilId: this.files[this.files.length - 1].id,
@ -602,17 +598,57 @@ export default Vue.extend({
 				for (const x of files) this.appendFile(x);
 				this.fetching = false;
 			});
-		}
+		},
+
+		getMenu() {
+			return [{
+				text: this.$t('addFile'),
+				type: 'label'
+			}, {
+				text: this.$t('upload'),
+				icon: faUpload,
+				action: () => { this.selectLocalFile(); }
+			}, {
+				text: this.$t('fromUrl'),
+				icon: faLink,
+				action: () => { this.urlUpload(); }
+			}, null, {
+				text: this.folder ? this.folder.name : this.$t('drive'),
+				type: 'label'
+			}, this.folder ? {
+				text: this.$t('renameFolder'),
+				icon: faICursor,
+				action: () => { this.renameFolder(this.folder); }
+			} : undefined, this.folder ? {
+				text: this.$t('deleteFolder'),
+				icon: faTrashAlt,
+				action: () => { this.deleteFolder(this.folder); }
+			} : undefined, {
+				text: this.$t('createFolder'),
+				icon: faFolderPlus,
+				action: () => { this.createFolder(); }
+			}];
+		},
+
+		onContextmenu(e) {
+			os.contextMenu(this.getMenu(), e);
+		},
 	}
 });
 </script>

 <style lang="scss" scoped>
 .yfudmmck {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+
 	> nav {
 		display: block;
 		z-index: 2;
 		width: 100%;
+		padding: 0 8px;
+		box-sizing: border-box;
 		overflow: auto;
 		font-size: 0.9em;
 		box-shadow: 0 1px 0 var(--divider);
@ -666,7 +702,7 @@ export default Vue.extend({
 	}

 	> .main {
-		padding: 8px 0;
+		flex: 1;
 		overflow: auto;

 		&, * {
@ -734,11 +770,6 @@ export default Vue.extend({
 		pointer-events: none;
 	}

-	> .mk-uploader {
-		height: 100px;
-		padding: 16px;
-	}
-
 	> input {
 		display: none;
 	}
--- a/src/client/components/emoji-picker.vue
+++ b/src/client/components/emoji-picker.vue
@ -1,97 +1,142 @@
 <template>
-<x-popup :source="source" ref="popup" @closed="() => { $emit('closed'); destroyDom(); }">
-	<div class="omfetrab">
-		<header>
-			<button v-for="(category, i) in categories"
-				class="_button"
-				@click="go(category)"
-				:class="{ active: category.isActive }"
-				:key="i"
-			>
-				<fa :icon="category.icon" fixed-width/>
-			</button>
-		</header>
-
+<MkModal ref="modal" :src="src" @click="$refs.modal.close()" @closed="$emit('closed')">
+	<div class="omfetrab _popup" :class="['w' + width, 'h' + height, { big }]">
+		<input ref="search" class="search" :class="{ filled: q != null && q != '' }" v-model.trim="q" :placeholder="$t('search')" @paste.stop="paste" @keyup.enter="done()">
 		<div class="emojis">
-			<template v-if="categories[0].isActive">
-				<header class="category"><fa :icon="faHistory" fixed-width/> {{ $t('recentUsed') }}</header>
-				<div class="list">
-					<button v-for="(emoji, i) in ($store.state.device.recentEmojis || [])"
+			<section class="result">
+				<div v-if="searchResultCustom.length > 0">
+					<button v-for="emoji in searchResultCustom"
 						class="_button"
 						:title="emoji.name"
-						@click="chosen(emoji)"
-						:key="i"
+						@click="chosen(emoji, $event)"
+						:key="emoji"
+						tabindex="0"
 					>
-						<mk-emoji v-if="emoji.char != null" :emoji="emoji.char"/>
+						<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>
 						<img v-else :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
 					</button>
 				</div>
-
-				<header class="category"><fa :icon="faAsterisk" fixed-width/> {{ $t('customEmojis') }}</header>
-			</template>
-
-			<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)"
+				<div v-if="searchResultUnicode.length > 0">
+					<button v-for="emoji in searchResultUnicode"
 						class="_button"
 						:title="emoji.name"
-						@click="chosen(emoji)"
+						@click="chosen(emoji, $event)"
 						:key="emoji.name"
+						tabindex="0"
 					>
-						<mk-emoji :emoji="emoji.char"/>
+						<MkEmoji :emoji="emoji.char"/>
 					</button>
 				</div>
-			</template>
-			<template v-else>
-				<div v-for="(key, i) in Object.keys(customEmojis)" :key="i">
-					<header class="sub" v-if="key">{{ key }}</header>
-					<div class="list">
-						<button v-for="emoji in customEmojis[key]"
+			</section>
+
+			<div class="index">
+				<section v-if="showPinned">
+					<div>
+						<button v-for="emoji in pinned"
+							class="_button"
+							@click="chosen(emoji, $event)"
+							tabindex="0"
+						>
+							<MkEmoji :emoji="emoji" :normal="true"/>
+						</button>
+					</div>
+				</section>
+
+				<section>
+					<header class="_acrylic"><Fa :icon="faClock" fixed-width/> {{ $t('recentUsed') }}</header>
+					<div>
+						<button v-for="emoji in $store.state.device.recentlyUsedEmojis"
+							class="_button"
+							@click="chosen(emoji, $event)"
+							:key="emoji"
+						>
+							<MkEmoji :emoji="emoji" :normal="true"/>
+						</button>
+					</div>
+				</section>
+
+				<div class="arrow"><Fa :icon="faChevronDown"/></div>
+			</div>
+
+			<section v-for="category in customEmojiCategories" :key="'custom:' + category" class="custom">
+				<header class="_acrylic" v-appear="() => visibleCategories[category] = true">{{ category || $t('other') }}</header>
+				<div v-if="visibleCategories[category]">
+					<button v-for="emoji in customEmojis.filter(e => e.category === category)"
 						class="_button"
 						:title="emoji.name"
-							@click="chosen(emoji)"
+						@click="chosen(emoji, $event)"
 						:key="emoji.name"
 					>
 						<img :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
 					</button>
 				</div>
+			</section>
+
+			<section v-for="category in categories" :key="category.name" class="unicode">
+				<header class="_acrylic" v-appear="() => category.isActive = true"><Fa :icon="category.icon" fixed-width/> {{ category.name }}</header>
+				<div v-if="category.isActive">
+					<button v-for="emoji in emojilist.filter(e => e.category === category.name)"
+						class="_button"
+						:title="emoji.name"
+						@click="chosen(emoji, $event)"
+						:key="emoji.name"
+					>
+						<MkEmoji :emoji="emoji.char"/>
+					</button>
 				</div>
-			</template>
+			</section>
 		</div>
 	</div>
-</x-popup>
+</MkModal>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent, markRaw } from 'vue';
 import { emojilist } from '../../misc/emojilist';
-import { getStaticImageUrl } from '../scripts/get-static-image-url';
-import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faHistory, faUser } from '@fortawesome/free-solid-svg-icons';
+import { getStaticImageUrl } from '@/scripts/get-static-image-url';
+import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faClock, faUser, faChevronDown } from '@fortawesome/free-solid-svg-icons';
 import { faHeart, faFlag, faLaugh } from '@fortawesome/free-regular-svg-icons';
-import { groupByX } from '../../prelude/array';
-import XPopup from './popup.vue';
+import MkModal from '@/components/ui/modal.vue';
+import Particle from '@/components/particle.vue';
+import * as os from '@/os';
+import { isDeviceTouch } from '../scripts/is-device-touch';

-export default Vue.extend({
+export default defineComponent({
 	components: {
-		XPopup,
+		MkModal,
 	},

 	props: {
-		source: {
-			required: true
+		src: {
+			required: false
+		},
+		showPinned: {
+			required: false,
+			default: true
+		},
+		asReactionPicker: {
+			required: false
 		},
 	},

+	emits: ['done', 'closed'],
+
 	data() {
 		return {
-			emojilist,
+			emojilist: markRaw(emojilist),
 			getStaticImageUrl,
-			customEmojis: {},
-			faGlobe, faHistory,
+			pinned: this.$store.state.settings.reactions,
+			width: this.asReactionPicker ? this.$store.state.device.reactionPickerWidth : 3,
+			height: this.asReactionPicker ? this.$store.state.device.reactionPickerHeight : 2,
+			big: this.asReactionPicker ? isDeviceTouch : false,
+			customEmojiCategories: this.$store.getters['instance/emojiCategories'],
+			customEmojis: this.$store.state.instance.meta.emojis,
+			visibleCategories: {},
+			q: null,
+			searchResultCustom: [],
+			searchResultUnicode: [],
+			faGlobe, faClock, faChevronDown,
 			categories: [{
-				icon: faAsterisk,
-				isActive: true
-			}, {
 				name: 'face',
 				icon: faLaugh,
 				isActive: false
@ -132,130 +177,357 @@ export default Vue.extend({
 		};
 	},

-	created() {
-		let local = this.$store.state.instance.meta.emojis;
-		local = groupByX(local, (x: any) => x.category || '');
-		this.customEmojis = local;
+	watch: {
+		q() {
+			if (this.q == null || this.q === '') {
+				this.searchResultCustom = [];
+				this.searchResultUnicode = [];
+				return;
+			}
+
+			const q = this.q.replace(/:/g, '');
+
+			const searchCustom = () => {
+				const max = 8;
+				const emojis = this.customEmojis;
+				const matches = new Set();
+
+				const exactMatch = emojis.find(e => e.name === q);
+				if (exactMatch) matches.add(exactMatch);
+
+				if (q.includes(' ')) { // AND検索
+					const keywords = q.split(' ');
+
+					// 名前にキーワードが含まれている
+					for (const emoji of emojis) {
+						if (keywords.every(keyword => emoji.name.includes(keyword))) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+					if (matches.size >= max) return matches;
+
+					// 名前またはエイリアスにキーワードが含まれている
+					for (const emoji of emojis) {
+						if (keywords.every(keyword => emoji.name.includes(keyword) || emoji.aliases.some(alias => alias.includes(keyword)))) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+				} else {
+					for (const emoji of emojis) {
+						if (emoji.name.startsWith(q)) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+					if (matches.size >= max) return matches;
+
+					for (const emoji of emojis) {
+						if (emoji.aliases.some(alias => alias.startsWith(q))) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+					if (matches.size >= max) return matches;
+
+					for (const emoji of emojis) {
+						if (emoji.name.includes(q)) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+					if (matches.size >= max) return matches;
+
+					for (const emoji of emojis) {
+						if (emoji.aliases.some(alias => alias.includes(q))) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+				}
+
+				return matches;
+			};
+
+			const searchUnicode = () => {
+				const max = 8;
+				const emojis = this.emojilist;
+				const matches = new Set();
+
+				const exactMatch = emojis.find(e => e.name === q);
+				if (exactMatch) matches.add(exactMatch);
+
+				if (q.includes(' ')) { // AND検索
+					const keywords = q.split(' ');
+
+					// 名前にキーワードが含まれている
+					for (const emoji of emojis) {
+						if (keywords.every(keyword => emoji.name.includes(keyword))) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+					if (matches.size >= max) return matches;
+
+					// 名前またはエイリアスにキーワードが含まれている
+					for (const emoji of emojis) {
+						if (keywords.every(keyword => emoji.name.includes(keyword) || emoji.keywords.some(alias => alias.includes(keyword)))) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+				} else {
+					for (const emoji of emojis) {
+						if (emoji.name.startsWith(q)) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+					if (matches.size >= max) return matches;
+
+					for (const emoji of emojis) {
+						if (emoji.keywords.some(keyword => keyword.startsWith(q))) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+					if (matches.size >= max) return matches;
+
+					for (const emoji of emojis) {
+						if (emoji.name.includes(q)) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+					if (matches.size >= max) return matches;
+
+					for (const emoji of emojis) {
+						if (emoji.keywords.some(keyword => keyword.includes(q))) {
+							matches.add(emoji);
+							if (matches.size >= max) break;
+						}
+					}
+				}
+
+				return matches;
+			};
+
+			this.searchResultCustom = Array.from(searchCustom());
+			this.searchResultUnicode = Array.from(searchUnicode());
+		}
+	},
+
+	mounted() {
+		if (!os.isMobile) {
+			this.$refs.search.focus({
+				preventScroll: true
+			});
+		}
 	},

 	methods: {
-		go(category: any) {
-			this.goCategory(category.name);
+		getKey(emoji: any) {
+			return typeof emoji === 'string' ? emoji : (emoji.char || `:${emoji.name}:`);
 		},

-		goCategory(name: string) {
-			let matched = false;
-			for (const c of this.categories) {
-				c.isActive = c.name === name;
-				if (c.isActive) {
-					matched = true;
+		chosen(emoji: any, ev) {
+			if (ev) {
+				const el = ev.currentTarget || ev.target;
+				const rect = el.getBoundingClientRect();
+				const x = rect.left + (el.clientWidth / 2);
+				const y = rect.top + (el.clientHeight / 2);
+				os.popup(Particle, { x, y }, {}, 'end');
 			}
-			}
-			if (!matched) {
-				this.categories[0].isActive = true;
+
+			const key = this.getKey(emoji);
+			this.$emit('done', key);
+			this.$refs.modal.close();
+
+			// 最近使った絵文字更新
+			if (!this.pinned.includes(key)) {
+				let recents = this.$store.state.device.recentlyUsedEmojis;
+				recents = recents.filter((e: any) => e !== key);
+				recents.unshift(key);
+				this.$store.commit('device/set', { key: 'recentlyUsedEmojis', value: recents.splice(0, 16) });
 			}
 		},

-		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));
+		paste(event) {
+			const paste = (event.clipboardData || window.clipboardData).getData('text');
+			if (this.done(paste)) {
+				event.preventDefault();
+			}
 		},

-		close() {
-			this.$refs.popup.close();
+		done(query) {
+			if (query == null) query = this.q;
+			if (query == null) return;
+			const q = query.replace(/:/g, '');
+			const exactMatchCustom = this.customEmojis.find(e => e.name === q);
+			if (exactMatchCustom) {
+				this.chosen(exactMatchCustom);
+				return true;
 			}
+			const exactMatchUnicode = this.emojilist.find(e => e.char === q || e.name === q);
+			if (exactMatchUnicode) {
+				this.chosen(exactMatchUnicode);
+				return true;
+			}
+			if (this.searchResultCustom.length > 0) {
+				this.chosen(this.searchResultCustom[0]);
+				return true;
+			}
+			if (this.searchResultUnicode.length > 0) {
+				this.chosen(this.searchResultUnicode[0]);
+				return true;
+			}
+		},
 	}
 });
 </script>

 <style lang="scss" scoped>
 .omfetrab {
-	width: 350px;
+	$pad: 8px;
+	--eachSize: 40px;

-	> header {
 	display: flex;
+	flex-direction: column;
+	contain: content;

-		> button {
-			flex: 1;
-			padding: 10px 0;
-			font-size: 16px;
-			transition: color 0.2s ease;
-
-			&:hover {
-				color: var(--textHighlighted);
-				transition: color 0s;
+	&.big {
+		--eachSize: 44px;
 	}

-			&.active {
-				color: var(--accent);
-				transition: color 0s;
+	&.w1 {
+		width: calc((var(--eachSize) * 5) + (#{$pad} * 2));
 	}
+
+	&.w2 {
+		width: calc((var(--eachSize) * 6) + (#{$pad} * 2));
+	}
+
+	&.w3 {
+		width: calc((var(--eachSize) * 7) + (#{$pad} * 2));
+	}
+
+	&.h1 {
+		--height: calc((var(--eachSize) * 4) + (#{$pad} * 2));
+	}
+
+	&.h2 {
+		--height: calc((var(--eachSize) * 6) + (#{$pad} * 2));
+	}
+
+	&.h3 {
+		--height: calc((var(--eachSize) * 8) + (#{$pad} * 2));
+	}
+
+	> .search {
+		width: 100%;
+		padding: 12px;
+		box-sizing: border-box;
+		font-size: 1em;
+		outline: none;
+		border: none;
+		background: transparent;
+		color: var(--fg);
+
+		&:not(.filled) {
+			order: 1;
+			z-index: 2;
+			box-shadow: 0px -1px 0 0px var(--divider);
 		}
 	}

 	> .emojis {
-		height: 300px;
+		height: var(--height);
 		overflow-y: auto;
 		overflow-x: hidden;

-		> header.category {
+		scrollbar-width: none;
+
+		&::-webkit-scrollbar {
+			display: none;
+		}
+
+		> .index {
+			min-height: var(--height);
+			position: relative;
+			border-bottom: solid 1px var(--divider);
+				
+			> .arrow {
+				position: absolute;
+				bottom: 0;
+				left: 0;
+				width: 100%;
+				padding: 16px 0;
+				text-align: center;
+				opacity: 0.5;
+				pointer-events: none;
+			}
+		}
+
+		section {
+			> header {
 				position: sticky;
 				top: 0;
 				left: 0;
 				z-index: 1;
 				padding: 8px;
-			background: var(--panel);
 				font-size: 12px;
 			}

-		header.sub {
-			padding: 4px 8px;
-			font-size: 12px;
-		}
-
-		div.list {
-			display: grid;
-			grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
-			gap: 4px;
-			padding: 8px;
+			> div {
+				padding: $pad;

 				> button {
 					position: relative;
 					padding: 0;
-				width: 100%;
+					width: var(--eachSize);
+					height: var(--eachSize);
+					border-radius: 4px;

-				&:before {
-					content: '';
-					display: block;
-					width: 1px;
-					height: 0;
-					padding-bottom: 100%;
+					&:focus {
+						outline: solid 2px var(--focus);
+						z-index: 1;
 					}

 					&:hover {
-					> * {
-						transform: scale(1.2);
-						transition: transform 0s;
+						background: rgba(0, 0, 0, 0.05);
 					}
+
+					&:active {
+						background: var(--accent);
+						box-shadow: inset 0 0.15em 0.3em rgba(27, 31, 35, 0.15);
 					}

 					> * {
-					position: absolute;
-					top: 0;
-					left: 0;
-					width: 100%;
-					height: 100%;
-					object-fit: contain;
-					font-size: 28px;
-					transition: transform 0.2s ease;
+						font-size: 24px;
+						height: 1.25em;
+						vertical-align: -.25em;
 						pointer-events: none;
 					}
 				}
 			}
+
+			&.result {
+				border-bottom: solid 1px var(--divider);
+
+				&:empty {
+					display: none;
+				}
+			}
+
+			&.unicode {
+				min-height: 384px;
+			}
+
+			&.custom {
+				min-height: 64px;
+			}
+		}
 	}
 }
 </style>
--- a/src/client/components/emoji.vue
+++ b/src/client/components/emoji.vue
@ -2,23 +2,19 @@
 <img v-if="customEmoji" class="mk-emoji custom" :class="{ normal, noStyle }" :src="url" :alt="alt" :title="alt"/>
 <img v-else-if="char && !useOsNativeEmojis" class="mk-emoji" :src="url" :alt="alt" :title="alt"/>
 <span v-else-if="char && useOsNativeEmojis">{{ char }}</span>
-<span v-else>:{{ name }}:</span>
+<span v-else>{{ emoji }}</span>
 </template>

 <script lang="ts">
-import Vue from 'vue';
-import { getStaticImageUrl } from '../scripts/get-static-image-url';
+import { defineComponent } from 'vue';
+import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import { twemojiSvgBase } from '../../misc/twemoji-base';

-export default Vue.extend({
+export default defineComponent({
 	props: {
-		name: {
-			type: String,
-			required: false
-		},
 		emoji: {
 			type: String,
-			required: false
+			required: true
 		},
 		normal: {
 			type: Boolean,
@ -49,6 +45,10 @@ export default Vue.extend({
 	},

 	computed: {
+		isCustom(): boolean {
+			return this.emoji.startsWith(':');
+		},
+
 		alt(): string {
 			return this.customEmoji ? `:${this.customEmoji.name}:` : this.char;
 		},
@ -68,8 +68,8 @@ export default Vue.extend({
 	watch: {
 		ce: {
 			handler() {
-				if (this.name) {
-					const customEmoji = this.ce.find(x => x.name == this.name);
+				if (this.isCustom) {
+					const customEmoji = this.ce.find(x => x.name === this.emoji.substr(1, this.emoji.length - 2));
 					if (customEmoji) {
 						this.customEmoji = customEmoji;
 						this.url = this.$store.state.device.disableShowingAnimatedImages
@ -83,7 +83,7 @@ export default Vue.extend({
 	},

 	created() {
-		if (!this.name) {
+		if (!this.isCustom) {
 			this.char = this.emoji;
 		}

--- a/src/client/components/error.vue
+++ b/src/client/components/error.vue
@ -1,17 +1,19 @@
 <template>
-<div class="mjndxjcg _panel">
+<transition :name="$store.state.device.animation ? 'zoom' : ''" appear>
+	<div class="mjndxjcg">
 		<img src="https://xn--931a.moe/assets/error.jpg" class="_ghost"/>
-	<p><fa :icon="faExclamationTriangle"/> {{ $t('error') }}</p>
-	<mk-button @click="() => $emit('retry')" class="button">{{ $t('retry') }}</mk-button>
-</div>
+		<p><Fa :icon="faExclamationTriangle"/> {{ $t('somethingHappened') }}</p>
+		<MkButton @click="() => $emit('retry')" class="button">{{ $t('retry') }}</MkButton>
+	</div>
+</transition>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import MkButton from './ui/button.vue';

-export default Vue.extend({
+export default defineComponent({
 	components: {
 		MkButton,
 	},
@ -38,7 +40,7 @@ export default Vue.extend({

 	> img {
 		vertical-align: bottom;
-		height: 150px;
+		height: 128px;
 		margin-bottom: 16px;
 		border-radius: 16px;
 	}
--- a/src/client/components/file-type-icon.vue
+++ b/src/client/components/file-type-icon.vue
@ -1,14 +1,15 @@
 <template>
 <span class="mk-file-type-icon">
-	<template v-if="kind == 'image'"><fa :icon="faFileImage"/></template>
+	<template v-if="kind == 'image'"><Fa :icon="faFileImage"/></template>
 </span>
 </template>

 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { faFileImage } from '@fortawesome/free-solid-svg-icons';
+import * as os from '@/os';

-export default Vue.extend({
+export default defineComponent({
 	props: {
 		type: {
 			type: String,
--- a/Show More
+++ b/Show More