4.17.1

Fix bug
2018-07-11 14:33:16 +09:00 · 2018-07-11 14:33:03 +09:00 · 2018-07-11 14:19:55 +09:00 · 2018-07-11 14:10:01 +09:00 · 2018-07-11 14:09:25 +09:00 · 2018-07-11 14:08:18 +09:00
561 changed files with 33696 additions and 10783 deletions
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -1,3 +1,9 @@
+# インスタンス名
+name:
+
+# インスタンスの紹介
+description:
+
 # サーバーのメンテナ情報
 maintainer:
  # メンテナの名前
@@ -6,13 +12,19 @@ maintainer:
  # メンテナの連絡先(URLかmailto形式のURL)
  url:

+  # レポジトリのURL
+  repository_url:
+
+  # フィードバックのURL(issueなど)
+  feedback_url:
+
 # (Misskeyを動かす)URL
 url:

 # 待受ポート
 port:

-# TLSの設定(利用しない場合は省略してください)
+# TLSの設定(利用しない場合はフィールドごと削除してください)
 https:
  # 証明書のパス...
  key:
@@ -37,7 +49,7 @@ recaptcha:
  site_key:
  secret_key:

-# ServiceWrokerの設定
+# ServiceWorkerの設定
 sw:
  # VAPIDの公開鍵
  public_key:
@@ -55,3 +67,7 @@ twitter:

  # インテグレーション用アプリのコンシューマーシークレット
  consumer_secret:
+
+# true にすると、リモートのファイルをキャッシュしなくなります(直リンクします)。
+# ストレージ容量を節約することができますが、「リモートメディアを表示しない」設定をオンにしているユーザーは、リモートの画像などは見えなくなります。
+preventCache: false
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,5 @@
 *.svg -diff -text
 *.psd -diff -text
 *.ai -diff -text
+yarn.lock -diff -text
+package-lock.json -diff -text
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,4 @@ npm-debug.log
 *.pem
 run.bat
 api-docs.json
-package-lock.json
-yarn.lock
+*.log
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1 @@
-package-lock = false
+save-exact=true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,28 @@
+ChangeLog
+=========
+
+破壊的変更のみ記載。
+
+This document describes breaking changes only.
+
+4.0.0
+-----
+
+オセロがリバーシに変更されました。
+
+Othello is now Reversi.
+
+### Migration
+
+MongoDBの、`othelloGames`と`othelloMatchings`コレクションをそれぞれ`reversiGames`と`reversiMatchings`にリネームしてください。
+
+You need to rename `othelloGames` and `othelloMatchings` MongoDB collections to `reversiGames` and `reversiMatchings`.
+
+3.0.0
+-----
+
+### Migration
+
+起動する前に、`node cli/recount-stats`してください。
+
+Please run `node cli/recount-stats` before launch.
--- a/README.md
+++ b/README.md
@@ -5,27 +5,29 @@

 [![][travis-badge]][travis-link]
 [![][dependencies-badge]][dependencies-link]
-[![][himawari-badge]][himasaku]
-[![][sakurako-badge]][himasaku]
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Greenkeeper badge](https://badges.greenkeeper.io/syuilo/misskey.svg)](https://greenkeeper.io/)

 > Lead Maintainer: [syuilo][syuilo-link]

 **[Misskey](https://misskey.xyz)** is a completely open source,
-ultimately sophisticated new type of mini-blog based SNS.
+ultimately sophisticated professional microblogging software.

 <a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>

+![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg)
+
 :sparkles: Features
 ----------------------------------------------------------------
 * Reactions
 * User lists
+* Customizable column view (called MisskeyDeck)
+  * and widgets!
 * Private messages
 * Mute
-* Real time contents
+* Real-time timelines
 * ActivityPub compatible

-and more! You can touch with your own eyes at [misskey.xyz](https://misskey.xyz).
+and more! You can see it with your own eyes at [misskey.xyz](https://misskey.xyz).

 :package: Create your instance
 ----------------------------------------------------------------
@@ -42,27 +44,15 @@ If you want to...

 :heart: Backers & Sponsors
 ----------------------------------------------------------------
-[![Backers][backers-image]][support-url]
-[![Sponsors][sponsors-image]][support-url]
-
-:mortar_board: Notable contributors
----------------------------------------------------------------
-| ![syuilo][syuilo-icon] | ![Morisawa Aya][ayamorisawa-icon] | ![otofune][otofune-icon] | ![akihikodaki][akihikodaki-icon] | ![tamaina][tamaina-icon] | ![rinsuki][rinsuki-icon] |
-|:-:|:-:|:-:|:-:|:-:|:-:|
-| [syuilo][syuilo-link]<br>Owner | [Aya Morisawa][ayamorisawa-link]<br>Collaborator | [otofune][otofune-link]<br>Collaborator | [akihikodaki][akihikodaki-link] | [tamaina][tamaina-link] | [rinsuki][rinsuki-link] |
-
-[List of all contributors](https://github.com/syuilo/misskey/graphs/contributors)
-
-### :earth_americas: Translators
-| ![][mirro-san-icon] | ![][Conan-kun-icon] | ![][m4sk1n-icon] |
-|:-:|:-:|:-:|
-| [Mirro][mirro-san-link]<br>English, French | [Asriel][Conan-kun-link]<br>English, French | [Marcin Mikołajczak][m4sk1n-link]<br>Polish |
+| ![][nagarus-icon] | ![][dansup-icon] |
+|:-:|:-:|
+| [nagarus][nagarus-link] | [dansup][dansup-link] |

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

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

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

@@ -72,9 +62,6 @@ Misskey is an open-source software licensed under [GNU AGPLv3](LICENSE).
 [travis-badge]:       http://img.shields.io/travis/syuilo/misskey/master.svg?style=flat-square
 [dependencies-link]:  https://david-dm.org/syuilo/misskey
 [dependencies-badge]: https://img.shields.io/david/syuilo/misskey.svg?style=flat-square
-[himasaku]:           https://himasaku.net
-[himawari-badge]:     https://img.shields.io/badge/%E5%8F%A4%E8%B0%B7-%E5%90%91%E6%97%A5%E8%91%B5-1684c5.svg?style=flat-square
-[sakurako-badge]:     https://img.shields.io/badge/%E5%A4%A7%E5%AE%A4-%E6%AB%BB%E5%AD%90-efb02a.svg?style=flat-square

 [backer-url]: #backers
 [backer-badge]: https://opencollective.com/misskey/backers/badge.svg
@@ -84,23 +71,11 @@ Misskey is an open-source software licensed under [GNU AGPLv3](LICENSE).
 [sponsors-image]: https://opencollective.com/misskey/sponsors.svg
 [support-url]: https://opencollective.com/misskey#support

-<!-- Contributors Info -->
 [syuilo-link]:      https://syuilo.com
 [syuilo-icon]:      https://avatars2.githubusercontent.com/u/4439005?v=3&s=70
-[ayamorisawa-link]: https://github.com/ayamorisawa
-[ayamorisawa-icon]: https://avatars0.githubusercontent.com/u/10798641?v=3&s=70
-[otofune-link]:     https://github.com/otofune
-[otofune-icon]:     https://avatars0.githubusercontent.com/u/15062473?v=3&s=70
-[akihikodaki-link]: https://github.com/akihikodaki
-[akihikodaki-icon]: https://avatars2.githubusercontent.com/u/17036990?s=70&v=4
-[rinsuki-link]:     https://github.com/rinsuki
-[rinsuki-icon]:     https://avatars0.githubusercontent.com/u/6533808?s=70&v=4
-[tamaina-link]:     https://github.com/tamaina
-[tamaina-icon]:     https://avatars1.githubusercontent.com/u/7973572?s=70&v=4

-[mirro-san-link]:   https://github.com/mirro-san
-[mirro-san-icon]:   https://avatars1.githubusercontent.com/u/17948612?s=70&v=4
-[Conan-kun-link]:   https://github.com/Conan-kun
-[Conan-kun-icon]:   https://avatars3.githubusercontent.com/u/30003708?s=70&v=4
-[m4sk1n-link]:      https://github.com/m4sk1n
-[m4sk1n-icon]:      https://avatars3.githubusercontent.com/u/21127288?s=70&v=4
+[nagarus-link]: https://www.patreon.com/user/creators?u=11601413
+[nagarus-icon]: https://c10.patreonusercontent.com/3/eyJ2IjoiMSIsInciOjIwMH0%3D/patreon-media/user/11601413/20cb15f209924302b399b99d3c98b850?token-time=2145916800&token-hash=IO31nK6VZCMWBWU2VAk2c824BX2QZ4DNPKyHHZXS0iw%3D
+[dansup-link]: https://www.patreon.com/dansup
+[dansup-icon]: https://c10.patreonusercontent.com/3/eyJ2IjoiMSIsInciOjIwMH0%3D/patreon-media/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb?token-time=2145916800&token-hash=opXAM_pnhUTuN1jCA6p_Nn_YsaqohY465YFjWFqMEEE%3D
+
--- a/assets/favicon.ico
+++ b/assets/favicon.ico
--- a/assets/favicon/128.png
+++ b/assets/favicon/128.png
--- a/assets/favicon/128.svg
+++ b/assets/favicon/128.svg
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="896"
-   height="896"
-   viewBox="0 0 237.06667 237.06667"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="128.svg"
-   inkscape:export-filename="C:\Users\syuilo\projects\misskey\assets\favicon\128.png"
-   inkscape:export-xdpi="13.714286"
-   inkscape:export-ydpi="13.714286">
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5115"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5111"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5104"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7071068"
-     inkscape:cx="908.16505"
-     inkscape:cy="468.2779"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4502"
-     showgrid="true"
-     units="px"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="1072"
-     inkscape:window-maximized="1"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-midpoints="true"
-     inkscape:object-paths="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     objecttolerance="1"
-     guidetolerance="1"
-     inkscape:snap-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4504"
-       spacingx="4.2333334"
-       spacingy="4.2333334"
-       empcolor="#ff3fff"
-       empopacity="0.25098039"
-       empspacing="4" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="レイヤー 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-30.809093,-10.18601)">
-    <g
-       id="g4502"
-       transform="matrix(1.096096,0,0,1.096096,47.839369,-94.823577)"
-       inkscape:export-xdpi="6"
-       inkscape:export-ydpi="6">
-      <rect
-         style="opacity:1;fill:#2fa1bb;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.96554804;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97647059"
-         id="rect4506"
-         width="216.28276"
-         height="216.28278"
-         x="-15.537212"
-         y="95.803268" />
-      <g
-         style="fill:#ffffff;fill-opacity:1"
-         transform="translate(-1.3333333e-6,-1.3439941e-6)"
-         id="g5125">
-        <g
-           transform="matrix(0.91391326,0,0,0.91391326,7.9719907,17.595761)"
-           id="text4489"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:141.03404236px;line-height:476.69509888px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28950602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           aria-label="Mi">
-          <path
-             sodipodi:nodetypes="zccssscssccscczzzccsccsscscsccz"
-             inkscape:connector-curvature="0"
-             id="path5210"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#ffffff;fill-opacity:1;stroke-width:0.28950602px"
-             d="m 75.196381,231.17126 c -5.855419,0.0202 -10.885068,-3.50766 -13.2572,-7.61584 -1.266603,-1.79454 -3.772419,-2.43291 -3.807919,0 v 11.2332 c 0,4.51309 -1.645397,8.41504 -4.936191,11.70583 -3.196772,3.19677 -7.098714,4.79516 -11.705826,4.79516 -4.513089,0 -8.415031,-1.59839 -11.705825,-4.79516 -3.196772,-3.29079 -4.795158,-7.19274 -4.795158,-11.70583 v -61.7729 c 0,-3.47884 0.987238,-6.6286 2.961715,-9.44928 2.068499,-2.91471 4.701135,-4.9362 7.897906,-6.06447 1.786431,-0.65816 3.666885,-0.98724 5.641362,-0.98724 5.077225,0 9.308247,1.97448 12.693064,5.92343 1.786431,1.97448 2.820681,3.00873 3.102749,3.10275 0,0 13.408119,16.21319 13.78421,16.49526 0.376091,0.28206 1.480789,2.43848 4.127113,2.43848 2.646324,0 3.89218,-2.15642 4.26827,-2.43848 0.376091,-0.28207 13.784088,-16.49526 13.784088,-16.49526 0.09402,0.094 1.081261,-0.94022 2.961715,-3.10275 3.478837,-3.94895 7.756866,-5.92343 12.834096,-5.92343 1.88045,0 3.76091,0.32908 5.64136,0.98724 3.19677,1.12827 5.7824,3.14976 7.75688,6.06447 2.06849,2.82068 3.10274,5.97044 3.10274,9.44928 v 61.7729 c 0,4.51309 -1.6454,8.41504 -4.93619,11.70583 -3.19677,3.19677 -7.09871,4.79516 -11.70582,4.79516 -4.51309,0 -8.41504,-1.59839 -11.705828,-4.79516 -3.196772,-3.29079 -4.795158,-7.19274 -4.795158,-11.70583 v -11.2332 c -0.277898,-3.06563 -2.987588,-1.13379 -3.948953,0 -2.538613,4.70114 -7.401781,7.59567 -13.2572,7.61584 z" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5212"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#ffffff;fill-opacity:1;stroke-width:0.28950602px"
-             d="m 145.83461,185.00361 q -5.92343,0 -10.15445,-4.08999 -4.08999,-4.23102 -4.08999,-10.15445 0,-5.92343 4.08999,-10.01342 4.23102,-4.23102 10.15445,-4.23102 5.92343,0 10.15445,4.23102 4.23102,4.08999 4.23102,10.01342 0,5.92343 -4.23102,10.15445 -4.23102,4.08999 -10.15445,4.08999 z m 0.14103,2.82068 q 5.92343,0 10.01342,4.23102 4.23102,4.23102 4.23102,10.15445 v 34.83541 q 0,5.92343 -4.23102,10.15445 -4.08999,4.08999 -10.01342,4.08999 -5.92343,0 -10.15445,-4.08999 -4.23102,-4.23102 -4.23102,-10.15445 v -34.83541 q 0,-5.92343 4.23102,-10.15445 4.23102,-4.23102 10.15445,-4.23102 z" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
--- a/assets/favicon/16.png
+++ b/assets/favicon/16.png
--- a/assets/favicon/256.svg
+++ b/assets/favicon/256.svg
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="896"
-   height="896"
-   viewBox="0 0 237.06667 237.06667"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="256.svg"
-   inkscape:export-filename="C:\Users\syuilo\projects\misskey\assets\favicon\256.png"
-   inkscape:export-xdpi="27.428572"
-   inkscape:export-ydpi="27.428572">
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5115"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5111"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-    <inkscape:path-effect
-       effect="simplify"
-       id="path-effect5104"
-       is_visible="true"
-       steps="1"
-       threshold="0.000408163"
-       smooth_angles="360"
-       helper_size="0"
-       simplify_individual_paths="false"
-       simplify_just_coalesce="false"
-       simplifyindividualpaths="false"
-       simplifyJustCoalesce="false" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7071068"
-     inkscape:cx="908.16505"
-     inkscape:cy="468.2779"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4502"
-     showgrid="true"
-     units="px"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-center="true"
-     inkscape:snap-page="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="1072"
-     inkscape:window-maximized="1"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-midpoints="true"
-     inkscape:object-paths="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     objecttolerance="1"
-     guidetolerance="1"
-     inkscape:snap-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4504"
-       spacingx="4.2333334"
-       spacingy="4.2333334"
-       empcolor="#ff3fff"
-       empopacity="0.25098039"
-       empspacing="4" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="レイヤー 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-30.809093,-10.18601)">
-    <g
-       id="g4502"
-       transform="matrix(1.096096,0,0,1.096096,47.839369,-94.823577)"
-       inkscape:export-xdpi="6"
-       inkscape:export-ydpi="6">
-      <rect
-         style="opacity:1;fill:#2fa1bb;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.96554804;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97647059"
-         id="rect4506"
-         width="216.28276"
-         height="216.28278"
-         x="-15.537212"
-         y="95.803268" />
-      <g
-         style="fill:#ffffff;fill-opacity:1"
-         transform="translate(-1.3333333e-6,-1.3439941e-6)"
-         id="g5125">
-        <g
-           transform="matrix(0.91391326,0,0,0.91391326,7.9719907,17.595761)"
-           id="text4489"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:141.03404236px;line-height:476.69509888px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.28950602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           aria-label="Mi">
-          <path
-             sodipodi:nodetypes="zccssscssccscczzzccsccsscscsccz"
-             inkscape:connector-curvature="0"
-             id="path5210"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#ffffff;fill-opacity:1;stroke-width:0.28950602px"
-             d="m 75.196381,231.17126 c -5.855419,0.0202 -10.885068,-3.50766 -13.2572,-7.61584 -1.266603,-1.79454 -3.772419,-2.43291 -3.807919,0 v 11.2332 c 0,4.51309 -1.645397,8.41504 -4.936191,11.70583 -3.196772,3.19677 -7.098714,4.79516 -11.705826,4.79516 -4.513089,0 -8.415031,-1.59839 -11.705825,-4.79516 -3.196772,-3.29079 -4.795158,-7.19274 -4.795158,-11.70583 v -61.7729 c 0,-3.47884 0.987238,-6.6286 2.961715,-9.44928 2.068499,-2.91471 4.701135,-4.9362 7.897906,-6.06447 1.786431,-0.65816 3.666885,-0.98724 5.641362,-0.98724 5.077225,0 9.308247,1.97448 12.693064,5.92343 1.786431,1.97448 2.820681,3.00873 3.102749,3.10275 0,0 13.408119,16.21319 13.78421,16.49526 0.376091,0.28206 1.480789,2.43848 4.127113,2.43848 2.646324,0 3.89218,-2.15642 4.26827,-2.43848 0.376091,-0.28207 13.784088,-16.49526 13.784088,-16.49526 0.09402,0.094 1.081261,-0.94022 2.961715,-3.10275 3.478837,-3.94895 7.756866,-5.92343 12.834096,-5.92343 1.88045,0 3.76091,0.32908 5.64136,0.98724 3.19677,1.12827 5.7824,3.14976 7.75688,6.06447 2.06849,2.82068 3.10274,5.97044 3.10274,9.44928 v 61.7729 c 0,4.51309 -1.6454,8.41504 -4.93619,11.70583 -3.19677,3.19677 -7.09871,4.79516 -11.70582,4.79516 -4.51309,0 -8.41504,-1.59839 -11.705828,-4.79516 -3.196772,-3.29079 -4.795158,-7.19274 -4.795158,-11.70583 v -11.2332 c -0.277898,-3.06563 -2.987588,-1.13379 -3.948953,0 -2.538613,4.70114 -7.401781,7.59567 -13.2572,7.61584 z" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5212"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#ffffff;fill-opacity:1;stroke-width:0.28950602px"
-             d="m 145.83461,185.00361 q -5.92343,0 -10.15445,-4.08999 -4.08999,-4.23102 -4.08999,-10.15445 0,-5.92343 4.08999,-10.01342 4.23102,-4.23102 10.15445,-4.23102 5.92343,0 10.15445,4.23102 4.23102,4.08999 4.23102,10.01342 0,5.92343 -4.23102,10.15445 -4.23102,4.08999 -10.15445,4.08999 z m 0.14103,2.82068 q 5.92343,0 10.01342,4.23102 4.23102,4.23102 4.23102,10.15445 v 34.83541 q 0,5.92343 -4.23102,10.15445 -4.08999,4.08999 -10.01342,4.08999 -5.92343,0 -10.15445,-4.08999 -4.23102,-4.23102 -4.23102,-10.15445 v -34.83541 q 0,-5.92343 4.23102,-10.15445 4.23102,-4.23102 10.15445,-4.23102 z" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
--- a/assets/favicon/32.png
+++ b/assets/favicon/32.png
--- a/assets/favicon/64.png
+++ b/assets/favicon/64.png
--- a/assets/favicon/favicon.png
+++ b/assets/favicon/favicon.png
--- a/assets/favicon/favicon.svg
+++ b/assets/favicon/favicon.svg
@@ -15,7 +15,7 @@
   version="1.1"
   id="svg8"
   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="16.svg"
+   sodipodi:docname="favicon.svg"
   inkscape:export-filename="C:\Users\syuilo\projects\misskey\assets\favicon\16.png"
   inkscape:export-xdpi="3"
   inkscape:export-ydpi="3">
@@ -66,7 +66,7 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="1.4142136"
-     inkscape:cx="110.21885"
+     inkscape:cx="15.466544"
     inkscape:cy="235.92965"
     inkscape:document-units="px"
     inkscape:current-layer="g4502"
@@ -79,7 +79,7 @@
     inkscape:snap-center="true"
     inkscape:snap-page="true"
     inkscape:window-width="1920"
-     inkscape:window-height="1017"
+     inkscape:window-height="1027"
     inkscape:window-x="-8"
     inkscape:window-y="1072"
     inkscape:window-maximized="1"
@@ -111,7 +111,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
--- a/assets/icons/128.png
+++ b/assets/icons/128.png
--- a/assets/icons/16.png
+++ b/assets/icons/16.png
--- a/assets/icons/192.png
+++ b/assets/icons/192.png
--- a/assets/favicon/256.png
+++ b/assets/favicon/256.png
--- a/assets/icons/32.png
+++ b/assets/icons/32.png
--- a/assets/icons/64.png
+++ b/assets/icons/64.png
--- a/assets/mi.svg
+++ b/assets/mi.svg
@@ -69,7 +69,7 @@
     inkscape:cx="232.39583"
     inkscape:cy="251.50613"
     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g4502"
     showgrid="true"
     units="px"
     inkscape:snap-bbox="true"
@@ -79,7 +79,7 @@
     inkscape:snap-center="true"
     inkscape:snap-page="true"
     inkscape:window-width="1920"
-     inkscape:window-height="1017"
+     inkscape:window-height="1027"
     inkscape:window-x="-8"
     inkscape:window-y="1072"
     inkscape:window-maximized="1"
@@ -111,7 +111,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
      </cc:Work>
    </rdf:RDF>
  </metadata>
@@ -124,25 +124,19 @@
       id="g4502"
       transform="matrix(1.096096,0,0,1.096096,-2.960633,-44.023579)">
      <g
-         style="fill:#2fa1bb;fill-opacity:0.94117647"
+         style="fill:#000000;fill-opacity:1"
         transform="translate(-1.3333333e-6,-1.3439941e-6)"
         id="g5125">
        <g
           transform="matrix(0.91391326,0,0,0.91391326,7.9719907,17.595761)"
           id="text4489"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:141.03404236px;line-height:476.69509888px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#2fa1bb;fill-opacity:0.94117647;stroke:none;stroke-width:0.28950602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:141.03404236px;line-height:476.69509888px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28950602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
           aria-label="Mi">
          <path
-             sodipodi:nodetypes="zccssscssccscczzzccsccsscscsccz"
-             inkscape:connector-curvature="0"
-             id="path5210"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#2fa1bb;fill-opacity:0.94117647;stroke-width:0.28950602px"
-             d="m 75.196381,231.17126 c -5.855419,0.0202 -10.885068,-3.50766 -13.2572,-7.61584 -1.266603,-1.79454 -3.772419,-2.43291 -3.807919,0 v 11.2332 c 0,4.51309 -1.645397,8.41504 -4.936191,11.70583 -3.196772,3.19677 -7.098714,4.79516 -11.705826,4.79516 -4.513089,0 -8.415031,-1.59839 -11.705825,-4.79516 -3.196772,-3.29079 -4.795158,-7.19274 -4.795158,-11.70583 v -61.7729 c 0,-3.47884 0.987238,-6.6286 2.961715,-9.44928 2.068499,-2.91471 4.701135,-4.9362 7.897906,-6.06447 1.786431,-0.65816 3.666885,-0.98724 5.641362,-0.98724 5.077225,0 9.308247,1.97448 12.693064,5.92343 1.786431,1.97448 2.820681,3.00873 3.102749,3.10275 0,0 13.408119,16.21319 13.78421,16.49526 0.376091,0.28206 1.480789,2.43848 4.127113,2.43848 2.646324,0 3.89218,-2.15642 4.26827,-2.43848 0.376091,-0.28207 13.784088,-16.49526 13.784088,-16.49526 0.09402,0.094 1.081261,-0.94022 2.961715,-3.10275 3.478837,-3.94895 7.756866,-5.92343 12.834096,-5.92343 1.88045,0 3.76091,0.32908 5.64136,0.98724 3.19677,1.12827 5.7824,3.14976 7.75688,6.06447 2.06849,2.82068 3.10274,5.97044 3.10274,9.44928 v 61.7729 c 0,4.51309 -1.6454,8.41504 -4.93619,11.70583 -3.19677,3.19677 -7.09871,4.79516 -11.70582,4.79516 -4.51309,0 -8.41504,-1.59839 -11.705828,-4.79516 -3.196772,-3.29079 -4.795158,-7.19274 -4.795158,-11.70583 v -11.2332 c -0.277898,-3.06563 -2.987588,-1.13379 -3.948953,0 -2.538613,4.70114 -7.401781,7.59567 -13.2572,7.61584 z" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5212"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#2fa1bb;fill-opacity:0.94117647;stroke-width:0.28950602px"
-             d="m 145.83461,185.00361 q -5.92343,0 -10.15445,-4.08999 -4.08999,-4.23102 -4.08999,-10.15445 0,-5.92343 4.08999,-10.01342 4.23102,-4.23102 10.15445,-4.23102 5.92343,0 10.15445,4.23102 4.23102,4.08999 4.23102,10.01342 0,5.92343 -4.23102,10.15445 -4.23102,4.08999 -10.15445,4.08999 z m 0.14103,2.82068 q 5.92343,0 10.01342,4.23102 4.23102,4.23102 4.23102,10.15445 v 34.83541 q 0,5.92343 -4.23102,10.15445 -4.08999,4.08999 -10.01342,4.08999 -5.92343,0 -10.15445,-4.08999 -4.23102,-4.23102 -4.23102,-10.15445 v -34.83541 q 0,-5.92343 4.23102,-10.15445 4.23102,-4.23102 10.15445,-4.23102 z" />
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#000000;fill-opacity:1;stroke-width:1.09609616px"
+             d="M 62.474609 76.585938 C 54.999059 76.585938 47.878825 77.832365 41.115234 80.324219 C 29.011968 84.595952 19.044417 92.249798 11.212891 103.28516 C 3.7373405 113.96451 0 125.88934 0 139.06055 L 0 372.93945 C 0 390.02642 6.0510264 404.79858 18.154297 417.25781 C 30.613543 429.36108 45.387643 435.41406 62.474609 435.41406 C 79.917556 435.41406 94.689698 429.36108 106.79297 417.25781 C 119.25222 404.79858 125.48242 390.02642 125.48242 372.93945 L 125.48242 330.4082 C 125.61683 321.19698 135.10492 323.61391 139.90039 330.4082 C 148.8815 345.96215 167.92265 359.32062 190.0918 359.24414 C 212.26095 359.16778 230.67374 348.20715 240.28516 330.4082 C 243.92497 326.11557 254.18418 318.80145 255.23633 330.4082 L 255.23633 372.93945 C 255.23633 390.02642 261.28735 404.79858 273.39062 417.25781 C 285.84985 429.36108 300.62397 435.41406 317.71094 435.41406 C 335.15388 435.41406 349.92603 429.36108 362.0293 417.25781 C 374.48853 404.79858 380.71875 390.02642 380.71875 372.93945 L 380.71875 139.06055 C 380.71875 125.88934 376.80415 113.96451 368.97266 103.28516 C 361.49709 92.249798 351.70678 84.595952 339.60352 80.324219 C 332.48396 77.832365 325.3637 76.585938 318.24414 76.585938 C 299.02128 76.585938 282.82549 84.062587 269.6543 99.013672 C 262.53473 107.20121 258.79542 111.11761 258.43945 110.76172 C 258.43945 110.76172 207.67587 172.14495 206.25195 173.21289 C 204.82804 174.2808 200.11102 182.44531 190.0918 182.44531 C 180.07257 182.44531 175.89071 174.2808 174.4668 173.21289 C 173.04288 172.14495 122.2793 110.76172 122.2793 110.76172 C 121.21136 110.40575 117.29484 106.48923 110.53125 99.013672 C 97.716024 84.062587 81.697447 76.585938 62.474609 76.585938 z M 457.53516 76.585938 C 442.58406 76.585937 429.7692 81.926117 419.08984 92.605469 C 408.76646 102.92885 403.60547 115.56648 403.60547 130.51758 C 403.60547 145.46868 408.76646 158.28354 419.08984 168.96289 C 429.7692 179.28627 442.58406 184.44922 457.53516 184.44922 C 472.48625 184.44922 485.30112 179.28627 495.98047 168.96289 C 506.65982 158.28354 512 145.46868 512 130.51758 C 512 115.56648 506.65982 102.92885 495.98047 92.605469 C 485.30112 81.926117 472.48625 76.585938 457.53516 76.585938 z M 458.06836 195.12695 C 443.11726 195.12695 430.3024 200.46713 419.62305 211.14648 C 408.94369 221.82584 403.60547 234.6407 403.60547 249.5918 L 403.60547 381.48242 C 403.60547 396.43352 408.94369 409.24838 419.62305 419.92773 C 430.3024 430.25112 443.11726 435.41406 458.06836 435.41406 C 473.01946 435.41406 485.65709 430.25112 495.98047 419.92773 C 506.65982 409.24838 512 396.43352 512 381.48242 L 512 249.5918 C 512 234.6407 506.65982 221.82584 495.98047 211.14648 C 485.65709 200.46713 473.01946 195.12695 458.06836 195.12695 z "
+             transform="matrix(0.26412464,0,0,0.26412464,24.988264,136.28626)"
+             id="path5210" />
        </g>
      </g>
    </g>
--- a/cli/recount-stats.js
+++ b/cli/recount-stats.js
@@ -0,0 +1,42 @@
+const { default: Note } = require('../built/models/note');
+const { default: Meta } = require('../built/models/meta');
+const { default: User } = require('../built/models/user');
+
+async function main() {
+	const meta = await Meta.findOne({});
+
+	const notesCount = await Note.count();
+
+	const usersCount = await User.count();
+
+	const originalNotesCount = await Note.count({
+		'_user.host': null
+	});
+
+	const originalUsersCount = await User.count({
+		host: null
+	});
+
+	const stats = {
+		notesCount,
+		usersCount,
+		originalNotesCount,
+		originalUsersCount
+	};
+
+	if (meta) {
+		await Meta.update({}, {
+			$set: {
+				stats
+			}
+		});
+	} else {
+		await Meta.insert({
+			stats
+		});
+	}
+}
+
+main().then(() => {
+	console.log('done');
+}).catch(console.error);
--- a/cli/suspend.js
+++ b/cli/suspend.js
@@ -3,16 +3,21 @@ const User = require('../built/models/user').default;

 const args = process.argv.slice(2);

-const userId = new mongo.ObjectID(args[0]);
+const user = args[0];

-console.log(`Suspending ${userId}...`);
+const q = user.startsWith('@') ? {
+	username: user.split('@')[1],
+	host: user.split('@')[2] || null
+} : { _id: new mongo.ObjectID(user) };

-User.update({ _id: userId }, {
+console.log(`Suspending ${user}...`);
+
+User.update(q, {
 	$set: {
 		isSuspended: true
 	}
 }).then(() => {
-	console.log(`Suspended ${userId}`);
+	console.log(`Suspended ${user}`);
 }, e => {
 	console.error(e);
 });
--- a/cli/update-remote-user.js
+++ b/cli/update-remote-user.js
@@ -0,0 +1,12 @@
+const updatePerson = require('../built/remote/activitypub/models/person').updatePerson;
+
+const args = process.argv.slice(2);
+const user = args[0];
+
+console.log(`Updating ${user}...`);
+
+updatePerson(user).then(() => {
+	console.log(`Updated ${user}`);
+}, e => {
+	console.error(e);
+});
--- a/docs/DONATORS.md
+++ b/docs/DONATORS.md
@@ -22,8 +22,4 @@ The list of people who have sent donation for Misskey.

 ---

-If your name is missing,  please contact us!
-
-If you want to donate to Misskey, please get in touch with [@syuilo][syuilo-link].
-
-[syuilo-link]: https://syuilo.com
+If your name is missing, please contact us!
--- a/docs/donate.ja.md
+++ b/docs/donate.ja.md
@@ -1,26 +0,0 @@
-# Misskeyにカンパする方法
-Misskeyのサポートにご興味をお持ちいただきありがとうございます！
-Misskeyにカンパをしていただくと、貴方のお名前と好きなURLなどをMisskeyのリポジトリに刻む権利がもらえます。
-
-Misskeyにカンパして開発・運営をサポートするには、次のいくつかの方法があります:
-
-## ConoHaカードを購入する
-(本家)Misskeyは、ConoHaというVPSサービスを利用しています。ConoHaカードを購入して、
-カードに記載されているクーポンコードを syuilotan@yahoo.co.jp までお送りいただければ、
-そのクーポンをチャージしてサーバーの運営費に充てることができます。
-
-ConoHaカードについてはこちらをご覧ください: https://www.conoha.jp/conohacard/
-
-Amazonでも買えます: https://www.amazon.co.jp/dp/B01N9E3416
-
-## Amazonギフトカード
-これは間接的な方法です。
-
-## 銀行振込
-syuilotan@yahoo.co.jp までお問い合わせください。
-
-## 手渡し
-オフ会を行ったときなどに行使できる方法です。
-
-## その他
-なにかいいアイデアがあればお教えください。
--- a/docs/setup.en.md
+++ b/docs/setup.en.md
@@ -47,7 +47,14 @@ You need to generate config file via `npm run config` command.

 *5.* Build Misskey
 ----------------------------------------------------------------
-We need to use `node-gyp` to build the `crypto` module.
+
+Build misskey with the following:
+
+`npm run build`
+
+If you're on Debian, you will need to install the `build-essential` package.
+
+If you're still encountering errors about some modules, use node-gyp:

 1. `npm install -g node-gyp`
 2. `node-gyp configure`
--- a/docs/translate.en.md
+++ b/docs/translate.en.md
@@ -4,19 +4,19 @@ Misskey's Translation
 If you find an untranslated part on Misskey:
 --------------------------------------------

-1. Look for untranslated parts in the miskey's source code.
+1. Look for untranslated parts in the misskey's source code.
 	- For instance, if you find an untranslated part in: `src/client/app/mobile/views/pages/home.vue`.

 2. Replace the untranslated portion with a character string of the form `%i18n:@foo%`.
 	- In fact, `foo` should be a word that is appropriate for the situation and is easy to understand in English.
 	- For example, if the untranslated portion is the following "タイムライン" you must write: `%i18n:@timeline%`.

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

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

 5. And done！

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

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

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

 5. 完了です！

--- a/elasticsearch/README.md
+++ b/elasticsearch/README.md
@@ -1,6 +0,0 @@
-How to create indexes
-=====================
-
-``` shell
-curl -XPOST localhost:9200/misskey -d @path/to/mappings.json
-```
--- a/elasticsearch/mappings.json
+++ b/elasticsearch/mappings.json
@@ -1,65 +0,0 @@
-{
-	"settings": {
-		"analysis": {
-			"analyzer": {
-				"bigram": {
-					"tokenizer": "bigram_tokenizer"
-				}
-			},
-			"tokenizer": {
-				"bigram_tokenizer": {
-					"type": "nGram",
-					"min_gram": 2,
-					"max_gram": 2,
-					"token_chars": [
-						"letter",
-						"digit"
-					]
-				}
-			}
-		}
-	},
-	"mappings": {
-		"user": {
-			"properties": {
-				"username": {
-					"type": "string",
-					"index": "analyzed",
-					"analyzer": "bigram"
-				},
-				"name": {
-					"type": "string",
-					"index": "analyzed",
-					"analyzer": "bigram"
-				},
-				"bio": {
-					"type": "string",
-					"index": "analyzed",
-					"analyzer": "kuromoji"
-				}
-			}
-		},
-		"post": {
-			"properties": {
-				"text": {
-					"type": "string",
-					"index": "analyzed",
-					"analyzer": "kuromoji"
-				}
-			}
-		},
-		"drive_file": {
-			"properties": {
-				"name": {
-					"type": "string",
-					"index": "analyzed",
-					"analyzer": "kuromoji"
-				},
-				"user": {
-					"type": "string",
-					"index": "not_analyzed"
-				}
-			}
-		}
-	}
-}
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -8,20 +8,20 @@ import * as gutil from 'gulp-util';
 import * as ts from 'gulp-typescript';
 const sourcemaps = require('gulp-sourcemaps');
 import tslint from 'gulp-tslint';
-import cssnano = require('gulp-cssnano');
+const cssnano = require('gulp-cssnano');
 import * as uglifyComposer from 'gulp-uglify/composer';
 import pug = require('gulp-pug');
 import * as rimraf from 'rimraf';
 import chalk from 'chalk';
-import imagemin = require('gulp-imagemin');
+const imagemin = require('gulp-imagemin');
 import * as rename from 'gulp-rename';
 import * as mocha from 'gulp-mocha';
 import * as replace from 'gulp-replace';
 import * as htmlmin from 'gulp-htmlmin';
 const uglifyes = require('uglify-es');

-import locales from './locales';
-import { fa } from './src/build/fa';
+const locales = require('./locales');
+import { fa } from './src/misc/fa';
 const client = require('./built/client/meta.json');
 import config from './src/config';

--- a/locales/ca.yml
+++ b/locales/ca.yml
@@ -0,0 +1,938 @@
+---
+meta:
+  lang: "日本語"
+  divider: ""
+common:
+  misskey: "A ⭐ of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
+  time:
+    unknown: "なぞのじかん"
+    future: "未来"
+    just_now: "たった今"
+    seconds_ago: "{}秒前"
+    minutes_ago: "{}分前"
+    hours_ago: "{}時間前"
+    days_ago: "{}日前"
+    weeks_ago: "{}週間前"
+    months_ago: "{}ヶ月前"
+    years_ago: "{}年前"
+  weekday-short:
+    sunday: "日"
+    monday: "月"
+    tuesday: "火"
+    wednesday: "水"
+    thursday: "木"
+    friday: "金"
+    saturday: "土"
+  reactions:
+    like: "いいね"
+    love: "しゅき"
+    laugh: "笑"
+    hmm: "ふぅ～む"
+    surprise: "わお"
+    congrats: "おめでとう"
+    angry: "おこ"
+    confused: "こまこまのこまり"
+    pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
+  search: "検索"
+  delete: "削除"
+  loading: "読み込み中"
+  ok: "わかった"
+  update-available-title: "更新があります"
+  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
+  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  reversi:
+    drawn: "引き分け"
+    my-turn: "あなたのターンです"
+    opponent-turn: "相手のターンです"
+    turn-of: "{}のターンです"
+    past-turn-of: "{}のターン"
+  widgets:
+    analog-clock: "アナログ時計"
+    profile: "プロフィール"
+    calendar: "カレンダー"
+    timemachine: "カレンダー(タイムマシン)"
+    activity: "アクティビティ"
+    rss: "RSSリーダー"
+    memo: "付箋"
+    trends: "トレンド"
+    photo-stream: "フォトストリーム"
+    posts-monitor: "投稿チャート"
+    slideshow: "スライドショー"
+    version: "バージョン"
+    broadcast: "ブロードキャスト"
+    notifications: "通知"
+    users: "おすすめユーザー"
+    polls: "アンケート"
+    post-form: "投稿フォーム"
+    messaging: "メッセージ"
+    server: "サーバー情報"
+    donation: "寄付のお願い"
+    nav: "ナビゲーション"
+    tips: "ヒント"
+    hashtags: "ハッシュタグ"
+  deck:
+    widgets: "ウィジェット"
+    home: "ホーム"
+    local: "ローカル"
+    global: "グローバル"
+    notifications: "通知"
+    list: "リスト"
+    swap-left: "左に移動"
+    swap-right: "右に移動"
+    swap-up: "上に移動"
+    swap-down: "下に移動"
+    remove: "カラムを削除"
+    add-column: "カラムを追加"
+    rename: "名前を変更"
+    stack-left: "左に重ねる"
+    pop-right: "右に出す"
+common/views/components/connect-failed.vue:
+  title: "サーバーに接続できません"
+  description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
+  thanks: "いつもMisskeyをご利用いただきありがとうございます。"
+  troubleshoot: "トラブルシュート"
+common/views/components/connect-failed.troubleshooter.vue:
+  title: "トラブルシューティング"
+  network: "ネットワーク接続"
+  checking-network: "ネットワーク接続を確認中"
+  internet: "インターネット接続"
+  checking-internet: "インターネット接続を確認中"
+  server: "サーバー接続"
+  checking-server: "サーバー接続を確認中"
+  finding: "問題を調べています"
+  no-network: "ネットワークに接続されていません"
+  no-network-desc: "お使いのPCのネットワーク接続が正常か確認してください。"
+  no-internet: "インターネットに接続されていません"
+  no-internet-desc: "ネットワークには接続されていますが、インターネットには接続されていないようです。お使いのPCのインターネット接続が正常か確認してください。"
+  no-server: "Misskeyのサーバーに接続できません"
+  no-server-desc: "お使いのPCのインターネット接続は正常ですが、Misskeyのサーバーには接続できませんでした。サーバーがダウンまたはメンテナンスしている可能性があるので、しばらくしてから再度御アクセスください。"
+  success: "Misskeyのサーバーに接続できました"
+  success-desc: "正常に接続できるようです。ページを再度読み込みしてください。"
+  flush: "キャッシュの削除"
+  set-version: "バージョン指定"
+common/views/components/messaging.vue:
+  search-user: "ユーザーを探す"
+  you: "あなた"
+  no-history: "履歴はありません"
+common/views/components/messaging-room.vue:
+  empty: "このユーザーと話したことはありません"
+  more: "もっと読む"
+  no-history: "これより過去の履歴はありません"
+  resize-form: "ドラッグしてフォームの広さを調整"
+  new-message: "新しいメッセージがあります"
+common/views/components/messaging-room.form.vue:
+  input-message-here: "ここにメッセージを入力"
+  send: "送信"
+  attach-from-local: "PCからファイルを添付する"
+  attach-from-drive: "ドライブからファイルを添付する"
+common/views/components/messaging-room.message.vue:
+  is-read: "既読"
+  deleted: "このメッセージは削除されました"
+common/views/components/nav.vue:
+  about: "Misskeyについて"
+  stats: "統計"
+  status: "ステータス"
+  wiki: "Wiki"
+  donors: "ドナー"
+  repository: "リポジトリ"
+  develop: "開発者"
+  feedback: "フィードバック"
+common/views/components/note-menu.vue:
+  favorite: "お気に入り"
+  pin: "ピン留め"
+  delete: "削除"
+  delete-confirm: "この投稿を削除しますか？"
+  remote: "投稿元で見る"
+common/views/components/poll.vue:
+  vote-to: "「{}」に投票する"
+  vote-count: "{}票"
+  total-users: "{}人が投票"
+  vote: "投票する"
+  show-result: "結果を見る"
+  voted: "投票済み"
+common/views/components/poll-editor.vue:
+  no-only-one-choice: "アンケートには、選択肢が最低2つ必要です"
+  choice-n: "選択肢{}"
+  remove: "この選択肢を削除"
+  add: "+選択肢を追加"
+  destroy: "アンケートを破棄"
+common/views/components/reaction-picker.vue:
+  choose-reaction: "リアクションを選択"
+common/views/components/signin.vue:
+  username: "ユーザー名"
+  password: "パスワード"
+  token: "トークン"
+  signing-in: "やってます..."
+  signin: "サインイン"
+common/views/components/signup.vue:
+  username: "ユーザー名"
+  checking: "確認しています..."
+  available: "利用できます"
+  unavailable: "既に利用されています"
+  error: "通信エラー"
+  invalid-format: "a~z、A~Z、0~9、_が使えます"
+  too-short: "1文字以上でお願いします！"
+  too-long: "20文字以内でお願いします"
+  password: "パスワード"
+  password-placeholder: "8文字以上を推奨します"
+  weak-password: "弱いパスワード"
+  normal-password: "まあまあのパスワード"
+  strong-password: "強いパスワード"
+  retype: "再入力"
+  retype-placeholder: "確認のため再入力してください"
+  password-matched: "確認されました"
+  password-not-matched: "一致していません"
+  recaptcha: "認証"
+  create: "アカウント作成"
+  some-error: "何らかの原因によりアカウントの作成に失敗しました。再度お試しください。"
+common/views/components/special-message.vue:
+  new-year: "Happy New Year!"
+  christmas: "Merry Christmas!"
+common/views/components/stream-indicator.vue:
+  connecting: "接続中"
+  reconnecting: "再接続中"
+  connected: "接続完了"
+common/views/components/twitter-setting.vue:
+  description: "お使いのTwitterアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでTwitterアカウント情報が表示されるようになったり、Twitterを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のTwitterアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Twitterと接続する"
+  disconnect: "切断する"
+common/views/components/uploader.vue:
+  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
+common/views/widgets/broadcast.vue:
+  fetching: "確認中"
+  no-broadcasts: "お知らせはありません"
+  have-a-nice-day: "良い一日を！"
+  next: "次"
+common/views/widgets/donation.vue:
+  title: "寄付のお願い"
+  text: "Misskeyの運営にはドメイン、サーバー等のコストが掛かります。Misskeyは広告を掲載したりしないため、収入を皆様からの寄付に頼っています。もしご興味があれば、{}までご連絡ください。ご協力ありがとうございます。"
+common/views/widgets/photo-stream.vue:
+  title: "フォトストリーム"
+  no-photos: "写真はありません"
+common/views/widgets/posts-monitor.vue:
+  title: "投稿チャート"
+  toggle: "表示を切り替え"
+common/views/widgets/hashtags.vue:
+  title: "ハッシュタグ"
+  count: "{}人が投稿"
+  empty: "トレンドなし"
+common/views/widgets/server.vue:
+  title: "サーバー情報"
+  toggle: "表示を切り替え"
+common/views/widgets/memo.vue:
+  title: "付箋"
+  memo: "ここに書いて！"
+  save: "保存"
+common/views/pages/follow.vue:
+  signed-in-as: "{}としてサインイン中"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+desktop/views/components/activity.chart.vue:
+  total: "Black ... Total"
+  notes: "Blue ... Notes"
+  replies: "Red ... Replies"
+  renotes: "Green ... Renotes"
+desktop/views/components/activity.vue:
+  title: "アクティビティ"
+  toggle: "表示を切り替え"
+desktop/views/components/calendar.vue:
+  title: "{1}年 {2}月"
+  prev: "前の月"
+  next: "次の月"
+  go: "クリックして時間遡行"
+desktop/views/components/choose-file-from-drive-window.vue:
+  choose-file: "ファイル選択中"
+  upload: "PCからドライブにファイルをアップロード"
+  cancel: "キャンセル"
+  ok: "決定"
+  choose-prompt: "ファイルを選択"
+desktop/views/components/choose-folder-from-drive-window.vue:
+  cancel: "キャンセル"
+  ok: "決定"
+  choose-prompt: "フォルダを選択"
+desktop/views/components/crop-window.vue:
+  skip: "クロップをスキップ"
+  cancel: "キャンセル"
+  ok: "決定"
+desktop/views/components/drive-window.vue:
+  used: "使用中"
+  drive: "ドライブ"
+desktop/views/components/drive.file.vue:
+  avatar: "アイコン"
+  banner: "バナー"
+  contextmenu:
+    rename: "名前を変更"
+    copy-url: "URLをコピー"
+    download: "ダウンロード"
+    else-files: "その他..."
+    set-as-avatar: "アイコンに設定"
+    set-as-banner: "バナーに設定"
+    open-in-app: "アプリで開く"
+    add-app: "アプリを追加"
+    rename-file: "ファイル名の変更"
+    input-new-file-name: "新しいファイル名を入力してください"
+    copied: "コピー完了"
+    copied-url-to-clipboard: "URLをクリップボードにコピーしました"
+desktop/views/components/drive.folder.vue:
+  unable-to-process: "操作を完了できません"
+  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
+  unhandled-error: "不明なエラー"
+  contextmenu:
+    move-to-this-folder: "このフォルダへ移動"
+    show-in-new-window: "新しいウィンドウで表示"
+    rename: "名前を変更"
+    rename-folder: "フォルダ名の変更"
+    input-new-folder-name: "新しいフォルダ名を入力してください"
+desktop/views/components/drive.nav-folder.vue:
+  drive: "ドライブ"
+desktop/views/components/drive.vue:
+  search: "検索"
+  load-more: "もっと読み込む"
+  empty-draghover: "ドロップですか？いいですよ、ボクはカワイイですからね"
+  empty-drive: "ドライブには何もありません。"
+  empty-drive-description: "右クリックして「ファイルをアップロード」を選んだり、ファイルをドラッグ&ドロップすることでもアップロードできます。"
+  empty-folder: "このフォルダーは空です"
+  unable-to-process: "操作を完了できません"
+  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
+  unhandled-error: "不明なエラー"
+  url-upload: "URLアップロード"
+  url-of-file: "アップロードしたいファイルのURL"
+  url-upload-requested: "アップロードをリクエストしました"
+  may-take-time: "アップロードが完了するまで時間がかかる場合があります。"
+  create-folder: "フォルダー作成"
+  folder-name: "フォルダー名"
+  contextmenu:
+    create-folder: "フォルダーを作成"
+    upload: "ファイルをアップロード"
+    url-upload: "URLからアップロード"
+desktop/views/components/follow-button.vue:
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+desktop/views/components/followers-window.vue:
+  followers: "{} のフォロワー"
+desktop/views/components/followers.vue:
+  empty: "フォロワーはいないようです。"
+desktop/views/components/following-window.vue:
+  following: "{} のフォロー"
+desktop/views/components/following.vue:
+  empty: "フォロー中のユーザーはいないようです。"
+desktop/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー:"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"
+desktop/views/components/game-window.vue:
+  game: "リバーシ"
+desktop/views/components/home.vue:
+  done: "完了"
+  add-widget: "ウィジェットを追加:"
+  add: "追加"
+desktop/views/input-dialog.vue:
+  cancel: "キャンセル"
+  ok: "決定"
+desktop/views/components/messaging-room-window.vue:
+  title: "メッセージ:"
+desktop/views/components/messaging-window.vue:
+  title: "メッセージ"
+desktop/views/components/note-detail.vue:
+  more: "会話をもっと読み込む"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  reposted-by: "{}がRenote"
+  location: "位置情報"
+  renote: "Renote"
+  add-reaction: "リアクション"
+desktop/views/components/notes.note.vue:
+  reposted-by: "{}がRenote"
+  reply: "返信"
+  renote: "Renote"
+  add-reaction: "リアクション"
+  detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+desktop/views/components/notes.vue:
+  error: "読み込みに失敗しました。"
+  retry: "リトライ"
+  load-more: "もっと読み込む"
+desktop/views/components/notifications.vue:
+  more: "もっと見る"
+  empty: "ありません！"
+desktop/views/components/post-form.vue:
+  reply-placeholder: "この投稿への返信..."
+  quote-placeholder: "この投稿を引用..."
+  submit: "投稿"
+  reply: "返信"
+  renote: "Renote"
+  posted: "投稿しました！"
+  replied: "返信しました！"
+  reposted: "Renoteしました！"
+  note-failed: "投稿に失敗しました"
+  reply-failed: "返信に失敗しました"
+  renote-failed: "Renoteに失敗しました"
+  posting: "投稿中"
+  attach-media-from-local: "PCからメディアを添付"
+  attach-media-from-drive: "ドライブからメディアを添付"
+  attach-cancel: "添付取り消し"
+  insert-a-kao: "v('ω')v"
+  create-poll: "アンケートを作成"
+  text-remain: "残り{}文字"
+desktop/views/components/post-form-window.vue:
+  note: "新規投稿"
+  reply: "返信"
+  attaches: "添付: {}メディア"
+  uploading-media: "{}個のメディアをアップロード中"
+desktop/views/components/progress-dialog.vue:
+  waiting: "待機中"
+desktop/views/components/renote-form.vue:
+  quote: "引用する..."
+  cancel: "キャンセル"
+  renote: "Renote"
+  reposting: "しています..."
+  success: "Renoteしました！"
+  failure: "Renoteに失敗しました"
+desktop/views/components/renote-form-window.vue:
+  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
+desktop/views/components/settings.vue:
+  profile: "プロフィール"
+  notification: "通知"
+  apps: "アプリ"
+  mute: "ミュート"
+  drive: "ドライブ"
+  security: "セキュリティ"
+  signin: "サインイン履歴"
+  password: "パスワード"
+  2fa: "二段階認証"
+  other: "その他"
+  license: "ライセンス"
+  behaviour: "動作"
+  fetch-on-scroll: "スクロールで自動読み込み"
+  fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
+  auto-popout: "ウィンドウの自動ポップアウト"
+  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
+  advanced: "詳細設定"
+  api-via-stream: "ストリームを経由したAPIリクエスト"
+  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  display: "デザインと表示"
+  customize: "ホームをカスタマイズ"
+  choose-wallpaper: "壁紙を選択"
+  delete-wallpaper: "壁紙を削除"
+  dark-mode: "ダークモード"
+  circle-icons: "円形のアイコンを使用"
+  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
+  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
+  show-reply-target: "リプライ先を表示する"
+  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
+  show-renoted-my-notes: "Renoteされた自分の投稿をタイムラインに表示する"
+  show-maps: "マップの自動展開"
+  show-maps-desc: "位置情報が添付された投稿のマップを自動的に展開します。"
+  sound: "サウンド"
+  enable-sounds: "サウンドを有効にする"
+  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
+  volume: "ボリューム"
+  test: "テスト"
+  mobile: "モバイル"
+  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  language: "言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  language-desc: "変更はページの再度読み込み後に反映されます。"
+  cache: "キャッシュ"
+  clean-cache: "クリーンアップ"
+  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
+  cache-cleared: "キャッシュを削除しました"
+  cache-cleared-desc: "ページを再度読み込みしてください。"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
+  about: "Misskeyについて"
+  operator: "このサーバーの運営者"
+  update: "Misskey Update"
+  version: "バージョン:"
+  latest-version: "最新のバージョン:"
+  update-checking: "アップデートを確認中"
+  do-update: "アップデートを確認"
+  update-settings: "詳細設定"
+  prevent-update: "アップデートを延期する(非推奨)"
+  prevent-update-desc: "この設定をオンにしてもアップデートが反映される場合があります。この設定はこのデバイスのみ有効です。"
+  no-updates: "利用可能な更新はありません"
+  no-updates-desc: "お使いのMisskeyは最新です。"
+  update-available: "新しいバージョンが利用可能です"
+  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
+  advanced-settings: "高度な設定"
+  debug-mode: "デバッグモードを有効にする"
+  debug-mode-desc: "この設定はブラウザに記憶されます。"
+  experimental: "実験的機能を有効にする"
+  experimental-desc: "実験的機能を有効にするとMisskeyの動作が不安定になる可能性があります。この設定はブラウザに記憶されます。"
+  tools: "ツール"
+  task-manager: "タスクマネージャ"
+  third-parties: "サードパーティ"
+desktop/views/components/settings.2fa.vue:
+  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
+  detail: "詳細..."
+  url: "https://www.google.co.jp/intl/ja/landing/2step/"
+  caution: "登録したデバイスを紛失するなどした場合、Misskeyにサインインできなくなりますのでご注意ください。"
+  register: "デバイスを登録する"
+  already-registered: "既に設定は完了しています。"
+  unregister: "設定を解除"
+  unregistered: "二段階認証が無効になりました。"
+  enter-password: "パスワードを入力してください"
+  authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
+  howtoinstall: "インストール方法はこちら"
+  scan: "次に、表示されているQRコードをスキャンします:"
+  done: "お使いのデバイスに表示されているトークンを入力して完了します:"
+  submit: "完了"
+  success: "設定が完了しました！"
+  failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
+  info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
+desktop/views/components/settings.api.vue:
+  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
+  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
+  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
+  regenerate-token: "トークンを再生成"
+  token: "Token:"
+  enter-password: "パスワードを入力してください"
+desktop/views/components/settings.apps.vue:
+  no-apps: "連携しているアプリケーションはありません"
+desktop/views/components/settings.mute.vue:
+  no-users: "ミュートしているユーザーはいません"
+desktop/views/components/settings.password.vue:
+  reset: "パスワードを変更する"
+  enter-current-password: "現在のパスワードを入力してください"
+  enter-new-password: "新しいパスワードを入力してください"
+  enter-new-password-again: "もう一度新しいパスワードを入力してください"
+  not-match: "新しいパスワードが一致しません"
+  changed: "パスワードを変更しました"
+desktop/views/components/settings.profile.vue:
+  avatar: "アイコン"
+  choice-avatar: "画像を選択"
+  name: "名前"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  save: "保存"
+  locked-account: "アカウントの保護"
+  is-locked: "投稿を非公開にする"
+  other: "その他"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
+desktop/views/components/sub-note-content.vue:
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
+desktop/views/components/taskmanager.vue:
+  title: "タスクマネージャ"
+desktop/views/components/timeline.vue:
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
+  list: "リスト"
+desktop/views/components/ui.header.vue:
+  welcome-back: "おかえりなさい、"
+desktop/views/components/ui.header.account.vue:
+  profile: "プロフィール"
+  drive: "ドライブ"
+  favorites: "お気に入り"
+  lists: "リスト"
+  follow-requests: "フォロー申請"
+  customize: "ホームのカスタマイズ"
+  settings: "設定"
+  signout: "サインアウト"
+  dark: "闇に飲まれる"
+desktop/views/components/ui.header.nav.vue:
+  home: "ホーム"
+  deck: "デッキ"
+  messaging: "メッセージ"
+  game: "ゲーム"
+desktop/views/components/ui.header.notifications.vue:
+  title: "通知"
+desktop/views/components/ui.header.post.vue:
+  post: "新規投稿"
+desktop/views/components/ui.header.search.vue:
+  placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
+desktop/views/components/user-lists-window.vue:
+  title: "リスト"
+  create-list: "リストを作成"
+desktop/views/components/user-preview.vue:
+  notes: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+desktop/views/components/users-list.vue:
+  all: "すべて"
+  iknow: "知り合い"
+  load-more: "もっと"
+  fetching: "読み込んでいます"
+desktop/views/components/users-list-item.vue:
+  followed: "フォローされています"
+desktop/views/components/window.vue:
+  popout: "ポップアウト"
+  close: "閉じる"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "メディア投稿のみ"
+  is-media-view: "メディアビュー"
+  edit: "オプション"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
+desktop/views/pages/drive.vue:
+  title: "Misskey Drive"
+desktop/views/pages/favorites.vue:
+  more: "さらに読み込む"
+desktop/views/pages/home-customize.vue:
+  title: "ホームのカスタマイズ"
+desktop/views/pages/note.vue:
+  prev: "前の投稿"
+  next: "次の投稿"
+desktop/views/pages/selectdrive.vue:
+  title: "ファイルを選択してください"
+  ok: "決定"
+  cancel: "キャンセル"
+  upload: "PCからドライブにファイルをアップロード"
+desktop/views/pages/user-list.users.vue:
+  users: "ユーザー"
+  add-user: "ユーザーを追加"
+  username: "ユーザー名"
+desktop/views/pages/user/user.followers-you-know.vue:
+  title: "知り合いのフォロワー"
+  loading: "読み込み中"
+  no-users: "知り合いのフォロワーはいません"
+desktop/views/pages/user/user.friends.vue:
+  title: "よく話すユーザー"
+  loading: "読み込み中"
+  no-users: "よく話すユーザーはいません"
+desktop/views/pages/user/user.vue:
+  is-suspended: "このユーザーは凍結されています。"
+  is-remote: "このユーザーはリモートユーザーです。"
+  view-remote: "正確な情報を見る"
+desktop/views/pages/user/user.home.vue:
+  last-used-at: "最終アクセス"
+desktop/views/pages/user/user.photos.vue:
+  title: "フォト"
+  loading: "読み込み中"
+  no-photos: "写真はありません"
+desktop/views/pages/user/user.profile.vue:
+  follows-you: "フォローされています"
+  stalk: "ストークする"
+  stalking: "ストーキングしています"
+  unstalk: "ストーク解除"
+  mute: "ミュートする"
+  muted: "ミュートしています"
+  unmute: "ミュート解除"
+desktop/views/pages/user/user.header.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  is-bot: "このアカウントはBotです"
+desktop/views/pages/user/user.timeline.vue:
+  default: "投稿"
+  with-replies: "投稿と返信"
+  with-media: "メディア"
+  empty: "このユーザーはまだ何も投稿していないようです。"
+desktop/views/widgets/messaging.vue:
+  title: "メッセージ"
+desktop/views/widgets/notifications.vue:
+  title: "通知"
+  settings: "通知の設定"
+desktop/views/widgets/polls.vue:
+  title: "アンケート"
+  refresh: "他を見る"
+  nothing: "ありません！"
+desktop/views/widgets/post-form.vue:
+  title: "投稿"
+  note: "投稿"
+desktop/views/widgets/profile.vue:
+  update-banner: "クリックでバナー編集"
+  update-avatar: "クリックでアバター編集"
+desktop/views/widgets/trends.vue:
+  title: "トレンド"
+  refresh: "他を見る"
+  nothing: "ありません！"
+desktop/views/widgets/users.vue:
+  title: "おすすめユーザー"
+  refresh: "他を見る"
+  no-one: "いません！"
+mobile/views/components/drive.vue:
+  drive: "ドライブ"
+  used: "使用中"
+  folder-count: "フォルダ"
+  count-separator: "、"
+  file-count: "ファイル"
+  load-more: "もっと読み込む"
+  nothing-in-drive: "ドライブには何もありません"
+  folder-is-empty: "このフォルダは空です"
+  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
+  folder-name: "フォルダー名"
+  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  url-prompt: "アップロードしたいファイルのURL"
+  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+mobile/views/components/drive-file-detail.vue:
+  rename: "名前を変更"
+mobile/views/components/drive-file-chooser.vue:
+  select-file: "ファイルを選択"
+mobile/views/components/drive-folder-chooser.vue:
+  select-folder: "フォルダーを選択"
+mobile/views/components/drive.file-detail.vue:
+  download: "ダウンロード"
+  rename: "名前を変更"
+  move: "移動"
+  hash: "ハッシュ (md5)"
+  exif: "EXIF"
+mobile/views/components/follow-button.vue:
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+mobile/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"
+mobile/views/components/note.vue:
+  reposted-by: "{}がRenote"
+  more: "もっと見る"
+  less: "隠す"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+mobile/views/components/note-detail.vue:
+  reply: "返信"
+  reaction: "リアクション"
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/notes.vue:
+  failed: "読み込みに失敗しました。"
+  retry: "リトライ"
+mobile/views/components/notifications.vue:
+  more: "もっと見る"
+  empty: "ありません！"
+mobile/views/components/post-form.vue:
+  add-visible-user: "ユーザーを追加"
+  submit: "投稿"
+  reply: "返信"
+  renote: "Renote"
+  quote-placeholder: "この投稿を引用... (オプション)"
+  reply-placeholder: "この投稿への返信..."
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "お使いの端末は位置情報に対応していません"
+  error: "エラー"
+  username-prompt: "ユーザー名を入力してください"
+mobile/views/components/sub-note-content.vue:
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
+mobile/views/components/timeline.vue:
+  empty: "投稿がありません"
+  load-more: "もっと"
+mobile/views/components/ui.nav.vue:
+  timeline: "タイムライン"
+  notifications: "通知"
+  messaging: "メッセージ"
+  follow-requests: "フォロー申請"
+  search: "検索"
+  drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
+  settings: "設定"
+  about: "Misskeyについて"
+mobile/views/components/user-timeline.vue:
+  no-notes: "このユーザーは投稿していないようです。"
+  no-notes-with-media: "メディア付き投稿はありません。"
+  load-more: "もっと"
+mobile/views/components/users-list.vue:
+  all: "すべて"
+  known: "知り合い"
+  load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
+mobile/views/pages/drive.vue:
+  drive: "ドライブ"
+  more: "もっと見る"
+mobile/views/pages/followers.vue:
+  followers-of: "{}のフォロワー"
+mobile/views/pages/following.vue:
+  following-of: "{}のフォロー"
+mobile/views/pages/home.vue:
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
+mobile/views/pages/messaging.vue:
+  messaging: "メッセージ"
+mobile/views/pages/messaging-room.vue:
+  messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
+mobile/views/pages/note.vue:
+  title: "投稿"
+  prev: "前の投稿"
+  next: "次の投稿"
+mobile/views/pages/notifications.vue:
+  notifications: "通知"
+  read-all: "すべての通知を既読にしますか？"
+mobile/views/pages/settings/settings.profile.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
+mobile/views/pages/search.vue:
+  search: "検索"
+  empty: "「{}」に関する投稿は見つかりませんでした。"
+mobile/views/pages/selectdrive.vue:
+  select-file: "ファイルを選択"
+mobile/views/pages/settings.vue:
+  signed-in-as: "{}としてサインイン中"
+  lang: "言語"
+  lang-tip: "変更はページの再読み込み後に反映されます。"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  design: "デザインと表示"
+  dark-mode: "ダークモード"
+  i-am-under-limited-internet: "私は通信を制限されている"
+  circle-icons: "円形のアイコンを使用"
+  timeline: "タイムライン"
+  show-reply-target: "リプライ先を表示する"
+  show-my-renotes: "自分の行ったRenoteを表示する"
+  show-renoted-my-notes: "Renoteされた自分の投稿を表示する"
+  post-style: "投稿の表示スタイル"
+  post-style-standard: "標準"
+  post-style-smart: "スマート"
+  behavior: "動作"
+  fetch-on-scroll: "スクロールで自動読み込み"
+  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
+  twitter: "Twitter連携"
+  twitter-connect: "Twitterアカウントに接続する"
+  twitter-reconnect: "再接続する"
+  twitter-disconnect: "切断する"
+  update: "Misskey Update"
+  version: "バージョン:"
+  latest-version: "最新のバージョン:"
+  update-checking: "アップデートを確認中"
+  check-for-updates: "アップデートを確認"
+  no-updates: "利用可能な更新はありません"
+  no-updates-desc: "お使いのMisskeyは最新です。"
+  update-available: "新しいバージョンが利用可能です"
+  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
+  settings: "設定"
+  signout: "サインアウト"
+mobile/views/pages/user.vue:
+  follows-you: "フォローされています"
+  following: "フォロー"
+  followers: "フォロワー"
+  notes: "投稿"
+  overview: "概要"
+  timeline: "タイムライン"
+  media: "メディア"
+  is-suspended: "このユーザーは凍結されています。"
+  is-remote: "このユーザーはリモートユーザーです。"
+  view-remote: "正確な情報を見る"
+mobile/views/pages/user/home.vue:
+  recent-notes: "最近の投稿"
+  images: "画像"
+  activity: "アクティビティ"
+  keywords: "キーワード"
+  domains: "頻出ドメイン"
+  frequently-replied-users: "よく会話するユーザー"
+  followers-you-know: "知り合いのフォロワー"
+  last-used-at: "最終ログイン"
+mobile/views/pages/user/home.followers-you-know.vue:
+  loading: "読み込み中"
+  no-users: "知り合いのユーザーはいません"
+mobile/views/pages/user/home.friends.vue:
+  loading: "読み込み中"
+  no-users: "よく会話するユーザーはいません"
+mobile/views/pages/user/home.notes.vue:
+  loading: "読み込み中"
+  no-notes: "投稿はありません"
+mobile/views/pages/user/home.photos.vue:
+  loading: "読み込み中"
+  no-photos: "写真はありません"
+docs:
+  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
+  edit-this-page-on-github-link: "このページをGitHubで編集"
+  api:
+    entities:
+      properties: "プロパティ"
+    endpoints:
+      params: "パラメータ"
+      res: "レスポンス"
+    props:
+      name: "名前"
+      type: "型"
+      description: "説明"
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -1,9 +1,11 @@
 ---
 meta:
  lang: "Deutsch"
-  divider: " "
+  divider: ""
 common:
-  misskey: "Teile alles mit anderen mithilfe von Misskey"
+  misskey: "A ⭐ of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
  time:
    unknown: "Unbekannt"
    future: "Zukunft"
@@ -33,11 +35,68 @@ common:
    angry: "Wütend"
    confused: "Verwirrt"
    pudding: "Pudding"
+  note-placeholders:
+    a: "Was machst du gerade?"
+    b: "Was ist so passiert?"
+    c: "Was geht dir durch den Kopf?"
+    d: "Willst du etwas sagen?"
+    e: "Schreib hier etwas!"
+    f: "Warte darauf, das du schreibst."
+  search: "検索"
  delete: "Löschen"
  loading: "Laden"
  ok: "OK"
+  update-available-title: "更新があります"
  update-available: "Eine neue Version von Misskey ist verfügbar ({newer}, aktuell ist {current}). Lade die Seite neu um die aktuelle Version zu laden"
  my-token-regenerated: "Dein Token wurde generiert. Du wirst jetzt abgemeldet."
+  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  reversi:
+    drawn: "引き分け"
+    my-turn: "あなたのターンです"
+    opponent-turn: "相手のターンです"
+    turn-of: "{}のターンです"
+    past-turn-of: "{}のターン"
+  widgets:
+    analog-clock: "Analoge Uhr"
+    profile: "Profil"
+    calendar: "Kalender"
+    timemachine: "Kalender (Zeitmaschiene)"
+    activity: "Aktivitäten"
+    rss: "RSS Leser"
+    memo: "Notizen"
+    trends: "Trends"
+    photo-stream: "Bilder"
+    posts-monitor: "投稿チャート"
+    slideshow: "Diashow"
+    version: "Version"
+    broadcast: "ブロードキャスト"
+    notifications: "Benachrichtigungen"
+    users: "Empfohlene Benutzer"
+    polls: "アンケート"
+    post-form: "Beitragsform"
+    messaging: "Nachrichten"
+    server: "Server-Info"
+    donation: "Spenden"
+    nav: "Navigation"
+    tips: "Tipps"
+    hashtags: "ハッシュタグ"
+  deck:
+    widgets: "Widget hinzufügen:"
+    home: "Startseite"
+    local: "Lokal"
+    global: "Global"
+    notifications: "Mitteilungen"
+    list: "Listen"
+    swap-left: "Nach links"
+    swap-right: "Nach rechts"
+    swap-up: "Nach oben"
+    swap-down: "Nach unten"
+    remove: "Spalte löschen"
+    add-column: "Eine Spalte hinzufügen"
+    rename: "Umbenennen"
+    stack-left: "Nach links schichten"
+    pop-right: "右に出す"
 common/views/components/connect-failed.vue:
  title: "Verbindung zum Server ist fehlgeschlagen"
  description: "Es gibt entweder ein Problem mit deiner Internetverbindung, der Server ist nicht erreichbar oder wird gerade gewartet. Bitte versuche es später noch einmal."
@@ -92,6 +151,8 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  favorite: "Diese Anmerkung favorisieren"
  pin: "An die Profilseite pinnen"
+  delete: "Löschen"
+  delete-confirm: "Diesen Post löschen?"
  remote: "Auf Quelle anzeigen"
 common/views/components/poll.vue:
  vote-to: "Stimme für '{}'"
@@ -151,6 +212,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "Trennen"
 common/views/components/uploader.vue:
  waiting: "Warten"
+common/views/components/visibility-chooser.vue:
+  public: "Öffentlich"
+  home: "Home"
+  home-desc: "Nur auf die Startseite posten"
+  followers: "Folgende"
+  followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
+  specified: "Direkt"
+  specified-desc: "Poste nur für bestimmte Benutzer"
+  private: "Privat"
 common/views/widgets/broadcast.vue:
  fetching: "Laden"
  no-broadcasts: "Keine Broadcasts"
@@ -162,18 +232,26 @@ common/views/widgets/donation.vue:
 common/views/widgets/photo-stream.vue:
  title: "Fotostream"
  no-photos: "Keine Fotos"
+common/views/widgets/posts-monitor.vue:
+  title: "投稿チャート"
+  toggle: "表示を切り替え"
+common/views/widgets/hashtags.vue:
+  title: "ハッシュタグ"
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "Serverinformationen"
  toggle: "Sicht umschalten"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
+common/views/widgets/memo.vue:
+  title: "Notizen"
+  memo: "Schreib hier!"
+  save: "Speichern"
+common/views/pages/follow.vue:
+  signed-in-as: "{}としてサインイン中"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/activity.chart.vue:
  total: "Schwarz ... komplett"
  notes: "Blau ... Hinweise"
@@ -211,30 +289,30 @@ desktop/views/components/drive.file.vue:
    rename: "Umbenennen"
    copy-url: "URL kopieren"
    download: "Download"
-    else-files: "その他..."
-    set-as-avatar: "アイコンに設定"
-    set-as-banner: "バナーに設定"
-    open-in-app: "アプリで開く"
-    add-app: "アプリを追加"
-    rename-file: "ファイル名の変更"
-    input-new-file-name: "新しいファイル名を入力してください"
-    copied: "コピー完了"
-    copied-url-to-clipboard: "URLをクリップボードにコピーしました"
+    else-files: "Anderes…"
+    set-as-avatar: "Als Avatar festlegen"
+    set-as-banner: "Setze als Banner"
+    open-in-app: "In der App öffnen"
+    add-app: "App hinzufügen"
+    rename-file: "Datei umbennen"
+    input-new-file-name: "Geben Sie den neuen Dateinamen an"
+    copied: "Kopieren erfolgreich"
+    copied-url-to-clipboard: "URL wurde in die Zwischenablage kopiert"
 desktop/views/components/drive.folder.vue:
-  unable-to-process: "操作を完了できません"
-  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
-  unhandled-error: "不明なエラー"
+  unable-to-process: "Der Vorgang konnte nicht beendet werden"
+  circular-reference-detected: "Das Zielverzeichnis ist ein Unterverzeichnis des Verzeichnisses welches du verschieben möchtest"
+  unhandled-error: "Unbekannter Fehler"
  contextmenu:
-    move-to-this-folder: "このフォルダへ移動"
-    show-in-new-window: "新しいウィンドウで表示"
-    rename: "名前を変更"
-    rename-folder: "フォルダ名の変更"
-    input-new-folder-name: "新しいフォルダ名を入力してください"
+    move-to-this-folder: "Verschiebe in diesen Ordner"
+    show-in-new-window: "In einem neuen Fenster anzeigen"
+    rename: "Umbenennen"
+    rename-folder: "Ordner umbenennen"
+    input-new-folder-name: "Namen für neuen Ordner eingeben"
 desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
+  drive: "Laufwerk"
 desktop/views/components/drive.vue:
-  search: "検索"
-  load-more: "もっと読み込む"
+  search: "Suchen"
+  load-more: "Mehr laden"
  empty-draghover: "Herzlich Willkommen!"
  empty-drive: "Dein Speicher ist leer"
  empty-drive-description: "Du kannst rechts klicken und \"Datei hochladen\" auswählen oder eine Datei per Drag and Drop auf das Fenster ziehen."
@@ -253,46 +331,29 @@ desktop/views/components/drive.vue:
    upload: "Eine Datei hochladen"
    url-upload: "Von einer URL hochladen"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
-  follow: "フォローする"
+  following: "Folge ich"
+  follow: "Folgen"
+  request-pending: "Ausstehend"
+  follow-request: "Follower-Anfragen"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
-  empty: "フォロワーはいないようです。"
+  empty: "Dir scheint niemand zu folgen."
 desktop/views/components/following-window.vue:
  following: "{} のフォロー"
 desktop/views/components/following.vue:
-  empty: "フォロー中のユーザーはいないようです。"
+  empty: "Du folgst niemanden"
 desktop/views/components/friends-maker.vue:
-  title: "気になるユーザーをフォロー:"
-  empty: "おすすめのユーザーは見つかりませんでした。"
-  fetching: "読み込んでいます"
-  refresh: "もっと見る"
-  close: "閉じる"
+  title: "Wem folgen?"
+  empty: "Der ausgewählte Benutzer konnte nicht gefunden werden."
+  fetching: "Lade…"
+  refresh: "Mehr"
+  close: "Schließen"
 desktop/views/components/game-window.vue:
-  game: "オセロ"
+  game: "リバーシ"
 desktop/views/components/home.vue:
-  done: "完了"
-  add-widget: "ウィジェットを追加:"
-  profile: "プロフィール"
-  calendar: "カレンダー"
-  timemachine: "カレンダー(タイムマシン)"
-  activity: "アクティビティ"
-  rss: "RSSリーダー"
-  trends: "トレンド"
-  photostream: "フォトストリーム"
-  slideshow: "スライドショー"
-  version: "バージョン"
-  broadcast: "ブロードキャスト"
-  notifications: "通知"
-  users: "おすすめユーザー"
-  polls: "投票"
-  post-form: "投稿フォーム"
-  messaging: "メッセージ"
-  server: "サーバー情報"
-  donation: "Spende"
-  nav: "Navigation"
-  tips: "Tipps"
+  done: "Verbunden"
+  add-widget: "Widget hinzufügen:"
  add: "Hinzufügen"
 desktop/views/input-dialog.vue:
  cancel: "Abbrechen"
@@ -303,30 +364,31 @@ desktop/views/components/messaging-window.vue:
  title: "Nachrichten"
 desktop/views/components/note-detail.vue:
  more: "Lade weitere Konversationen"
-  private: "(Dieser Post ist privat)"
-  reposted-by: "{}がRenote"
+  private: "Dieser Post ist privat"
+  deleted: "Dieser Beitrag wurde entfernt"
+  reposted-by: "Repostet von {}"
  location: "Ort"
  renote: "Anmerkung"
  add-reaction: "Reaktion hinzufügen"
-desktop/views/components/note-detail.sub.vue:
-  private: "(Dieser Post ist privat)"
 desktop/views/components/notes.note.vue:
  reposted-by: "Auch geteilt von"
  reply: "Antworten"
  renote: "Anmerken"
  add-reaction: "Eine Reaktion hinzufügen"
  detail: "Zeige Details"
+  private: "Dieser Beitrag ist eine privat"
+  deleted: "Dieser Beitrag wurde entfernt"
 desktop/views/components/notes.vue:
  error: "Laden fehlgeschlagen."
  retry: "Erneut versuchen"
+  load-more: "もっと読み込む"
 desktop/views/components/notifications.vue:
  more: "Mehr"
  empty: "Keine Benachrichtigungen"
 desktop/views/components/post-form.vue:
-  note-placeholder: "Was ist bei dir los?"
  reply-placeholder: "Antworte auf diese Anmerkung..."
  quote-placeholder: "Zitiere diese Anmerkung..."
-  note: "Post"
+  submit: "Beitragsform"
  reply: "Antworten"
  renote: "Anmerkung"
  posted: "Gepostet!"
@@ -339,7 +401,7 @@ desktop/views/components/post-form.vue:
  attach-media-from-local: "Medien von deinem PC hinzufügen"
  attach-media-from-drive: "Medien von deinem Speicher hinzufügen"
  attach-cancel: "Hinzufügen abbrechen"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
  create-poll: "Eine Abstimmung erstellen"
  text-remain: "{} Zeichen verbleibend"
 desktop/views/components/post-form-window.vue:
@@ -357,54 +419,58 @@ desktop/views/components/renote-form.vue:
  success: "Weitergesagt!"
  failure: "Weitersagen fehlgeschlagen"
 desktop/views/components/renote-form-window.vue:
-  title: "この投稿をRenoteしますか？"
+  title: "Bist du dir sicher, dass du das reposten willst?"
+desktop/views/components/settings-window.vue:
+  settings: "Experimentelles"
 desktop/views/components/settings.vue:
-  profile: "プロフィール"
-  notification: "通知"
-  apps: "アプリ"
-  mute: "ミュート"
-  drive: "ドライブ"
-  security: "セキュリティ"
+  profile: "Profil"
+  notification: "Mitteilungen"
+  apps: "In App öffnen"
+  mute: "Stummschalten"
+  drive: "Dateien vom Drive anfügen"
+  security: "Sicherheit"
  signin: "サインイン履歴"
-  password: "パスワード"
-  2fa: "二段階認証"
-  other: "その他"
-  license: "ライセンス"
-  behaviour: "動作"
-  fetch-on-scroll: "スクロールで自動読み込み"
-  fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
-  auto-popout: "ウィンドウの自動ポップアウト"
-  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  advanced: "詳細設定"
-  api-via-stream: "ストリームを経由したAPIリクエスト"
-  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
-  display: "デザインと表示"
-  customize: "ホームをカスタマイズ"
-  dark-mode: "ダークモード"
-  circle-icons: "円形のアイコンを使用"
-  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
+  password: "Passwort"
+  2fa: "Zwei-Faktor-Authentifizierung"
+  other: "Anderes"
+  license: "Lizenz"
+  behaviour: "Verhalten"
+  fetch-on-scroll: "Aktualisieren beim scrollen"
+  fetch-on-scroll-desc: "Wenn du runterscrollst empfängt die Seite automatisch zusätzliche Inhalte."
+  auto-popout: "Automatische Pop-out Fenster"
+  auto-popout-desc: "Pop-out ein offenes Fenster wenn möglich. Diese Einstellung wird im Browser gespeichert."
+  advanced: "Erweiterte Einstellungen"
+  api-via-stream: "API-Anfrage via stream"
+  api-via-stream-desc: "API-Anfrage über WebSocket statt native Aktualisierungs-API (für bessere Leistung). Diese Einstellung wird im Browser gespeichert."
+  display: "Erscheinungsbild und Anzeige"
+  customize: "Startseite anpassen"
+  choose-wallpaper: "壁紙を選択"
+  delete-wallpaper: "壁紙を削除"
+  dark-mode: "Nacht Modus"
+  circle-icons: "Kreisförmige Icons"
+  gradient-window-header: "Übergang in Fensterköpfen"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
-  show-reply-target: "リプライ先を表示する"
-  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
-  show-renoted-my-notes: "Renoteされた自分の投稿をタイムラインに表示する"
-  show-maps: "マップの自動展開"
-  show-maps-desc: "位置情報が添付された投稿のマップを自動的に展開します。"
-  sound: "サウンド"
-  enable-sounds: "サウンドを有効にする"
-  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
-  volume: "ボリューム"
-  test: "テスト"
-  mobile: "モバイル"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
+  show-reply-target: "Zeige Antworten"
+  show-my-renotes: "Zeige meine Reposts auf der Zeitleiste"
+  show-renoted-my-notes: "Zeige meine Reposts, die geteilt wurden, auf der Zeitleiste"
+  show-maps: "Karte anzeigen"
+  show-maps-desc: "Zeige den Standort zu diesem Beitrag automatisch an."
+  sound: "Ton"
+  enable-sounds: "Ton aktivieren"
+  enable-sounds-desc: "Spiel einen Ton ab beim Erhalten eines Beitrags bzw. einer Nachricht. Diese Einstellung wird im Browser gespeichert."
+  volume: "Lautstärke"
+  test: "Test"
+  mobile: "Mobil"
+  disable-via-mobile: "Diesen Beitrag nicht mit 'vom Handy' absenden"
+  language: "Sprache"
+  pick-language: "Sprache auswählen"
+  recommended: "Empfohlen"
+  auto: "Automatisch"
+  specify-language: "Sprache auswählen"
  language-desc: "変更はページの再度読み込み後に反映されます。"
  cache: "キャッシュ"
  clean-cache: "クリーンアップ"
-  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
+  cache-warn: "Der Cache deines Benutzerkontos (Info, Beiträge, Antworten, Direktnachrichten, Einstellungen), die lokal im Browser gespeichert sind werden gelöscht.\nDu musst die Seite aktualisieren nachdem du aufgeräumt hast."
  cache-cleared: "キャッシュを削除しました"
  cache-cleared-desc: "ページを再度読み込みしてください。"
  auto-watch: "投稿の自動ウォッチ"
@@ -413,9 +479,9 @@ desktop/views/components/settings.vue:
  operator: "このサーバーの運営者"
  update: "Misskey Update"
  version: "バージョン:"
-  latest-version: "最新のバージョン:"
-  update-checking: "アップデートを確認中"
-  do-update: "アップデートを確認"
+  latest-version: "Neuste Version:"
+  update-checking: "Suche nach Updates"
+  do-update: "Suche nach Updates"
  update-settings: "詳細設定"
  prevent-update: "アップデートを延期する(非推奨)"
  prevent-update-desc: "この設定をオンにしてもアップデートが反映される場合があります。この設定はこのデバイスのみ有効です。"
@@ -427,20 +493,20 @@ desktop/views/components/settings.vue:
  debug-mode: "デバッグモードを有効にする"
  debug-mode-desc: "この設定はブラウザに記憶されます。"
  experimental: "実験的機能を有効にする"
-  experimental-desc: "実験的機能を有効にするとMisskeyの動作が不安定になる可能性があります。この設定はブラウザに記憶されます。"
-  tools: "ツール"
-  task-manager: "タスクマネージャ"
+  experimental-desc: "Experimentelle Funktionen können die Stabilität von Misskey beeinträchtigen. Diese Einstellung wird im Browser gespeichert."
+  tools: "Werkzeuge"
+  task-manager: "Taskmanager"
  third-parties: "サードパーティ"
 desktop/views/components/settings.2fa.vue:
  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
  detail: "詳細..."
-  url: "https://www.google.co.jp/intl/ja/landing/2step/"
+  url: "https://www.google.de/intl/de/landing/2step/"
  caution: "登録したデバイスを紛失するなどした場合、Misskeyにサインインできなくなりますのでご注意ください。"
-  register: "デバイスを登録する"
-  already-registered: "既に設定は完了しています。"
-  unregister: "設定を解除"
-  unregistered: "二段階認証が無効になりました。"
-  enter-password: "パスワードを入力してください"
+  register: "Ein Gerät registrieren"
+  already-registered: "Das Gerät wurde bereits registriert"
+  unregister: "Abschalten"
+  unregistered: "Zwei-Faktor-Authentifizierung wurde deaktiviert."
+  enter-password: "Bitte Passwort eingeben"
  authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
  howtoinstall: "インストール方法はこちら"
  scan: "次に、表示されているQRコードをスキャンします:"
@@ -455,16 +521,16 @@ desktop/views/components/settings.api.vue:
  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
  regenerate-token: "トークンを再生成"
  token: "Token:"
-  enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+  enter-password: "Bitte Passwort eingeben"
+desktop/views/components/settings.apps.vue:
  no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
  no-users: "ミュートしているユーザーはいません"
 desktop/views/components/settings.password.vue:
  reset: "パスワードを変更する"
-  enter-current-password: "現在のパスワードを入力してください"
-  enter-new-password: "新しいパスワードを入力してください"
-  enter-new-password-again: "もう一度新しいパスワードを入力してください"
+  enter-current-password: "Derzeitiges Passwort eingeben"
+  enter-new-password: "Neues Passwort eingeben"
+  enter-new-password-again: "Neues Passwort erneut eingeben"
  not-match: "新しいパスワードが一致しません"
  changed: "パスワードを変更しました"
 desktop/views/components/settings.profile.vue:
@@ -475,30 +541,38 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "Profil aktualisieren"
+  locked-account: "アカウントの保護"
+  is-locked: "投稿を非公開にする"
+  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
-  hidden: "(この投稿は非公開です)"
-  media: "つのメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 desktop/views/components/taskmanager.vue:
-  title: "タスクマネージャ"
+  title: "Taskmanager"
 desktop/views/components/timeline.vue:
  home: "Home"
  local: "Lokal"
  global: "Global"
  list: "Listen"
+desktop/views/components/ui.header.vue:
+  welcome-back: "おかえりなさい、"
 desktop/views/components/ui.header.account.vue:
  profile: "Dein Profil"
  drive: "Speicher"
  favorites: "Favoriten"
  lists: "Listen"
-  customize: "Anpassen"
+  follow-requests: "フォロー申請"
+  customize: "ホームのカスタマイズ"
  settings: "Einstellungen"
  signout: "Ausloggen"
  dark: "Verdunkeln"
 desktop/views/components/ui.header.nav.vue:
  home: "Home"
+  deck: "デッキ"
  messaging: "Nachrichten"
  game: "Spielen"
 desktop/views/components/ui.header.notifications.vue:
@@ -507,7 +581,12 @@ desktop/views/components/ui.header.post.vue:
  post: "Einen neuen Post erstellen"
 desktop/views/components/ui.header.search.vue:
  placeholder: "Suchen"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
  create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
  notes: "投稿"
@@ -517,13 +596,23 @@ desktop/views/components/users-list.vue:
  all: "すべて"
  iknow: "知り合い"
  load-more: "もっと"
-  fetching: "読み込んでいます"
+  fetching: "Lade…"
 desktop/views/components/users-list-item.vue:
  followed: "フォローされています"
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "メディア投稿のみ"
+  is-media-view: "メディアビュー"
+  edit: "オプション"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
  signin: "ログイン"
  signup: "新規登録"
  signin-button: "やってる"
@@ -555,7 +644,7 @@ desktop/views/pages/user/user.friends.vue:
  title: "よく話すユーザー"
  loading: "読み込み中"
  no-users: "よく話すユーザーはいません"
-desktop/views/pages/user/user.header.vue:
+desktop/views/pages/user/user.vue:
  is-suspended: "このユーザーは凍結されています。"
  is-remote: "このユーザーはリモートユーザーです。"
  view-remote: "正確な情報を見る"
@@ -573,6 +662,11 @@ desktop/views/pages/user/user.profile.vue:
  mute: "ミュートする"
  muted: "ミュートしています"
  unmute: "ミュート解除"
+desktop/views/pages/user/user.header.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  is-bot: "このアカウントはBotです"
 desktop/views/pages/user/user.timeline.vue:
  default: "投稿"
  with-replies: "投稿と返信"
@@ -584,13 +678,12 @@ desktop/views/widgets/notifications.vue:
  title: "通知"
  settings: "通知の設定"
 desktop/views/widgets/polls.vue:
-  title: "投票"
+  title: "アンケート"
  refresh: "他を見る"
  nothing: "ありません！"
 desktop/views/widgets/post-form.vue:
  title: "投稿"
  note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
  update-banner: "クリックでバナー編集"
  update-avatar: "クリックでアバター編集"
@@ -611,6 +704,15 @@ mobile/views/components/drive.vue:
  load-more: "もっと読み込む"
  nothing-in-drive: "ドライブには何もありません"
  folder-is-empty: "このフォルダは空です"
+  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
+  folder-name: "フォルダー名"
+  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  url-prompt: "アップロードしたいファイルのURL"
+  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+mobile/views/components/drive-file-detail.vue:
+  rename: "名前を変更"
 mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
@@ -622,35 +724,75 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  following: "フォロー中"
  follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+mobile/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "Lade…"
+  refresh: "もっと見る"
+  close: "閉じる"
 mobile/views/components/note.vue:
  reposted-by: "{}がRenote"
+  more: "もっと見る"
+  less: "隠す"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
 mobile/views/components/note-detail.vue:
  reply: "返信"
  reaction: "リアクション"
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/notes.vue:
+  failed: "読み込みに失敗しました。"
+  retry: "リトライ"
 mobile/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 mobile/views/components/post-form.vue:
+  add-visible-user: "ユーザーを追加"
  submit: "投稿"
  reply: "返信"
  renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
  reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "お使いの端末は位置情報に対応していません"
+  error: "エラー"
+  username-prompt: "ユーザー名を入力してください"
 mobile/views/components/sub-note-content.vue:
-  media-count: "{}個のメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
+  follow-requests: "フォロー申請"
  search: "検索"
  drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
  settings: "設定"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -661,8 +803,14 @@ mobile/views/components/users-list.vue:
  all: "すべて"
  known: "知り合い"
  load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
  followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:
@@ -675,6 +823,10 @@ mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
  messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
  title: "投稿"
  prev: "前の投稿"
@@ -683,7 +835,7 @@ mobile/views/pages/notifications.vue:
  notifications: "通知"
  read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
+  title: "Profil"
  name: "名前"
  account: "アカウント"
  location: "場所"
@@ -693,7 +845,7 @@ mobile/views/pages/settings/settings.profile.vue:
  banner: "バナー"
  is-cat: "このアカウントはCatです"
  save: "保存"
-  saved: "プロフィールを保存しました"
+  saved: "Profil wurde aktualisiert"
  uploading: "アップロード中"
  upload-failed: "アップロードに失敗しました"
 mobile/views/pages/search.vue:
@@ -707,7 +859,7 @@ mobile/views/pages/settings.vue:
  lang-tip: "変更はページの再読み込み後に反映されます。"
  recommended: "推奨"
  auto: "自動"
-  specify-language: "言語を指定"
+  specify-language: "Sprache auswählen"
  design: "デザインと表示"
  dark-mode: "ダークモード"
  i-am-under-limited-internet: "私は通信を制限されている"
@@ -730,9 +882,9 @@ mobile/views/pages/settings.vue:
  twitter-disconnect: "切断する"
  update: "Misskey Update"
  version: "バージョン:"
-  latest-version: "最新のバージョン:"
-  update-checking: "アップデートを確認中"
-  check-for-updates: "アップデートを確認"
+  latest-version: "Neuste Version:"
+  update-checking: "Suche nach Updates"
+  check-for-updates: "Suche nach Updates"
  no-updates: "利用可能な更新はありません"
  no-updates-desc: "お使いのMisskeyは最新です。"
  update-available: "新しいバージョンが利用可能です"
@@ -783,7 +935,4 @@ docs:
    props:
      name: "名前"
      type: "型"
-      optional: "オプション"
      description: "説明"
-      yes: "はい"
-      no: "いいえ"
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -3,11 +3,13 @@ meta:
  lang: "English"
  divider: ""
 common:
-  misskey: "Share everything with others using Misskey."
+  misskey: "A ⭐ of the fediverse"
+  about-title: "A ⭐ of the fediverse."
+  about: "Thank you for finding Misskey. Misskey is a <b>decentralized microblogging platform</b> born on Earth. Since it exists within the Fediverse (a universe where various social media platforms are organized), it is mutually linked with other social media platforms. Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet?"
  time:
    unknown: "unknown"
    future: "future"
-    just_now: "just now"
+    just_now: "now"
    seconds_ago: "{}s ago"
    minutes_ago: "{}m ago"
    hours_ago: "{}h ago"
@@ -33,14 +35,71 @@ common:
    angry: "Angry"
    confused: "Confused"
    pudding: "Pudding"
+  note-placeholders:
+    a: "What are you doing?"
+    b: "What's happening?"
+    c: "What’s on your mind?"
+    d: "What do you wish to say?"
+    e: "Write here"
+    f: "Waiting for your writing..."
+  search: "Search"
  delete: "Delete"
  loading: "Loading"
  ok: "OK"
-  update-available: "A new version of Misskey is now available({newer}, current is {current}). Reload the page to apply the update."
-  my-token-regenerated: "Your token has been generated. You will now get logged out."
+  update-available-title: "Update available"
+  update-available: "A new version of Misskey is now available({newer}, the current version is {current}). Reload the page to apply updates."
+  my-token-regenerated: "Your token has been regenerated, so you will be signed out."
+  i-like-sushi: "I prefer sushi rather than pudding"
+  show-reversi-board-labels: "Show row and column labels in Reversi"
+  reversi:
+    drawn: "Draw"
+    my-turn: "Your turn"
+    opponent-turn: "Opponent's turn"
+    turn-of: "{}'s turn"
+    past-turn-of: "{}'s turn"
+  widgets:
+    analog-clock: "Analog clock"
+    profile: "Profile"
+    calendar: "Calendar"
+    timemachine: "Calendar (Time Machine)"
+    activity: "Activity"
+    rss: "RSS reader"
+    memo: "Sticky note"
+    trends: "Trends"
+    photo-stream: "Photostream"
+    posts-monitor: "Chart of posts"
+    slideshow: "Slideshow"
+    version: "Version"
+    broadcast: "Broadcast"
+    notifications: "Notifications"
+    users: "Recommended users"
+    polls: "Polls"
+    post-form: "Post form"
+    messaging: "Messages"
+    server: "Server info"
+    donation: "Request for donations"
+    nav: "Navigation"
+    tips: "Tips"
+    hashtags: "Hashtags"
+  deck:
+    widgets: "Widgets"
+    home: "Home"
+    local: "Local"
+    global: "Global"
+    notifications: "Notifications"
+    list: "Lists"
+    swap-left: "Move to the left"
+    swap-right: "Move to the right"
+    swap-up: "Move upward"
+    swap-down: "Move downward"
+    remove: "Remove"
+    add-column: "Add a column"
+    rename: "Rename"
+    stack-left: "Stack to the left"
+    pop-right: "Dock on the right"
 common/views/components/connect-failed.vue:
  title: "Unable to connect to the server"
-  description: "There is a problem either with your internet connection, or the server may be down or under maintenance. Please {try again} later."
+  description: "There is a problem with your Internet connection, or the server may be down or under maintenance. Please try again later."
  thanks: "Thank you for using Misskey."
  troubleshoot: "Troubleshoot"
 common/views/components/connect-failed.troubleshooter.vue:
@@ -48,34 +107,34 @@ common/views/components/connect-failed.troubleshooter.vue:
  network: "Network connection"
  checking-network: "Checking network connection"
  internet: "Internet connection"
-  checking-internet: "Checking internet connection"
+  checking-internet: "Checking Internet connection"
  server: "Server connection"
  checking-server: "Checking server connection"
-  finding: "Finding a problem"
-  no-network: "There is no Network connection"
-  no-network-desc: "Please make sure you are connected to the Network."
+  finding: "Searching for issues"
+  no-network: "No connection"
+  no-network-desc: "Please make sure that you have a network connection."
  no-internet: "There is no Internet connection"
  no-internet-desc: "Please make sure you are connected to the Internet."
  no-server: "Unable to connect to the Misskey server"
-  no-server-desc: "The network connection of your PC is normal, but you could not connect to the Misskey server. There is a possibility that the server is either down or under maintenance, please try again later."
+  no-server-desc: "The network connection of your device is normal, but you could not connect to the Misskey server. There is a possibility that the server is either down, or under maintenance, please try again later."
  success: "Successfully connected to the Misskey server"
  success-desc: "It seems to be able to connect. Please reload the page."
  flush: "Clean cache"
  set-version: "Specify version"
 common/views/components/messaging.vue:
-  search-user: "Find an user"
+  search-user: "Find a user"
  you: "You"
-  no-history: "No history"
+  no-history: "Without history"
 common/views/components/messaging-room.vue:
  empty: "No conversations"
-  more: "More"
-  no-history: "There is no more history"
+  more: "Read more"
+  no-history: "There is no further history"
  resize-form: "Drag to resize"
  new-message: "New message"
 common/views/components/messaging-room.form.vue:
  input-message-here: "Enter message here"
  send: "Send"
-  attach-from-local: "Attach files from your pc"
+  attach-from-local: "Attach files from your device"
  attach-from-drive: "Attach files from your Drive"
 common/views/components/messaging-room.message.vue:
  is-read: "Read"
@@ -91,8 +150,10 @@ common/views/components/nav.vue:
  feedback: "Feedback"
 common/views/components/note-menu.vue:
  favorite: "Favorite this note"
-  pin: "Pin to profile page"
-  remote: "Show on origin"
+  pin: "Pin to your profile page"
+  delete: "Delete"
+  delete-confirm: "Delete this post for sure?"
+  remote: "Show the originating note"
 common/views/components/poll.vue:
  vote-to: "Vote for '{}'"
  vote-count: "{} votes"
@@ -101,13 +162,13 @@ common/views/components/poll.vue:
  show-result: "Show results"
  voted: "Voted"
 common/views/components/poll-editor.vue:
-  no-only-one-choice: "You need to enter two or more choices."
+  no-only-one-choice: "At least two choices are required for this survey."
  choice-n: "Choice {}"
-  remove: "Remove this choice"
+  remove: "Delete this choice"
  add: "+ Add a choice"
-  destroy: "Destroy this poll"
+  destroy: "Discard the poll"
 common/views/components/reaction-picker.vue:
-  choose-reaction: "Choose a reaction"
+  choose-reaction: "Express a reaction"
 common/views/components/signin.vue:
  username: "Username"
  password: "Password"
@@ -125,16 +186,16 @@ common/views/components/signup.vue:
  too-long: "Please enter up to 20 characters."
  password: "Password"
  password-placeholder: "We recommend more than 8 characters."
-  weak-password: "Weak"
-  normal-password: "So so"
-  strong-password: "Strong"
-  retype: "Type again"
+  weak-password: "Weak password"
+  normal-password: "Fair password"
+  strong-password: "Strong password"
+  retype: "Re-enter"
  retype-placeholder: "Confirm your password"
  password-matched: "OK"
  password-not-matched: "Doesn't match"
-  recaptcha: "Verify"
+  recaptcha: "Verification"
  create: "Create an Account"
-  some-error: "Account creation failed for some reason. Please try again."
+  some-error: "An attempt at account creation has failed for some reason. Please try again."
 common/views/components/special-message.vue:
  new-year: "Happy New Year!"
  christmas: "Merry Christmas!"
@@ -143,29 +204,15 @@ common/views/components/stream-indicator.vue:
  reconnecting: "Reconnecting"
  connected: "Connected"
 common/views/components/twitter-setting.vue:
-  description: "If you connect your Twitter account to your Misskey account, you will be able to see your Twitter account information on your profile and you can sign-in using Twitter."
+  description: "Once you connect your Twitter account to your Misskey account, you will be able to see information about your Twitter account on your profile, and you will be able to sign-in using Twitter."
  connected-to: "You are connected to this Twitter account"
-  detail: "Detail..."
+  detail: "Details..."
  reconnect: "Reconnect"
-  connect: "Link your twitter account"
+  connect: "Link your Twitter account"
  disconnect: "Disconnect"
 common/views/components/uploader.vue:
  waiting: "Waiting"
-common/views/widgets/broadcast.vue:
-  fetching: "Fetching"
-  no-broadcasts: "No broadcasts"
-  have-a-nice-day: "Have a nice day!"
-  next: "Next"
-common/views/widgets/donation.vue:
-  title: "Donation"
-  text: "To keep Misskey up and running we spend money for our domain name, servers and so on.. We don't get any money from it, and we would really appreciate it if you could donate. If you're interested contact {}. Thank you for your contribution!"
-common/views/widgets/photo-stream.vue:
-  title: "Photostream"
-  no-photos: "No photos"
-common/views/widgets/server.vue:
-  title: "Server info"
-  toggle: "Toggle views"
-common/views/widgets/visibility-chooser.vue:
+common/views/components/visibility-chooser.vue:
  public: "Public"
  home: "Home"
  home-desc: "Post to the home timeline only"
@@ -174,11 +221,42 @@ common/views/widgets/visibility-chooser.vue:
  specified: "Direct"
  specified-desc: "Post to specified users only"
  private: "Private"
+common/views/widgets/broadcast.vue:
+  fetching: "Fetching"
+  no-broadcasts: "No announcements"
+  have-a-nice-day: "Have a nice day!"
+  next: "Next"
+common/views/widgets/donation.vue:
+  title: "Request for donations"
+  text: "To keep Misskey up and running, we have to spend money on our domain name, the server costs and so on. Since we don't receive money from advertisements, we count on donations from all of you. If you're interested in helping, contact {}. Thank you for your contribution!"
+common/views/widgets/photo-stream.vue:
+  title: "Photostream"
+  no-photos: "No photos"
+common/views/widgets/posts-monitor.vue:
+  title: "Chart of posts"
+  toggle: "Toggle views"
+common/views/widgets/hashtags.vue:
+  title: "Hashtags"
+  count: "{} users mentioned"
+  empty: "No popular hashtag trends"
+common/views/widgets/server.vue:
+  title: "Server info"
+  toggle: "Toggle views"
+common/views/widgets/memo.vue:
+  title: "Sticky note"
+  memo: "Write here!"
+  save: "Save"
+common/views/pages/follow.vue:
+  signed-in-as: "Signed in as {}"
+  following: "Following"
+  follow: "Follow"
+  request-pending: "Pending follow request"
+  follow-request: "Follow request"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
  replies: "Red ... Replies"
-  renotes: "Green ... Renotes"
+  renotes: "Green ... Repost"
 desktop/views/components/activity.vue:
  title: "Activity"
  toggle: "Toggle views"
@@ -186,24 +264,24 @@ desktop/views/components/calendar.vue:
  title: "{1} / {2}"
  prev: "Previous month"
  next: "Next month"
-  go: "Click to naviguate"
+  go: "Click to navigate"
 desktop/views/components/choose-file-from-drive-window.vue:
-  choose-file: "Choosing files"
-  upload: "Upload files from your PC"
+  choose-file: "Choose files"
+  upload: "Upload files from your device"
  cancel: "Cancel"
  ok: "OK"
  choose-prompt: "Choose a file"
 desktop/views/components/choose-folder-from-drive-window.vue:
  cancel: "Cancel"
  ok: "OK"
-  choose-prompt: "Choose a Folder"
+  choose-prompt: "Choose a folder"
 desktop/views/components/crop-window.vue:
  skip: "Skip cropping"
  cancel: "Cancel"
  ok: "OK"
 desktop/views/components/drive-window.vue:
  used: "used"
-  drive: "Drive"
+  drive: "Media storage"
 desktop/views/components/drive.file.vue:
  avatar: "Avatar"
  banner: "Banner"
@@ -231,13 +309,13 @@ desktop/views/components/drive.folder.vue:
    rename-folder: "Rename folder"
    input-new-folder-name: "Enter new name"
 desktop/views/components/drive.nav-folder.vue:
-  drive: "Drive"
+  drive: "Media storage"
 desktop/views/components/drive.vue:
  search: "Search"
  load-more: "Load more"
-  empty-draghover: "Drop Welcome!"
-  empty-drive: "Your drive is empty"
-  empty-drive-description: "You can also upload by right clicking and selecting \"Upload file\" or you can drag and drop a file onto the window."
+  empty-draghover: "Drop it here, don't I look cute?"
+  empty-drive: "Your media storage is empty"
+  empty-drive-description: "Right-click to open the menu, or drag and drop a file onto here for uploading."
  empty-folder: "This folder is empty"
  unable-to-process: "The operation could not be completed."
  circular-reference-detected: "The destination folder is a subfolder of the folder you wish to move."
@@ -253,46 +331,29 @@ desktop/views/components/drive.vue:
    upload: "Upload a file"
    url-upload: "Upload from a URL"
 desktop/views/components/follow-button.vue:
-  unfollow: "Unfollow"
+  following: "Following"
  follow: "Follow"
+  request-pending: "Pending follow request"
+  follow-request: "Follow request"
 desktop/views/components/followers-window.vue:
-  followers: "Followers of {}"
+  followers: "{}'s followers"
 desktop/views/components/followers.vue:
-  empty: "Seems that you don’t have any followers."
+  empty: "Seems like you don’t have any followers."
 desktop/views/components/following-window.vue:
  following: "Following {}"
 desktop/views/components/following.vue:
  empty: "You don’t follow anyone."
 desktop/views/components/friends-maker.vue:
  title: "Recommended users:"
-  empty: "Similar users weren’t found."
-  fetching: "Loading…"
+  empty: "Couldn't find any recommended users."
+  fetching: "Loading"
  refresh: "More"
  close: "Close"
 desktop/views/components/game-window.vue:
-  game: "Othello"
+  game: "Reversi"
 desktop/views/components/home.vue:
-  done: "Submit"
+  done: "Done"
  add-widget: "Add widget:"
-  profile: "Profile"
-  calendar: "Calendar"
-  timemachine: "Calendar (Time Machine)"
-  activity: "Activity"
-  rss: "RSS reader"
-  trends: "Trends"
-  photostream: "Photostream"
-  slideshow: "Slideshow"
-  version: "Version"
-  broadcast: "Broadcast"
-  notifications: "Notifications"
-  users: "Recommended users"
-  polls: "Polls"
-  post-form: "Post form"
-  messaging: "Messaging"
-  server: "Server info"
-  donation: "Donation"
-  nav: "Navigation"
-  tips: "Tips"
  add: "Add"
 desktop/views/input-dialog.vue:
  cancel: "Cancel"
@@ -303,45 +364,46 @@ desktop/views/components/messaging-window.vue:
  title: "Messaging"
 desktop/views/components/note-detail.vue:
  more: "Load more conversations"
-  private: "(this post is private)"
-  reposted-by: "Renoted by {}"
+  private: "This post is private"
+  deleted: "This post has been removed"
+  reposted-by: "Reposted by {}"
  location: "Location"
-  renote: "Renote"
+  renote: "Repost"
  add-reaction: "Add a reaction"
-desktop/views/components/note-detail.sub.vue:
-  private: "(this post is private)"
 desktop/views/components/notes.note.vue:
  reposted-by: "Reposted by {}"
  reply: "Reply"
-  renote: "Renote"
+  renote: "Repost"
  add-reaction: "Add a reaction"
-  detail: "Show detail"
+  detail: "Show details"
+  private: "This post is private"
+  deleted: "The post has been deleted"
 desktop/views/components/notes.vue:
  error: "Loading failed."
  retry: "Retry"
+  load-more: "Read more"
 desktop/views/components/notifications.vue:
  more: "More"
-  empty: "No notifications"
+  empty: "No notifications!"
 desktop/views/components/post-form.vue:
-  note-placeholder: "What's happening?"
  reply-placeholder: "Reply to this note..."
  quote-placeholder: "Quote this note..."
-  note: "Post"
+  submit: "Post"
  reply: "Reply"
-  renote: "Renote"
+  renote: "Repost"
  posted: "Posted!"
  replied: "Replied!"
  reposted: "Reposted!"
-  note-failed: "Failed to note"
+  note-failed: "Failed to post the note"
  reply-failed: "Failed to reply"
-  renote-failed: "Failed to renote"
+  renote-failed: "Failed to repost"
  posting: "Posting"
-  attach-media-from-local: "Attach media from your pc"
+  attach-media-from-local: "Attach media from your device"
  attach-media-from-drive: "Attach media from your Drive"
  attach-cancel: "Cancel attachment"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
  create-poll: "Create a poll"
-  text-remain: "{} chars remaining"
+  text-remain: "{} characters remaining"
 desktop/views/components/post-form-window.vue:
  note: "New note"
  reply: "Reply"
@@ -352,12 +414,14 @@ desktop/views/components/progress-dialog.vue:
 desktop/views/components/renote-form.vue:
  quote: "Quote..."
  cancel: "Cancel"
-  renote: "Renote"
+  renote: "Repost"
  reposting: "Reposting..."
  success: "Reposted!"
-  failure: "Failed to Renote"
+  failure: "Repost failed"
 desktop/views/components/renote-form-window.vue:
-  title: "Are you sure you want to renote this note?"
+  title: "Are you sure you want to repost this?"
+desktop/views/components/settings-window.vue:
+  settings: "Settings"
 desktop/views/components/settings.vue:
  profile: "Profile"
  notification: "Notification"
@@ -371,43 +435,45 @@ desktop/views/components/settings.vue:
  other: "Other"
  license: "License"
  behaviour: "Behavior"
-  fetch-on-scroll: "Fetch on scroll"
-  fetch-on-scroll-desc: "When you scroll down the page automatically fetches additional content."
+  fetch-on-scroll: "Endless loading on scroll"
+  fetch-on-scroll-desc: "When you scroll down the page, it automatically fetches additional content."
  auto-popout: "Auto pop-out window"
-  auto-popout-desc: "Pop-out an opened window if possible. This setting is stored in the browser."
+  auto-popout-desc: "Pops-out a newly opened window (onto a new tab), if possible. This setting is stored in the browser."
  advanced: "Advanced settings"
  api-via-stream: "API request via stream"
  api-via-stream-desc: "API request is performed via the WebSocket connection instead of native fetch API (for better performance). This setting is stored in the browser."
  display: "Design and display"
-  customize: "Customize Home"
+  customize: "Customize home layout"
+  choose-wallpaper: "Choose a background"
+  delete-wallpaper: "Remove background"
  dark-mode: "Dark Mode"
  circle-icons: "Use circle icons"
  gradient-window-header: "Use gradients on window headers"
  post-form-on-timeline: "Display post form at the top of the timeline"
  show-reply-target: "Display reply target"
-  show-my-renotes: "Show my renote in the timeline"
-  show-renoted-my-notes: "Show renoted my post in the timeline"
+  show-my-renotes: "Show my reposts in the timeline"
+  show-renoted-my-notes: "Show my posts that have been shared in the timeline"
  show-maps: "Show the map"
-  show-maps-desc: "Show the map of the location attached to the post."
+  show-maps-desc: "Automatically show the location on the map attached to this post."
  sound: "Sound"
  enable-sounds: "Enable sound"
-  enable-sounds-desc: "Play a sound when you received a post/message. This setting is stored in the browser."
+  enable-sounds-desc: "Play a sound when you receive a post/message. This setting is stored in the browser."
  volume: "Volume"
  test: "Test"
  mobile: "Mobile"
-  disable-via-mobile: "Not mark the post as 'from mobile'"
+  disable-via-mobile: "Don't mark the post as 'from mobile'"
  language: "Language"
  pick-language: "Select a language"
  recommended: "Recommended"
-  auto: "Auto"
-  specify-language: "Specify the language"
+  auto: "Automatic"
+  specify-language: "Specify language"
  language-desc: "You need to reload the page for the changes to take effect."
  cache: "Cache"
-  clean-cache: "Cleanup"
+  clean-cache: "Clear cache"
  cache-warn: "The cache of account info/posts/replies/messages/settings stored in the browser will be deleted. You need to reload the page after cleaning up."
  cache-cleared: "Cache cleared"
  cache-cleared-desc: "Please reload the page."
-  auto-watch: "Auto watch"
+  auto-watch: "Automatic watch"
  auto-watch-desc: "Receive notifications about the post/reply/reaction automatically."
  about: "About Misskey"
  operator: "The admin of this instance"
@@ -415,58 +481,58 @@ desktop/views/components/settings.vue:
  version: "Version:"
  latest-version: "Latest version:"
  update-checking: "Checking for updates"
-  do-update: "Check for update"
+  do-update: "Check for updates"
  update-settings: "Advanced settings"
  prevent-update: "Postpone updates (not recommended)"
-  prevent-update-desc: "You may reflect updates even if you select this setting. This setting is valid only this device."
+  prevent-update-desc: "Even if you turn this setting on, updates may apply. This setting is enabled only for this device."
  no-updates: "No updates available"
  no-updates-desc: "Your Misskey is up to date."
-  update-available: "New version is available!"
-  update-available-desc: "To reload the page and updates are applied."
+  update-available: "A new version is available"
+  update-available-desc: "The updates will apply if you reload the page again."
  advanced-settings: "Advanced"
  debug-mode: "Enable the debug mode"
  debug-mode-desc: "This setting is stored in the browser."
  experimental: "Enable experimental features"
-  experimental-desc: "It would make Misskey client unstable. This setting is stored in the browser."
+  experimental-desc: "Activating this might make the Misskey client unstable. This setting is stored in the browser."
  tools: "Tools"
  task-manager: "Task Manager"
-  third-parties: "Third-party"
+  third-parties: "Third-parties"
 desktop/views/components/settings.2fa.vue:
-  intro: "If you set up 2-step verification, you will need not only a password at sign-in but also a pre-registered physical device (such as your smartphone), which will improve security. "
+  intro: "If you set up 2-step verification, you will not only need a password at sign-in, but also a pre-registered physical device (such as your smartphone), which will improve security."
  detail: "See details..."
  url: "https://www.google.com/landing/2step/"
  caution: "If you lose access to your device, you won't be able to connect to Misskey anymore!"
  register: "Register a device"
  already-registered: "A device is already registered"
  unregister: "Disable"
-  unregistered: "Two-step authentication has been disabled."
+  unregistered: "Two-factor authentication has been disabled."
  enter-password: "Enter the password"
-  authenticator: "First, you need install Google Authenticator on your device:"
+  authenticator: "First, you need to install Google Authenticator on your device:"
  howtoinstall: "How to install"
  scan: "And then, scan the QR code:"
  done: "Please enter the token displaying on your device:"
  submit: "Submit"
-  success: "Setup completed successfully!"
-  failed: "Failed to setup. please ensure that the token is correct."
+  success: "Settings saved!"
+  failed: "Failed to setup. Please ensure that the token is correct."
  info: "From now on, enter the token that is displayed on your device in addition to your password when signing-in to Misskey."
 desktop/views/components/settings.api.vue:
  intro: "To access the API, set this token as the key 'i' of request parameters."
  caution: "Please do not show this token to third parties (do not enter it somewhere else other than here) otherwise your account could get compromised."
-  regeneration-of-token: "In the unlikely event that this token leaks out you can regenerate it."
+  regeneration-of-token: "In the unlikely event that this token leaks out, you can regenerate it."
  regenerate-token: "Regenerate the token"
  token: "Token:"
  enter-password: "Please enter the password"
-desktop/views/components/settings.app.vue:
-  no-apps: "No authorized apps"
+desktop/views/components/settings.apps.vue:
+  no-apps: "No linked applications"
 desktop/views/components/settings.mute.vue:
  no-users: "No muted users"
 desktop/views/components/settings.password.vue:
-  reset: "Change your password"
+  reset: "Change password"
  enter-current-password: "Enter the current password"
  enter-new-password: "Enter the new password"
-  enter-new-password-again: "Enter the new password again"
-  not-match: "New password doesn't match"
-  changed: "Password updated successfully"
+  enter-new-password-again: "Enter new password again"
+  not-match: "The new passwords do not match"
+  changed: "Password updated"
 desktop/views/components/settings.profile.vue:
  avatar: "Avatar"
  choice-avatar: "Choose an image"
@@ -475,12 +541,16 @@ desktop/views/components/settings.profile.vue:
  description: "Description"
  birthday: "Birthday"
  save: "Update profile"
+  locked-account: "Protect your account"
+  is-locked: "Make a note private"
+  other: "Other"
  is-bot: "This account is a Bot"
  is-cat: "This account is a Cat"
 desktop/views/components/sub-note-content.vue:
-  hidden: "(this post is private)"
-  media: " media"
-  poll: "Polls"
+  private: "This post is private"
+  deleted: "This post has been deleted"
+  media-count: "{} media attached"
+  poll: "Poll"
 desktop/views/components/taskmanager.vue:
  title: "Task Manager"
 desktop/views/components/timeline.vue:
@@ -488,27 +558,36 @@ desktop/views/components/timeline.vue:
  local: "Local"
  global: "Global"
  list: "Lists"
+desktop/views/components/ui.header.vue:
+  welcome-back: "Welcome back,"
 desktop/views/components/ui.header.account.vue:
  profile: "Your profile"
-  drive: "Drive"
+  drive: "Media storage"
  favorites: "Favorites"
  lists: "Lists"
-  customize: "Customize"
+  follow-requests: "Follow requests"
+  customize: "Customization of the home layout"
  settings: "Settings"
  signout: "Sign out"
-  dark: "Fall in dark"
+  dark: "Submerge in dark"
 desktop/views/components/ui.header.nav.vue:
  home: "Home"
+  deck: "Deck"
  messaging: "Messages"
-  game: "Play Othello"
+  game: "Games"
 desktop/views/components/ui.header.notifications.vue:
  title: "Notifications"
 desktop/views/components/ui.header.post.vue:
  post: "Compose new Post"
 desktop/views/components/ui.header.search.vue:
  placeholder: "Search"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "Follow requests"
+  accept: "Accept"
+  reject: "Reject"
 desktop/views/components/user-lists-window.vue:
-  create-list: "Create list"
+  title: "User lists"
+  create-list: "Create new list"
 desktop/views/components/user-preview.vue:
  notes: "Posts"
  following: "Following"
@@ -521,20 +600,30 @@ desktop/views/components/users-list.vue:
 desktop/views/components/users-list-item.vue:
  followed: "Follows you"
 desktop/views/components/window.vue:
-  popout: "Popout"
+  popout: "Pop-out"
  close: "Close"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "Only media posts"
+  is-media-view: "Media view"
+  edit: "Options"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "Reposted by {}"
+  private: "This post is private"
+  deleted: "This post has been deleted"
 desktop/views/pages/welcome.vue:
+  about: "More details..."
+  gotit: "Got it!"
  signin: "Log In"
  signup: "Sign up"
  signin-button: "Log in"
  signup-button: "Sign up"
  timeline: "Timeline"
 desktop/views/pages/drive.vue:
-  title: "Misskey Drive"
+  title: "Misskey storage"
 desktop/views/pages/favorites.vue:
-  more: "Load More"
+  more: "Load more"
 desktop/views/pages/home-customize.vue:
-  title: "Customize home"
+  title: "Customize home layout"
 desktop/views/pages/note.vue:
  prev: "Previous note"
  next: "Next note"
@@ -542,7 +631,7 @@ desktop/views/pages/selectdrive.vue:
  title: "Choose file(s)"
  ok: "OK"
  cancel: "Cancel"
-  upload: "Upload files from you PC"
+  upload: "Upload files from your device"
 desktop/views/pages/user-list.users.vue:
  users: "User"
  add-user: "Add a user"
@@ -550,17 +639,17 @@ desktop/views/pages/user-list.users.vue:
 desktop/views/pages/user/user.followers-you-know.vue:
  title: "Followers you know"
  loading: "Loading"
-  no-users: "No users"
+  no-users: "No followers you know"
 desktop/views/pages/user/user.friends.vue:
-  title: "Frequently replied"
+  title: "Frequent mentions"
  loading: "Loading"
  no-users: "No users"
-desktop/views/pages/user/user.header.vue:
+desktop/views/pages/user/user.vue:
  is-suspended: "This account has been suspended."
-  is-remote: "This user is a remote user, so the information is not accurate. "
-  view-remote: "See accurate information"
+  is-remote: "This user is a remote user, so the information about them that you see here is not complete. "
+  view-remote: "See their complete profile"
 desktop/views/pages/user/user.home.vue:
-  last-used-at: "Last active: "
+  last-used-at: "Last active:"
 desktop/views/pages/user/user.photos.vue:
  title: "Photos"
  loading: "Loading"
@@ -573,11 +662,16 @@ desktop/views/pages/user/user.profile.vue:
  mute: "Mute"
  muted: "Muting"
  unmute: "Unmute"
+desktop/views/pages/user/user.header.vue:
+  posts: "Notes"
+  following: "Following"
+  followers: "Followers"
+  is-bot: "This account is a Bot"
 desktop/views/pages/user/user.timeline.vue:
  default: "Posts"
-  with-replies: "Posts and replies"
+  with-replies: "Notes and replies"
  with-media: "Media"
-  empty: "This user has never posted yet."
+  empty: "This user doesn't seem to have posted anything yet."
 desktop/views/widgets/messaging.vue:
  title: "Messaging"
 desktop/views/widgets/notifications.vue:
@@ -585,32 +679,40 @@ desktop/views/widgets/notifications.vue:
  settings: "Settings"
 desktop/views/widgets/polls.vue:
  title: "Polls"
-  refresh: "Show others"
+  refresh: "refresh"
  nothing: "Nothing"
 desktop/views/widgets/post-form.vue:
  title: "Post"
  note: "Post"
-  placeholder: "What's happening?"
 desktop/views/widgets/profile.vue:
  update-banner: "Click to edit your banner"
  update-avatar: "Click to edit your avatar"
 desktop/views/widgets/trends.vue:
  title: "Trend"
-  refresh: "Show others"
+  refresh: "refresh"
  nothing: "Nothing"
 desktop/views/widgets/users.vue:
  title: "Recommended users"
-  refresh: "Show others"
+  refresh: "refresh"
  no-one: "No one"
 mobile/views/components/drive.vue:
-  drive: "Drive"
+  drive: "Media storage"
  used: "used"
  folder-count: "Folder(s)"
  count-separator: ", "
  file-count: "File(s)"
  load-more: "Load more"
-  nothing-in-drive: "Nothing"
+  nothing-in-drive: "There's nothing stored."
  folder-is-empty: "This folder is empty"
+  prompt: "What do you want to do? (Please enter a number): <1 → Upload a file | 2 → Upload a file from a URL | 3 → Create a folder | 4 → Change this folder's name | 5 → Move this folder | 6 → Delete this folder>"
+  deletion-alert: "Sorry! Deleting a folder is not yet implemented."
+  folder-name: "Folder name"
+  root-rename-alert: "You're in the root; it can't be renamed because it's not a folder. Navigate to a folder you want to rename and try again."
+  root-move-alert: "You're in the root; it can't be moved because it's not a folder. Navigate to a folder you want to move and try again."
+  url-prompt: "URL of the file you want to upload"
+  uploading: "Upload requested. It may take a while for the upload to finish."
+mobile/views/components/drive-file-detail.vue:
+  rename: "Rename"
 mobile/views/components/drive-file-chooser.vue:
  select-file: "Choose a file"
 mobile/views/components/drive-folder-chooser.vue:
@@ -622,47 +724,93 @@ mobile/views/components/drive.file-detail.vue:
  hash: "Hash (md5)"
  exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  following: "Following"
  follow: "Follow"
-  unfollow: "Unfollow"
+  request-pending: "Pending follow request"
+  follow-request: "Follow request"
+mobile/views/components/friends-maker.vue:
+  title: "Let's follow users"
+  empty: "Featured user was not found."
+  fetching: "Loading"
+  refresh: "See more"
+  close: "Close"
 mobile/views/components/note.vue:
-  reposted-by: "Renoted by {}"
+  reposted-by: "Reposted by {}"
+  more: "See more"
+  less: "Hide"
+  private: "This post is private"
+  deleted: "This post has been deleted"
+  location: "Location"
 mobile/views/components/note-detail.vue:
  reply: "Reply"
  reaction: "Reaction"
+  reposted-by: "Reposted by {}"
+  private: "This post is private"
+  deleted: "This post has been deleted"
+  location: "Location"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/notes.vue:
+  failed: "Failed to load"
+  retry: "Retry"
 mobile/views/components/notifications.vue:
  more: "More"
  empty: "No notifications"
 mobile/views/components/post-form.vue:
+  add-visible-user: "Add a user"
  submit: "Post"
  reply: "Reply"
  renote: "Renote"
-  renote-placeholder: "Quote this post. (optional)"
+  quote-placeholder: "Quote this post... (optional)"
  reply-placeholder: "Reply to this note..."
-  note-placeholder: "What's happening?"
+  cw-placeholder: "Comments about content (optional)"
+  location-alert: "Your device does not provide location services"
+  error: "Error"
+  username-prompt: "Enter user name"
 mobile/views/components/sub-note-content.vue:
-  media-count: "{} media"
+  private: "This post is private"
+  deleted: "This post has been deleted"
+  media-count: "{} media attached"
  poll: "Poll"
 mobile/views/components/timeline.vue:
  empty: "No notes"
  load-more: "More"
 mobile/views/components/ui.nav.vue:
-  home: "Home"
+  timeline: "Timeline"
  notifications: "Notifications"
  messaging: "Messages"
+  follow-requests: "Follow requests"
  search: "Search"
  drive: "Drive"
+  favorites: "Favorites"
+  user-lists: "Lists"
+  widgets: "Widgets"
+  game: "Games"
+  darkmode: "Dark mode"
  settings: "Settings"
  about: "About Misskey"
 mobile/views/components/user-timeline.vue:
-  no-notes: "It seems this user hasn't posted yet"
-  no-notes-with-media: "There is no notes with attached media"
+  no-notes: "It seems this user hasn't posted anything yet."
+  no-notes-with-media: "There are no notes with media attachments"
  load-more: "More"
 mobile/views/components/users-list.vue:
  all: "All"
  known: "You know"
  load-more: "More"
+mobile/views/pages/favorites.vue:
+  title: "Favorites"
+mobile/views/pages/user-lists.vue:
+  title: "Lists"
+  enter-list-name: "Enter list name"
 mobile/views/pages/drive.vue:
  drive: "Drive"
+  more: "Load more"
 mobile/views/pages/followers.vue:
  followers-of: "Followers of {}"
 mobile/views/pages/following.vue:
@@ -675,27 +823,31 @@ mobile/views/pages/messaging.vue:
  messaging: "Messaging"
 mobile/views/pages/messaging-room.vue:
  messaging: "Messaging"
+mobile/views/pages/received-follow-requests.vue:
+  title: "Follow requests"
+  accept: "Accept"
+  reject: "Reject"
 mobile/views/pages/note.vue:
  title: "Post"
  prev: "Previous note"
  next: "Next note"
 mobile/views/pages/notifications.vue:
  notifications: "Notifications"
-  read-all: "Are you sure you want to mark all unread notifications as read?"
+  read-all: "Do you wish to mark all notifications as read?"
 mobile/views/pages/settings/settings.profile.vue:
  title: "Profile"
  name: "Name"
  account: "Account"
  location: "Location"
-  description: "Description"
+  description: "Biography"
  birthday: "Birthday"
  avatar: "Avatar"
  banner: "Banner"
  is-cat: "This account is a Cat"
  save: "Update profile"
-  saved: "Profile updated successfully"
+  saved: "Profile updated"
  uploading: "Uploading"
-  upload-failed: "Upload failed"
+  upload-failed: "Failed to upload"
 mobile/views/pages/search.vue:
  search: "Search"
  empty: "No posts were found for '{}'"
@@ -707,23 +859,23 @@ mobile/views/pages/settings.vue:
  lang-tip: "You will need to reload the page for the changes to take effect."
  recommended: "Recommended"
  auto: "Auto"
-  specify-language: "Specify the language"
+  specify-language: "Select your language"
  design: "Design and display"
  dark-mode: "Dark Mode"
  i-am-under-limited-internet: "I'm under limited internet"
  circle-icons: "Use circle icons"
  timeline: "Timeline"
  show-reply-target: "Show reply target"
-  show-my-renotes: "Show my renotes"
-  show-renoted-my-notes: "Show renoted my notes"
+  show-my-renotes: "Show my reposts"
+  show-renoted-my-notes: "Show my reposted posts"
  post-style: "Post design"
  post-style-standard: "Standard"
  post-style-smart: "Smart"
  behavior: "Behavior"
-  fetch-on-scroll: "Fetch on scroll"
-  disable-via-mobile: "Without the \"mobile posts\" flag"
-  load-raw-images: "Show attached pictures in high-quality"
-  load-remote-media: "Show media on a remote server"
+  fetch-on-scroll: "Endless loading on scroll"
+  disable-via-mobile: "Don't mark the post as 'from mobile'"
+  load-raw-images: "Show attached images in high-quality"
+  load-remote-media: "Show media from a remote server"
  twitter: "Twitter integration"
  twitter-connect: "Connect to your Twitter account"
  twitter-reconnect: "Reconnect"
@@ -732,39 +884,39 @@ mobile/views/pages/settings.vue:
  version: "Current version:"
  latest-version: "Latest version:"
  update-checking: "Checking for updates"
-  check-for-updates: "Check for update"
+  check-for-updates: "Check for updates"
  no-updates: "No updates available"
  no-updates-desc: "Your Misskey is up to date."
-  update-available: "New version is available!"
-  update-available-desc: "To reload the page and updates are applied."
+  update-available: "A new version is available"
+  update-available-desc: "Updates will be applied after reloading the page"
  settings: "Settings"
  signout: "Sign out"
 mobile/views/pages/user.vue:
  follows-you: "Follows you"
  following: "Following"
  followers: "Followers"
-  notes: "Posts"
+  notes: "Notes"
  overview: "Overview"
  timeline: "Timeline"
  media: "Media"
  is-suspended: "This account has been suspended."
-  is-remote: "This user is a remote user, so the information is not accurate. "
-  view-remote: "See accurate information"
+  is-remote: "This user is a remote user, so the information you see here is not complete."
+  view-remote: "See their complete profile"
 mobile/views/pages/user/home.vue:
  recent-notes: "Recent notes"
  images: "Images"
  activity: "Activity"
  keywords: "Keywords"
  domains: "Domains"
-  frequently-replied-users: "Frequently talking users"
+  frequently-replied-users: "Frequently mentioned users"
  followers-you-know: "Followers you know"
  last-used-at: "Last active:"
 mobile/views/pages/user/home.followers-you-know.vue:
  loading: "Loading"
-  no-users: "No users"
+  no-users: "No users you know"
 mobile/views/pages/user/home.friends.vue:
  loading: "Loading"
-  no-users: "No users"
+  no-users: "There are no users that you know"
 mobile/views/pages/user/home.notes.vue:
  loading: "Loading"
  no-notes: "No notes"
@@ -783,7 +935,4 @@ docs:
    props:
      name: "Name"
      type: "Type"
-      optional: "Optional"
      description: "Description"
-      yes: "Yes"
-      no: "No"
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -1,179 +1,257 @@
 ---
 meta:
-  lang: "日本語"
+  lang: "Español"
  divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "Una ⭐️ del fediverso"
+  about-title: "Una ⭐️ del fediverso"
+  about: "Gracias por encontrae Misskey. Misskey es una <b>plataforma descentralizada de microblogging</b> nacida en la Tierra. Gracias a existir dentro del Fediverso (un universo donde se organizan varias plataformas sociales) se encuentra enlazada mutuamente con otras plataformas sociales. ¿Por què no te tomas un respiro del caos de la ciudad y te sumerges es una nueva manera de entender Internet?"
  time:
-    unknown: "なぞのじかん"
-    future: "未来"
-    just_now: "たった今"
-    seconds_ago: "{}秒前"
-    minutes_ago: "{}分前"
-    hours_ago: "{}時間前"
-    days_ago: "{}日前"
-    weeks_ago: "{}週間前"
-    months_ago: "{}ヶ月前"
-    years_ago: "{}年前"
+    unknown: "Desconocido"
+    future: "Futuro"
+    just_now: "Ahora mismo"
+    seconds_ago: "Hace {}"
+    minutes_ago: "Hace {} minuto(s)"
+    hours_ago: "Hace {} hora(s)"
+    days_ago: "Hace {} dia(s)"
+    weeks_ago: "Hace {} semana(s)"
+    months_ago: "Hace {} mes(es)"
+    years_ago: "Hace {} año(s)"
  weekday-short:
-    sunday: "日"
-    monday: "月"
-    tuesday: "火"
-    wednesday: "水"
-    thursday: "木"
-    friday: "金"
-    saturday: "土"
+    sunday: "domingo"
+    monday: "lunes"
+    tuesday: "martes"
+    wednesday: "miércoles"
+    thursday: "jueves"
+    friday: "viernes"
+    saturday: "sábado"
  reactions:
-    like: "いいね"
-    love: "しゅき"
-    laugh: "笑"
-    hmm: "ふぅ～む"
-    surprise: "わお"
-    congrats: "おめでとう"
-    angry: "おこ"
-    confused: "こまこまのこまり"
-    pudding: "Pudding"
-  delete: "削除"
-  loading: "読み込み中"
-  ok: "わかった"
-  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
-  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+    like: "me gusta"
+    love: "amor"
+    laugh: "risa"
+    hmm: "hmm"
+    surprise: "sorpresa"
+    congrats: "felicidades"
+    angry: "enfadado"
+    confused: "confundido"
+    pudding: "Chafado"
+  note-placeholders:
+    a: "¿Qué haces?"
+    b: "¿Qué está pasando?"
+    c: "¿Qué te pasa por la cabeza?"
+    d: "¿Quieres decir algo?"
+    e: "¡Escribe aquí!"
+    f: "Esperando a que escribas algo..."
+  search: "検索"
+  delete: "eliminar"
+  loading: "cargando"
+  ok: "OK"
+  update-available-title: "更新があります"
+  update-available: "Hay disponible una nueva versión de Misskey ({newer}, la versión actual es {current}). Refresca la página para aplicar las actualizaciones."
+  my-token-regenerated: "Tu token se ha regenerado vas a ser desconectado."
+  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  reversi:
+    drawn: "引き分け"
+    my-turn: "あなたのターンです"
+    opponent-turn: "相手のターンです"
+    turn-of: "{}のターンです"
+    past-turn-of: "{}のターン"
+  widgets:
+    analog-clock: "Reloj analógico"
+    profile: "Perfil"
+    calendar: "Calendario"
+    timemachine: "Calendario (máquina del tiempo)"
+    activity: "Actividad"
+    rss: "Lector RSS"
+    memo: "Notas adhesivas"
+    trends: "Tendencias"
+    photo-stream: "Secuencia de fotos"
+    posts-monitor: "Gráfico de publicaciones"
+    slideshow: "Diapositivas"
+    version: "Versión"
+    broadcast: "Transmisión"
+    notifications: "Notificaciones"
+    users: "Usuarios destacados"
+    polls: "Encuestas"
+    post-form: "Formulario"
+    messaging: "Mensajes"
+    server: "Información del servidor"
+    donation: "Donaciones"
+    nav: "Navegación"
+    tips: "Consejos"
+    hashtags: "Etiquetas"
+  deck:
+    widgets: "Accesorios"
+    home: "Inicio"
+    local: "Local"
+    global: "Global"
+    notifications: "Notificaciones"
+    list: "Listado"
+    swap-left: "Desplazar a la izq."
+    swap-right: "Desplazar a la dcha."
+    swap-up: "Desplazar arriba"
+    swap-down: "Desplazar abajo"
+    remove: "Borrar"
+    add-column: "Añadir columna"
+    rename: "Renombrar"
+    stack-left: "A la izqda."
+    pop-right: "A la dcha."
 common/views/components/connect-failed.vue:
-  title: "サーバーに接続できません"
-  description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
-  thanks: "いつもMisskeyをご利用いただきありがとうございます。"
-  troubleshoot: "トラブルシュート"
+  title: "Imposible conectar al servidor"
+  description: "Hay un problema en tu conexió o puede que el servidor esté caido o en mantenimiento. Por favor {try again} más tarde."
+  thanks: "Gracias por usar Misskey."
+  troubleshoot: "Problemas más frecuentes"
 common/views/components/connect-failed.troubleshooter.vue:
-  title: "トラブルシューティング"
-  network: "ネットワーク接続"
-  checking-network: "ネットワーク接続を確認中"
-  internet: "インターネット接続"
-  checking-internet: "インターネット接続を確認中"
-  server: "サーバー接続"
-  checking-server: "サーバー接続を確認中"
-  finding: "問題を調べています"
-  no-network: "ネットワークに接続されていません"
-  no-network-desc: "お使いのPCのネットワーク接続が正常か確認してください。"
-  no-internet: "インターネットに接続されていません"
-  no-internet-desc: "ネットワークには接続されていますが、インターネットには接続されていないようです。お使いのPCのインターネット接続が正常か確認してください。"
-  no-server: "Misskeyのサーバーに接続できません"
-  no-server-desc: "お使いのPCのインターネット接続は正常ですが、Misskeyのサーバーには接続できませんでした。サーバーがダウンまたはメンテナンスしている可能性があるので、しばらくしてから再度御アクセスください。"
-  success: "Misskeyのサーバーに接続できました"
-  success-desc: "正常に接続できるようです。ページを再度読み込みしてください。"
-  flush: "キャッシュの削除"
-  set-version: "バージョン指定"
+  title: "Resolución de problemas"
+  network: "Conexión de red"
+  checking-network: "Verificar la conexión a la red"
+  internet: "Conexión a Internet"
+  checking-internet: "Comprobando la conexión a Internet"
+  server: "Conexión al servidor"
+  checking-server: "Probando la conexión al servidor"
+  finding: "Buscando cualquier problema"
+  no-network: "Sin conexión"
+  no-network-desc: "Por favor, asegurate que estás conectado a una red"
+  no-internet: "Sin conexión a Internet"
+  no-internet-desc: "Por favor, asegurate de estar conectado a Internet."
+  no-server: "Imposible conectarse al servidor de Misskey"
+  no-server-desc: "La conexión de red de tu PC es correcta, aún así no puedes conectarte al servidor de Misskey. Es posible que el servidor esté caido o en mantenimiento. Por favor vuelve a intentarlo más tarde."
+  success: "Conectado al servidor de Misskey de manera correcta"
+  success-desc: "Parece que la conexión ha sido posible. Por favor refresca la página."
+  flush: "Limpiar la memoria caché"
+  set-version: "Escoge la versión"
 common/views/components/messaging.vue:
-  search-user: "ユーザーを探す"
-  you: "あなた"
-  no-history: "履歴はありません"
+  search-user: "Encuentra un usuario"
+  you: "Tu"
+  no-history: "Sin historial"
 common/views/components/messaging-room.vue:
-  empty: "このユーザーと話したことはありません"
-  more: "もっと読む"
-  no-history: "これより過去の履歴はありません"
-  resize-form: "ドラッグしてフォームの広さを調整"
-  new-message: "新しいメッセージがあります"
+  empty: "Sin conversaciones"
+  more: "Leer más"
+  no-history: "El historial se ha acabado"
+  resize-form: "Arrastra para redimensionar"
+  new-message: "Nuevo mensaje"
 common/views/components/messaging-room.form.vue:
-  input-message-here: "ここにメッセージを入力"
-  send: "送信"
-  attach-from-local: "PCからファイルを添付する"
-  attach-from-drive: "ドライブからファイルを添付する"
+  input-message-here: "Escribe el mensaje aquí"
+  send: "Enviar"
+  attach-from-local: "Adjunta ficheros desde tu PC"
+  attach-from-drive: "Adjunta ficheros desde tu disco"
 common/views/components/messaging-room.message.vue:
-  is-read: "既読"
-  deleted: "このメッセージは削除されました"
+  is-read: "Leer"
+  deleted: "El mensaje se ha borrado"
 common/views/components/nav.vue:
-  about: "Misskeyについて"
-  stats: "統計"
-  status: "ステータス"
+  about: "Sobre"
+  stats: "Estadísticas"
+  status: "Estado"
  wiki: "Wiki"
-  donors: "ドナー"
-  repository: "リポジトリ"
-  develop: "開発者"
-  feedback: "フィードバック"
+  donors: "Donantes"
+  repository: "Repositorio"
+  develop: "Desarrolladores"
+  feedback: "Opiniones"
 common/views/components/note-menu.vue:
-  favorite: "お気に入り"
-  pin: "ピン留め"
-  remote: "投稿元で見る"
+  favorite: "Me gusta esta nota"
+  pin: "Fijar en el perfil"
+  delete: "Borrar"
+  delete-confirm: "¿Seguro que quieres borrar la publicación?"
+  remote: "Ver el original"
 common/views/components/poll.vue:
-  vote-to: "「{}」に投票する"
-  vote-count: "{}票"
-  total-users: "{}人が投票"
-  vote: "投票する"
-  show-result: "結果を見る"
-  voted: "投票済み"
+  vote-to: "'{}' para votar"
+  vote-count: "{} votos"
+  total-users: "{} usuario(s) que ha(n) votado"
+  vote: "Vota"
+  show-result: "Mostrar resultados"
+  voted: "Votado"
 common/views/components/poll-editor.vue:
-  no-only-one-choice: "投票には、選択肢が最低2つ必要です"
-  choice-n: "選択肢{}"
-  remove: "この選択肢を削除"
-  add: "+選択肢を追加"
-  destroy: "投票を破棄"
+  no-only-one-choice: "Selecciona dos o más opciones."
+  choice-n: "{} opcion(es)"
+  remove: "Borra la opción"
+  add: "+ Añade una opción"
+  destroy: "Cancelar la encuesta"
 common/views/components/reaction-picker.vue:
-  choose-reaction: "リアクションを選択"
+  choose-reaction: "Escoge una reacción"
 common/views/components/signin.vue:
-  username: "ユーザー名"
-  password: "パスワード"
-  token: "トークン"
-  signing-in: "やってます..."
-  signin: "サインイン"
+  username: "Usuario"
+  password: "Contraseña"
+  token: "Identificador"
+  signing-in: "Entrando..."
+  signin: "Entra"
 common/views/components/signup.vue:
-  username: "ユーザー名"
-  checking: "確認しています..."
-  available: "利用できます"
-  unavailable: "既に利用されています"
-  error: "通信エラー"
-  invalid-format: "a~z、A~Z、0~9、_が使えます"
-  too-short: "1文字以上でお願いします！"
-  too-long: "20文字以内でお願いします"
-  password: "パスワード"
-  password-placeholder: "8文字以上を推奨します"
-  weak-password: "弱いパスワード"
-  normal-password: "まあまあのパスワード"
-  strong-password: "強いパスワード"
-  retype: "再入力"
-  retype-placeholder: "確認のため再入力してください"
-  password-matched: "確認されました"
-  password-not-matched: "一致していません"
-  recaptcha: "認証"
-  create: "アカウント作成"
-  some-error: "何らかの原因によりアカウントの作成に失敗しました。再度お試しください。"
+  username: "Usuario"
+  checking: "Comprobando..."
+  available: "Disponible"
+  unavailable: "Utilizado"
+  error: "Error de conexión"
+  invalid-format: "utiliza letras, números y/o -."
+  too-short: "¡Mínimo tienes que introducir un caracter!"
+  too-long: "No puedes usar más de 20 caracteres."
+  password: "Contraseña"
+  password-placeholder: "Te recomendamos más de 8 caracteres"
+  weak-password: "Contraseña débil"
+  normal-password: "No está mal"
+  strong-password: "Muy buena contraseña"
+  retype: "Inténtalo otra vez"
+  retype-placeholder: "Confirma la contraseña"
+  password-matched: "OK"
+  password-not-matched: "Las contraseñas no son las mismas"
+  recaptcha: "Verificar"
+  create: "Crea una cuenta"
+  some-error: "Por algún motivo no se ha podido crear la cuenta. Por favor inténtalo de nuevo."
 common/views/components/special-message.vue:
-  new-year: "Happy New Year!"
-  christmas: "Merry Christmas!"
+  new-year: "¡Feliz Año Nuevo!"
+  christmas: "¡Feliz Navidad!"
 common/views/components/stream-indicator.vue:
-  connecting: "接続中"
-  reconnecting: "再接続中"
-  connected: "接続完了"
+  connecting: "Conectando"
+  reconnecting: "Reconectando"
+  connected: "Conectado"
 common/views/components/twitter-setting.vue:
-  description: "お使いのTwitterアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでTwitterアカウント情報が表示されるようになったり、Twitterを用いた便利なサインインを利用できるようになります。"
-  connected-to: "次のTwitterアカウントに接続されています"
-  detail: "詳細..."
-  reconnect: "再接続する"
-  connect: "Twitterと接続する"
-  disconnect: "切断する"
+  description: "Si comectas tu cuenta de Twitter con tu cuenta de Misskey podrás ver la información de tu cuemta de Twitter en tu perfil y además podrás entrar usando Twitter."
+  connected-to: "Estas comectado con las siguientes cuentas de Twitter"
+  detail: "Detalles..."
+  reconnect: "Conectar de nuevo"
+  connect: "Conectate usando Twitter"
+  disconnect: "Desconectado"
 common/views/components/uploader.vue:
-  waiting: "待機中"
+  waiting: "Un momento"
+common/views/components/visibility-chooser.vue:
+  public: "Público"
+  home: "Inicio"
+  home-desc: "Publica solo en la página de inicio"
+  followers: "Seguidores"
+  followers-desc: "Piblica solo para tus seguidores"
+  specified: "Directo"
+  specified-desc: "Publica solo para los seguidores que quieras"
+  private: "Privada"
 common/views/widgets/broadcast.vue:
-  fetching: "確認中"
-  no-broadcasts: "お知らせはありません"
-  have-a-nice-day: "良い一日を！"
-  next: "次"
+  fetching: "Recuperando"
+  no-broadcasts: "Sin emisión"
+  have-a-nice-day: "¡Buenos dias!"
+  next: "Siguiente"
 common/views/widgets/donation.vue:
-  title: "寄付のお願い"
+  title: "Donaciones"
  text: "Misskeyの運営にはドメイン、サーバー等のコストが掛かります。Misskeyは広告を掲載したりしないため、収入を皆様からの寄付に頼っています。もしご興味があれば、{}までご連絡ください。ご協力ありがとうございます。"
 common/views/widgets/photo-stream.vue:
  title: "フォトストリーム"
  no-photos: "写真はありません"
+common/views/widgets/posts-monitor.vue:
+  title: "投稿チャート"
+  toggle: "表示を切り替え"
+common/views/widgets/hashtags.vue:
+  title: "ハッシュタグ"
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
+common/views/widgets/memo.vue:
+  title: "付箋"
+  memo: "ここに書いて！"
+  save: "保存"
+common/views/pages/follow.vue:
+  signed-in-as: "{}としてサインイン中"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -196,65 +274,67 @@ desktop/views/components/choose-file-from-drive-window.vue:
 desktop/views/components/choose-folder-from-drive-window.vue:
  cancel: "キャンセル"
  ok: "決定"
-  choose-prompt: "フォルダを選択"
+  choose-prompt: "Escoge una Carpeta"
 desktop/views/components/crop-window.vue:
  skip: "クロップをスキップ"
-  cancel: "キャンセル"
-  ok: "決定"
+  cancel: "Cancelar"
+  ok: "OK"
 desktop/views/components/drive-window.vue:
-  used: "使用中"
-  drive: "ドライブ"
+  used: "usado"
+  drive: "Disco"
 desktop/views/components/drive.file.vue:
-  avatar: "アイコン"
-  banner: "バナー"
+  avatar: "Avatar"
+  banner: "Banner"
  contextmenu:
-    rename: "名前を変更"
-    copy-url: "URLをコピー"
-    download: "ダウンロード"
-    else-files: "その他..."
-    set-as-avatar: "アイコンに設定"
-    set-as-banner: "バナーに設定"
-    open-in-app: "アプリで開く"
-    add-app: "アプリを追加"
-    rename-file: "ファイル名の変更"
-    input-new-file-name: "新しいファイル名を入力してください"
-    copied: "コピー完了"
-    copied-url-to-clipboard: "URLをクリップボードにコピーしました"
+    rename: "Renombrar"
+    copy-url: "Copia la URL"
+    download: "Descargar"
+    else-files: "Otros"
+    set-as-avatar: "Utilizar como avatar"
+    set-as-banner: "Utilizar como banner"
+    open-in-app: "Abrir en la aplicación"
+    add-app: "Añadir aplicación"
+    rename-file: "Renombra el fichero"
+    input-new-file-name: "Escribe el nombre nuevo"
+    copied: "Copiado"
+    copied-url-to-clipboard: "URL copiada al porta papeles"
 desktop/views/components/drive.folder.vue:
-  unable-to-process: "操作を完了できません"
-  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
-  unhandled-error: "不明なエラー"
+  unable-to-process: "La operación no se puede llevar a cabo"
+  circular-reference-detected: "La carpeta de destino es una sub-carpeta de la carpeta que quieres mover."
+  unhandled-error: "Error desconocido"
  contextmenu:
-    move-to-this-folder: "このフォルダへ移動"
-    show-in-new-window: "新しいウィンドウで表示"
-    rename: "名前を変更"
-    rename-folder: "フォルダ名の変更"
-    input-new-folder-name: "新しいフォルダ名を入力してください"
+    move-to-this-folder: "Mover a esta carpeta"
+    show-in-new-window: "Abrir en una ventana nueva"
+    rename: "Renombrar"
+    rename-folder: "Renombrar carpeta"
+    input-new-folder-name: "Escribe el nombre nuevo"
 desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
+  drive: "Disco"
 desktop/views/components/drive.vue:
-  search: "検索"
-  load-more: "もっと読み込む"
-  empty-draghover: "ドロップですか？いいですよ、ボクはカワイイですからね"
-  empty-drive: "ドライブには何もありません。"
-  empty-drive-description: "右クリックして「ファイルをアップロード」を選んだり、ファイルをドラッグ&ドロップすることでもアップロードできます。"
-  empty-folder: "このフォルダーは空です"
-  unable-to-process: "操作を完了できません"
-  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
-  unhandled-error: "不明なエラー"
-  url-upload: "URLアップロード"
-  url-of-file: "アップロードしたいファイルのURL"
-  url-upload-requested: "アップロードをリクエストしました"
-  may-take-time: "アップロードが完了するまで時間がかかる場合があります。"
-  create-folder: "フォルダー作成"
-  folder-name: "フォルダー名"
+  search: "Buscar"
+  load-more: "Cargar más"
+  empty-draghover: "¡Saluda!"
+  empty-drive: "Tu disco está vacio"
+  empty-drive-description: "También puedes subir archivos seleccionándolos y con el botón derecho selecciona \"Subir fichero\" o puedes arrastrarlo hasta la ventana."
+  empty-folder: "La carpeta está vacia"
+  unable-to-process: "La operación no se puede llevar a cabo."
+  circular-reference-detected: "La carpeta de destino es una sub-carpeta de la carpeta que quieres mover."
+  unhandled-error: "Errer desconocido"
+  url-upload: "Subir desde una URL"
+  url-of-file: "URL del fichero que quieres subir"
+  url-upload-requested: "Subida solicitada"
+  may-take-time: "Subir el fichero puede tardar un tiempo."
+  create-folder: "Crear una carpeta"
+  folder-name: "Nombre de la carpeta"
  contextmenu:
-    create-folder: "フォルダーを作成"
-    upload: "ファイルをアップロード"
-    url-upload: "URLからアップロード"
+    create-folder: "Crear una carpeta"
+    upload: "Subir fichero"
+    url-upload: "Subir desde una URL"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
-  follow: "フォローする"
+  following: "Siguiendo"
+  follow: "Sigue"
+  request-pending: "Pendiente de aprobación"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -270,29 +350,10 @@ desktop/views/components/friends-maker.vue:
  refresh: "もっと見る"
  close: "閉じる"
 desktop/views/components/game-window.vue:
-  game: "オセロ"
+  game: "リバーシ"
 desktop/views/components/home.vue:
  done: "完了"
  add-widget: "ウィジェットを追加:"
-  profile: "プロフィール"
-  calendar: "カレンダー"
-  timemachine: "カレンダー(タイムマシン)"
-  activity: "アクティビティ"
-  rss: "RSSリーダー"
-  trends: "トレンド"
-  photostream: "フォトストリーム"
-  slideshow: "スライドショー"
-  version: "バージョン"
-  broadcast: "ブロードキャスト"
-  notifications: "通知"
-  users: "おすすめユーザー"
-  polls: "投票"
-  post-form: "投稿フォーム"
-  messaging: "メッセージ"
-  server: "サーバー情報"
-  donation: "寄付のお願い"
-  nav: "ナビゲーション"
-  tips: "ヒント"
  add: "追加"
 desktop/views/input-dialog.vue:
  cancel: "キャンセル"
@@ -303,30 +364,31 @@ desktop/views/components/messaging-window.vue:
  title: "メッセージ"
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
-  private: "(この投稿は非公開です)"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "(この投稿は非公開です)"
 desktop/views/components/notes.note.vue:
  reposted-by: "{}がRenote"
  reply: "返信"
  renote: "Renote"
  add-reaction: "リアクション"
  detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
  error: "読み込みに失敗しました。"
  retry: "リトライ"
+  load-more: "もっと読み込む"
 desktop/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
  reply-placeholder: "この投稿への返信..."
  quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
  reply: "返信"
  renote: "Renote"
  posted: "投稿しました！"
@@ -337,53 +399,57 @@ desktop/views/components/post-form.vue:
  renote-failed: "Renoteに失敗しました"
  posting: "投稿中"
  attach-media-from-local: "PCからメディアを添付"
-  attach-media-from-drive: "ドライブからメディアを添付"
-  attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
-  create-poll: "投票を作成"
-  text-remain: "残り{}文字"
+  attach-media-from-drive: "Adjunta multimedia desde tu Disco"
+  attach-cancel: "Quitar el archivo adjunto"
+  insert-a-kao: "v('ω')v"
+  create-poll: "Crea una encuesta"
+  text-remain: "quedan {} caracteres"
 desktop/views/components/post-form-window.vue:
-  note: "新規投稿"
-  reply: "返信"
-  attaches: "添付: {}メディア"
-  uploading-media: "{}個のメディアをアップロード中"
+  note: "Nota nueva"
+  reply: "Responder"
+  attaches: "{} archivo(s) multimedia adjuntados"
+  uploading-media: "Subiendo {} archivo(s) multimedia"
 desktop/views/components/progress-dialog.vue:
-  waiting: "待機中"
+  waiting: "Un momento"
 desktop/views/components/renote-form.vue:
-  quote: "引用する..."
-  cancel: "キャンセル"
-  renote: "Renote"
-  reposting: "しています..."
-  success: "Renoteしました！"
-  failure: "Renoteに失敗しました"
+  quote: "Cita..."
+  cancel: "Cancelar"
+  renote: "Volver a publicar"
+  reposting: "Publicando de nuevo..."
+  success: "¡Publicado!"
+  failure: "La publicación ha fallado"
 desktop/views/components/renote-form-window.vue:
-  title: "この投稿をRenoteしますか？"
+  title: "¿Seguro qué quieres volver a publicarlo?"
+desktop/views/components/settings-window.vue:
+  settings: "Configuración"
 desktop/views/components/settings.vue:
-  profile: "プロフィール"
-  notification: "通知"
-  apps: "アプリ"
-  mute: "ミュート"
-  drive: "ドライブ"
-  security: "セキュリティ"
-  signin: "サインイン履歴"
-  password: "パスワード"
-  2fa: "二段階認証"
-  other: "その他"
-  license: "ライセンス"
-  behaviour: "動作"
-  fetch-on-scroll: "スクロールで自動読み込み"
-  fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
-  auto-popout: "ウィンドウの自動ポップアウト"
-  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  advanced: "詳細設定"
-  api-via-stream: "ストリームを経由したAPIリクエスト"
-  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
-  display: "デザインと表示"
-  customize: "ホームをカスタマイズ"
-  dark-mode: "ダークモード"
-  circle-icons: "円形のアイコンを使用"
-  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
-  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
+  profile: "Perfil"
+  notification: "Notificación"
+  apps: "Aplicaciones"
+  mute: "Silenciar"
+  drive: "Disco"
+  security: "Seguridad"
+  signin: "Historial de inicios de sesión"
+  password: "Contraseña"
+  2fa: "Autenticación de Doble-Factor"
+  other: "Otros"
+  license: "Licencia"
+  behaviour: "Acciones"
+  fetch-on-scroll: "Desplazamiento infinito"
+  fetch-on-scroll-desc: "Cuando te deslizas al final de la página nuevo contenido se carga automáticamente."
+  auto-popout: "Ventana emergente automática"
+  auto-popout-desc: "Muestra una ventana emergente si es posible. Esta configuración depende del navegador."
+  advanced: "Configuración avanzada"
+  api-via-stream: "Solicitar API por medio de un stream"
+  api-via-stream-desc: "Las peticiones de las API se realizan por conexiones WebSocket en lugar de las tradicionales (para una mejora en el rendimiento). Esta función depende del navegador."
+  display: "Diseño y pantalla"
+  customize: "Personaliza la página principal"
+  choose-wallpaper: "壁紙を選択"
+  delete-wallpaper: "壁紙を削除"
+  dark-mode: "Modo Nocturno"
+  circle-icons: "Usar iconos circulares"
+  gradient-window-header: "Usar degradados en las cabeceras de las páginas"
+  post-form-on-timeline: "Mostrar el formulario de las entradas encima de la línea de tiempo"
  show-reply-target: "リプライ先を表示する"
  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
  show-renoted-my-notes: "Renoteされた自分の投稿をタイムラインに表示する"
@@ -456,7 +522,7 @@ desktop/views/components/settings.api.vue:
  regenerate-token: "トークンを再生成"
  token: "Token:"
  enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
  no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
  no-users: "ミュートしているユーザーはいません"
@@ -475,12 +541,16 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  locked-account: "アカウントの保護"
+  is-locked: "投稿を非公開にする"
+  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
-  hidden: "(この投稿は非公開です)"
-  media: "つのメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 desktop/views/components/taskmanager.vue:
  title: "タスクマネージャ"
 desktop/views/components/timeline.vue:
@@ -488,17 +558,21 @@ desktop/views/components/timeline.vue:
  local: "ローカル"
  global: "グローバル"
  list: "リスト"
+desktop/views/components/ui.header.vue:
+  welcome-back: "おかえりなさい、"
 desktop/views/components/ui.header.account.vue:
  profile: "プロフィール"
  drive: "ドライブ"
  favorites: "お気に入り"
  lists: "リスト"
-  customize: "カスタマイズ"
+  follow-requests: "フォロー申請"
+  customize: "ホームのカスタマイズ"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"
 desktop/views/components/ui.header.nav.vue:
  home: "ホーム"
+  deck: "デッキ"
  messaging: "メッセージ"
  game: "ゲーム"
 desktop/views/components/ui.header.notifications.vue:
@@ -507,7 +581,12 @@ desktop/views/components/ui.header.post.vue:
  post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
  placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
  create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
  notes: "投稿"
@@ -523,7 +602,17 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "メディア投稿のみ"
+  is-media-view: "メディアビュー"
+  edit: "オプション"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
  signin: "ログイン"
  signup: "新規登録"
  signin-button: "やってる"
@@ -555,7 +644,7 @@ desktop/views/pages/user/user.friends.vue:
  title: "よく話すユーザー"
  loading: "読み込み中"
  no-users: "よく話すユーザーはいません"
-desktop/views/pages/user/user.header.vue:
+desktop/views/pages/user/user.vue:
  is-suspended: "このユーザーは凍結されています。"
  is-remote: "このユーザーはリモートユーザーです。"
  view-remote: "正確な情報を見る"
@@ -573,6 +662,11 @@ desktop/views/pages/user/user.profile.vue:
  mute: "ミュートする"
  muted: "ミュートしています"
  unmute: "ミュート解除"
+desktop/views/pages/user/user.header.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  is-bot: "このアカウントはBotです"
 desktop/views/pages/user/user.timeline.vue:
  default: "投稿"
  with-replies: "投稿と返信"
@@ -584,13 +678,12 @@ desktop/views/widgets/notifications.vue:
  title: "通知"
  settings: "通知の設定"
 desktop/views/widgets/polls.vue:
-  title: "投票"
+  title: "アンケート"
  refresh: "他を見る"
  nothing: "ありません！"
 desktop/views/widgets/post-form.vue:
  title: "投稿"
  note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
  update-banner: "クリックでバナー編集"
  update-avatar: "クリックでアバター編集"
@@ -611,6 +704,15 @@ mobile/views/components/drive.vue:
  load-more: "もっと読み込む"
  nothing-in-drive: "ドライブには何もありません"
  folder-is-empty: "このフォルダは空です"
+  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
+  folder-name: "フォルダー名"
+  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  url-prompt: "アップロードしたいファイルのURL"
+  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+mobile/views/components/drive-file-detail.vue:
+  rename: "名前を変更"
 mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
@@ -622,35 +724,75 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  following: "フォロー中"
  follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+mobile/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"
 mobile/views/components/note.vue:
  reposted-by: "{}がRenote"
+  more: "もっと見る"
+  less: "隠す"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
 mobile/views/components/note-detail.vue:
  reply: "返信"
  reaction: "リアクション"
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/notes.vue:
+  failed: "読み込みに失敗しました。"
+  retry: "リトライ"
 mobile/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 mobile/views/components/post-form.vue:
+  add-visible-user: "ユーザーを追加"
  submit: "投稿"
  reply: "返信"
  renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
  reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "お使いの端末は位置情報に対応していません"
+  error: "エラー"
+  username-prompt: "ユーザー名を入力してください"
 mobile/views/components/sub-note-content.vue:
-  media-count: "{}個のメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
+  follow-requests: "フォロー申請"
  search: "検索"
  drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
  settings: "設定"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -661,8 +803,14 @@ mobile/views/components/users-list.vue:
  all: "すべて"
  known: "知り合い"
  load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
  followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:
@@ -675,6 +823,10 @@ mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
  messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
  title: "投稿"
  prev: "前の投稿"
@@ -783,7 +935,4 @@ docs:
    props:
      name: "名前"
      type: "型"
-      optional: "オプション"
      description: "説明"
-      yes: "はい"
-      no: "いいえ"
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -1,20 +1,22 @@
 ---
 meta:
  lang: "Français"
-  divider: " "
+  divider: ""
 common:
-  misskey: "Partagez avec les autres en utilisant Misskey"
+  misskey: "Une ⭐ du fédiverse"
+  about-title: "Une ⭐ du fédiverse."
+  about: "Merci d'avoir découvert Misskey. Misskey est une <b>plateforme de micro-blogging distribuée</b> née sur Terre. Parce qu'il fait partie du Fédiverse (un univers composé de diverses plateformes de réseaux sociaux organisées), il est mutuellement connecté avec d'autres plateformes de réseaux sociaux. Désirez-vous prendre une pause, pendant un instant, loin de l'agitation de la ville et plonger dans un nouvel Internet ?"
  time:
    unknown: "inconnu"
    future: "future"
-    just_now: "maintenant"
-    seconds_ago: "Il y a {}seconde(s)"
-    minutes_ago: "Il y a {}minute(s)"
-    hours_ago: "Il y a {}heure(s)"
-    days_ago: "Il y a {}jour(s)"
-    weeks_ago: "Il y a{}semaines(s)"
-    months_ago: "Il y a {}mois"
-    years_ago: "Il y a {}an(s)"
+    just_now: "à l'instant"
+    seconds_ago: "Il y a {} seconde·s"
+    minutes_ago: "Il y a {} minute·s"
+    hours_ago: "Il y a {} heure·s"
+    days_ago: "Il y a {} jour·s"
+    weeks_ago: "Il y a {} semaines·s"
+    months_ago: "Il y a {} mois"
+    years_ago: "Il y a {} an·s"
  weekday-short:
    sunday: "D"
    monday: "L"
@@ -22,22 +24,79 @@ common:
    wednesday: "M"
    thursday: "J"
    friday: "V"
-    saturday: "土"
+    saturday: "S"
  reactions:
    like: "Aime"
    love: "Adore"
    laugh: "Rire"
-    hmm: "Hmm...?"
+    hmm: "Hmm ... ?"
    surprise: "Wow"
-    congrats: "Félicitations!"
-    angry: "En Colère"
+    congrats: "Félicitations !"
+    angry: "En colère"
    confused: "Confus"
    pudding: "Pudding"
+  note-placeholders:
+    a: "Que faîtes vous maintenant ?"
+    b: "Quoi de neuf ?"
+    c: "Qu'avez-vous en tête ?"
+    d: "Voulez-vous exprimer quelque chose ?"
+    e: "Écrivez ici"
+    f: "En attente de vos écrits"
+  search: "Recherche"
  delete: "Supprimer"
  loading: "Chargement"
  ok: "OK"
-  update-available: "Une nouvelle version de Misskey est disponible({newer}, version actuelle: {current}). Recharger la page pour appliquer la mise à jour."
+  update-available-title: "Mise à jour disponible"
+  update-available: "Une nouvelle version de Misskey est disponible ({newer}, version actuelle: {current}). Veuillez recharger la page pour appliquer la mise à jour."
  my-token-regenerated: "Votre token vient d'être généré, vous allez maintenant être déconnecté."
+  i-like-sushi: "Je préfère les sushis (au pudding)"
+  show-reversi-board-labels: "Afficher les étiquettes des lignes et colonnes dans Reversi"
+  reversi:
+    drawn: "Partie nulle"
+    my-turn: "C’est votre tour"
+    opponent-turn: "Tour de l’adversaire"
+    turn-of: "C’est le tour de {}"
+    past-turn-of: "C'est au tour de {}"
+  widgets:
+    analog-clock: "Horloge analogique"
+    profile: "Profil"
+    calendar: "Calendrier"
+    timemachine: "カレンダー(タイムマシン)"
+    activity: "Activité"
+    rss: "Lecteur de flux RSS"
+    memo: "Pense-bête"
+    trends: "Tendances"
+    photo-stream: "Flux de photos"
+    posts-monitor: "Graph des publications"
+    slideshow: "Diaporama"
+    version: "Version"
+    broadcast: "Diffusion"
+    notifications: "Notifications"
+    users: "Utilisateurs"
+    polls: "Sondages"
+    post-form: "投稿フォーム"
+    messaging: "Messagerie"
+    server: "Info sur le serveur"
+    donation: "Dons"
+    nav: "Navigation"
+    tips: "Conseils"
+    hashtags: "Étiquettes"
+  deck:
+    widgets: "Widgets"
+    home: "Accueil"
+    local: "Local"
+    global: "Global"
+    notifications: "Notifications"
+    list: "Liste"
+    swap-left: "Déplacer à gauche"
+    swap-right: "Déplacer à droite"
+    swap-up: "Vers le haut"
+    swap-down: "Vers le bas"
+    remove: "Supprimer"
+    add-column: "Ajouter une colonne"
+    rename: "Renommer"
+    stack-left: "Vers la gauche"
+    pop-right: "Vers la droite"
 common/views/components/connect-failed.vue:
  title: "Impossible de se connecter au server."
  description: "Il y a soit un problème avec votre connexion internet, soit le serveur est hors-ligne ou en maintenance. Veuillez {ressayer} plus tard."
@@ -60,8 +119,8 @@ common/views/components/connect-failed.troubleshooter.vue:
  no-server-desc: "Votre connexion est OK, mais il a été impossible de vous connecter au serveur de Misskey. Il y a des chances que le serveur soit hors-ligne ou en maintenance, veuillez ressayer plus tard."
  success: "Connexion au serveur de Misskey reussie!"
  success-desc: "La connexion au serveur a été reussie. Veuillez recharger la page."
-  flush: "キャッシュの削除"
-  set-version: "バージョン指定"
+  flush: "Vider le cache"
+  set-version: "Choisissez une version"
 common/views/components/messaging.vue:
  search-user: "Trouver un utilisateur"
  you: "Vous"
@@ -88,11 +147,13 @@ common/views/components/nav.vue:
  donors: "Donateurs"
  repository: "Repo"
  develop: "Développeurs"
-  feedback: "フィードバック"
+  feedback: "Remarques"
 common/views/components/note-menu.vue:
  favorite: "Favorite this note"
  pin: "Épingler sur votre profile"
-  remote: "投稿元で見る"
+  delete: "Supprimer"
+  delete-confirm: "Supprimer cette publication ?"
+  remote: "Afficher les note originale"
 common/views/components/poll.vue:
  vote-to: "Voter pour '{}'"
  vote-count: "{} votes"
@@ -101,11 +162,11 @@ common/views/components/poll.vue:
  show-result: "Montrer les résultats"
  voted: "Voté"
 common/views/components/poll-editor.vue:
-  no-only-one-choice: "Vous devez entrer au moins deux choix"
+  no-only-one-choice: "Vous devez saisir au moins deux choix."
  choice-n: "Choix {}"
  remove: "Supprimer ce choix"
  add: "+ Ajouter un choix"
-  destroy: "Supprimer ce sondage"
+  destroy: "Annuler ce sondage"
 common/views/components/reaction-picker.vue:
  choose-reaction: "Choisissez votre réaction"
 common/views/components/signin.vue:
@@ -151,6 +212,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "Deconnecter"
 common/views/components/uploader.vue:
  waiting: "En attente"
+common/views/components/visibility-chooser.vue:
+  public: "Public"
+  home: "Accueil"
+  home-desc: "Publier sur le fil d'Accueil uniquement"
+  followers: "Abonnés"
+  followers-desc: "Publier à vos abonnés uniquement"
+  specified: "Direct"
+  specified-desc: "Publier aux utilisateurs mentionnés"
+  private: "Privé"
 common/views/widgets/broadcast.vue:
  fetching: "Récuperation"
  no-broadcasts: "No broadcasts"
@@ -162,23 +232,31 @@ common/views/widgets/donation.vue:
 common/views/widgets/photo-stream.vue:
  title: "Flux de photo"
  no-photos: "Pas de photos"
+common/views/widgets/posts-monitor.vue:
+  title: "Graph des publications"
+  toggle: "Basculer les vues"
+common/views/widgets/hashtags.vue:
+  title: "Étiquettes"
+  count: "{} utilisateurs mentionnés"
+  empty: "Aucune tendance"
 common/views/widgets/server.vue:
  title: "Info sur le serveur"
  toggle: "Afficher les vues"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
+common/views/widgets/memo.vue:
+  title: "Pense-bête"
+  memo: "Écrivez ici !"
+  save: "Enregistrer"
+common/views/pages/follow.vue:
+  signed-in-as: "Connecté en tant que {}"
+  following: "Suit"
+  follow: "Suivre"
+  request-pending: "Demande d'abonnement en attente"
+  follow-request: "Demande d'abonnement"
 desktop/views/components/activity.chart.vue:
-  total: "Black ... Total"
-  notes: "Blue ... Notes"
-  replies: "Red ... Replies"
-  renotes: "Green ... Renotes"
+  total: "Noir ... Total"
+  notes: "Bleu ... Notes"
+  replies: "Rouge ... Réponses"
+  renotes: "Vert ... Partages"
 desktop/views/components/activity.vue:
  title: "Activitié"
  toggle: "Afficher les vues"
@@ -188,19 +266,19 @@ desktop/views/components/calendar.vue:
  next: "Mois prochain"
  go: "Cliquer pour naviguer"
 desktop/views/components/choose-file-from-drive-window.vue:
-  choose-file: "ファイル選択中"
-  upload: "PCからドライブにファイルをアップロード"
-  cancel: "キャンセル"
-  ok: "決定"
-  choose-prompt: "ファイルを選択"
+  choose-file: "Sélection de fichiers"
+  upload: "Téléverser des fichiers à partir de votre PC"
+  cancel: "Annuler"
+  ok: "OK"
+  choose-prompt: "Choisir un fichier"
 desktop/views/components/choose-folder-from-drive-window.vue:
-  cancel: "キャンセル"
-  ok: "決定"
-  choose-prompt: "フォルダを選択"
+  cancel: "Annuler"
+  ok: "OK"
+  choose-prompt: "Choisir un dossier"
 desktop/views/components/crop-window.vue:
-  skip: "クロップをスキップ"
-  cancel: "キャンセル"
-  ok: "決定"
+  skip: "Ignorer la découpe"
+  cancel: "Annuler"
+  ok: "OK"
 desktop/views/components/drive-window.vue:
  used: "utilisé"
  drive: "Drive"
@@ -253,82 +331,66 @@ desktop/views/components/drive.vue:
    upload: "Uploader un fichier"
    url-upload: "Uploader d'un URL"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
-  follow: "フォローする"
+  following: "Abonnements"
+  follow: "Suivre"
+  request-pending: "En attente d'approbation"
+  follow-request: "Demande d'abonnement"
 desktop/views/components/followers-window.vue:
-  followers: "{} のフォロワー"
+  followers: "{} abonnés"
 desktop/views/components/followers.vue:
-  empty: "フォロワーはいないようです。"
+  empty: "Il semble que vous n'avez pas encore d'abonnés."
 desktop/views/components/following-window.vue:
-  following: "{} のフォロー"
+  following: "Suit {}"
 desktop/views/components/following.vue:
-  empty: "フォロー中のユーザーはいないようです。"
+  empty: "Vous ne suivez aucun compte."
 desktop/views/components/friends-maker.vue:
-  title: "気になるユーザーをフォロー:"
-  empty: "おすすめのユーザーは見つかりませんでした。"
-  fetching: "読み込んでいます"
-  refresh: "もっと見る"
-  close: "閉じる"
+  title: "Utilisateurs recommandés :"
+  empty: "Impossible de trouver des utilisateurs à recommander."
+  fetching: "Chargement"
+  refresh: "Plus"
+  close: "Fermer"
 desktop/views/components/game-window.vue:
-  game: "オセロ"
+  game: "Reversi"
 desktop/views/components/home.vue:
-  done: "完了"
-  add-widget: "ウィジェットを追加:"
-  profile: "プロフィール"
-  calendar: "カレンダー"
-  timemachine: "カレンダー(タイムマシン)"
-  activity: "アクティビティ"
-  rss: "RSSリーダー"
-  trends: "トレンド"
-  photostream: "フォトストリーム"
-  slideshow: "スライドショー"
-  version: "バージョン"
-  broadcast: "ブロードキャスト"
-  notifications: "通知"
-  users: "おすすめユーザー"
-  polls: "投票"
-  post-form: "投稿フォーム"
-  messaging: "メッセージ"
-  server: "サーバー情報"
-  donation: "寄付のお願い"
-  nav: "ナビゲーション"
-  tips: "ヒント"
-  add: "追加"
+  done: "Envoyer"
+  add-widget: "Ajouter un widget"
+  add: "Ajouter"
 desktop/views/input-dialog.vue:
-  cancel: "キャンセル"
-  ok: "決定"
+  cancel: "Annuler"
+  ok: "OK"
 desktop/views/components/messaging-room-window.vue:
-  title: "メッセージ:"
+  title: "Messages :"
 desktop/views/components/messaging-window.vue:
  title: "Messagerie"
 desktop/views/components/note-detail.vue:
-  more: "会話をもっと読み込む"
-  private: "(この投稿は非公開です)"
-  reposted-by: "{}がRenote"
-  location: "位置情報"
-  renote: "Renote"
-  add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "(この投稿は非公開です)"
+  more: "Charger davantage de conversations"
+  private: "cette publication est privée"
+  deleted: "cette publication a été supprimée"
+  reposted-by: "Republié par {}"
+  location: "Géolocalisation"
+  renote: "Republier"
+  add-reaction: "Ajouter votre reaction"
 desktop/views/components/notes.note.vue:
  reposted-by: "Reposté par {}"
  reply: "Répondre"
-  renote: "Renote"
+  renote: "Republier"
  add-reaction: "Ajouter votre reaction"
  detail: "Afficher les détails"
+  private: "cette publication est privée"
+  deleted: "cette publication a été supprimée"
 desktop/views/components/notes.vue:
-  error: "読み込みに失敗しました。"
-  retry: "リトライ"
+  error: "Échec du chargement."
+  retry: "Réessayer"
+  load-more: "もっと読み込む"
 desktop/views/components/notifications.vue:
  more: "Plus"
  empty: "Pas de notifications"
 desktop/views/components/post-form.vue:
-  note-placeholder: "Qu'est-ce qui se passe?"
  reply-placeholder: "Répondre à cette note"
  quote-placeholder: "Citer cette note"
-  note: "Poster"
+  submit: "Poster"
  reply: "Répondre"
-  renote: "Renote"
+  renote: "Republier"
  posted: "Posté!"
  replied: "Répondu!"
  reposted: "Reposté!"
@@ -339,7 +401,7 @@ desktop/views/components/post-form.vue:
  attach-media-from-local: "Joindre un media depuis votre PC"
  attach-media-from-drive: "Joindre un media depuis votre Drive"
  attach-cancel: "Annuler la jointure de fichier"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
  create-poll: "Créer un sondage"
  text-remain: "{} charactères restants"
 desktop/views/components/post-form-window.vue:
@@ -348,16 +410,18 @@ desktop/views/components/post-form-window.vue:
  attaches: "{} media joint(s)"
  uploading-media: "Upload du media {}"
 desktop/views/components/progress-dialog.vue:
-  waiting: "待機中"
+  waiting: "En attente"
 desktop/views/components/renote-form.vue:
  quote: "Citer..."
  cancel: "Annuler"
-  renote: "Renote"
+  renote: "Republier"
  reposting: "Repost en cours..."
  success: "Reposté!"
  failure: "La renote a échoué"
 desktop/views/components/renote-form-window.vue:
  title: "Êtes vous sûr de vouloir renote cette note?"
+desktop/views/components/settings-window.vue:
+  settings: "Paramètres"
 desktop/views/components/settings.vue:
  profile: "Profil"
  notification: "Notification"
@@ -365,72 +429,74 @@ desktop/views/components/settings.vue:
  mute: "Mettre en sourdine"
  drive: "Drive"
  security: "Sécurité"
-  signin: "サインイン履歴"
+  signin: "Historique de connexion"
  password: "Mot de Passe"
  2fa: "Vérification en deux étapes"
  other: "Autres"
  license: "License"
-  behaviour: "動作"
-  fetch-on-scroll: "スクロールで自動読み込み"
-  fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
-  auto-popout: "ウィンドウの自動ポップアウト"
+  behaviour: "Comportement"
+  fetch-on-scroll: "Chargement lors du défilement"
+  fetch-on-scroll-desc: "Chargement automatique du contenu lors du défilement de la page."
+  auto-popout: "Fenêtre contextuelle automatique"
  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
-  advanced: "詳細設定"
-  api-via-stream: "ストリームを経由したAPIリクエスト"
+  advanced: "Paramètres avancés"
+  api-via-stream: "Requête API via le flux"
  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
-  display: "デザインと表示"
-  customize: "ホームをカスタマイズ"
-  dark-mode: "ダークモード"
-  circle-icons: "円形のアイコンを使用"
-  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
+  display: "Affichage et design"
+  customize: "Personnaliser l'Accueil"
+  choose-wallpaper: "壁紙を選択"
+  delete-wallpaper: "壁紙を削除"
+  dark-mode: "Mode nuit"
+  circle-icons: "Utiliser des icônes circulaires"
+  gradient-window-header: "Utiliser les dégradés sur la barre de titre de la fenêtre"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
  show-reply-target: "リプライ先を表示する"
-  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
+  show-my-renotes: "Afficher mes republications dans le fil"
  show-renoted-my-notes: "Renoteされた自分の投稿をタイムラインに表示する"
-  show-maps: "マップの自動展開"
+  show-maps: "Afficher la carte"
  show-maps-desc: "位置情報が添付された投稿のマップを自動的に展開します。"
-  sound: "サウンド"
-  enable-sounds: "サウンドを有効にする"
+  sound: "Son"
+  enable-sounds: "Activer le son"
  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
-  volume: "ボリューム"
-  test: "テスト"
-  mobile: "モバイル"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
-  cache: "キャッシュ"
-  clean-cache: "クリーンアップ"
+  volume: "Volume"
+  test: "Test"
+  mobile: "Mobile"
+  disable-via-mobile: "Enlever la mention publié via 'un périphérique mobile'"
+  language: "Langue"
+  pick-language: "Sélectionner une langue"
+  recommended: "Recommandé"
+  auto: "Automatique"
+  specify-language: "Spécifier la langue"
+  language-desc: "Le rechargement de la page est requis afin d'appliquer les modifications."
+  cache: "Cache"
+  clean-cache: "Nettoyage"
  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
-  cache-cleared: "キャッシュを削除しました"
-  cache-cleared-desc: "ページを再度読み込みしてください。"
+  cache-cleared: "Cache nettoyé"
+  cache-cleared-desc: "Veuillez recharger la page."
  auto-watch: "投稿の自動ウォッチ"
  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
-  about: "Misskeyについて"
-  operator: "このサーバーの運営者"
-  update: "Misskey Update"
-  version: "バージョン:"
-  latest-version: "最新のバージョン:"
-  update-checking: "アップデートを確認中"
-  do-update: "アップデートを確認"
-  update-settings: "詳細設定"
-  prevent-update: "アップデートを延期する(非推奨)"
+  about: "À propose de Misskey"
+  operator: "L'admin de cette instance"
+  update: "Mise à jour de Misskey"
+  version: "Version :"
+  latest-version: "Dernière version :"
+  update-checking: "Recherche de mises à jour"
+  do-update: "Rechercher des mises à jour"
+  update-settings: "Paramètres avancés"
+  prevent-update: "Reporter les mises à jour (non recommandé)"
  prevent-update-desc: "この設定をオンにしてもアップデートが反映される場合があります。この設定はこのデバイスのみ有効です。"
-  no-updates: "利用可能な更新はありません"
-  no-updates-desc: "お使いのMisskeyは最新です。"
-  update-available: "新しいバージョンが利用可能です"
-  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
-  advanced-settings: "高度な設定"
-  debug-mode: "デバッグモードを有効にする"
-  debug-mode-desc: "この設定はブラウザに記憶されます。"
-  experimental: "実験的機能を有効にする"
+  no-updates: "Aucune mise à jour disponible"
+  no-updates-desc: "Votre Misskey est à jour."
+  update-available: "Nouvelle version disponible !"
+  update-available-desc: "Les mises à jour seront appliquées une fois la page est rechargée."
+  advanced-settings: "Réglages avancés"
+  debug-mode: "Activer le mode debug"
+  debug-mode-desc: "Ce paramètre est stocké dans le navigateur."
+  experimental: "Activer les fonctionnalités expérimentales"
  experimental-desc: "実験的機能を有効にするとMisskeyの動作が不安定になる可能性があります。この設定はブラウザに記憶されます。"
-  tools: "ツール"
-  task-manager: "タスクマネージャ"
-  third-parties: "サードパーティ"
+  tools: "Outils"
+  task-manager: "Gestionnaire de tâches"
+  third-parties: "Services tiers"
 desktop/views/components/settings.2fa.vue:
  intro: "Si vous configurez la vérication en deux étapes vous aurez non seulement besoin de votre mot de passe mais aussi un appareil déjà pré-enregistré(tel que votre smartphone) ce qui ameliora grandement la sécurité de votre compte."
  detail: "Voir les détails..."
@@ -454,10 +520,10 @@ desktop/views/components/settings.api.vue:
  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
  regenerate-token: "Regenerer le token"
-  token: "Token:"
+  token: "Jeton :"
  enter-password: "Veuillez entrer le mot de passe"
-desktop/views/components/settings.app.vue:
-  no-apps: "Aucune application authorisée"
+desktop/views/components/settings.apps.vue:
+  no-apps: "Aucune application autorisée"
 desktop/views/components/settings.mute.vue:
  no-users: "Aucun utilisateurs mis en sourdine"
 desktop/views/components/settings.password.vue:
@@ -475,30 +541,38 @@ desktop/views/components/settings.profile.vue:
  description: "Description"
  birthday: "Date de naissance"
  save: "Mettre à jour le profil"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
+  locked-account: "アカウントの保護"
+  is-locked: "投稿を非公開にする"
+  other: "その他"
+  is-bot: "Ce compte est un Bot"
+  is-cat: "Ce compte est un Chat"
 desktop/views/components/sub-note-content.vue:
-  hidden: "(この投稿は非公開です)"
-  media: "つのメディア"
-  poll: "投票"
+  private: "cette publication est privée"
+  deleted: "cette publication a été supprimée"
+  media-count: "{} médias attachés"
+  poll: "Sondage"
 desktop/views/components/taskmanager.vue:
-  title: "タスクマネージャ"
+  title: "Gestionnaire de tâches"
 desktop/views/components/timeline.vue:
-  home: "ホーム"
-  local: "ローカル"
-  global: "グローバル"
-  list: "リスト"
+  home: "Accueil"
+  local: "Local"
+  global: "Global"
+  list: "Listes"
+desktop/views/components/ui.header.vue:
+  welcome-back: "Vous êtes de retour !"
 desktop/views/components/ui.header.account.vue:
  profile: "Votre profil"
  drive: "Drive"
  favorites: "Favorites"
-  lists: "リスト"
-  customize: "Modifications"
+  lists: "Listes"
+  follow-requests: "Demandes de suivi"
+  customize: "ホームのカスタマイズ"
  settings: "Réglages"
  signout: "Déconnexion"
  dark: "Fall in dark"
 desktop/views/components/ui.header.nav.vue:
  home: "Accueil"
+  deck: "デッキ"
  messaging: "Messages"
  game: "Jeux"
 desktop/views/components/ui.header.notifications.vue:
@@ -507,34 +581,49 @@ desktop/views/components/ui.header.post.vue:
  post: "Composer un nouveau post"
 desktop/views/components/ui.header.search.vue:
  placeholder: "Chercher"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "Demandes de suivi"
+  accept: "Approuver"
+  reject: "Refuser"
 desktop/views/components/user-lists-window.vue:
-  create-list: "リストを作成"
+  title: "Listes de l'utilisateur"
+  create-list: "Créer une liste"
 desktop/views/components/user-preview.vue:
-  notes: "投稿"
-  following: "フォロー"
-  followers: "フォロワー"
+  notes: "Publications"
+  following: "Abonné à"
+  followers: "Abonnés"
 desktop/views/components/users-list.vue:
-  all: "すべて"
-  iknow: "知り合い"
-  load-more: "もっと"
-  fetching: "読み込んでいます"
+  all: "Tout"
+  iknow: "Vous connaissez"
+  load-more: "Afficher plus"
+  fetching: "Chargement ..."
 desktop/views/components/users-list-item.vue:
-  followed: "フォローされています"
+  followed: "vous suit"
 desktop/views/components/window.vue:
  popout: "ポップアウト"
-  close: "閉じる"
+  close: "Fermer"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "Les publications médias uniquement"
+  is-media-view: "Vue média"
+  edit: "オプション"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "Reposté par {}"
+  private: "cette publication est privée"
+  deleted: "cette publication a été supprimée"
 desktop/views/pages/welcome.vue:
-  signin: "ログイン"
-  signup: "新規登録"
-  signin-button: "やってる"
-  signup-button: "やる"
-  timeline: "タイムライン"
+  about: "à propos"
+  gotit: "J'ai compris !"
+  signin: "Connexion"
+  signup: "S'enregistrer"
+  signin-button: "Se connecter"
+  signup-button: "S'inscrire"
+  timeline: "Fil d'actualité"
 desktop/views/pages/drive.vue:
-  title: "Misskey Drive"
+  title: "Lecteur de Misskey"
 desktop/views/pages/favorites.vue:
-  more: "さらに読み込む"
+  more: "Plus de résultats"
 desktop/views/pages/home-customize.vue:
-  title: "ホームのカスタマイズ"
+  title: "Personnaliser l'Accueil"
 desktop/views/pages/note.vue:
  prev: "Note précédente"
  next: "Note suivante"
@@ -544,9 +633,9 @@ desktop/views/pages/selectdrive.vue:
  cancel: "Annuler"
  upload: "Uploader un ou plusieurs fichier(s) depuis votre PC"
 desktop/views/pages/user-list.users.vue:
-  users: "ユーザー"
-  add-user: "ユーザーを追加"
-  username: "ユーザー名"
+  users: "Utilisateurs"
+  add-user: "Ajouter un utilisateur"
+  username: "Nom d'utilisateur"
 desktop/views/pages/user/user.followers-you-know.vue:
  title: "Abonnés que vous connaissez"
  loading: "Chargement en cours"
@@ -555,9 +644,9 @@ desktop/views/pages/user/user.friends.vue:
  title: "Personnes qui répondent le plus"
  loading: "Chargement en cours"
  no-users: "Pas d'utilisateurs"
-desktop/views/pages/user/user.header.vue:
-  is-suspended: "This account has been suspended."
-  is-remote: "Cet utilisateur n'est pas un utilisateur de Misskey. Certaines informations peuvent être erronées "
+desktop/views/pages/user/user.vue:
+  is-suspended: "Ce compte a été suspendu."
+  is-remote: "Cet utilisateur n'est pas un utilisateur de Misskey. Certaines informations peuvent être erronées"
  view-remote: "Voir les informations détaillées"
 desktop/views/pages/user/user.home.vue:
  last-used-at: "Last used at"
@@ -573,11 +662,16 @@ desktop/views/pages/user/user.profile.vue:
  mute: "Mettre en sourdine"
  muted: "Muting"
  unmute: "Enlever la sourdine"
+desktop/views/pages/user/user.header.vue:
+  posts: "投稿"
+  following: "Suit"
+  followers: "Abonnés"
+  is-bot: "Ce compte est un Bot"
 desktop/views/pages/user/user.timeline.vue:
-  default: "投稿"
-  with-replies: "投稿と返信"
-  with-media: "メディア"
-  empty: "このユーザーはまだ何も投稿していないようです。"
+  default: "Publications"
+  with-replies: "Publications et réponses"
+  with-media: "Média"
+  empty: "Cet utilisateur n'a rien posté encore."
 desktop/views/widgets/messaging.vue:
  title: "Messagerie"
 desktop/views/widgets/notifications.vue:
@@ -590,10 +684,9 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
  title: "Post"
  note: "Post"
-  placeholder: "Qu'est-ce qu'il se passe?"
 desktop/views/widgets/profile.vue:
-  update-banner: "クリックでバナー編集"
-  update-avatar: "クリックでアバター編集"
+  update-banner: "Cliquer pour éditer votre bannière"
+  update-avatar: "Cliquer pour éditer votre avatar"
 desktop/views/widgets/trends.vue:
  title: "Tendances"
  refresh: "Afficher d'autres"
@@ -611,6 +704,15 @@ mobile/views/components/drive.vue:
  load-more: "Charger plus"
  nothing-in-drive: "Rien"
  folder-is-empty: "Ce dossier est vide"
+  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "Désolé ! La suppression d’un dossier n’est pas encore implémentée."
+  folder-name: "Nom du dossier"
+  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  url-prompt: "URL du fichier que vous souhaitez téléverser"
+  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+mobile/views/components/drive-file-detail.vue:
+  rename: "Renommer"
 mobile/views/components/drive-file-chooser.vue:
  select-file: "Choisissez un fichier"
 mobile/views/components/drive-folder-chooser.vue:
@@ -622,35 +724,75 @@ mobile/views/components/drive.file-detail.vue:
  hash: "Hash (md5)"
  exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  following: "Abonnements"
  follow: "Suivre"
-  unfollow: "Ne plus suivre"
+  request-pending: "En attente d'approbation"
+  follow-request: "Demande d'abonnement"
+mobile/views/components/friends-maker.vue:
+  title: "Abonnez-vous aux utilisateurs"
+  empty: "Impossible de trouver des utilisateurs à recommander."
+  fetching: "Chargement"
+  refresh: "Voir plus"
+  close: "Fermer"
 mobile/views/components/note.vue:
  reposted-by: "Renoté par {}"
+  more: "Voir plus"
+  less: "Masquer"
+  private: "cette publication est privée"
+  deleted: "cette publication a été supprimée"
+  location: "Géolocalisation"
 mobile/views/components/note-detail.vue:
  reply: "Répondre"
  reaction: "Réaction"
+  reposted-by: "Republié par {}"
+  private: "cette publication est privée"
+  deleted: "cette publication a été supprimée"
+  location: "Lieu"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "chat"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "chat"
+mobile/views/components/notes.vue:
+  failed: "Échec du chargement."
+  retry: "Réessayer"
 mobile/views/components/notifications.vue:
  more: "Plus"
  empty: "Pas de notifications"
 mobile/views/components/post-form.vue:
+  add-visible-user: "Ajouter un utilisateur"
  submit: "Poster"
-  reply: "返信"
-  renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  reply: "Répondre"
+  renote: "Republier"
+  quote-placeholder: "Citer ce billet ... (Facultatif)"
  reply-placeholder: "Répondre à cette note"
-  note-placeholder: "Qu'est-ce qu'il se passe?"
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "Votre appareil ne prend pas en charge les services de localisation"
+  error: "Erreur"
+  username-prompt: "Saisir un nom d'utilisateur"
 mobile/views/components/sub-note-content.vue:
-  media-count: "{} media"
+  private: "cette publication est privée"
+  deleted: "cette publication a été supprimée"
+  media-count: "{} médias attachés"
  poll: "Sondage"
 mobile/views/components/timeline.vue:
  empty: "Pas de notes"
  load-more: "Afficher plus"
 mobile/views/components/ui.nav.vue:
-  home: "Accueil"
+  timeline: "Fil d'actualité"
  notifications: "Notifications"
  messaging: "Messages"
+  follow-requests: "Demandes d'abonnement"
  search: "Rechercher"
  drive: "Drive"
+  favorites: "Favoris"
+  user-lists: "Listes"
+  widgets: "Modules"
+  game: "Jeux"
+  darkmode: "Mode nuit"
  settings: "Réglages"
  about: "À propose de Misskey"
 mobile/views/components/user-timeline.vue:
@@ -661,20 +803,30 @@ mobile/views/components/users-list.vue:
  all: "Tout"
  known: "Vous connaissez"
  load-more: "Afficher plus"
+mobile/views/pages/favorites.vue:
+  title: "Favoris"
+mobile/views/pages/user-lists.vue:
+  title: "Listes"
+  enter-list-name: "Nom de la liste"
 mobile/views/pages/drive.vue:
  drive: "Drive"
+  more: "Afficher plus ..."
 mobile/views/pages/followers.vue:
  followers-of: "Abonnés de {}"
 mobile/views/pages/following.vue:
  following-of: "Abonnements de {}"
 mobile/views/pages/home.vue:
-  home: "ホーム"
-  local: "ローカル"
-  global: "グローバル"
+  home: "Accueil"
+  local: "Local"
+  global: "Global"
 mobile/views/pages/messaging.vue:
  messaging: "Messagerie"
 mobile/views/pages/messaging-room.vue:
  messaging: "Messagerie"
+mobile/views/pages/received-follow-requests.vue:
+  title: "Demandes d'abonnement"
+  accept: "Approuver"
+  reject: "Refuser"
 mobile/views/pages/note.vue:
  title: "Post"
  prev: "Note précedante"
@@ -683,19 +835,19 @@ mobile/views/pages/notifications.vue:
  notifications: "Notifications"
  read-all: "Êtes vous sûr de vouloir marqués toutes les notifications non-lus en tant que lus?"
 mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  name: "名前"
-  account: "アカウント"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  is-cat: "このアカウントはCatです"
-  save: "保存"
-  saved: "プロフィールを保存しました"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
+  title: "Profil"
+  name: "Nom"
+  account: "Compte"
+  location: "Lieu"
+  description: "Description"
+  birthday: "Date de naissance"
+  avatar: "Avatar"
+  banner: "Bannière"
+  is-cat: "Ce compte est un Bot"
+  save: "Mettre à jour le profil"
+  saved: "Profil mis à jour avec succès"
+  uploading: "En cours d'envoi"
+  upload-failed: "Échec de l'envoi"
 mobile/views/pages/search.vue:
  search: "Chercher"
  empty: "Aucun message trouvé pour '{}' "
@@ -703,40 +855,40 @@ mobile/views/pages/selectdrive.vue:
  select-file: "Choisissez un fichier"
 mobile/views/pages/settings.vue:
  signed-in-as: "Connecté en tant que {}"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  design: "デザインと表示"
-  dark-mode: "ダークモード"
-  i-am-under-limited-internet: "私は通信を制限されている"
-  circle-icons: "円形のアイコンを使用"
-  timeline: "タイムライン"
+  lang: "Langue"
+  lang-tip: "Le rechargement de la page est requis afin d'appliquer les modifications."
+  recommended: "Recommandé"
+  auto: "Automatique"
+  specify-language: "Spécifier la langue"
+  design: "Affichage et design"
+  dark-mode: "Mode nuit"
+  i-am-under-limited-internet: "J'ai un accès Internet limité"
+  circle-icons: "Utiliser des icônes circulaires"
+  timeline: "Fil d'actualité"
  show-reply-target: "リプライ先を表示する"
-  show-my-renotes: "自分の行ったRenoteを表示する"
+  show-my-renotes: "Afficher mes republications"
  show-renoted-my-notes: "Renoteされた自分の投稿を表示する"
-  post-style: "投稿の表示スタイル"
-  post-style-standard: "標準"
-  post-style-smart: "スマート"
-  behavior: "動作"
-  fetch-on-scroll: "スクロールで自動読み込み"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
-  load-raw-images: "添付された画像を高画質で表示する"
-  load-remote-media: "リモートサーバーのメディアを表示する"
-  twitter: "Twitter連携"
-  twitter-connect: "Twitterアカウントに接続する"
-  twitter-reconnect: "再接続する"
-  twitter-disconnect: "切断する"
-  update: "Misskey Update"
-  version: "バージョン:"
-  latest-version: "最新のバージョン:"
-  update-checking: "アップデートを確認中"
-  check-for-updates: "アップデートを確認"
-  no-updates: "利用可能な更新はありません"
-  no-updates-desc: "お使いのMisskeyは最新です。"
-  update-available: "新しいバージョンが利用可能です"
-  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
+  post-style: "Style de la publication"
+  post-style-standard: "Standard"
+  post-style-smart: "Intelligent"
+  behavior: "Comportement"
+  fetch-on-scroll: "Chargement lors du défilement"
+  disable-via-mobile: "Ne pas mentionner que ma publication provient d'un 'périphérique mobile'"
+  load-raw-images: "Afficher les photos jointes en haute qualité"
+  load-remote-media: "Afficher les médias sur le serveur distant"
+  twitter: "Intégration à Twitter"
+  twitter-connect: "Se connecter à votre compte Twitter"
+  twitter-reconnect: "Reconnecter"
+  twitter-disconnect: "Déconnexion"
+  update: "Mise à jour de Misskey"
+  version: "Version :"
+  latest-version: "Dernière version :"
+  update-checking: "Recherche de mises à jour"
+  check-for-updates: "Fréquence de vérification"
+  no-updates: "Aucune mise à jour disponible"
+  no-updates-desc: "Votre Misskey est à jour."
+  update-available: "Nouvelle version disponible !"
+  update-available-desc: "Les mises à jour seront appliquées une fois la page est rechargée."
  settings: "Réglages"
  signout: "Déconnexion"
 mobile/views/pages/user.vue:
@@ -783,7 +935,4 @@ docs:
    props:
      name: "Nom"
      type: "Type"
-      optional: "Optionel"
      description: "Description"
-      yes: "Oui"
-      no: "Non"
--- a/locales/index.js
+++ b/locales/index.js
@@ -2,11 +2,11 @@
 * Languages Loader
 */

-import * as fs from 'fs';
-import * as yaml from 'js-yaml';
+const fs = require('fs');
+const yaml = require('js-yaml');

 const loadLang = lang => yaml.safeLoad(
-	fs.readFileSync(`./locales/${lang}.yml`, 'utf-8'));
+	fs.readFileSync(`${__dirname}/${lang}.yml`, 'utf-8'));

 const native = loadLang('ja');

@@ -15,7 +15,8 @@ const langs = {
 	'en': loadLang('en'),
 	'fr': loadLang('fr'),
 	'ja': native,
-	'pl': loadLang('pl')
+	'pl': loadLang('pl'),
+	'es': loadLang('es')
 };

 Object.entries(langs).map(([, locale]) => {
@@ -23,4 +24,4 @@ Object.entries(langs).map(([, locale]) => {
 	locale = Object.assign({}, native, locale);
 });

-export default langs;
+module.exports = langs;
--- a/locales/it.yml
+++ b/locales/it.yml
@@ -3,7 +3,9 @@ meta:
  lang: "日本語"
  divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A ⭐ of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
  time:
    unknown: "なぞのじかん"
    future: "未来"
@@ -33,11 +35,68 @@ common:
    angry: "おこ"
    confused: "こまこまのこまり"
    pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
+  search: "検索"
  delete: "削除"
  loading: "読み込み中"
  ok: "わかった"
+  update-available-title: "更新があります"
  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  reversi:
+    drawn: "引き分け"
+    my-turn: "あなたのターンです"
+    opponent-turn: "相手のターンです"
+    turn-of: "{}のターンです"
+    past-turn-of: "{}のターン"
+  widgets:
+    analog-clock: "アナログ時計"
+    profile: "プロフィール"
+    calendar: "カレンダー"
+    timemachine: "カレンダー(タイムマシン)"
+    activity: "アクティビティ"
+    rss: "RSSリーダー"
+    memo: "付箋"
+    trends: "トレンド"
+    photo-stream: "フォトストリーム"
+    posts-monitor: "投稿チャート"
+    slideshow: "スライドショー"
+    version: "バージョン"
+    broadcast: "ブロードキャスト"
+    notifications: "通知"
+    users: "おすすめユーザー"
+    polls: "アンケート"
+    post-form: "投稿フォーム"
+    messaging: "メッセージ"
+    server: "サーバー情報"
+    donation: "寄付のお願い"
+    nav: "ナビゲーション"
+    tips: "ヒント"
+    hashtags: "ハッシュタグ"
+  deck:
+    widgets: "ウィジェット"
+    home: "ホーム"
+    local: "ローカル"
+    global: "グローバル"
+    notifications: "通知"
+    list: "リスト"
+    swap-left: "左に移動"
+    swap-right: "右に移動"
+    swap-up: "上に移動"
+    swap-down: "下に移動"
+    remove: "カラムを削除"
+    add-column: "カラムを追加"
+    rename: "名前を変更"
+    stack-left: "左に重ねる"
+    pop-right: "右に出す"
 common/views/components/connect-failed.vue:
  title: "サーバーに接続できません"
  description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
@@ -92,6 +151,8 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  favorite: "お気に入り"
  pin: "ピン留め"
+  delete: "削除"
+  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"
 common/views/components/poll.vue:
  vote-to: "「{}」に投票する"
@@ -101,11 +162,11 @@ common/views/components/poll.vue:
  show-result: "結果を見る"
  voted: "投票済み"
 common/views/components/poll-editor.vue:
-  no-only-one-choice: "投票には、選択肢が最低2つ必要です"
+  no-only-one-choice: "アンケートには、選択肢が最低2つ必要です"
  choice-n: "選択肢{}"
  remove: "この選択肢を削除"
  add: "+選択肢を追加"
-  destroy: "投票を破棄"
+  destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/signin.vue:
@@ -151,6 +212,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@@ -162,18 +232,26 @@ common/views/widgets/donation.vue:
 common/views/widgets/photo-stream.vue:
  title: "フォトストリーム"
  no-photos: "写真はありません"
+common/views/widgets/posts-monitor.vue:
+  title: "投稿チャート"
+  toggle: "表示を切り替え"
+common/views/widgets/hashtags.vue:
+  title: "ハッシュタグ"
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
+common/views/widgets/memo.vue:
+  title: "付箋"
+  memo: "ここに書いて！"
+  save: "保存"
+common/views/pages/follow.vue:
+  signed-in-as: "{}としてサインイン中"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -253,8 +331,10 @@ desktop/views/components/drive.vue:
    upload: "ファイルをアップロード"
    url-upload: "URLからアップロード"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
-  follow: "フォローする"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -270,29 +350,10 @@ desktop/views/components/friends-maker.vue:
  refresh: "もっと見る"
  close: "閉じる"
 desktop/views/components/game-window.vue:
-  game: "オセロ"
+  game: "リバーシ"
 desktop/views/components/home.vue:
  done: "完了"
  add-widget: "ウィジェットを追加:"
-  profile: "プロフィール"
-  calendar: "カレンダー"
-  timemachine: "カレンダー(タイムマシン)"
-  activity: "アクティビティ"
-  rss: "RSSリーダー"
-  trends: "トレンド"
-  photostream: "フォトストリーム"
-  slideshow: "スライドショー"
-  version: "バージョン"
-  broadcast: "ブロードキャスト"
-  notifications: "通知"
-  users: "おすすめユーザー"
-  polls: "投票"
-  post-form: "投稿フォーム"
-  messaging: "メッセージ"
-  server: "サーバー情報"
-  donation: "寄付のお願い"
-  nav: "ナビゲーション"
-  tips: "ヒント"
  add: "追加"
 desktop/views/input-dialog.vue:
  cancel: "キャンセル"
@@ -303,30 +364,31 @@ desktop/views/components/messaging-window.vue:
  title: "メッセージ"
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
-  private: "(この投稿は非公開です)"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "(この投稿は非公開です)"
 desktop/views/components/notes.note.vue:
  reposted-by: "{}がRenote"
  reply: "返信"
  renote: "Renote"
  add-reaction: "リアクション"
  detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
  error: "読み込みに失敗しました。"
  retry: "リトライ"
+  load-more: "もっと読み込む"
 desktop/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
  reply-placeholder: "この投稿への返信..."
  quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
  reply: "返信"
  renote: "Renote"
  posted: "投稿しました！"
@@ -339,8 +401,8 @@ desktop/views/components/post-form.vue:
  attach-media-from-local: "PCからメディアを添付"
  attach-media-from-drive: "ドライブからメディアを添付"
  attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
-  create-poll: "投票を作成"
+  insert-a-kao: "v('ω')v"
+  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
 desktop/views/components/post-form-window.vue:
  note: "新規投稿"
@@ -358,6 +420,8 @@ desktop/views/components/renote-form.vue:
  failure: "Renoteに失敗しました"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
@@ -380,6 +444,8 @@ desktop/views/components/settings.vue:
  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  display: "デザインと表示"
  customize: "ホームをカスタマイズ"
+  choose-wallpaper: "壁紙を選択"
+  delete-wallpaper: "壁紙を削除"
  dark-mode: "ダークモード"
  circle-icons: "円形のアイコンを使用"
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
@@ -456,7 +522,7 @@ desktop/views/components/settings.api.vue:
  regenerate-token: "トークンを再生成"
  token: "Token:"
  enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
  no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
  no-users: "ミュートしているユーザーはいません"
@@ -475,12 +541,16 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  locked-account: "アカウントの保護"
+  is-locked: "投稿を非公開にする"
+  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
-  hidden: "(この投稿は非公開です)"
-  media: "つのメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 desktop/views/components/taskmanager.vue:
  title: "タスクマネージャ"
 desktop/views/components/timeline.vue:
@@ -488,17 +558,21 @@ desktop/views/components/timeline.vue:
  local: "ローカル"
  global: "グローバル"
  list: "リスト"
+desktop/views/components/ui.header.vue:
+  welcome-back: "おかえりなさい、"
 desktop/views/components/ui.header.account.vue:
  profile: "プロフィール"
  drive: "ドライブ"
  favorites: "お気に入り"
  lists: "リスト"
-  customize: "カスタマイズ"
+  follow-requests: "フォロー申請"
+  customize: "ホームのカスタマイズ"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"
 desktop/views/components/ui.header.nav.vue:
  home: "ホーム"
+  deck: "デッキ"
  messaging: "メッセージ"
  game: "ゲーム"
 desktop/views/components/ui.header.notifications.vue:
@@ -507,7 +581,12 @@ desktop/views/components/ui.header.post.vue:
  post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
  placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
  create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
  notes: "投稿"
@@ -523,7 +602,17 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "メディア投稿のみ"
+  is-media-view: "メディアビュー"
+  edit: "オプション"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
  signin: "ログイン"
  signup: "新規登録"
  signin-button: "やってる"
@@ -555,7 +644,7 @@ desktop/views/pages/user/user.friends.vue:
  title: "よく話すユーザー"
  loading: "読み込み中"
  no-users: "よく話すユーザーはいません"
-desktop/views/pages/user/user.header.vue:
+desktop/views/pages/user/user.vue:
  is-suspended: "このユーザーは凍結されています。"
  is-remote: "このユーザーはリモートユーザーです。"
  view-remote: "正確な情報を見る"
@@ -573,6 +662,11 @@ desktop/views/pages/user/user.profile.vue:
  mute: "ミュートする"
  muted: "ミュートしています"
  unmute: "ミュート解除"
+desktop/views/pages/user/user.header.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  is-bot: "このアカウントはBotです"
 desktop/views/pages/user/user.timeline.vue:
  default: "投稿"
  with-replies: "投稿と返信"
@@ -584,13 +678,12 @@ desktop/views/widgets/notifications.vue:
  title: "通知"
  settings: "通知の設定"
 desktop/views/widgets/polls.vue:
-  title: "投票"
+  title: "アンケート"
  refresh: "他を見る"
  nothing: "ありません！"
 desktop/views/widgets/post-form.vue:
  title: "投稿"
  note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
  update-banner: "クリックでバナー編集"
  update-avatar: "クリックでアバター編集"
@@ -611,6 +704,15 @@ mobile/views/components/drive.vue:
  load-more: "もっと読み込む"
  nothing-in-drive: "ドライブには何もありません"
  folder-is-empty: "このフォルダは空です"
+  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
+  folder-name: "フォルダー名"
+  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  url-prompt: "アップロードしたいファイルのURL"
+  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+mobile/views/components/drive-file-detail.vue:
+  rename: "名前を変更"
 mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
@@ -622,35 +724,75 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  following: "フォロー中"
  follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+mobile/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"
 mobile/views/components/note.vue:
  reposted-by: "{}がRenote"
+  more: "もっと見る"
+  less: "隠す"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
 mobile/views/components/note-detail.vue:
  reply: "返信"
  reaction: "リアクション"
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/notes.vue:
+  failed: "読み込みに失敗しました。"
+  retry: "リトライ"
 mobile/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 mobile/views/components/post-form.vue:
+  add-visible-user: "ユーザーを追加"
  submit: "投稿"
  reply: "返信"
  renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
  reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "お使いの端末は位置情報に対応していません"
+  error: "エラー"
+  username-prompt: "ユーザー名を入力してください"
 mobile/views/components/sub-note-content.vue:
-  media-count: "{}個のメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
+  follow-requests: "フォロー申請"
  search: "検索"
  drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
  settings: "設定"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -661,8 +803,14 @@ mobile/views/components/users-list.vue:
  all: "すべて"
  known: "知り合い"
  load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
  followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:
@@ -675,6 +823,10 @@ mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
  messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
  title: "投稿"
  prev: "前の投稿"
@@ -783,7 +935,4 @@ docs:
    props:
      name: "名前"
      type: "型"
-      optional: "オプション"
      description: "説明"
-      yes: "はい"
-      no: "いいえ"
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -3,7 +3,9 @@ meta:
  divider: ""

 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A ⭐ of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"

  time:
    unknown: "なぞのじかん"
@@ -37,11 +39,73 @@ common:
    confused: "こまこまのこまり"
    pudding: "Pudding"

+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
+
+  search: "検索"
  delete: "削除"
  loading: "読み込み中"
  ok: "わかった"
+  update-available-title: "更新があります"
  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+
+  reversi:
+    drawn: "引き分け"
+    my-turn: "あなたのターンです"
+    opponent-turn: "相手のターンです"
+    turn-of: "{}のターンです"
+    past-turn-of: "{}のターン"
+
+  widgets:
+    analog-clock: "アナログ時計"
+    profile: "プロフィール"
+    calendar: "カレンダー"
+    timemachine: "カレンダー(タイムマシン)"
+    activity: "アクティビティ"
+    rss: "RSSリーダー"
+    memo: "付箋"
+    trends: "トレンド"
+    photo-stream: "フォトストリーム"
+    posts-monitor: "投稿チャート"
+    slideshow: "スライドショー"
+    version: "バージョン"
+    broadcast: "ブロードキャスト"
+    notifications: "通知"
+    users: "おすすめユーザー"
+    polls: "アンケート"
+    post-form: "投稿フォーム"
+    messaging: "メッセージ"
+    server: "サーバー情報"
+    donation: "寄付のお願い"
+    nav: "ナビゲーション"
+    tips: "ヒント"
+    hashtags: "ハッシュタグ"
+
+  deck:
+    widgets: "ウィジェット"
+    home: "ホーム"
+    local: "ローカル"
+    hybrid: "ハイブリッド"
+    global: "グローバル"
+    notifications: "通知"
+    list: "リスト"
+    swap-left: "左に移動"
+    swap-right: "右に移動"
+    swap-up: "上に移動"
+    swap-down: "下に移動"
+    remove: "カラムを削除"
+    add-column: "カラムを追加"
+    rename: "名前を変更"
+    stack-left: "左に重ねる"
+    pop-right: "右に出す"

 common/views/components/connect-failed.vue:
  title: "サーバーに接続できません"
@@ -104,6 +168,8 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  favorite: "お気に入り"
  pin: "ピン留め"
+  delete: "削除"
+  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"

 common/views/components/poll.vue:
@@ -115,11 +181,11 @@ common/views/components/poll.vue:
  voted: "投票済み"

 common/views/components/poll-editor.vue:
-  no-only-one-choice: "投票には、選択肢が最低2つ必要です"
+  no-only-one-choice: "アンケートには、選択肢が最低2つ必要です"
  choice-n: "選択肢{}"
  remove: "この選択肢を削除"
  add: "+選択肢を追加"
-  destroy: "投票を破棄"
+  destroy: "アンケートを破棄"

 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
@@ -173,6 +239,16 @@ common/views/components/twitter-setting.vue:
 common/views/components/uploader.vue:
  waiting: "待機中"

+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
+
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@@ -187,19 +263,30 @@ common/views/widgets/photo-stream.vue:
  title: "フォトストリーム"
  no-photos: "写真はありません"

+common/views/widgets/posts-monitor.vue:
+  title: "投稿チャート"
+  toggle: "表示を切り替え"
+
+common/views/widgets/hashtags.vue:
+  title: "ハッシュタグ"
+  count: "{}人が投稿"
+  empty: "トレンドなし"
+
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"

-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
+common/views/widgets/memo.vue:
+  title: "付箋"
+  memo: "ここに書いて！"
+  save: "保存"
+
+common/views/pages/follow.vue:
+  signed-in-as: "{}としてサインイン中"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"

 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
@@ -291,8 +378,10 @@ desktop/views/components/drive.vue:
    url-upload: "URLからアップロード"

 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
-  follow: "フォローする"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"

 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
@@ -314,30 +403,11 @@ desktop/views/components/friends-maker.vue:
  close: "閉じる"

 desktop/views/components/game-window.vue:
-  game: "オセロ"
+  game: "リバーシ"

 desktop/views/components/home.vue:
  done: "完了"
  add-widget: "ウィジェットを追加:"
-  profile: "プロフィール"
-  calendar: "カレンダー"
-  timemachine: "カレンダー(タイムマシン)"
-  activity: "アクティビティ"
-  rss: "RSSリーダー"
-  trends: "トレンド"
-  photostream: "フォトストリーム"
-  slideshow: "スライドショー"
-  version: "バージョン"
-  broadcast: "ブロードキャスト"
-  notifications: "通知"
-  users: "おすすめユーザー"
-  polls: "投票"
-  post-form: "投稿フォーム"
-  messaging: "メッセージ"
-  server: "サーバー情報"
-  donation: "寄付のお願い"
-  nav: "ナビゲーション"
-  tips: "ヒント"
  add: "追加"

 desktop/views/input-dialog.vue:
@@ -352,35 +422,35 @@ desktop/views/components/messaging-window.vue:

 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
-  private: "(この投稿は非公開です)"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"

-desktop/views/components/note-detail.sub.vue:
-  private: "(この投稿は非公開です)"
-
 desktop/views/components/notes.note.vue:
  reposted-by: "{}がRenote"
  reply: "返信"
  renote: "Renote"
  add-reaction: "リアクション"
  detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"

 desktop/views/components/notes.vue:
  error: "読み込みに失敗しました。"
  retry: "リトライ"
+  load-more: "もっと読み込む"

 desktop/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"

 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
  reply-placeholder: "この投稿への返信..."
  quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
  reply: "返信"
  renote: "Renote"
  posted: "投稿しました！"
@@ -393,8 +463,8 @@ desktop/views/components/post-form.vue:
  attach-media-from-local: "PCからメディアを添付"
  attach-media-from-drive: "ドライブからメディアを添付"
  attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
-  create-poll: "投票を作成"
+  insert-a-kao: "v('ω')v"
+  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"

 desktop/views/components/post-form-window.vue:
@@ -417,6 +487,9 @@ desktop/views/components/renote-form.vue:
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"

+desktop/views/components/settings-window.vue:
+  settings: "設定"
+
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
@@ -441,6 +514,8 @@ desktop/views/components/settings.vue:

  display: "デザインと表示"
  customize: "ホームをカスタマイズ"
+  choose-wallpaper: "壁紙を選択"
+  delete-wallpaper: "壁紙を削除"
  dark-mode: "ダークモード"
  circle-icons: "円形のアイコンを使用"
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
@@ -528,7 +603,7 @@ desktop/views/components/settings.api.vue:
  token: "Token:"
  enter-password: "パスワードを入力してください"

-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
  no-apps: "連携しているアプリケーションはありません"

 desktop/views/components/settings.mute.vue:
@@ -550,13 +625,17 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  locked-account: "アカウントの保護"
+  is-locked: "投稿を非公開にする"
+  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"

 desktop/views/components/sub-note-content.vue:
-  hidden: "(この投稿は非公開です)"
-  media: "つのメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"

 desktop/views/components/taskmanager.vue:
  title: "タスクマネージャ"
@@ -564,21 +643,27 @@ desktop/views/components/taskmanager.vue:
 desktop/views/components/timeline.vue:
  home: "ホーム"
  local: "ローカル"
+  hybrid: "ハイブリッド"
  global: "グローバル"
  list: "リスト"

+desktop/views/components/ui.header.vue:
+  welcome-back: "おかえりなさい、"
+
 desktop/views/components/ui.header.account.vue:
  profile: "プロフィール"
  drive: "ドライブ"
  favorites: "お気に入り"
  lists: "リスト"
-  customize: "カスタマイズ"
+  follow-requests: "フォロー申請"
+  customize: "ホームのカスタマイズ"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"

 desktop/views/components/ui.header.nav.vue:
  home: "ホーム"
+  deck: "デッキ"
  messaging: "メッセージ"
  game: "ゲーム"

@@ -591,7 +676,13 @@ desktop/views/components/ui.header.post.vue:
 desktop/views/components/ui.header.search.vue:
  placeholder: "検索"

+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
+
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
  create-list: "リストを作成"

 desktop/views/components/user-preview.vue:
@@ -612,7 +703,19 @@ desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"

+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "メディア投稿のみ"
+  is-media-view: "メディアビュー"
+  edit: "オプション"
+
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
  signin: "ログイン"
  signup: "新規登録"
  signin-button: "やってる"
@@ -653,7 +756,7 @@ desktop/views/pages/user/user.friends.vue:
  loading: "読み込み中"
  no-users: "よく話すユーザーはいません"

-desktop/views/pages/user/user.header.vue:
+desktop/views/pages/user/user.vue:
  is-suspended: "このユーザーは凍結されています。"
  is-remote: "このユーザーはリモートユーザーです。"
  view-remote: "正確な情報を見る"
@@ -675,6 +778,12 @@ desktop/views/pages/user/user.profile.vue:
  muted: "ミュートしています"
  unmute: "ミュート解除"

+desktop/views/pages/user/user.header.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  is-bot: "このアカウントはBotです"
+
 desktop/views/pages/user/user.timeline.vue:
  default: "投稿"
  with-replies: "投稿と返信"
@@ -689,14 +798,13 @@ desktop/views/widgets/notifications.vue:
  settings: "通知の設定"

 desktop/views/widgets/polls.vue:
-  title: "投票"
+  title: "アンケート"
  refresh: "他を見る"
  nothing: "ありません！"

 desktop/views/widgets/post-form.vue:
  title: "投稿"
  note: "投稿"
-  placeholder: "いまどうしてる？"

 desktop/views/widgets/profile.vue:
  update-banner: "クリックでバナー編集"
@@ -721,6 +829,16 @@ mobile/views/components/drive.vue:
  load-more: "もっと読み込む"
  nothing-in-drive: "ドライブには何もありません"
  folder-is-empty: "このフォルダは空です"
+  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
+  folder-name: "フォルダー名"
+  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  url-prompt: "アップロードしたいファイルのURL"
+  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+
+mobile/views/components/drive-file-detail.vue:
+  rename: "名前を変更"

 mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
@@ -736,42 +854,86 @@ mobile/views/components/drive.file-detail.vue:
  exif: "EXIF"

 mobile/views/components/follow-button.vue:
+  following: "フォロー中"
  follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+
+mobile/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"

 mobile/views/components/note.vue:
  reposted-by: "{}がRenote"
+  more: "もっと見る"
+  less: "隠す"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"

 mobile/views/components/note-detail.vue:
  reply: "返信"
  reaction: "リアクション"
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+
+mobile/views/components/notes.vue:
+  failed: "読み込みに失敗しました。"
+  retry: "リトライ"

 mobile/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"

 mobile/views/components/post-form.vue:
+  add-visible-user: "ユーザーを追加"
  submit: "投稿"
  reply: "返信"
  renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
  reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "お使いの端末は位置情報に対応していません"
+  error: "エラー"
+  username-prompt: "ユーザー名を入力してください"

 mobile/views/components/sub-note-content.vue:
-  media-count: "{}個のメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"

 mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"

 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
+  follow-requests: "フォロー申請"
  search: "検索"
  drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
  settings: "設定"
  about: "Misskeyについて"

@@ -785,8 +947,16 @@ mobile/views/components/users-list.vue:
  known: "知り合い"
  load-more: "もっと"

+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
+
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
+  more: "もっと見る"

 mobile/views/pages/followers.vue:
  followers-of: "{}のフォロワー"
@@ -797,6 +967,7 @@ mobile/views/pages/following.vue:
 mobile/views/pages/home.vue:
  home: "ホーム"
  local: "ローカル"
+  hybrid: "ハイブリッド"
  global: "グローバル"

 mobile/views/pages/messaging.vue:
@@ -805,6 +976,11 @@ mobile/views/pages/messaging.vue:
 mobile/views/pages/messaging-room.vue:
  messaging: "メッセージ"

+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
+
 mobile/views/pages/note.vue:
  title: "投稿"
  prev: "前の投稿"
@@ -926,7 +1102,4 @@ docs:
    props:
      name: "名前"
      type: "型"
-      optional: "オプション"
      description: "説明"
-      yes: "はい"
-      no: "いいえ"
--- a/locales/ko.yml
+++ b/locales/ko.yml
@@ -3,7 +3,9 @@ meta:
  lang: "日本語"
  divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A ⭐ of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
  time:
    unknown: "なぞのじかん"
    future: "未来"
@@ -33,11 +35,68 @@ common:
    angry: "おこ"
    confused: "こまこまのこまり"
    pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
+  search: "検索"
  delete: "削除"
  loading: "読み込み中"
  ok: "わかった"
+  update-available-title: "更新があります"
  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  reversi:
+    drawn: "引き分け"
+    my-turn: "あなたのターンです"
+    opponent-turn: "相手のターンです"
+    turn-of: "{}のターンです"
+    past-turn-of: "{}のターン"
+  widgets:
+    analog-clock: "アナログ時計"
+    profile: "プロフィール"
+    calendar: "カレンダー"
+    timemachine: "カレンダー(タイムマシン)"
+    activity: "アクティビティ"
+    rss: "RSSリーダー"
+    memo: "付箋"
+    trends: "トレンド"
+    photo-stream: "フォトストリーム"
+    posts-monitor: "投稿チャート"
+    slideshow: "スライドショー"
+    version: "バージョン"
+    broadcast: "ブロードキャスト"
+    notifications: "通知"
+    users: "おすすめユーザー"
+    polls: "アンケート"
+    post-form: "投稿フォーム"
+    messaging: "メッセージ"
+    server: "サーバー情報"
+    donation: "寄付のお願い"
+    nav: "ナビゲーション"
+    tips: "ヒント"
+    hashtags: "ハッシュタグ"
+  deck:
+    widgets: "ウィジェット"
+    home: "ホーム"
+    local: "ローカル"
+    global: "グローバル"
+    notifications: "通知"
+    list: "リスト"
+    swap-left: "左に移動"
+    swap-right: "右に移動"
+    swap-up: "上に移動"
+    swap-down: "下に移動"
+    remove: "カラムを削除"
+    add-column: "カラムを追加"
+    rename: "名前を変更"
+    stack-left: "左に重ねる"
+    pop-right: "右に出す"
 common/views/components/connect-failed.vue:
  title: "サーバーに接続できません"
  description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
@@ -92,6 +151,8 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  favorite: "お気に入り"
  pin: "ピン留め"
+  delete: "削除"
+  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"
 common/views/components/poll.vue:
  vote-to: "「{}」に投票する"
@@ -101,11 +162,11 @@ common/views/components/poll.vue:
  show-result: "結果を見る"
  voted: "投票済み"
 common/views/components/poll-editor.vue:
-  no-only-one-choice: "投票には、選択肢が最低2つ必要です"
+  no-only-one-choice: "アンケートには、選択肢が最低2つ必要です"
  choice-n: "選択肢{}"
  remove: "この選択肢を削除"
  add: "+選択肢を追加"
-  destroy: "投票を破棄"
+  destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/signin.vue:
@@ -151,6 +212,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@@ -162,18 +232,26 @@ common/views/widgets/donation.vue:
 common/views/widgets/photo-stream.vue:
  title: "フォトストリーム"
  no-photos: "写真はありません"
+common/views/widgets/posts-monitor.vue:
+  title: "投稿チャート"
+  toggle: "表示を切り替え"
+common/views/widgets/hashtags.vue:
+  title: "ハッシュタグ"
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
+common/views/widgets/memo.vue:
+  title: "付箋"
+  memo: "ここに書いて！"
+  save: "保存"
+common/views/pages/follow.vue:
+  signed-in-as: "{}としてサインイン中"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -253,8 +331,10 @@ desktop/views/components/drive.vue:
    upload: "ファイルをアップロード"
    url-upload: "URLからアップロード"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
-  follow: "フォローする"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -270,29 +350,10 @@ desktop/views/components/friends-maker.vue:
  refresh: "もっと見る"
  close: "閉じる"
 desktop/views/components/game-window.vue:
-  game: "オセロ"
+  game: "リバーシ"
 desktop/views/components/home.vue:
  done: "完了"
  add-widget: "ウィジェットを追加:"
-  profile: "プロフィール"
-  calendar: "カレンダー"
-  timemachine: "カレンダー(タイムマシン)"
-  activity: "アクティビティ"
-  rss: "RSSリーダー"
-  trends: "トレンド"
-  photostream: "フォトストリーム"
-  slideshow: "スライドショー"
-  version: "バージョン"
-  broadcast: "ブロードキャスト"
-  notifications: "通知"
-  users: "おすすめユーザー"
-  polls: "投票"
-  post-form: "投稿フォーム"
-  messaging: "メッセージ"
-  server: "サーバー情報"
-  donation: "寄付のお願い"
-  nav: "ナビゲーション"
-  tips: "ヒント"
  add: "追加"
 desktop/views/input-dialog.vue:
  cancel: "キャンセル"
@@ -303,30 +364,31 @@ desktop/views/components/messaging-window.vue:
  title: "メッセージ"
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
-  private: "(この投稿は非公開です)"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "(この投稿は非公開です)"
 desktop/views/components/notes.note.vue:
  reposted-by: "{}がRenote"
  reply: "返信"
  renote: "Renote"
  add-reaction: "リアクション"
  detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
  error: "読み込みに失敗しました。"
  retry: "リトライ"
+  load-more: "もっと読み込む"
 desktop/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
  reply-placeholder: "この投稿への返信..."
  quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
  reply: "返信"
  renote: "Renote"
  posted: "投稿しました！"
@@ -339,8 +401,8 @@ desktop/views/components/post-form.vue:
  attach-media-from-local: "PCからメディアを添付"
  attach-media-from-drive: "ドライブからメディアを添付"
  attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
-  create-poll: "投票を作成"
+  insert-a-kao: "v('ω')v"
+  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
 desktop/views/components/post-form-window.vue:
  note: "新規投稿"
@@ -358,6 +420,8 @@ desktop/views/components/renote-form.vue:
  failure: "Renoteに失敗しました"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
@@ -380,6 +444,8 @@ desktop/views/components/settings.vue:
  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  display: "デザインと表示"
  customize: "ホームをカスタマイズ"
+  choose-wallpaper: "壁紙を選択"
+  delete-wallpaper: "壁紙を削除"
  dark-mode: "ダークモード"
  circle-icons: "円形のアイコンを使用"
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
@@ -456,7 +522,7 @@ desktop/views/components/settings.api.vue:
  regenerate-token: "トークンを再生成"
  token: "Token:"
  enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
  no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
  no-users: "ミュートしているユーザーはいません"
@@ -475,12 +541,16 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  locked-account: "アカウントの保護"
+  is-locked: "投稿を非公開にする"
+  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
-  hidden: "(この投稿は非公開です)"
-  media: "つのメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 desktop/views/components/taskmanager.vue:
  title: "タスクマネージャ"
 desktop/views/components/timeline.vue:
@@ -488,17 +558,21 @@ desktop/views/components/timeline.vue:
  local: "ローカル"
  global: "グローバル"
  list: "リスト"
+desktop/views/components/ui.header.vue:
+  welcome-back: "おかえりなさい、"
 desktop/views/components/ui.header.account.vue:
  profile: "プロフィール"
  drive: "ドライブ"
  favorites: "お気に入り"
  lists: "リスト"
-  customize: "カスタマイズ"
+  follow-requests: "フォロー申請"
+  customize: "ホームのカスタマイズ"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"
 desktop/views/components/ui.header.nav.vue:
  home: "ホーム"
+  deck: "デッキ"
  messaging: "メッセージ"
  game: "ゲーム"
 desktop/views/components/ui.header.notifications.vue:
@@ -507,7 +581,12 @@ desktop/views/components/ui.header.post.vue:
  post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
  placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
  create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
  notes: "投稿"
@@ -523,7 +602,17 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "メディア投稿のみ"
+  is-media-view: "メディアビュー"
+  edit: "オプション"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
  signin: "ログイン"
  signup: "新規登録"
  signin-button: "やってる"
@@ -555,7 +644,7 @@ desktop/views/pages/user/user.friends.vue:
  title: "よく話すユーザー"
  loading: "読み込み中"
  no-users: "よく話すユーザーはいません"
-desktop/views/pages/user/user.header.vue:
+desktop/views/pages/user/user.vue:
  is-suspended: "このユーザーは凍結されています。"
  is-remote: "このユーザーはリモートユーザーです。"
  view-remote: "正確な情報を見る"
@@ -573,6 +662,11 @@ desktop/views/pages/user/user.profile.vue:
  mute: "ミュートする"
  muted: "ミュートしています"
  unmute: "ミュート解除"
+desktop/views/pages/user/user.header.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  is-bot: "このアカウントはBotです"
 desktop/views/pages/user/user.timeline.vue:
  default: "投稿"
  with-replies: "投稿と返信"
@@ -584,13 +678,12 @@ desktop/views/widgets/notifications.vue:
  title: "通知"
  settings: "通知の設定"
 desktop/views/widgets/polls.vue:
-  title: "投票"
+  title: "アンケート"
  refresh: "他を見る"
  nothing: "ありません！"
 desktop/views/widgets/post-form.vue:
  title: "投稿"
  note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
  update-banner: "クリックでバナー編集"
  update-avatar: "クリックでアバター編集"
@@ -611,6 +704,15 @@ mobile/views/components/drive.vue:
  load-more: "もっと読み込む"
  nothing-in-drive: "ドライブには何もありません"
  folder-is-empty: "このフォルダは空です"
+  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
+  folder-name: "フォルダー名"
+  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  url-prompt: "アップロードしたいファイルのURL"
+  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+mobile/views/components/drive-file-detail.vue:
+  rename: "名前を変更"
 mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
@@ -622,35 +724,75 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  following: "フォロー中"
  follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+mobile/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"
 mobile/views/components/note.vue:
  reposted-by: "{}がRenote"
+  more: "もっと見る"
+  less: "隠す"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
 mobile/views/components/note-detail.vue:
  reply: "返信"
  reaction: "リアクション"
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/notes.vue:
+  failed: "読み込みに失敗しました。"
+  retry: "リトライ"
 mobile/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 mobile/views/components/post-form.vue:
+  add-visible-user: "ユーザーを追加"
  submit: "投稿"
  reply: "返信"
  renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
  reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "お使いの端末は位置情報に対応していません"
+  error: "エラー"
+  username-prompt: "ユーザー名を入力してください"
 mobile/views/components/sub-note-content.vue:
-  media-count: "{}個のメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
+  follow-requests: "フォロー申請"
  search: "検索"
  drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
  settings: "設定"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -661,8 +803,14 @@ mobile/views/components/users-list.vue:
  all: "すべて"
  known: "知り合い"
  load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
  followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:
@@ -675,6 +823,10 @@ mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
  messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
  title: "投稿"
  prev: "前の投稿"
@@ -783,7 +935,4 @@ docs:
    props:
      name: "名前"
      type: "型"
-      optional: "オプション"
      description: "説明"
-      yes: "はい"
-      no: "いいえ"
--- a/locales/pl.yml
+++ b/locales/pl.yml
@@ -1,9 +1,11 @@
 ---
 meta:
  lang: "język polski"
-  divider: " "
+  divider: ""
 common:
-  misskey: "Dziel się zawartością z innymi korzystając z Misskey."
+  misskey: "⭐ Fediwersum"
+  about-title: "⭐ Fediwersum"
+  about: "Dziękujemy za znalezienie Misskey. Misskey jest <b>zdecentralizowaną platformą mikroblogową</b> powstałą na Ziemi. Ponieważ działa ona w Fediwersum (uniwersum, w którego skład wchodzi wiele sieci społecznościowych), jest ona połączona z innymi platformami społecznościowymi. Spróbujesz odpocząć od zatłoczoneo miasta i zanurzyć się w nowym Internecie?"
  time:
    unknown: "nieznany"
    future: "w przyszłości"
@@ -33,11 +35,68 @@ common:
    angry: "Wściekły"
    confused: "Zmieszany"
    pudding: "Pudding"
+  note-placeholders:
+    a: "Co robisz?"
+    b: "Co się wydarzyło?"
+    c: "Co Ci chodzi po głowie?"
+    d: "Czy masz coś do powiedzenia?"
+    e: "Napisz coś tutaj!"
+    f: "Czekamy, aż coś napiszesz."
+  search: "Szukaj"
  delete: "Usuń"
  loading: "Ładowanie"
  ok: "OK"
+  update-available-title: "Aktualizacja jest dostępna"
  update-available: "Nowa wersja Misskey jest dostępna ({newer}, obecna to {current}). Odśwież stronę, aby zastosować aktualizację."
  my-token-regenerated: "Twój token został wygenerowany. Zostaniesz wylogowany."
+  i-like-sushi: "Wolę sushi od puddingu"
+  show-reversi-board-labels: "Pokazuj podpisy wierszy i kolumn w Reversi"
+  reversi:
+    drawn: "Remis"
+    my-turn: "Twoja kolej"
+    opponent-turn: "Kolej na przeciwnika"
+    turn-of: "Kolej na {}"
+    past-turn-of: "Kolej {}"
+  widgets:
+    analog-clock: "Zegar analogowy"
+    profile: "Profil"
+    calendar: "Kalendarz"
+    timemachine: "Kalendarz (wehikuł czasu)"
+    activity: "Aktywność"
+    rss: "Czytnik RSS"
+    memo: "Notatka"
+    trends: "Na czasie"
+    photo-stream: "Photostream"
+    posts-monitor: "Wykres wpisów"
+    slideshow: "Pokaz slajdów"
+    version: "Wersja"
+    broadcast: "Transmisja"
+    notifications: "Powiadomienia"
+    users: "Polecani użytkownicy"
+    polls: "Ankiety"
+    post-form: "Formularz tworzenia"
+    messaging: "Wiadomości"
+    server: "Informacje o serwerze"
+    donation: "Dotacje"
+    nav: "Nawigacja"
+    tips: "Wskazówki"
+    hashtags: "Hashtagi"
+  deck:
+    widgets: "Widżety"
+    home: "Strona główna"
+    local: "Lokalne"
+    global: "Globalne"
+    notifications: "Powiadomienia"
+    list: "Listy"
+    swap-left: "Przesuń w lewo"
+    swap-right: "Przesuń w prawo"
+    swap-up: "Przenieś w górę"
+    swap-down: "Przenieś w dół"
+    remove: "Usuń"
+    add-column: "Dodaj kolumnę"
+    rename: "Zmień nazwę"
+    stack-left: "Przypnij do lewej"
+    pop-right: "Odepnij w prawo"
 common/views/components/connect-failed.vue:
  title: "Nie udało się połączyć z serwerem"
  description: "Wystąpił problem z Twoim połączeniem z Internetem, lub z serwerem. {Spróbuj ponownie} wkrótce."
@@ -92,7 +151,9 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  favorite: "Dodaj do ulubionych"
  pin: "Przypnij do profilu"
-  remote: "投稿元で見る"
+  delete: "Usuń"
+  delete-confirm: "Czy na pewno chcesz usunąć ten wpis?"
+  remote: "Pokaż oryginał"
 common/views/components/poll.vue:
  vote-to: "Zagłosuj na '{}'"
  vote-count: "{} głosów"
@@ -101,11 +162,11 @@ common/views/components/poll.vue:
  show-result: "Pokaż wyniki"
  voted: "Zagłosowano"
 common/views/components/poll-editor.vue:
-  no-only-one-choice: "Musisz wprowadzić dwie lub więcej opcji."
+  no-only-one-choice: "Musisz wprowadzić przynajmniej dwie opcje."
  choice-n: "Opcja {}"
  remove: "Usuń tą opcję"
  add: "+ Dodaj opcję"
-  destroy: "Usuń ankietę"
+  destroy: "Usuń tę ankietę"
 common/views/components/reaction-picker.vue:
  choose-reaction: "Wybierz reakcję"
 common/views/components/signin.vue:
@@ -151,6 +212,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "Rozłącz"
 common/views/components/uploader.vue:
  waiting: "Oczekiwanie"
+common/views/components/visibility-chooser.vue:
+  public: "Publiczny"
+  home: "Lokalny"
+  home-desc: "Widoczny tylko na tej instancji"
+  followers: "Dla śledzących"
+  followers-desc: "Widoczny tylko dla osób, które Cię śledzą"
+  specified: "Bezpośredni"
+  specified-desc: "Tylko dla określonych użytkowników"
+  private: "Prywatny"
 common/views/widgets/broadcast.vue:
  fetching: "Sprawdzanie"
  no-broadcasts: "Brak transmisji"
@@ -162,18 +232,26 @@ common/views/widgets/donation.vue:
 common/views/widgets/photo-stream.vue:
  title: "Photostream"
  no-photos: "Brak zdjęć"
+common/views/widgets/posts-monitor.vue:
+  title: "Wykres wpisów"
+  toggle: "Przełącz widok"
+common/views/widgets/hashtags.vue:
+  title: "Hashtagi"
+  count: "Wspomniany przez {} użytkowników"
+  empty: "Brak popularnych hashtagów"
 common/views/widgets/server.vue:
  title: "Informacje o serwerze"
  toggle: "Przełącz widok"
-common/views/widgets/visibility-chooser.vue:
-  public: "Publiczny"
-  home: "Lokalny"
-  home-desc: "Widoczny tylko na tej instancji"
-  followers: "Dla śledzących"
-  followers-desc: "Widoczny tylko dla osób, które Cię śledzą"
-  specified: "Bezpośredni"
-  specified-desc: "Tylko dla określonych użytkowników"
-  private: "Prywatny"
+common/views/widgets/memo.vue:
+  title: "Notatka"
+  memo: "Napisz tutaj!"
+  save: "Zapisz"
+common/views/pages/follow.vue:
+  signed-in-as: "Zalogowany jako {}"
+  following: "Śledzisz"
+  follow: "Śledź"
+  request-pending: "Oczekiwanie na pozwolenie"
+  follow-request: "Poproś o śledzenie"
 desktop/views/components/activity.chart.vue:
  total: "Czarny … Łącznie"
  notes: "Niebieski … Wpisy"
@@ -235,7 +313,7 @@ desktop/views/components/drive.nav-folder.vue:
 desktop/views/components/drive.vue:
  search: "Szukaj"
  load-more: "Załaduj więcej"
-  empty-draghover: "ドロップですか？いいですよ、ボクはカワイイですからね"
+  empty-draghover: "Przeciągnij tutaj!"
  empty-drive: "Twój dysk jest pusty"
  empty-drive-description: "Możesz wysłać plik klikając prawym przyciskiem myszy i wybierając \"Wyślij plik\" lub przeciągnąć plik i upuścić w tym oknie."
  empty-folder: "Ten katalog jest posty"
@@ -253,8 +331,10 @@ desktop/views/components/drive.vue:
    upload: "Wyślij plik"
    url-upload: "Wyślij z adresu URL"
 desktop/views/components/follow-button.vue:
-  unfollow: "Przestań śledzić"
+  following: "Śledzisz"
  follow: "Śledź"
+  request-pending: "Oczekiwanie na pozwolenie"
+  follow-request: "Poproś o śledzenie"
 desktop/views/components/followers-window.vue:
  followers: "Śledzący"
 desktop/views/components/followers.vue:
@@ -270,29 +350,10 @@ desktop/views/components/friends-maker.vue:
  refresh: "Więcej"
  close: "Zamknij"
 desktop/views/components/game-window.vue:
-  game: "Othello"
+  game: "Reversi"
 desktop/views/components/home.vue:
  done: "Wyślij"
  add-widget: "Dodaj widżet:"
-  profile: "Profil"
-  calendar: "Kalendarz"
-  timemachine: "Kalendarz (wehikuł czasu)"
-  activity: "Aktywność"
-  rss: "Czytnik RSS"
-  trends: "Na czasie"
-  photostream: "Photostream"
-  slideshow: "Pokaz slajdów"
-  version: "Wersja"
-  broadcast: "Transmisja"
-  notifications: "Powiadomienia"
-  users: "Polecani użytkownicy"
-  polls: "Ankiety"
-  post-form: "Formularz tworzenia"
-  messaging: "Wiadomości"
-  server: "Informacje o serwerze"
-  donation: "Dotacje"
-  nav: "Nawigacja"
-  tips: "Wskazówki"
  add: "Dodaj"
 desktop/views/input-dialog.vue:
  cancel: "Anuluj"
@@ -303,43 +364,44 @@ desktop/views/components/messaging-window.vue:
  title: "Wiadomości"
 desktop/views/components/note-detail.vue:
  more: "Załaduj więcej konwersacji"
-  private: "(ten wpis jest prywatny)"
-  reposted-by: "{}がRenote"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
+  reposted-by: "Udostępniono przez {}"
  location: "Informacje o lokalizacji"
-  renote: "Przeredaguj"
+  renote: "Udostępnienie"
  add-reaction: "Dodaj reakcję"
-desktop/views/components/note-detail.sub.vue:
-  private: "(ten wpis jest prywatny)"
 desktop/views/components/notes.note.vue:
  reposted-by: "Udostępniono przez {}"
  reply: "Odpowiedz"
-  renote: "Przeredaguj"
+  renote: "Udostępnij"
  add-reaction: "Dodaj reakcję"
  detail: "Pokaż szczegóły"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
 desktop/views/components/notes.vue:
  error: "Ładowanie nie powiodło się."
  retry: "Spróbuj ponownie"
+  load-more: "Załaduj więcej"
 desktop/views/components/notifications.vue:
  more: "Więcej"
  empty: "Brak powiadomień"
 desktop/views/components/post-form.vue:
-  note-placeholder: "Co się dzieje?"
  reply-placeholder: "Odpowiedz na ten wpis…"
  quote-placeholder: "Zacytuj ten wpis…"
-  note: "Wyślij"
+  submit: "Wyślij"
  reply: "Odpowiedz"
-  renote: "Przeredaguj"
+  renote: "Udostępnienie"
  posted: "Opublikowano!"
  replied: "Odpowiedziano!"
  reposted: "Udostępniono!"
  note-failed: "Nie udało się wysłać"
  reply-failed: "Nie udało się odpowiedzieć"
-  renote-failed: "Nie udało się przeredagować"
+  renote-failed: "Nie udało się udostępnić"
  posting: "Wysyłanie"
  attach-media-from-local: "Załącz zawartość multimedialną z komputera"
  attach-media-from-drive: "Załącz zawartość multimedialną z dysku"
  attach-cancel: "Usuń załącznik"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
  create-poll: "Utwórz ankietę"
  text-remain: "pozostałe znaki: {}"
 desktop/views/components/post-form-window.vue:
@@ -352,12 +414,14 @@ desktop/views/components/progress-dialog.vue:
 desktop/views/components/renote-form.vue:
  quote: "Cytuj…"
  cancel: "Anuluj"
-  renote: "Przeredaguj"
+  renote: "Udostępnij"
  reposting: "Udostępnianie…"
  success: "Udostępniono!"
-  failure: "Nie udało się przeredagować"
+  failure: "Nie udało się udostępnić"
 desktop/views/components/renote-form-window.vue:
-  title: "Czy na pewno chcesz przeredagować ten wpis?"
+  title: "Czy na pewno chcesz udostępnić ten wpis?"
+desktop/views/components/settings-window.vue:
+  settings: "Ustawienia"
 desktop/views/components/settings.vue:
  profile: "Profil"
  notification: "Powiadomienia"
@@ -380,13 +444,15 @@ desktop/views/components/settings.vue:
  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  display: "Wygląd i wyświetlanie"
  customize: "Dostosuj stronę główną"
+  choose-wallpaper: "Wybierz tło"
+  delete-wallpaper: "Usuń tło"
  dark-mode: "Tryb ciemny"
  circle-icons: "Używaj okrągłych ikon"
  gradient-window-header: "Używaj gradientów na pasku tytułu okna"
  post-form-on-timeline: "Wyświetlaj formularz tworzenia wpisu w górnej części osi czasu"
  show-reply-target: "Pokazuj cel odpowiedzi"
-  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
-  show-renoted-my-notes: "Renoteされた自分の投稿をタイムラインに表示する"
+  show-my-renotes: "Pokazuj moje udostępnienia na osi czasu"
+  show-renoted-my-notes: "Pokazuj udostępnienia moich wpisów na osi czasu"
  show-maps: "Automatycznie pokazuj mapę"
  show-maps-desc: "Mapa będzie automatycznie rozwijana dla wpisów zawierających informacje o lokalizacji."
  sound: "Dźwięk"
@@ -404,11 +470,11 @@ desktop/views/components/settings.vue:
  language-desc: "Aby zmiany zostały uwzględnione, odśwież stronę."
  cache: "Pamięć podręczna"
  clean-cache: "Wyczyść"
-  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
+  cache-warn: "Pamięć podręczna informacji o koncie/wpisów/odpowiedzi/wiadomości/ustawień przechowywanych w przeglądarce zostanie usunięta. Będziesz musiał odświeżyć stronę po wyczyszczeniu."
  cache-cleared: "Wyczyszczono pamięć podręczną"
  cache-cleared-desc: "Proszę odświeżyć stronę."
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
+  auto-watch: "Automatycznie nasłuchuj"
+  auto-watch-desc: "Otrzymuj natychmiastowo informacje o wpisach/odpowiedziach/reakcjach."
  about: "O Misskey"
  operator: "Administrator instancji"
  update: "Aktualizacja Misskey"
@@ -430,7 +496,7 @@ desktop/views/components/settings.vue:
  experimental-desc: "Aktywowanie eksperymentalnych funkcji może spowodować niestabilność Misskey. Opcja ta jest przechowywana w przeglądarce."
  tools: "Narzędzia"
  task-manager: "Menedżer zadań"
-  third-parties: "サードパーティ"
+  third-parties: "Autorzy trzeci"
 desktop/views/components/settings.2fa.vue:
  intro: "Jeżeli skonfigurujesz uwierzytelnianie dwuetapowe, aby zablokować się będziesz potrzebować (oprócz hasła) kodu ze skonfigurowanego urządzenia (np. smartfonu), co zwiększy bezpieczeństwo."
  detail: "Zobacz szczegóły…"
@@ -450,13 +516,13 @@ desktop/views/components/settings.2fa.vue:
  failed: "Nie udało się skonfigurować uwierzytelniania dwuetapowego, upewnij się że wprowadziłeś prawidłowy token."
  info: "Od teraz, wprowadzaj token wyświetlany na urządzeniu przy każdym logowaniu do Misskey."
 desktop/views/components/settings.api.vue:
-  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
+  intro: "Aby uzyskać dostęp do API, ustaw ten token jako klucz 'i' parametrów żądań."
  caution: "Nie pokazuj tego tokenu osobom trzecim (nie wprowadzaj go nigdzie indziej), aby konto nie trafiło w niepowołane ręce."
  regeneration-of-token: "W przypadku wycieku tokenu, możesz wygenerować nowy."
  regenerate-token: "Wygeneruj nowy token"
  token: "Token:"
  enter-password: "Wprowadź hasło"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
  no-apps: "Brak zautoryzowanych aplikacji"
 desktop/views/components/settings.mute.vue:
  no-users: "Brak wyciszonych użytkowników"
@@ -475,12 +541,16 @@ desktop/views/components/settings.profile.vue:
  description: "Opis"
  birthday: "Data urodzenia"
  save: "Aktualizuj profil"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
+  locked-account: "Zabezpiecz swoje konto"
+  is-locked: "Uczyń wpis prywatnym"
+  other: "Inne"
+  is-bot: "To konto jest prowadzone przez bota"
+  is-cat: "To konto jest prowadzone przez kota"
 desktop/views/components/sub-note-content.vue:
-  hidden: "(この投稿は非公開です)"
-  media: "つのメディア"
-  poll: "投票"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
+  media-count: "{}zawartości multimedialnej"
+  poll: "Ankieta"
 desktop/views/components/taskmanager.vue:
  title: "Menedżer zadań"
 desktop/views/components/timeline.vue:
@@ -488,17 +558,21 @@ desktop/views/components/timeline.vue:
  local: "Lokalne"
  global: "Globalne"
  list: "Listy"
+desktop/views/components/ui.header.vue:
+  welcome-back: "Witaj ponownie,"
 desktop/views/components/ui.header.account.vue:
  profile: "Twój profil"
  drive: "Dysk"
  favorites: "Ulubione"
  lists: "Listy"
-  customize: "Dostosuj"
+  follow-requests: "Prośby o śledzenie"
+  customize: "Dostosuj stronę główną"
  settings: "Ustawienia"
  signout: "Wyloguj się"
  dark: "Sprowadź ciemność"
 desktop/views/components/ui.header.nav.vue:
  home: "Strona główna"
+  deck: "Talia"
  messaging: "Wiadomości"
  game: "Gra"
 desktop/views/components/ui.header.notifications.vue:
@@ -507,7 +581,12 @@ desktop/views/components/ui.header.post.vue:
  post: "Utwórz nowy wpis"
 desktop/views/components/ui.header.search.vue:
  placeholder: "Szukaj"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "Poproś o śledzenie"
+  accept: "Zatwierdź"
+  reject: "Odmów"
 desktop/views/components/user-lists-window.vue:
+  title: "Listy"
  create-list: "Utwórz listę"
 desktop/views/components/user-preview.vue:
  notes: "Wpisy"
@@ -519,16 +598,26 @@ desktop/views/components/users-list.vue:
  load-more: "Więcej"
  fetching: "Ładowanie…"
 desktop/views/components/users-list-item.vue:
-  followed: "フォローされています"
+  followed: "Obserwuje Cię"
 desktop/views/components/window.vue:
-  popout: "ポップアウト"
-  close: "閉じる"
+  popout: "Pop-out"
+  close: "Zamknij"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "Tylko wpisy z zawartością multimedialną"
+  is-media-view: "Widok multimediów"
+  edit: "Opcje"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "Udostępniono przez {}"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
 desktop/views/pages/welcome.vue:
-  signin: "ログイン"
-  signup: "新規登録"
-  signin-button: "やってる"
-  signup-button: "やる"
-  timeline: "タイムライン"
+  about: "O Misskey"
+  gotit: "Rozumiem!"
+  signin: "Zaloguj się"
+  signup: "Zarejestruj się"
+  signin-button: "Zaloguj się"
+  signup-button: "Zarejestruj się"
+  timeline: "Oś czasu"
 desktop/views/pages/drive.vue:
  title: "Dysk Misskey"
 desktop/views/pages/favorites.vue:
@@ -555,7 +644,7 @@ desktop/views/pages/user/user.friends.vue:
  title: "Najbardziej aktywni"
  loading: "Ładowanie"
  no-users: "Brak użytkowników"
-desktop/views/pages/user/user.header.vue:
+desktop/views/pages/user/user.vue:
  is-suspended: "To konto zostało zawieszone."
  is-remote: "To jest użytkownik zdalnej instancji, informacje mogą nie być w pełni dokładne."
  view-remote: "Wyświetl dokładne informacje"
@@ -573,10 +662,15 @@ desktop/views/pages/user/user.profile.vue:
  mute: "Wycisz"
  muted: "Wyciszyłeś"
  unmute: "Cofnij wyciszenie"
+desktop/views/pages/user/user.header.vue:
+  posts: "Wpisy"
+  following: "Śledzeni"
+  followers: "Śledzący"
+  is-bot: "To konto jest botem"
 desktop/views/pages/user/user.timeline.vue:
  default: "Wpisy"
  with-replies: "Wpisy i odpowiedzi"
-  with-media: "Zawartość multimedialna"
+  with-media: "Multimedia"
  empty: "Ten użytkownik nie umieścił jeszcze niczego."
 desktop/views/widgets/messaging.vue:
  title: "Wiadomości"
@@ -590,7 +684,6 @@ desktop/views/widgets/polls.vue:
 desktop/views/widgets/post-form.vue:
  title: "Wpis"
  note: "Wpis"
-  placeholder: "Co się dzieje?"
 desktop/views/widgets/profile.vue:
  update-banner: "Naciśnij, aby zmienić baner"
  update-avatar: "Naciśnij, aby zmienić awatar"
@@ -611,6 +704,15 @@ mobile/views/components/drive.vue:
  load-more: "Załaduj więcej"
  nothing-in-drive: "Pusto"
  folder-is-empty: "Ten katalog jest pusty"
+  prompt: "Co chcesz zrobić? (wprowadź odpowiednią cyfrę): <1 → Wysłać plik | 2 → Wysłać plik z adresu URL | 3 → Utworzyć katalog | 4 → Zmienić nazwę tego katalogu | 5 → Przenieść ten katalog | 6 → Usunąć ten katalog>"
+  deletion-alert: "Przepraszamy. Usuwanie katalogów nie zostało jeszcze zaimplementowane."
+  folder-name: "Nazwa katalogu"
+  root-rename-alert: "Nie można zmienić nazwy katalogu głównego. Przejdź do katalogu, którego nazwę chcesz zmienić."
+  root-move-alert: "Nie można przenieść tego katalogu, ponieważ jest on katalogiem głównym. Przejdź do katalogu, który chcesz przenieść."
+  url-prompt: "Adres URL pliku, który chcesz wysłać"
+  uploading: "Rozpoczęto wysyłanie. Może to trochę potrwać."
+mobile/views/components/drive-file-detail.vue:
+  rename: "Zmień nazwę"
 mobile/views/components/drive-file-chooser.vue:
  select-file: "Wybierz plik"
 mobile/views/components/drive-folder-chooser.vue:
@@ -622,35 +724,75 @@ mobile/views/components/drive.file-detail.vue:
  hash: "Hash (md5)"
  exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  following: "Śledzisz"
  follow: "Śledź"
-  unfollow: "Przestań śledzić"
+  request-pending: "Oczekiwanie na pozwolenie"
+  follow-request: "Poproś o śledzenie"
+mobile/views/components/friends-maker.vue:
+  title: "Zacznij śledzić ludzi takich jak Ty"
+  empty: "Nie znaleziono podobnych użytkowników."
+  fetching: "Ładowanie…"
+  refresh: "Więcej"
+  close: "Zamknij"
 mobile/views/components/note.vue:
  reposted-by: "Udostępniono przez {}"
+  more: "Rozwiń"
+  less: "Zwiń"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
+  location: "Informacje o lokalizacji"
 mobile/views/components/note-detail.vue:
  reply: "Odpowiedz"
  reaction: "Reakcja"
+  reposted-by: "Udostępniono przez {}"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
+  location: "Informacje o lokalizacji"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "kot"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "kot"
+mobile/views/components/notes.vue:
+  failed: "Ładowanie nie powiodło się."
+  retry: "Spróbuj ponownie"
 mobile/views/components/notifications.vue:
  more: "Więcej"
  empty: "Brak powiadomień"
 mobile/views/components/post-form.vue:
+  add-visible-user: "Dodaj użytkownika"
  submit: "Wyślij"
  reply: "Odpowiedz"
-  renote: "Przeredaguj"
-  renote-placeholder: "Zacytuj wpis… (nieobowiązkowe)"
+  renote: "Udostępnij"
+  quote-placeholder: "Zacytuj ten wpis… (nieobowiązkowe)"
  reply-placeholder: "Odpowiedź na ten wpis…"
-  note-placeholder: "Co się dzieje?"
+  cw-placeholder: "Treść ostrzeżenia (opcjonalnie)"
+  location-alert: "Twoje urządzenie nie pozwala na przekazywanie informacji o lokalizacji"
+  error: "Błąd"
+  username-prompt: "Wprowadź nazwę użytkownika"
 mobile/views/components/sub-note-content.vue:
-  media-count: "{} zawartości multimedialnej"
+  private: "ten wpis jest prywatny"
+  deleted: "ten wpis został usunięty"
+  media-count: "{}zawartości multimedialnej"
  poll: "Ankieta"
 mobile/views/components/timeline.vue:
  empty: "Brak wpisów"
  load-more: "Więcej"
 mobile/views/components/ui.nav.vue:
-  home: "Strona główna"
+  timeline: "Oś czasu"
  notifications: "Powiadomienia"
  messaging: "Wiadomości"
+  follow-requests: "Prośby o śledzenie"
  search: "Szukaj"
  drive: "Dysk"
+  favorites: "Ulubione"
+  user-lists: "Listy"
+  widgets: "Widżety"
+  game: "Gry"
+  darkmode: "Tryb ciemny"
  settings: "Ustawienia"
  about: "O Misskey"
 mobile/views/components/user-timeline.vue:
@@ -661,20 +803,30 @@ mobile/views/components/users-list.vue:
  all: "Wszyscy"
  known: "Znasz"
  load-more: "Więcej"
+mobile/views/pages/favorites.vue:
+  title: "Ulubione"
+mobile/views/pages/user-lists.vue:
+  title: "Listy"
+  enter-list-name: "Wprowadź nazwę listy"
 mobile/views/pages/drive.vue:
  drive: "Dysk"
+  more: "Załaduj więcej"
 mobile/views/pages/followers.vue:
  followers-of: "Śledzący {}"
 mobile/views/pages/following.vue:
  following-of: "Śledzeni przez {}"
 mobile/views/pages/home.vue:
-  home: "ホーム"
-  local: "ローカル"
-  global: "グローバル"
+  home: "Strona główna"
+  local: "Lokalne"
+  global: "Globalne"
 mobile/views/pages/messaging.vue:
  messaging: "Wiadomości"
 mobile/views/pages/messaging-room.vue:
  messaging: "Wiadomości"
+mobile/views/pages/received-follow-requests.vue:
+  title: "Prośby o śledzenie"
+  accept: "Zatwierdź"
+  reject: "Odmów"
 mobile/views/pages/note.vue:
  title: "Wpis"
  prev: "Poprzedni wpis"
@@ -691,7 +843,7 @@ mobile/views/pages/settings/settings.profile.vue:
  birthday: "Data urodzenia"
  avatar: "Awatar"
  banner: "Baner"
-  is-cat: "このアカウントはCatです"
+  is-cat: "To konto jest prowadzone przez kota"
  save: "Aktualizuj profil"
  saved: "Pomyślnie zaktualizowano profil"
  uploading: "Wysyłanie"
@@ -714,16 +866,16 @@ mobile/views/pages/settings.vue:
  circle-icons: "Używaj okrągłych ikon"
  timeline: "Oś czasu"
  show-reply-target: "Pokazuj cel odpowiedzi"
-  show-my-renotes: "自分の行ったRenoteを表示する"
-  show-renoted-my-notes: "Renoteされた自分の投稿を表示する"
+  show-my-renotes: "Pokazuj moje udostępnienia"
+  show-renoted-my-notes: "Pokazuj udostępnienia moich wpisów"
  post-style: "Styl wpisów"
  post-style-standard: "Standardowy"
-  post-style-smart: "スマート"
+  post-style-smart: "Inteligentny"
  behavior: "Zachowanie"
  fetch-on-scroll: "Automatycznie ładuj po przeciągnięciu w dół"
  disable-via-mobile: "Nie oznaczaj wpisów jako „wysłane z telefonu”"
-  load-raw-images: "添付された画像を高画質で表示する"
-  load-remote-media: "リモートサーバーのメディアを表示する"
+  load-raw-images: "Wyświetlaj załączone zdjęcia w wysokiej jakości"
+  load-remote-media: "Wyświetlaj zawartość multimedialną ze zdalnych serwerów"
  twitter: "Połączenie z Twitterem"
  twitter-connect: "Połącz z Twitterem"
  twitter-reconnect: "Połącz ponownie"
@@ -746,7 +898,7 @@ mobile/views/pages/user.vue:
  notes: "Wpisy"
  overview: "Przegląd"
  timeline: "Oś czasu"
-  media: "Zawartość multimedialna"
+  media: "Multimedia"
  is-suspended: "To konto zostało zablokowane"
  is-remote: "To jest użytkownik zdalnej instancji, informacje mogą nie być w pełni dokładne."
  view-remote: "Wyświetl dokładne informacje"
@@ -758,7 +910,7 @@ mobile/views/pages/user/home.vue:
  domains: "Domeny"
  frequently-replied-users: "Często aktywni użytkownicy"
  followers-you-know: "Śledzący których znasz"
-  last-used-at: "Ostatnio aktywny:"
+  last-used-at: "Ostatnio aktywny"
 mobile/views/pages/user/home.followers-you-know.vue:
  loading: "Ładowanie"
  no-users: "Brak użytkowników"
@@ -783,7 +935,4 @@ docs:
    props:
      name: "Nazwa"
      type: "Rodzaj"
-      optional: "Nieobowiązkowy"
      description: "Opis"
-      yes: "Tak"
-      no: "Nie"
--- a/locales/pt.yml
+++ b/locales/pt.yml
@@ -3,7 +3,9 @@ meta:
  lang: "Português"
  divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A ⭐ of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
  time:
    unknown: "なぞのじかん"
    future: "未来"
@@ -33,11 +35,68 @@ common:
    angry: "おこ"
    confused: "こまこまのこまり"
    pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
+  search: "検索"
  delete: "削除"
  loading: "読み込み中"
  ok: "わかった"
+  update-available-title: "更新があります"
  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  reversi:
+    drawn: "引き分け"
+    my-turn: "あなたのターンです"
+    opponent-turn: "相手のターンです"
+    turn-of: "{}のターンです"
+    past-turn-of: "{}のターン"
+  widgets:
+    analog-clock: "アナログ時計"
+    profile: "プロフィール"
+    calendar: "カレンダー"
+    timemachine: "カレンダー(タイムマシン)"
+    activity: "アクティビティ"
+    rss: "RSSリーダー"
+    memo: "付箋"
+    trends: "トレンド"
+    photo-stream: "フォトストリーム"
+    posts-monitor: "投稿チャート"
+    slideshow: "スライドショー"
+    version: "バージョン"
+    broadcast: "ブロードキャスト"
+    notifications: "通知"
+    users: "おすすめユーザー"
+    polls: "アンケート"
+    post-form: "投稿フォーム"
+    messaging: "メッセージ"
+    server: "サーバー情報"
+    donation: "寄付のお願い"
+    nav: "ナビゲーション"
+    tips: "ヒント"
+    hashtags: "ハッシュタグ"
+  deck:
+    widgets: "ウィジェット"
+    home: "ホーム"
+    local: "ローカル"
+    global: "グローバル"
+    notifications: "通知"
+    list: "リスト"
+    swap-left: "左に移動"
+    swap-right: "右に移動"
+    swap-up: "上に移動"
+    swap-down: "下に移動"
+    remove: "カラムを削除"
+    add-column: "カラムを追加"
+    rename: "名前を変更"
+    stack-left: "左に重ねる"
+    pop-right: "右に出す"
 common/views/components/connect-failed.vue:
  title: "サーバーに接続できません"
  description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
@@ -92,6 +151,8 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  favorite: "お気に入り"
  pin: "ピン留め"
+  delete: "削除"
+  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"
 common/views/components/poll.vue:
  vote-to: "「{}」に投票する"
@@ -101,11 +162,11 @@ common/views/components/poll.vue:
  show-result: "結果を見る"
  voted: "投票済み"
 common/views/components/poll-editor.vue:
-  no-only-one-choice: "投票には、選択肢が最低2つ必要です"
+  no-only-one-choice: "アンケートには、選択肢が最低2つ必要です"
  choice-n: "選択肢{}"
  remove: "この選択肢を削除"
  add: "+選択肢を追加"
-  destroy: "投票を破棄"
+  destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/signin.vue:
@@ -151,6 +212,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@@ -162,18 +232,26 @@ common/views/widgets/donation.vue:
 common/views/widgets/photo-stream.vue:
  title: "フォトストリーム"
  no-photos: "写真はありません"
+common/views/widgets/posts-monitor.vue:
+  title: "投稿チャート"
+  toggle: "表示を切り替え"
+common/views/widgets/hashtags.vue:
+  title: "ハッシュタグ"
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
+common/views/widgets/memo.vue:
+  title: "付箋"
+  memo: "ここに書いて！"
+  save: "保存"
+common/views/pages/follow.vue:
+  signed-in-as: "{}としてサインイン中"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -253,8 +331,10 @@ desktop/views/components/drive.vue:
    upload: "ファイルをアップロード"
    url-upload: "URLからアップロード"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
-  follow: "フォローする"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -270,29 +350,10 @@ desktop/views/components/friends-maker.vue:
  refresh: "もっと見る"
  close: "閉じる"
 desktop/views/components/game-window.vue:
-  game: "オセロ"
+  game: "リバーシ"
 desktop/views/components/home.vue:
  done: "完了"
  add-widget: "ウィジェットを追加:"
-  profile: "プロフィール"
-  calendar: "カレンダー"
-  timemachine: "カレンダー(タイムマシン)"
-  activity: "アクティビティ"
-  rss: "RSSリーダー"
-  trends: "トレンド"
-  photostream: "フォトストリーム"
-  slideshow: "スライドショー"
-  version: "バージョン"
-  broadcast: "ブロードキャスト"
-  notifications: "通知"
-  users: "おすすめユーザー"
-  polls: "投票"
-  post-form: "投稿フォーム"
-  messaging: "メッセージ"
-  server: "サーバー情報"
-  donation: "寄付のお願い"
-  nav: "ナビゲーション"
-  tips: "ヒント"
  add: "追加"
 desktop/views/input-dialog.vue:
  cancel: "キャンセル"
@@ -303,30 +364,31 @@ desktop/views/components/messaging-window.vue:
  title: "メッセージ"
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
-  private: "(この投稿は非公開です)"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "(この投稿は非公開です)"
 desktop/views/components/notes.note.vue:
  reposted-by: "{}がRenote"
  reply: "返信"
  renote: "Renote"
  add-reaction: "リアクション"
  detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
  error: "読み込みに失敗しました。"
  retry: "リトライ"
+  load-more: "もっと読み込む"
 desktop/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
  reply-placeholder: "この投稿への返信..."
  quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
  reply: "返信"
  renote: "Renote"
  posted: "投稿しました！"
@@ -339,8 +401,8 @@ desktop/views/components/post-form.vue:
  attach-media-from-local: "PCからメディアを添付"
  attach-media-from-drive: "ドライブからメディアを添付"
  attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
-  create-poll: "投票を作成"
+  insert-a-kao: "v('ω')v"
+  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
 desktop/views/components/post-form-window.vue:
  note: "新規投稿"
@@ -358,6 +420,8 @@ desktop/views/components/renote-form.vue:
  failure: "Renoteに失敗しました"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
@@ -380,6 +444,8 @@ desktop/views/components/settings.vue:
  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  display: "デザインと表示"
  customize: "ホームをカスタマイズ"
+  choose-wallpaper: "壁紙を選択"
+  delete-wallpaper: "壁紙を削除"
  dark-mode: "ダークモード"
  circle-icons: "円形のアイコンを使用"
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
@@ -456,7 +522,7 @@ desktop/views/components/settings.api.vue:
  regenerate-token: "トークンを再生成"
  token: "Token:"
  enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
  no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
  no-users: "ミュートしているユーザーはいません"
@@ -475,12 +541,16 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  locked-account: "アカウントの保護"
+  is-locked: "投稿を非公開にする"
+  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
-  hidden: "(この投稿は非公開です)"
-  media: "つのメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 desktop/views/components/taskmanager.vue:
  title: "タスクマネージャ"
 desktop/views/components/timeline.vue:
@@ -488,17 +558,21 @@ desktop/views/components/timeline.vue:
  local: "ローカル"
  global: "グローバル"
  list: "リスト"
+desktop/views/components/ui.header.vue:
+  welcome-back: "おかえりなさい、"
 desktop/views/components/ui.header.account.vue:
  profile: "プロフィール"
  drive: "ドライブ"
  favorites: "お気に入り"
  lists: "リスト"
-  customize: "カスタマイズ"
+  follow-requests: "フォロー申請"
+  customize: "ホームのカスタマイズ"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"
 desktop/views/components/ui.header.nav.vue:
  home: "ホーム"
+  deck: "デッキ"
  messaging: "メッセージ"
  game: "ゲーム"
 desktop/views/components/ui.header.notifications.vue:
@@ -507,7 +581,12 @@ desktop/views/components/ui.header.post.vue:
  post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
  placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
  create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
  notes: "投稿"
@@ -523,7 +602,17 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "メディア投稿のみ"
+  is-media-view: "メディアビュー"
+  edit: "オプション"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
  signin: "ログイン"
  signup: "新規登録"
  signin-button: "やってる"
@@ -555,7 +644,7 @@ desktop/views/pages/user/user.friends.vue:
  title: "よく話すユーザー"
  loading: "読み込み中"
  no-users: "よく話すユーザーはいません"
-desktop/views/pages/user/user.header.vue:
+desktop/views/pages/user/user.vue:
  is-suspended: "このユーザーは凍結されています。"
  is-remote: "このユーザーはリモートユーザーです。"
  view-remote: "正確な情報を見る"
@@ -573,6 +662,11 @@ desktop/views/pages/user/user.profile.vue:
  mute: "ミュートする"
  muted: "ミュートしています"
  unmute: "ミュート解除"
+desktop/views/pages/user/user.header.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  is-bot: "このアカウントはBotです"
 desktop/views/pages/user/user.timeline.vue:
  default: "投稿"
  with-replies: "投稿と返信"
@@ -584,13 +678,12 @@ desktop/views/widgets/notifications.vue:
  title: "通知"
  settings: "通知の設定"
 desktop/views/widgets/polls.vue:
-  title: "投票"
+  title: "アンケート"
  refresh: "他を見る"
  nothing: "ありません！"
 desktop/views/widgets/post-form.vue:
  title: "投稿"
  note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
  update-banner: "クリックでバナー編集"
  update-avatar: "クリックでアバター編集"
@@ -611,6 +704,15 @@ mobile/views/components/drive.vue:
  load-more: "もっと読み込む"
  nothing-in-drive: "ドライブには何もありません"
  folder-is-empty: "このフォルダは空です"
+  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
+  folder-name: "フォルダー名"
+  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  url-prompt: "アップロードしたいファイルのURL"
+  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+mobile/views/components/drive-file-detail.vue:
+  rename: "名前を変更"
 mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
@@ -622,35 +724,75 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  following: "フォロー中"
  follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+mobile/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"
 mobile/views/components/note.vue:
  reposted-by: "{}がRenote"
+  more: "もっと見る"
+  less: "隠す"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
 mobile/views/components/note-detail.vue:
  reply: "返信"
  reaction: "リアクション"
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/notes.vue:
+  failed: "読み込みに失敗しました。"
+  retry: "リトライ"
 mobile/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 mobile/views/components/post-form.vue:
+  add-visible-user: "ユーザーを追加"
  submit: "投稿"
  reply: "返信"
  renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
  reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "お使いの端末は位置情報に対応していません"
+  error: "エラー"
+  username-prompt: "ユーザー名を入力してください"
 mobile/views/components/sub-note-content.vue:
-  media-count: "{}個のメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
+  follow-requests: "フォロー申請"
  search: "検索"
  drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
  settings: "設定"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -661,8 +803,14 @@ mobile/views/components/users-list.vue:
  all: "すべて"
  known: "知り合い"
  load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
  followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:
@@ -675,6 +823,10 @@ mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
  messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
  title: "投稿"
  prev: "前の投稿"
@@ -783,7 +935,4 @@ docs:
    props:
      name: "名前"
      type: "型"
-      optional: "オプション"
      description: "説明"
-      yes: "はい"
-      no: "いいえ"
--- a/locales/ru.yml
+++ b/locales/ru.yml
@@ -1,9 +1,11 @@
 ---
 meta:
  lang: "Русский язык"
-  divider: " "
+  divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A ⭐ of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
  time:
    unknown: "なぞのじかん"
    future: "未来"
@@ -33,11 +35,68 @@ common:
    angry: "おこ"
    confused: "こまこまのこまり"
    pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
+  search: "検索"
  delete: "削除"
  loading: "読み込み中"
  ok: "わかった"
+  update-available-title: "更新があります"
  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  reversi:
+    drawn: "引き分け"
+    my-turn: "あなたのターンです"
+    opponent-turn: "相手のターンです"
+    turn-of: "{}のターンです"
+    past-turn-of: "{}のターン"
+  widgets:
+    analog-clock: "アナログ時計"
+    profile: "プロフィール"
+    calendar: "カレンダー"
+    timemachine: "カレンダー(タイムマシン)"
+    activity: "アクティビティ"
+    rss: "RSSリーダー"
+    memo: "付箋"
+    trends: "トレンド"
+    photo-stream: "フォトストリーム"
+    posts-monitor: "投稿チャート"
+    slideshow: "スライドショー"
+    version: "バージョン"
+    broadcast: "ブロードキャスト"
+    notifications: "通知"
+    users: "おすすめユーザー"
+    polls: "アンケート"
+    post-form: "投稿フォーム"
+    messaging: "メッセージ"
+    server: "サーバー情報"
+    donation: "寄付のお願い"
+    nav: "ナビゲーション"
+    tips: "ヒント"
+    hashtags: "ハッシュタグ"
+  deck:
+    widgets: "ウィジェット"
+    home: "ホーム"
+    local: "ローカル"
+    global: "グローバル"
+    notifications: "通知"
+    list: "リスト"
+    swap-left: "左に移動"
+    swap-right: "右に移動"
+    swap-up: "上に移動"
+    swap-down: "下に移動"
+    remove: "カラムを削除"
+    add-column: "カラムを追加"
+    rename: "名前を変更"
+    stack-left: "左に重ねる"
+    pop-right: "右に出す"
 common/views/components/connect-failed.vue:
  title: "サーバーに接続できません"
  description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
@@ -92,6 +151,8 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  favorite: "お気に入り"
  pin: "ピン留め"
+  delete: "削除"
+  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"
 common/views/components/poll.vue:
  vote-to: "「{}」に投票する"
@@ -101,11 +162,11 @@ common/views/components/poll.vue:
  show-result: "結果を見る"
  voted: "投票済み"
 common/views/components/poll-editor.vue:
-  no-only-one-choice: "投票には、選択肢が最低2つ必要です"
+  no-only-one-choice: "アンケートには、選択肢が最低2つ必要です"
  choice-n: "選択肢{}"
  remove: "この選択肢を削除"
  add: "+選択肢を追加"
-  destroy: "投票を破棄"
+  destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/signin.vue:
@@ -151,6 +212,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@@ -162,18 +232,26 @@ common/views/widgets/donation.vue:
 common/views/widgets/photo-stream.vue:
  title: "フォトストリーム"
  no-photos: "写真はありません"
+common/views/widgets/posts-monitor.vue:
+  title: "投稿チャート"
+  toggle: "表示を切り替え"
+common/views/widgets/hashtags.vue:
+  title: "ハッシュタグ"
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
+common/views/widgets/memo.vue:
+  title: "付箋"
+  memo: "ここに書いて！"
+  save: "保存"
+common/views/pages/follow.vue:
+  signed-in-as: "{}としてサインイン中"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -253,8 +331,10 @@ desktop/views/components/drive.vue:
    upload: "ファイルをアップロード"
    url-upload: "URLからアップロード"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
-  follow: "フォローする"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -270,29 +350,10 @@ desktop/views/components/friends-maker.vue:
  refresh: "もっと見る"
  close: "閉じる"
 desktop/views/components/game-window.vue:
-  game: "オセロ"
+  game: "リバーシ"
 desktop/views/components/home.vue:
  done: "完了"
  add-widget: "ウィジェットを追加:"
-  profile: "プロフィール"
-  calendar: "カレンダー"
-  timemachine: "カレンダー(タイムマシン)"
-  activity: "アクティビティ"
-  rss: "RSSリーダー"
-  trends: "トレンド"
-  photostream: "フォトストリーム"
-  slideshow: "スライドショー"
-  version: "バージョン"
-  broadcast: "ブロードキャスト"
-  notifications: "通知"
-  users: "おすすめユーザー"
-  polls: "投票"
-  post-form: "投稿フォーム"
-  messaging: "メッセージ"
-  server: "サーバー情報"
-  donation: "寄付のお願い"
-  nav: "ナビゲーション"
-  tips: "ヒント"
  add: "追加"
 desktop/views/input-dialog.vue:
  cancel: "キャンセル"
@@ -303,30 +364,31 @@ desktop/views/components/messaging-window.vue:
  title: "メッセージ"
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
-  private: "(この投稿は非公開です)"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "(この投稿は非公開です)"
 desktop/views/components/notes.note.vue:
  reposted-by: "{}がRenote"
  reply: "返信"
  renote: "Renote"
  add-reaction: "リアクション"
  detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
  error: "読み込みに失敗しました。"
  retry: "リトライ"
+  load-more: "もっと読み込む"
 desktop/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
  reply-placeholder: "この投稿への返信..."
  quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
  reply: "返信"
  renote: "Renote"
  posted: "投稿しました！"
@@ -339,8 +401,8 @@ desktop/views/components/post-form.vue:
  attach-media-from-local: "PCからメディアを添付"
  attach-media-from-drive: "ドライブからメディアを添付"
  attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
-  create-poll: "投票を作成"
+  insert-a-kao: "v('ω')v"
+  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
 desktop/views/components/post-form-window.vue:
  note: "新規投稿"
@@ -358,6 +420,8 @@ desktop/views/components/renote-form.vue:
  failure: "Renoteに失敗しました"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
@@ -380,6 +444,8 @@ desktop/views/components/settings.vue:
  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  display: "デザインと表示"
  customize: "ホームをカスタマイズ"
+  choose-wallpaper: "壁紙を選択"
+  delete-wallpaper: "壁紙を削除"
  dark-mode: "ダークモード"
  circle-icons: "円形のアイコンを使用"
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
@@ -456,7 +522,7 @@ desktop/views/components/settings.api.vue:
  regenerate-token: "トークンを再生成"
  token: "Token:"
  enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
  no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
  no-users: "ミュートしているユーザーはいません"
@@ -475,12 +541,16 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  locked-account: "アカウントの保護"
+  is-locked: "投稿を非公開にする"
+  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
-  hidden: "(この投稿は非公開です)"
-  media: "つのメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 desktop/views/components/taskmanager.vue:
  title: "タスクマネージャ"
 desktop/views/components/timeline.vue:
@@ -488,17 +558,21 @@ desktop/views/components/timeline.vue:
  local: "ローカル"
  global: "グローバル"
  list: "リスト"
+desktop/views/components/ui.header.vue:
+  welcome-back: "おかえりなさい、"
 desktop/views/components/ui.header.account.vue:
  profile: "プロフィール"
  drive: "ドライブ"
  favorites: "お気に入り"
  lists: "リスト"
-  customize: "カスタマイズ"
+  follow-requests: "フォロー申請"
+  customize: "ホームのカスタマイズ"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"
 desktop/views/components/ui.header.nav.vue:
  home: "ホーム"
+  deck: "デッキ"
  messaging: "メッセージ"
  game: "ゲーム"
 desktop/views/components/ui.header.notifications.vue:
@@ -507,7 +581,12 @@ desktop/views/components/ui.header.post.vue:
  post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
  placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
  create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
  notes: "投稿"
@@ -523,7 +602,17 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "メディア投稿のみ"
+  is-media-view: "メディアビュー"
+  edit: "オプション"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
  signin: "ログイン"
  signup: "新規登録"
  signin-button: "やってる"
@@ -555,7 +644,7 @@ desktop/views/pages/user/user.friends.vue:
  title: "よく話すユーザー"
  loading: "読み込み中"
  no-users: "よく話すユーザーはいません"
-desktop/views/pages/user/user.header.vue:
+desktop/views/pages/user/user.vue:
  is-suspended: "このユーザーは凍結されています。"
  is-remote: "このユーザーはリモートユーザーです。"
  view-remote: "正確な情報を見る"
@@ -573,6 +662,11 @@ desktop/views/pages/user/user.profile.vue:
  mute: "ミュートする"
  muted: "ミュートしています"
  unmute: "ミュート解除"
+desktop/views/pages/user/user.header.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  is-bot: "このアカウントはBotです"
 desktop/views/pages/user/user.timeline.vue:
  default: "投稿"
  with-replies: "投稿と返信"
@@ -584,13 +678,12 @@ desktop/views/widgets/notifications.vue:
  title: "通知"
  settings: "通知の設定"
 desktop/views/widgets/polls.vue:
-  title: "投票"
+  title: "アンケート"
  refresh: "他を見る"
  nothing: "ありません！"
 desktop/views/widgets/post-form.vue:
  title: "投稿"
  note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
  update-banner: "クリックでバナー編集"
  update-avatar: "クリックでアバター編集"
@@ -611,6 +704,15 @@ mobile/views/components/drive.vue:
  load-more: "もっと読み込む"
  nothing-in-drive: "ドライブには何もありません"
  folder-is-empty: "このフォルダは空です"
+  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
+  folder-name: "フォルダー名"
+  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  url-prompt: "アップロードしたいファイルのURL"
+  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+mobile/views/components/drive-file-detail.vue:
+  rename: "名前を変更"
 mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
@@ -622,35 +724,75 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  following: "フォロー中"
  follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+mobile/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"
 mobile/views/components/note.vue:
  reposted-by: "{}がRenote"
+  more: "もっと見る"
+  less: "隠す"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
 mobile/views/components/note-detail.vue:
  reply: "返信"
  reaction: "リアクション"
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/notes.vue:
+  failed: "読み込みに失敗しました。"
+  retry: "リトライ"
 mobile/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 mobile/views/components/post-form.vue:
+  add-visible-user: "ユーザーを追加"
  submit: "投稿"
  reply: "返信"
  renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
  reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "お使いの端末は位置情報に対応していません"
+  error: "エラー"
+  username-prompt: "ユーザー名を入力してください"
 mobile/views/components/sub-note-content.vue:
-  media-count: "{}個のメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
+  follow-requests: "フォロー申請"
  search: "検索"
  drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
  settings: "設定"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -661,8 +803,14 @@ mobile/views/components/users-list.vue:
  all: "すべて"
  known: "知り合い"
  load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
  followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:
@@ -675,6 +823,10 @@ mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
  messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
  title: "投稿"
  prev: "前の投稿"
@@ -783,7 +935,4 @@ docs:
    props:
      name: "名前"
      type: "型"
-      optional: "オプション"
      description: "説明"
-      yes: "はい"
-      no: "いいえ"
--- a/locales/zh.yml
+++ b/locales/zh.yml
@@ -3,7 +3,9 @@ meta:
  lang: "中文(简体)"
  divider: ""
 common:
-  misskey: "Misskeyで皆と共有しよう。"
+  misskey: "A ⭐ of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
  time:
    unknown: "なぞのじかん"
    future: "未来"
@@ -33,11 +35,68 @@ common:
    angry: "おこ"
    confused: "こまこまのこまり"
    pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
+  search: "検索"
  delete: "削除"
  loading: "読み込み中"
  ok: "わかった"
+  update-available-title: "更新があります"
  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  reversi:
+    drawn: "引き分け"
+    my-turn: "あなたのターンです"
+    opponent-turn: "相手のターンです"
+    turn-of: "{}のターンです"
+    past-turn-of: "{}のターン"
+  widgets:
+    analog-clock: "アナログ時計"
+    profile: "プロフィール"
+    calendar: "カレンダー"
+    timemachine: "カレンダー(タイムマシン)"
+    activity: "アクティビティ"
+    rss: "RSSリーダー"
+    memo: "付箋"
+    trends: "トレンド"
+    photo-stream: "フォトストリーム"
+    posts-monitor: "投稿チャート"
+    slideshow: "スライドショー"
+    version: "バージョン"
+    broadcast: "ブロードキャスト"
+    notifications: "通知"
+    users: "おすすめユーザー"
+    polls: "アンケート"
+    post-form: "投稿フォーム"
+    messaging: "メッセージ"
+    server: "サーバー情報"
+    donation: "寄付のお願い"
+    nav: "ナビゲーション"
+    tips: "ヒント"
+    hashtags: "ハッシュタグ"
+  deck:
+    widgets: "ウィジェット"
+    home: "ホーム"
+    local: "ローカル"
+    global: "グローバル"
+    notifications: "通知"
+    list: "リスト"
+    swap-left: "左に移動"
+    swap-right: "右に移動"
+    swap-up: "上に移動"
+    swap-down: "下に移動"
+    remove: "カラムを削除"
+    add-column: "カラムを追加"
+    rename: "名前を変更"
+    stack-left: "左に重ねる"
+    pop-right: "右に出す"
 common/views/components/connect-failed.vue:
  title: "サーバーに接続できません"
  description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
@@ -92,6 +151,8 @@ common/views/components/nav.vue:
 common/views/components/note-menu.vue:
  favorite: "お気に入り"
  pin: "ピン留め"
+  delete: "削除"
+  delete-confirm: "この投稿を削除しますか？"
  remote: "投稿元で見る"
 common/views/components/poll.vue:
  vote-to: "「{}」に投票する"
@@ -101,11 +162,11 @@ common/views/components/poll.vue:
  show-result: "結果を見る"
  voted: "投票済み"
 common/views/components/poll-editor.vue:
-  no-only-one-choice: "投票には、選択肢が最低2つ必要です"
+  no-only-one-choice: "アンケートには、選択肢が最低2つ必要です"
  choice-n: "選択肢{}"
  remove: "この選択肢を削除"
  add: "+選択肢を追加"
-  destroy: "投票を破棄"
+  destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/signin.vue:
@@ -151,6 +212,15 @@ common/views/components/twitter-setting.vue:
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
 common/views/widgets/broadcast.vue:
  fetching: "確認中"
  no-broadcasts: "お知らせはありません"
@@ -162,18 +232,26 @@ common/views/widgets/donation.vue:
 common/views/widgets/photo-stream.vue:
  title: "フォトストリーム"
  no-photos: "写真はありません"
+common/views/widgets/posts-monitor.vue:
+  title: "投稿チャート"
+  toggle: "表示を切り替え"
+common/views/widgets/hashtags.vue:
+  title: "ハッシュタグ"
+  count: "{}人が投稿"
+  empty: "トレンドなし"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
-common/views/widgets/visibility-chooser.vue:
-  public: "公開"
-  home: "ホーム"
-  home-desc: "ホームタイムラインにのみ公開"
-  followers: "フォロワー"
-  followers-desc: "自分のフォロワーにのみ公開"
-  specified: "ダイレクト"
-  specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
+common/views/widgets/memo.vue:
+  title: "付箋"
+  memo: "ここに書いて！"
+  save: "保存"
+common/views/pages/follow.vue:
+  signed-in-as: "{}としてサインイン中"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
  notes: "Blue ... Notes"
@@ -253,8 +331,10 @@ desktop/views/components/drive.vue:
    upload: "ファイルをアップロード"
    url-upload: "URLからアップロード"
 desktop/views/components/follow-button.vue:
-  unfollow: "フォロー解除"
-  follow: "フォローする"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -270,29 +350,10 @@ desktop/views/components/friends-maker.vue:
  refresh: "もっと見る"
  close: "閉じる"
 desktop/views/components/game-window.vue:
-  game: "オセロ"
+  game: "リバーシ"
 desktop/views/components/home.vue:
  done: "完了"
  add-widget: "ウィジェットを追加:"
-  profile: "プロフィール"
-  calendar: "カレンダー"
-  timemachine: "カレンダー(タイムマシン)"
-  activity: "アクティビティ"
-  rss: "RSSリーダー"
-  trends: "トレンド"
-  photostream: "フォトストリーム"
-  slideshow: "スライドショー"
-  version: "バージョン"
-  broadcast: "ブロードキャスト"
-  notifications: "通知"
-  users: "おすすめユーザー"
-  polls: "投票"
-  post-form: "投稿フォーム"
-  messaging: "メッセージ"
-  server: "サーバー情報"
-  donation: "寄付のお願い"
-  nav: "ナビゲーション"
-  tips: "ヒント"
  add: "追加"
 desktop/views/input-dialog.vue:
  cancel: "キャンセル"
@@ -303,30 +364,31 @@ desktop/views/components/messaging-window.vue:
  title: "メッセージ"
 desktop/views/components/note-detail.vue:
  more: "会話をもっと読み込む"
-  private: "(この投稿は非公開です)"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
  reposted-by: "{}がRenote"
  location: "位置情報"
  renote: "Renote"
  add-reaction: "リアクション"
-desktop/views/components/note-detail.sub.vue:
-  private: "(この投稿は非公開です)"
 desktop/views/components/notes.note.vue:
  reposted-by: "{}がRenote"
  reply: "返信"
  renote: "Renote"
  add-reaction: "リアクション"
  detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
  error: "読み込みに失敗しました。"
  retry: "リトライ"
+  load-more: "もっと読み込む"
 desktop/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
  reply-placeholder: "この投稿への返信..."
  quote-placeholder: "この投稿を引用..."
-  note: "投稿"
+  submit: "投稿"
  reply: "返信"
  renote: "Renote"
  posted: "投稿しました！"
@@ -339,8 +401,8 @@ desktop/views/components/post-form.vue:
  attach-media-from-local: "PCからメディアを添付"
  attach-media-from-drive: "ドライブからメディアを添付"
  attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
-  create-poll: "投票を作成"
+  insert-a-kao: "v('ω')v"
+  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
 desktop/views/components/post-form-window.vue:
  note: "新規投稿"
@@ -358,6 +420,8 @@ desktop/views/components/renote-form.vue:
  failure: "Renoteに失敗しました"
 desktop/views/components/renote-form-window.vue:
  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
 desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
@@ -380,6 +444,8 @@ desktop/views/components/settings.vue:
  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  display: "デザインと表示"
  customize: "ホームをカスタマイズ"
+  choose-wallpaper: "壁紙を選択"
+  delete-wallpaper: "壁紙を削除"
  dark-mode: "ダークモード"
  circle-icons: "円形のアイコンを使用"
  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
@@ -456,7 +522,7 @@ desktop/views/components/settings.api.vue:
  regenerate-token: "トークンを再生成"
  token: "Token:"
  enter-password: "パスワードを入力してください"
-desktop/views/components/settings.app.vue:
+desktop/views/components/settings.apps.vue:
  no-apps: "連携しているアプリケーションはありません"
 desktop/views/components/settings.mute.vue:
  no-users: "ミュートしているユーザーはいません"
@@ -475,12 +541,16 @@ desktop/views/components/settings.profile.vue:
  description: "自己紹介"
  birthday: "誕生日"
  save: "保存"
+  locked-account: "アカウントの保護"
+  is-locked: "投稿を非公開にする"
+  other: "その他"
  is-bot: "このアカウントはBotです"
  is-cat: "このアカウントはCatです"
 desktop/views/components/sub-note-content.vue:
-  hidden: "(この投稿は非公開です)"
-  media: "つのメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 desktop/views/components/taskmanager.vue:
  title: "タスクマネージャ"
 desktop/views/components/timeline.vue:
@@ -488,17 +558,21 @@ desktop/views/components/timeline.vue:
  local: "ローカル"
  global: "グローバル"
  list: "リスト"
+desktop/views/components/ui.header.vue:
+  welcome-back: "おかえりなさい、"
 desktop/views/components/ui.header.account.vue:
  profile: "プロフィール"
  drive: "ドライブ"
  favorites: "お気に入り"
  lists: "リスト"
-  customize: "カスタマイズ"
+  follow-requests: "フォロー申請"
+  customize: "ホームのカスタマイズ"
  settings: "設定"
  signout: "サインアウト"
  dark: "闇に飲まれる"
 desktop/views/components/ui.header.nav.vue:
  home: "ホーム"
+  deck: "デッキ"
  messaging: "メッセージ"
  game: "ゲーム"
 desktop/views/components/ui.header.notifications.vue:
@@ -507,7 +581,12 @@ desktop/views/components/ui.header.post.vue:
  post: "新規投稿"
 desktop/views/components/ui.header.search.vue:
  placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 desktop/views/components/user-lists-window.vue:
+  title: "リスト"
  create-list: "リストを作成"
 desktop/views/components/user-preview.vue:
  notes: "投稿"
@@ -523,7 +602,17 @@ desktop/views/components/users-list-item.vue:
 desktop/views/components/window.vue:
  popout: "ポップアウト"
  close: "閉じる"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "メディア投稿のみ"
+  is-media-view: "メディアビュー"
+  edit: "オプション"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
 desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
  signin: "ログイン"
  signup: "新規登録"
  signin-button: "やってる"
@@ -555,7 +644,7 @@ desktop/views/pages/user/user.friends.vue:
  title: "よく話すユーザー"
  loading: "読み込み中"
  no-users: "よく話すユーザーはいません"
-desktop/views/pages/user/user.header.vue:
+desktop/views/pages/user/user.vue:
  is-suspended: "このユーザーは凍結されています。"
  is-remote: "このユーザーはリモートユーザーです。"
  view-remote: "正確な情報を見る"
@@ -573,6 +662,11 @@ desktop/views/pages/user/user.profile.vue:
  mute: "ミュートする"
  muted: "ミュートしています"
  unmute: "ミュート解除"
+desktop/views/pages/user/user.header.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  is-bot: "このアカウントはBotです"
 desktop/views/pages/user/user.timeline.vue:
  default: "投稿"
  with-replies: "投稿と返信"
@@ -584,13 +678,12 @@ desktop/views/widgets/notifications.vue:
  title: "通知"
  settings: "通知の設定"
 desktop/views/widgets/polls.vue:
-  title: "投票"
+  title: "アンケート"
  refresh: "他を見る"
  nothing: "ありません！"
 desktop/views/widgets/post-form.vue:
  title: "投稿"
  note: "投稿"
-  placeholder: "いまどうしてる？"
 desktop/views/widgets/profile.vue:
  update-banner: "クリックでバナー編集"
  update-avatar: "クリックでアバター編集"
@@ -611,6 +704,15 @@ mobile/views/components/drive.vue:
  load-more: "もっと読み込む"
  nothing-in-drive: "ドライブには何もありません"
  folder-is-empty: "このフォルダは空です"
+  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
+  folder-name: "フォルダー名"
+  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  url-prompt: "アップロードしたいファイルのURL"
+  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+mobile/views/components/drive-file-detail.vue:
+  rename: "名前を変更"
 mobile/views/components/drive-file-chooser.vue:
  select-file: "ファイルを選択"
 mobile/views/components/drive-folder-chooser.vue:
@@ -622,35 +724,75 @@ mobile/views/components/drive.file-detail.vue:
  hash: "ハッシュ (md5)"
  exif: "EXIF"
 mobile/views/components/follow-button.vue:
+  following: "フォロー中"
  follow: "フォロー"
-  unfollow: "フォロー解除"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+mobile/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"
 mobile/views/components/note.vue:
  reposted-by: "{}がRenote"
+  more: "もっと見る"
+  less: "隠す"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
 mobile/views/components/note-detail.vue:
  reply: "返信"
  reaction: "リアクション"
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/notes.vue:
+  failed: "読み込みに失敗しました。"
+  retry: "リトライ"
 mobile/views/components/notifications.vue:
  more: "もっと見る"
  empty: "ありません！"
 mobile/views/components/post-form.vue:
+  add-visible-user: "ユーザーを追加"
  submit: "投稿"
  reply: "返信"
  renote: "Renote"
-  renote-placeholder: "この投稿を引用... (オプション)"
+  quote-placeholder: "この投稿を引用... (オプション)"
  reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "お使いの端末は位置情報に対応していません"
+  error: "エラー"
+  username-prompt: "ユーザー名を入力してください"
 mobile/views/components/sub-note-content.vue:
-  media-count: "{}個のメディア"
-  poll: "投票"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
 mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
+  follow-requests: "フォロー申請"
  search: "検索"
  drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
  settings: "設定"
  about: "Misskeyについて"
 mobile/views/components/user-timeline.vue:
@@ -661,8 +803,14 @@ mobile/views/components/users-list.vue:
  all: "すべて"
  known: "知り合い"
  load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
+  more: "もっと見る"
 mobile/views/pages/followers.vue:
  followers-of: "{}のフォロワー"
 mobile/views/pages/following.vue:
@@ -675,6 +823,10 @@ mobile/views/pages/messaging.vue:
  messaging: "メッセージ"
 mobile/views/pages/messaging-room.vue:
  messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
 mobile/views/pages/note.vue:
  title: "投稿"
  prev: "前の投稿"
@@ -783,7 +935,4 @@ docs:
    props:
      name: "名前"
      type: "型"
-      optional: "オプション"
      description: "説明"
-      yes: "はい"
-      no: "いいえ"
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.17.0",
-	"clientVersion": "1.0.5731",
+	"version": "4.17.1",
+	"clientVersion": "1.0.7112",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -23,18 +23,18 @@
 		"format": "gulp format"
 	},
 	"dependencies": {
-		"@fortawesome/fontawesome": "1.0.1",
-		"@fortawesome/fontawesome-free-brands": "5.0.2",
-		"@fortawesome/fontawesome-free-regular": "5.0.2",
-		"@fortawesome/fontawesome-free-solid": "5.0.2",
+		"@fortawesome/fontawesome": "1.1.8",
+		"@fortawesome/fontawesome-free-brands": "5.0.13",
+		"@fortawesome/fontawesome-free-regular": "5.0.13",
+		"@fortawesome/fontawesome-free-solid": "5.0.13",
 		"@koa/cors": "2.2.1",
 		"@prezzemolo/rap": "0.1.2",
 		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.1",
 		"@types/debug": "0.0.30",
 		"@types/deep-equal": "1.0.1",
-		"@types/elasticsearch": "5.0.23",
-		"@types/eventemitter3": "2.0.2",
+		"@types/elasticsearch": "5.0.24",
+		"@types/file-type": "5.2.1",
 		"@types/gm": "1.18.0",
 		"@types/gulp": "3.8.36",
 		"@types/gulp-htmlmin": "1.3.32",
@@ -43,80 +43,78 @@
 		"@types/gulp-replace": "0.0.31",
 		"@types/gulp-uglify": "3.0.5",
 		"@types/gulp-util": "3.0.34",
-		"@types/inquirer": "0.0.41",
+		"@types/inquirer": "0.0.42",
 		"@types/is-root": "1.0.0",
 		"@types/is-url": "1.2.28",
-		"@types/js-yaml": "3.11.1",
-		"@types/koa": "2.0.45",
-		"@types/koa-bodyparser": "4.2.0",
+		"@types/js-yaml": "3.11.2",
+		"@types/jsdom": "11.0.6",
+		"@types/koa": "2.0.46",
+		"@types/koa-bodyparser": "5.0.1",
 		"@types/koa-compress": "2.0.8",
 		"@types/koa-favicon": "2.0.19",
 		"@types/koa-logger": "3.1.0",
 		"@types/koa-mount": "3.0.1",
 		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.28",
+		"@types/koa-router": "7.0.30",
 		"@types/koa-send": "4.1.1",
 		"@types/koa-views": "2.0.3",
 		"@types/koa__cors": "2.2.2",
-		"@types/kue": "0.11.8",
-		"@types/license-checker": "15.0.0",
+		"@types/kue": "0.11.9",
 		"@types/mkdirp": "0.5.2",
-		"@types/mocha": "5.2.0",
-		"@types/mongodb": "3.0.18",
-		"@types/monk": "6.0.0",
+		"@types/mocha": "5.2.3",
+		"@types/mongodb": "3.1.1",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.1.2",
-		"@types/nopt": "3.0.29",
-		"@types/parse5": "3.0.0",
+		"@types/node": "10.5.2",
+		"@types/parse5": "5.0.0",
 		"@types/pug": "2.0.4",
-		"@types/qrcode": "0.8.1",
+		"@types/qrcode": "1.2.0",
 		"@types/ratelimiter": "2.1.28",
 		"@types/redis": "2.8.6",
-		"@types/request": "2.47.0",
-		"@types/request-promise-native": "1.0.14",
+		"@types/request": "2.47.1",
+		"@types/request-promise-native": "1.0.15",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
 		"@types/single-line-log": "1.1.0",
 		"@types/speakeasy": "2.0.2",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.3",
-		"@types/webpack": "4.4.0",
+		"@types/webpack": "4.4.5",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.39",
-		"@types/ws": "5.1.1",
+		"@types/ws": "5.1.2",
 		"animejs": "2.2.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
-		"bootstrap-vue": "2.0.0-rc.6",
-		"cafy": "8.0.0",
+		"bootstrap-vue": "2.0.0-rc.11",
+		"cafy": "11.3.0",
 		"chalk": "2.4.1",
 		"crc-32": "1.2.0",
-		"css-loader": "0.28.11",
+		"css-loader": "1.0.0",
 		"debug": "3.1.0",
 		"deep-equal": "1.0.1",
 		"deepcopy": "0.6.3",
 		"diskusage": "0.2.4",
-		"dompurify": "1.0.4",
-		"elasticsearch": "15.0.0",
-		"element-ui": "2.3.9",
+		"dompurify": "1.0.5",
+		"elasticsearch": "15.1.1",
+		"element-ui": "2.4.3",
 		"emojilib": "2.2.12",
 		"escape-regexp": "0.0.1",
-		"eslint": "4.19.1",
+		"eslint": "5.0.1",
 		"eslint-plugin-vue": "4.5.0",
 		"eventemitter3": "3.1.0",
 		"exif-js": "2.3.0",
 		"file-loader": "1.1.11",
-		"file-type": "8.0.0",
+		"file-type": "8.1.0",
 		"fuckadblock": "3.2.1",
 		"gm": "1.23.1",
 		"gulp": "3.9.1",
 		"gulp-cssnano": "2.1.3",
 		"gulp-htmlmin": "4.0.0",
 		"gulp-imagemin": "4.1.0",
-		"gulp-mocha": "5.0.0",
+		"gulp-mocha": "6.0.0",
 		"gulp-pug": "4.0.1",
-		"gulp-rename": "1.2.3",
+		"gulp-rename": "1.3.0",
 		"gulp-replace": "1.0.0",
 		"gulp-sourcemaps": "2.6.4",
 		"gulp-stylus": "2.7.0",
@@ -124,17 +122,17 @@
 		"gulp-typescript": "4.0.2",
 		"gulp-uglify": "3.0.0",
 		"gulp-util": "3.0.8",
-		"hard-source-webpack-plugin": "0.6.9",
+		"hard-source-webpack-plugin": "0.11.0",
 		"highlight.js": "9.12.0",
-		"html-minifier": "3.5.15",
+		"html-minifier": "3.5.18",
 		"http-signature": "1.2.0",
-		"inquirer": "5.2.0",
+		"inquirer": "6.0.0",
 		"is-root": "2.0.0",
 		"is-url": "1.2.4",
-		"js-yaml": "3.11.0",
-		"jsdom": "11.10.0",
+		"js-yaml": "3.12.0",
+		"jsdom": "11.11.0",
 		"koa": "2.5.1",
-		"koa-bodyparser": "4.2.0",
+		"koa-bodyparser": "4.2.1",
 		"koa-compress": "3.0.0",
 		"koa-favicon": "2.0.1",
 		"koa-json-body": "5.3.0",
@@ -142,44 +140,42 @@
 		"koa-mount": "3.0.0",
 		"koa-multer": "1.0.2",
 		"koa-router": "7.4.0",
-		"koa-send": "4.1.3",
+		"koa-send": "5.0.0",
 		"koa-slow": "2.1.0",
 		"koa-views": "6.1.4",
 		"kue": "0.11.6",
-		"license-checker": "20.0.0",
 		"loader-utils": "1.1.0",
 		"mecab-async": "0.1.2",
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",
 		"moji": "0.5.1",
-		"mongodb": "3.0.8",
+		"mongodb": "3.1.1",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nan": "2.10.0",
-		"node-sass": "4.9.0",
-		"node-sass-json-importer": "3.2.0",
-		"nopt": "4.0.1",
+		"node-sass": "4.9.2",
+		"node-sass-json-importer": "3.3.1",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"on-build-webpack": "0.1.0",
 		"os-utils": "0.0.14",
-		"parse5": "4.0.0",
+		"parse5": "5.0.0",
 		"progress-bar-webpack-plugin": "1.11.0",
 		"prominence": "0.2.0",
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
-		"punycode": "2.1.0",
+		"punycode": "2.1.1",
 		"qrcode": "1.2.0",
-		"ratelimiter": "3.0.3",
+		"ratelimiter": "3.1.0",
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "3.2.2",
 		"redis": "2.8.0",
-		"request": "2.86.0",
+		"request": "2.87.0",
 		"request-promise-native": "1.0.5",
 		"rimraf": "2.6.2",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass-loader": "7.0.1",
+		"sass-loader": "7.0.3",
 		"seedrandom": "2.4.3",
 		"single-line-log": "1.1.2",
 		"speakeasy": "2.0.0",
@@ -192,32 +188,38 @@
 		"tcp-port-used": "0.1.2",
 		"textarea-caret": "3.1.0",
 		"tmp": "0.0.33",
-		"ts-loader": "4.3.0",
-		"ts-node": "6.0.3",
+		"ts-loader": "4.4.1",
+		"ts-node": "7.0.0",
 		"tslint": "5.10.0",
-		"typescript": "2.8.3",
-		"typescript-eslint-parser": "15.0.0",
+		"typescript": "2.9.2",
+		"typescript-eslint-parser": "16.0.1",
 		"uglify-es": "3.3.9",
 		"url-loader": "1.0.1",
-		"uuid": "3.2.1",
+		"uuid": "3.3.2",
 		"v-animate-css": "0.0.2",
 		"vue": "2.5.16",
-		"vue-cropperjs": "2.2.0",
-		"vue-js-modal": "1.3.13",
+		"vue-cropperjs": "2.2.1",
+		"vue-js-modal": "1.3.16",
 		"vue-json-tree-view": "2.1.4",
-		"vue-loader": "15.1.0",
-		"vue-material": "^1.0.0-beta-10.2",
+		"vue-loader": "15.2.4",
 		"vue-router": "3.0.1",
 		"vue-template-compiler": "2.5.16",
 		"vuedraggable": "2.16.0",
 		"vuex": "3.0.1",
 		"vuex-persistedstate": "^2.5.4",
-		"web-push": "3.3.1",
+		"web-push": "3.3.2",
 		"webfinger.js": "2.6.6",
-		"webpack": "4.8.3",
-		"webpack-cli": "2.1.3",
+		"webpack": "4.15.1",
+		"webpack-cli": "3.0.8",
 		"websocket": "1.0.26",
-		"ws": "5.1.1",
-		"xev": "2.0.0"
+		"ws": "5.2.1",
+		"xev": "2.0.1"
+	},
+	"greenkeeper": {
+		"ignore": [
+			"deepcopy",
+			"cafy",
+			"@types/gulp"
+		]
 	}
 }
--- a/src/client/app/app.styl
+++ b/src/client/app/app.styl
@@ -7,11 +7,6 @@ html
 			cursor progress !important

 body
-	// for md
-	font-size 16px !important
-	line-height initial !important
-	letter-spacing initial !important
-
 	overflow-wrap break-word

 #error
--- a/src/client/app/auth/assets/icon.svg
+++ b/src/client/app/auth/assets/icon.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!-- Generator: Gravit.io --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="isolation:isolate" viewBox="0 0 512 512" width="512" height="512"><defs><clipPath id="_clipPath_P6eAE2OaBltOJ3gHGVajfqsOnfv4xIns"><rect width="512" height="512"/></clipPath></defs><g clip-path="url(#_clipPath_P6eAE2OaBltOJ3gHGVajfqsOnfv4xIns)"><clipPath id="_clipPath_P6q7MZAUp3XpQhVgs2GuAbegX9v4gkom"><rect x="0" y="0" width="512" height="512" transform="matrix(1,0,0,1,0,0)" fill="rgb(255,255,255)"/></clipPath><g clip-path="url(#_clipPath_P6q7MZAUp3XpQhVgs2GuAbegX9v4gkom)"><g id="Group"><g id="g4502"><g id="g5125"><g id="text4489"><path d=" M 190.093 359.243 C 167.923 359.32 148.881 345.963 139.9 330.409 C 135.104 323.615 125.617 321.198 125.482 330.409 L 125.482 372.939 C 125.482 390.026 119.253 404.799 106.794 417.258 C 94.69 429.362 79.917 435.413 62.474 435.413 C 45.387 435.413 30.614 429.362 18.155 417.258 C 6.052 404.799 0 390.026 0 372.939 L 0 139.061 C 0 125.89 3.738 113.965 11.213 103.285 C 19.045 92.25 29.012 84.596 41.116 80.325 C 47.879 77.833 54.999 76.587 62.474 76.587 C 81.697 76.587 97.716 84.062 110.531 99.013 C 117.295 106.489 121.211 110.405 122.279 110.761 C 122.279 110.761 173.043 172.145 174.467 173.213 C 175.891 174.281 180.073 182.446 190.093 182.446 C 200.112 182.446 204.829 174.281 206.253 173.213 C 207.676 172.145 258.44 110.761 258.44 110.761 C 258.796 111.117 262.534 107.201 269.654 99.013 C 282.825 84.062 299.022 76.587 318.245 76.587 C 325.364 76.587 332.484 77.833 339.603 80.325 C 351.707 84.596 361.496 92.25 368.972 103.285 C 376.803 113.965 380.719 125.89 380.719 139.061 L 380.719 372.939 C 380.719 390.026 374.489 404.799 362.03 417.258 C 349.927 429.362 335.154 435.413 317.711 435.413 C 300.624 435.413 285.851 429.362 273.391 417.258 C 261.288 404.799 255.237 390.026 255.237 372.939 L 255.237 330.409 C 254.184 318.802 243.925 326.116 240.285 330.409 C 230.674 348.208 212.262 359.167 190.093 359.243 Z  M 457.535 184.448 Q 435.109 184.448 419.09 168.963 Q 403.605 152.944 403.605 130.518 Q 403.605 108.091 419.09 92.606 Q 435.109 76.587 457.535 76.587 Q 479.962 76.587 495.981 92.606 Q 512 108.091 512 130.518 Q 512 152.944 495.981 168.963 Q 479.962 184.448 457.535 184.448 Z  M 458.069 195.128 Q 480.496 195.128 495.981 211.147 Q 512 227.166 512 249.592 L 512 381.482 Q 512 403.909 495.981 419.928 Q 480.496 435.413 458.069 435.413 Q 435.643 435.413 419.624 419.928 Q 403.605 403.909 403.605 381.482 L 403.605 249.592 Q 403.605 227.166 419.624 211.147 Q 435.643 195.128 458.069 195.128 Z " fill-rule="evenodd" fill="rgb(157,157,157)"/></g></g></g></g></g></g></svg>
--- a/src/client/app/auth/assets/logo.svg
+++ b/src/client/app/auth/assets/logo.svg
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" width="1024px" height="512px" viewBox="0 256 1024 512" enable-background="new 0 256 1024 512" xml:space="preserve">
-<polyline opacity="0.5" fill="none" stroke="#000000" stroke-width="34" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-	896.5,608.5 800.5,416.5 704.5,608.5 608.5,416.5 512.5,608.5 416.5,416.5 320.5,608.5 224.5,416.5 128.5,608.5 "/>
-</svg>
--- a/src/client/app/auth/script.ts
+++ b/src/client/app/auth/script.ts
@@ -20,6 +20,7 @@ init(launch => {
 	// Init router
 	const router = new VueRouter({
 		mode: 'history',
+		base: '/auth/',
 		routes: [
 			{ path: '/:token', component: Index },
 		]
--- a/src/client/app/auth/views/index.vue
+++ b/src/client/app/auth/views/index.vue
@@ -1,8 +1,9 @@
 <template>
 <div class="index">
-	<main v-if="os.isSignedIn">
+	<main v-if="$store.getters.isSignedIn">
 		<p class="fetching" v-if="fetching">読み込み中<mk-ellipsis/></p>
 		<x-form
+			class="form"
 			ref="form"
 			v-if="state == 'waiting'"
 			:session="session"
@@ -22,11 +23,11 @@
 			<p>セッションが存在しません。</p>
 		</div>
 	</main>
-	<main class="signin" v-if="!os.isSignedIn">
+	<main class="signin" v-if="!$store.getters.isSignedIn">
 		<h1>サインインしてください</h1>
 		<mk-signin/>
 	</main>
-	<footer><img src="/assets/auth/logo.svg" alt="Misskey"/></footer>
+	<footer><img src="/assets/auth/icon.svg" alt="Misskey"/></footer>
 </div>
 </template>

@@ -51,7 +52,7 @@ export default Vue.extend({
 		}
 	},
 	mounted() {
-		if (!this.$root.$data.os.isSignedIn) return;
+		if (!this.$store.getters.isSignedIn) return;

 		// Fetch session
 		(this as any).api('auth/session/show', {
@@ -62,7 +63,7 @@ export default Vue.extend({

 			// 既に連携していた場合
 			if (this.session.app.isAuthorized) {
-				this.$root.$data.os.api('auth/accept', {
+				(this as any).api('auth/accept', {
 					token: this.session.token
 				}).then(() => {
 					this.accepted();
@@ -72,6 +73,7 @@ export default Vue.extend({
 			}
 		}).catch(error => {
 			this.state = 'fetch-session-error';
+			this.fetching = false;
 		});
 	},
 	methods: {
@@ -101,7 +103,7 @@ export default Vue.extend({
 			padding 32px
 			color #555

-		> div
+		> div:not(.form)
 			padding 64px

 			> h1
@@ -142,8 +144,8 @@ export default Vue.extend({
 	> footer
 		> img
 			display block
-			width 64px
-			height 64px
-			margin 0 auto
+			width 32px
+			height 32px
+			margin 16px auto

 </style>
--- a/src/client/app/base.pug
+++ b/src/client/app/base.pug
@@ -19,7 +19,7 @@ html
 				| Misskey

 		block desc
-			meta(name='description' content='A SNS')
+			meta(name='description' content='A planet of fediverse')

 		block meta

@@ -42,7 +42,7 @@ html
 			| JavaScriptを有効にしてください
 			br
 			| Please turn on your JavaScript
-		div#ini: p
-			span .
-			span .
-			span .
+		div#ini.
+			<svg viewBox="0 0 50 50">
+				<path fill=#{themeColor} d="M25.251,6.461c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615V6.461z" />
+			</svg>
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -32,9 +32,9 @@
 	//#region Detect app name
 	let app = null;

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

 	//#region Detect the user language
--- a/src/client/app/common/define-widget.ts
+++ b/src/client/app/common/define-widget.ts
@@ -9,9 +9,9 @@ export default function<T extends object>(data: {
 			widget: {
 				type: Object
 			},
-			isMobile: {
-				type: Boolean,
-				default: false
+			platform: {
+				type: String,
+				required: true
 			},
 			isCustomizeMode: {
 				type: Boolean,
@@ -66,17 +66,10 @@ export default function<T extends object>(data: {

 				this.bakeProps();

-				if (this.isMobile) {
-					(this as any).api('i/update_mobile_home', {
-						id: this.id,
-						data: this.props
-					});
-				} else {
-					(this as any).api('i/update_home', {
-						id: this.id,
-						data: this.props
-					});
-				}
+				(this as any).api('i/update_widget', {
+					id: this.id,
+					data: this.props
+				});
 			}
 		}
 	});
--- a/src/client/app/common/scripts/can-hide-text.ts
+++ b/src/client/app/common/scripts/can-hide-text.ts
@@ -1,16 +0,0 @@
-export default function(note) {
-	if (note.text == null) return true;
-
-	let txt = note.text;
-
-	if (note.media) {
-		note.media.forEach(file => {
-			txt = txt.replace(file.url, '');
-			if (file.src) txt = txt.replace(file.src, '');
-		});
-
-		if (txt == '') return true;
-	}
-
-	return false;
-}
--- a/src/client/app/common/scripts/check-for-update.ts
+++ b/src/client/app/common/scripts/check-for-update.ts
@@ -23,7 +23,10 @@ export default async function(mios: MiOS, force = false, silent = false) {
 		}

 		if (!silent) {
-			alert('%i18n:common.update-available%'.replace('{newer}', newer).replace('{current}', current));
+			mios.apis.dialog({
+				title: '%i18n:common.update-available-title%',
+				text: '%i18n:common.update-available%'.replace('{newer}', newer).replace('{current}', current)
+			});
 		}

 		return newer;
--- a/src/client/app/common/scripts/compose-notification.ts
+++ b/src/client/app/common/scripts/compose-notification.ts
@@ -1,6 +1,6 @@
-import getNoteSummary from '../../../../renderers/get-note-summary';
-import getReactionEmoji from '../../../../renderers/get-reaction-emoji';
-import getUserName from '../../../../renderers/get-user-name';
+import getNoteSummary from '../../../../misc/get-note-summary';
+import getReactionEmoji from '../../../../misc/get-reaction-emoji';
+import getUserName from '../../../../misc/get-user-name';

 type Notification = {
 	title: string;
@@ -20,34 +20,6 @@ export default function(type, data): Notification {
 				icon: data.url + '?thumbnail&size=64'
 			};

-		case 'mention':
-			return {
-				title: `${getUserName(data.user)}さんから:`,
-				body: getNoteSummary(data),
-				icon: data.user.avatarUrl + '?thumbnail&size=64'
-			};
-
-		case 'reply':
-			return {
-				title: `${getUserName(data.user)}さんから返信:`,
-				body: getNoteSummary(data),
-				icon: data.user.avatarUrl + '?thumbnail&size=64'
-			};
-
-		case 'quote':
-			return {
-				title: `${getUserName(data.user)}さんが引用:`,
-				body: getNoteSummary(data),
-				icon: data.user.avatarUrl + '?thumbnail&size=64'
-			};
-
-		case 'reaction':
-			return {
-				title: `${getUserName(data.user)}: ${getReactionEmoji(data.reaction)}:`,
-				body: getNoteSummary(data.note),
-				icon: data.user.avatarUrl + '?thumbnail&size=64'
-			};
-
 		case 'unread_messaging_message':
 			return {
 				title: `${getUserName(data.user)}さんからメッセージ:`,
@@ -55,13 +27,47 @@ export default function(type, data): Notification {
 				icon: data.user.avatarUrl + '?thumbnail&size=64'
 			};

-		case 'othello_invited':
+		case 'reversi_invited':
 			return {
 				title: '対局への招待があります',
 				body: `${getUserName(data.parent)}さんから`,
 				icon: data.parent.avatarUrl + '?thumbnail&size=64'
 			};

+		case 'notification':
+			switch (data.type) {
+				case 'mention':
+					return {
+						title: `${getUserName(data.user)}さんから:`,
+						body: getNoteSummary(data),
+						icon: data.user.avatarUrl + '?thumbnail&size=64'
+					};
+
+				case 'reply':
+					return {
+						title: `${getUserName(data.user)}さんから返信:`,
+						body: getNoteSummary(data),
+						icon: data.user.avatarUrl + '?thumbnail&size=64'
+					};
+
+				case 'quote':
+					return {
+						title: `${getUserName(data.user)}さんが引用:`,
+						body: getNoteSummary(data),
+						icon: data.user.avatarUrl + '?thumbnail&size=64'
+					};
+
+				case 'reaction':
+					return {
+						title: `${getUserName(data.user)}: ${getReactionEmoji(data.reaction)}:`,
+						body: getNoteSummary(data.note),
+						icon: data.user.avatarUrl + '?thumbnail&size=64'
+					};
+
+				default:
+					return null;
+			}
+
 		default:
 			return null;
 	}
--- a/src/client/app/common/scripts/get-kao.ts
+++ b/src/client/app/common/scripts/get-kao.ts
@@ -1,5 +1,5 @@
 export default () => [
 	'(=^・・^=)',
-	'v(‘ω’)v',
+	'v(\'ω\')v',
 	'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!'
 ][Math.floor(Math.random() * 3)];
--- a/src/client/app/common/scripts/streaming/games/reversi/reversi-game.ts
+++ b/src/client/app/common/scripts/streaming/games/reversi/reversi-game.ts
@@ -0,0 +1,11 @@
+import Stream from '../../stream';
+import MiOS from '../../../../../mios';
+
+export class ReversiGameStream extends Stream {
+	constructor(os: MiOS, me, game) {
+		super(os, 'games/reversi-game', {
+			i: me ? me.token : null,
+			game: game.id
+		});
+	}
+}
--- a/src/client/app/common/scripts/streaming/games/reversi/reversi.ts
+++ b/src/client/app/common/scripts/streaming/games/reversi/reversi.ts
@@ -0,0 +1,31 @@
+import StreamManager from '../../stream-manager';
+import Stream from '../../stream';
+import MiOS from '../../../../../mios';
+
+export class ReversiStream extends Stream {
+	constructor(os: MiOS, me) {
+		super(os, 'games/reversi', {
+			i: me.token
+		});
+	}
+}
+
+export class ReversiStreamManager extends StreamManager<ReversiStream> {
+	private me;
+	private os: MiOS;
+
+	constructor(os: MiOS, me) {
+		super();
+
+		this.me = me;
+		this.os = os;
+	}
+
+	public getConnection() {
+		if (this.connection == null) {
+			this.connection = new ReversiStream(this.os, this.me);
+		}
+
+		return this.connection;
+	}
+}
--- a/src/client/app/common/scripts/streaming/home.ts
+++ b/src/client/app/common/scripts/streaming/home.ts
@@ -1,5 +1,3 @@
-import * as merge from 'object-assign-deep';
-
 import Stream from './stream';
 import StreamManager from './stream-manager';
 import MiOS from '../../../mios';
@@ -20,14 +18,36 @@ export class HomeStream extends Stream {
 		}, 1000 * 60);

 		// 自分の情報が更新されたとき
-		this.on('i_updated', i => {
+		this.on('meUpdated', i => {
 			if (os.debug) {
 				console.log('I updated:', i);
 			}
-			merge(me, i);

-			// キャッシュ更新
-			os.bakeMe();
+			os.store.dispatch('mergeMe', i);
+		});
+
+		this.on('read_all_notifications', () => {
+			os.store.dispatch('mergeMe', {
+				hasUnreadNotification: false
+			});
+		});
+
+		this.on('unread_notification', () => {
+			os.store.dispatch('mergeMe', {
+				hasUnreadNotification: true
+			});
+		});
+
+		this.on('read_all_messaging_messages', () => {
+			os.store.dispatch('mergeMe', {
+				hasUnreadMessagingMessage: false
+			});
+		});
+
+		this.on('unread_messaging_message', () => {
+			os.store.dispatch('mergeMe', {
+				hasUnreadMessagingMessage: true
+			});
 		});

 		this.on('clientSettingUpdated', x => {
@@ -38,25 +58,18 @@ export class HomeStream extends Stream {
 		});

 		this.on('home_updated', x => {
-			if (x.home) {
-				os.store.commit('settings/setHome', x.home);
-			} else {
-				os.store.commit('settings/setHomeWidget', {
-					id: x.id,
-					data: x.data
-				});
-			}
+			os.store.commit('settings/setHome', x);
 		});

 		this.on('mobile_home_updated', x => {
-			if (x.home) {
-				os.store.commit('settings/setMobileHome', x.home);
-			} else {
-				os.store.commit('settings/setMobileHomeWidget', {
-					id: x.id,
-					data: x.data
-				});
-			}
+			os.store.commit('settings/setMobileHome', x);
+		});
+
+		this.on('widgetUpdated', x => {
+			os.store.commit('settings/setWidget', {
+				id: x.id,
+				data: x.data
+			});
 		});

 		// トークンが再生成されたとき
--- a/src/client/app/common/scripts/streaming/hybrid-timeline.ts
+++ b/src/client/app/common/scripts/streaming/hybrid-timeline.ts
@@ -1,16 +1,19 @@
-import StreamManager from './stream-manager';
 import Stream from './stream';
+import StreamManager from './stream-manager';
 import MiOS from '../../../mios';

-export class OthelloStream extends Stream {
+/**
+ * Hybrid timeline stream connection
+ */
+export class HybridTimelineStream extends Stream {
 	constructor(os: MiOS, me) {
-		super(os, 'othello', {
+		super(os, 'hybrid-timeline', {
 			i: me.token
 		});
 	}
 }

-export class OthelloStreamManager extends StreamManager<OthelloStream> {
+export class HybridTimelineStreamManager extends StreamManager<HybridTimelineStream> {
 	private me;
 	private os: MiOS;

@@ -23,7 +26,7 @@ export class OthelloStreamManager extends StreamManager<OthelloStream> {

 	public getConnection() {
 		if (this.connection == null) {
-			this.connection = new OthelloStream(this.os, this.me);
+			this.connection = new HybridTimelineStream(this.os, this.me);
 		}

 		return this.connection;
--- a/src/client/app/common/scripts/streaming/notes-stats.ts
+++ b/src/client/app/common/scripts/streaming/notes-stats.ts
@@ -3,15 +3,15 @@ import StreamManager from './stream-manager';
 import MiOS from '../../../mios';

 /**
- * Server stream connection
+ * Notes stats stream connection
 */
-export class ServerStream extends Stream {
+export class NotesStatsStream extends Stream {
 	constructor(os: MiOS) {
-		super(os, 'server');
+		super(os, 'notes-stats');
 	}
 }

-export class ServerStreamManager extends StreamManager<ServerStream> {
+export class NotesStatsStreamManager extends StreamManager<NotesStatsStream> {
 	private os: MiOS;

 	constructor(os: MiOS) {
@@ -22,7 +22,7 @@ export class ServerStreamManager extends StreamManager<ServerStream> {

 	public getConnection() {
 		if (this.connection == null) {
-			this.connection = new ServerStream(this.os);
+			this.connection = new NotesStatsStream(this.os);
 		}

 		return this.connection;
--- a/src/client/app/common/scripts/streaming/othello-game.ts
+++ b/src/client/app/common/scripts/streaming/othello-game.ts
@@ -1,11 +0,0 @@
-import Stream from './stream';
-import MiOS from '../../../mios';
-
-export class OthelloGameStream extends Stream {
-	constructor(os: MiOS, me, game) {
-		super(os, 'othello-game', {
-			i: me ? me.token : null,
-			game: game.id
-		});
-	}
-}
--- a/src/client/app/common/scripts/streaming/server-stats.ts
+++ b/src/client/app/common/scripts/streaming/server-stats.ts
@@ -0,0 +1,30 @@
+import Stream from './stream';
+import StreamManager from './stream-manager';
+import MiOS from '../../../mios';
+
+/**
+ * Server stats stream connection
+ */
+export class ServerStatsStream extends Stream {
+	constructor(os: MiOS) {
+		super(os, 'server-stats');
+	}
+}
+
+export class ServerStatsStreamManager extends StreamManager<ServerStatsStream> {
+	private os: MiOS;
+
+	constructor(os: MiOS) {
+		super();
+
+		this.os = os;
+	}
+
+	public getConnection() {
+		if (this.connection == null) {
+			this.connection = new ServerStatsStream(this.os);
+		}
+
+		return this.connection;
+	}
+}
--- a/src/client/app/common/views/components/analog-clock.vue
+++ b/src/client/app/common/views/components/analog-clock.vue
@@ -0,0 +1,127 @@
+<template>
+<svg class="mk-analog-clock" viewBox="0 0 10 10" preserveAspectRatio="none">
+	<circle v-for="angle, i in graduations"
+		:cx="5 + (Math.sin(angle) * (5 - graduationsPadding))"
+		:cy="5 - (Math.cos(angle) * (5 - graduationsPadding))"
+		:r="i % 5 == 0 ? 0.125 : 0.05"
+		:fill="i % 5 == 0 ? majorGraduationColor : minorGraduationColor"/>
+
+	<line
+		:x1="5 - (Math.sin(sAngle) * (sHandLengthRatio * handsTailLength))"
+		:y1="5 + (Math.cos(sAngle) * (sHandLengthRatio * handsTailLength))"
+		:x2="5 + (Math.sin(sAngle) * ((sHandLengthRatio * 5) - handsPadding))"
+		:y2="5 - (Math.cos(sAngle) * ((sHandLengthRatio * 5) - handsPadding))"
+		:stroke="sHandColor"
+		stroke-width="0.05"/>
+	<line
+		:x1="5 - (Math.sin(mAngle) * (mHandLengthRatio * handsTailLength))"
+		:y1="5 + (Math.cos(mAngle) * (mHandLengthRatio * handsTailLength))"
+		:x2="5 + (Math.sin(mAngle) * ((mHandLengthRatio * 5) - handsPadding))"
+		:y2="5 - (Math.cos(mAngle) * ((mHandLengthRatio * 5) - handsPadding))"
+		:stroke="mHandColor"
+		stroke-width="0.1"/>
+	<line
+		:x1="5 - (Math.sin(hAngle) * (hHandLengthRatio * handsTailLength))"
+		:y1="5 + (Math.cos(hAngle) * (hHandLengthRatio * handsTailLength))"
+		:x2="5 + (Math.sin(hAngle) * ((hHandLengthRatio * 5) - handsPadding))"
+		:y2="5 - (Math.cos(hAngle) * ((hHandLengthRatio * 5) - handsPadding))"
+		:stroke="hHandColor"
+		stroke-width="0.1"/>
+</svg>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { themeColor } from '../../../config';
+
+export default Vue.extend({
+	props: {
+		dark: {
+			type: Boolean,
+			default: false
+		}
+	},
+
+	data() {
+		return {
+			now: new Date(),
+			clock: null,
+
+			graduationsPadding: 0.5,
+			handsPadding: 1,
+			handsTailLength: 0.7,
+			hHandLengthRatio: 0.75,
+			mHandLengthRatio: 1,
+			sHandLengthRatio: 1
+		};
+	},
+
+	computed: {
+		majorGraduationColor(): string {
+			return this.dark ? 'rgba(255, 255, 255, 0.3)' : 'rgba(0, 0, 0, 0.3)';
+		},
+		minorGraduationColor(): string {
+			return this.dark ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
+		},
+
+		sHandColor(): string {
+			return this.dark ? 'rgba(255, 255, 255, 0.5)' : 'rgba(0, 0, 0, 0.3)';
+		},
+		mHandColor(): string {
+			return this.dark ? '#fff' : '#777';
+		},
+		hHandColor(): string {
+			return themeColor;
+		},
+
+		s(): number {
+			return this.now.getSeconds();
+		},
+		m(): number {
+			return this.now.getMinutes();
+		},
+		h(): number {
+			return this.now.getHours();
+		},
+
+		hAngle(): number {
+			return Math.PI * (this.h % 12 + this.m / 60) / 6;
+		},
+		mAngle(): number {
+			return Math.PI * (this.m + this.s / 60) / 30;
+		},
+		sAngle(): number {
+			return Math.PI * this.s / 30;
+		},
+
+		graduations(): any {
+			const angles = [];
+			for (let i = 0; i < 60; i++) {
+				const angle = Math.PI * i / 30;
+				angles.push(angle);
+			}
+
+			return angles;
+		}
+	},
+
+	mounted() {
+		this.clock = setInterval(this.tick, 1000);
+	},
+
+	beforeDestroy() {
+		clearInterval(this.clock);
+	},
+
+	methods: {
+		tick() {
+			this.now = new Date();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.mk-analog-clock
+	display block
+</style>
--- a/src/client/app/common/views/components/avatar.vue
+++ b/src/client/app/common/views/components/avatar.vue
@@ -32,7 +32,7 @@ export default Vue.extend({
 						? `rgb(${ this.user.avatarColor.join(',') })`
 						: null,
 				backgroundImage: this.lightmode ? null : `url(${ this.user.avatarUrl }?thumbnail)`,
-				borderRadius: (this as any).clientSettings.circleIcons ? '100%' : null
+				borderRadius: this.$store.state.settings.circleIcons ? '100%' : null
 			};
 		}
 	}
--- a/src/client/app/common/views/components/forkit.vue
+++ b/src/client/app/common/views/components/forkit.vue
@@ -13,9 +13,6 @@

 .a
 	display block
-	position absolute
-	top 0
-	right 0

 	> svg
 		display block
--- a/src/client/app/common/views/components/games/reversi/reversi.game.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue
@@ -3,24 +3,39 @@
 	<header><b>{{ blackUser.name }}</b>(黒) vs <b>{{ whiteUser.name }}</b>(白)</header>

 	<div style="overflow: hidden">
-		<p class="turn" v-if="!iAmPlayer && !game.isEnded">{{ turnUser.name }}のターンです<mk-ellipsis/></p>
-		<p class="turn" v-if="logPos != logs.length">{{ turnUser.name }}のターン</p>
-		<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">相手のターンです<mk-ellipsis/></p>
-		<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">あなたのターンです</p>
+		<p class="turn" v-if="!iAmPlayer && !game.isEnded">{{ '%i18n:common.reversi.turn-of%'.replace('{}', turnUser.name) }}<mk-ellipsis/></p>
+		<p class="turn" v-if="logPos != logs.length">{{ '%i18n:common.reversi.past-turn-of%'.replace('{}', turnUser.name) }}</p>
+		<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">%i18n:common.reversi.opponent-turn%<mk-ellipsis/></p>
+		<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">%i18n:common.reversi.my-turn%</p>
 		<p class="result" v-if="game.isEnded && logPos == logs.length">
 			<template v-if="game.winner"><b>{{ game.winner.name }}</b>の勝ち{{ game.settings.isLlotheo ? ' (ロセオ)' : '' }}</template>
-			<template v-else>引き分け</template>
+			<template v-else>%i18n:common.reversi.drawn%</template>
 		</p>
 	</div>

-	<div class="board" :style="{ 'grid-template-rows': `repeat(${ game.settings.map.length }, 1fr)`, 'grid-template-columns': `repeat(${ game.settings.map[0].length }, 1fr)` }">
-		<div v-for="(stone, i) in o.board"
-			:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
-			@click="set(i)"
-			:title="'[' + (o.transformPosToXy(i)[0] + 1) + ', ' + (o.transformPosToXy(i)[1] + 1) + '] (' + i + ')'"
-		>
-			<img v-if="stone === true" :src="`${blackUser.avatarUrl}?thumbnail&size=128`" alt="">
-			<img v-if="stone === false" :src="`${whiteUser.avatarUrl}?thumbnail&size=128`" alt="">
+	<div class="board">
+		<div class="labels-x" v-if="this.$store.state.settings.reversiBoardLabels">
+			<span v-for="i in game.settings.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
+		</div>
+		<div class="flex">
+			<div class="labels-y" v-if="this.$store.state.settings.reversiBoardLabels">
+				<div v-for="i in game.settings.map.length">{{ i }}</div>
+			</div>
+			<div class="cells" :style="cellsStyle">
+				<div v-for="(stone, i) in o.board"
+						:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
+						@click="set(i)"
+						:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
+					<img v-if="stone === true" :src="`${blackUser.avatarUrl}?thumbnail&size=128`" alt="">
+					<img v-if="stone === false" :src="`${whiteUser.avatarUrl}?thumbnail&size=128`" alt="">
+				</div>
+			</div>
+			<div class="labels-y" v-if="this.$store.state.settings.reversiBoardLabels">
+				<div v-for="i in game.settings.map.length">{{ i }}</div>
+			</div>
+		</div>
+		<div class="labels-x" v-if="this.$store.state.settings.reversiBoardLabels">
+			<span v-for="i in game.settings.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 	</div>

@@ -43,8 +58,8 @@
 <script lang="ts">
 import Vue from 'vue';
 import * as CRC32 from 'crc-32';
-import Othello, { Color } from '../../../../../othello/core';
-import { url } from '../../../config';
+import Reversi, { Color } from '../../../../../../../games/reversi/core';
+import { url } from '../../../../../config';

 export default Vue.extend({
 	props: ['initGame', 'connection'],
@@ -52,7 +67,7 @@ export default Vue.extend({
 	data() {
 		return {
 			game: null,
-			o: null as Othello,
+			o: null as Reversi,
 			logs: [],
 			logPos: 0,
 			pollingClock: null
@@ -61,13 +76,13 @@ export default Vue.extend({

 	computed: {
 		iAmPlayer(): boolean {
-			if (!(this as any).os.isSignedIn) return false;
-			return this.game.user1Id == (this as any).os.i.id || this.game.user2Id == (this as any).os.i.id;
+			if (!this.$store.getters.isSignedIn) return false;
+			return this.game.user1Id == this.$store.state.i.id || this.game.user2Id == this.$store.state.i.id;
 		},
 		myColor(): Color {
 			if (!this.iAmPlayer) return null;
-			if (this.game.user1Id == (this as any).os.i.id && this.game.black == 1) return true;
-			if (this.game.user2Id == (this as any).os.i.id && this.game.black == 2) return true;
+			if (this.game.user1Id == this.$store.state.i.id && this.game.black == 1) return true;
+			if (this.game.user2Id == this.$store.state.i.id && this.game.black == 2) return true;
 			return false;
 		},
 		opColor(): Color {
@@ -91,14 +106,20 @@ export default Vue.extend({
 		},
 		isMyTurn(): boolean {
 			if (this.turnUser == null) return null;
-			return this.turnUser.id == (this as any).os.i.id;
+			return this.turnUser.id == this.$store.state.i.id;
+		},
+		cellsStyle(): any {
+			return {
+				'grid-template-rows': `repeat(${ this.game.settings.map.length }, 1fr)`,
+				'grid-template-columns': `repeat(${ this.game.settings.map[0].length }, 1fr)`
+			};
 		}
 	},

 	watch: {
 		logPos(v) {
 			if (!this.game.isEnded) return;
-			this.o = new Othello(this.game.settings.map, {
+			this.o = new Reversi(this.game.settings.map, {
 				isLlotheo: this.game.settings.isLlotheo,
 				canPutEverywhere: this.game.settings.canPutEverywhere,
 				loopedBoard: this.game.settings.loopedBoard
@@ -115,7 +136,7 @@ export default Vue.extend({
 	created() {
 		this.game = this.initGame;

-		this.o = new Othello(this.game.settings.map, {
+		this.o = new Reversi(this.game.settings.map, {
 			isLlotheo: this.game.settings.isLlotheo,
 			canPutEverywhere: this.game.settings.canPutEverywhere,
 			loopedBoard: this.game.settings.loopedBoard
@@ -163,7 +184,7 @@ export default Vue.extend({

 			// サウンドを再生する
 			if (this.$store.state.device.enableSounds) {
-				const sound = new Audio(`${url}/assets/othello-put-me.mp3`);
+				const sound = new Audio(`${url}/assets/reversi-put-me.mp3`);
 				sound.volume = this.$store.state.device.soundVolume;
 				sound.play();
 			}
@@ -187,7 +208,7 @@ export default Vue.extend({

 			// サウンドを再生する
 			if (this.$store.state.device.enableSounds && x.color != this.myColor) {
-				const sound = new Audio(`${url}/assets/othello-put-you.mp3`);
+				const sound = new Audio(`${url}/assets/reversi-put-you.mp3`);
 				sound.volume = this.$store.state.device.soundVolume;
 				sound.play();
 			}
@@ -213,7 +234,7 @@ export default Vue.extend({
 		onRescue(game) {
 			this.game = game;

-			this.o = new Othello(this.game.settings.map, {
+			this.o = new Reversi(this.game.settings.map, {
 				isLlotheo: this.game.settings.isLlotheo,
 				canPutEverywhere: this.game.settings.canPutEverywhere,
 				loopedBoard: this.game.settings.loopedBoard
@@ -244,54 +265,99 @@ export default Vue.extend({
 		border-bottom dashed 1px #c4cdd4

 	> .board
-		display grid
-		grid-gap 4px
-		width 350px
-		height 350px
+		width calc(100% - 16px)
+		max-width 500px
 		margin 0 auto

-		> div
-			background transparent
-			border-radius 6px
-			overflow hidden
+		$label-size = 16px
+		$gap = 4px

-			*
-				pointer-events none
-				user-select none
+		> .labels-x
+			height $label-size
+			padding 0 $label-size
+			display flex

-			&.empty
-				border solid 2px #eee
+			> *
+				flex 1
+				display flex
+				align-items center
+				justify-content center
+				font-size 12px

-			&.empty.can
-				background #eee
+				&:first-child
+					margin-left -($gap / 2)

-			&.empty.myTurn
-				border-color #ddd
+				&:last-child
+					margin-right -($gap / 2)

-				&.can
-					background #eee
-					cursor pointer
+		> .flex
+			display flex

-					&:hover
-						border-color darken($theme-color, 10%)
-						background $theme-color
+			> .labels-y
+				width $label-size
+				display flex
+				flex-direction column

-					&:active
-						background darken($theme-color, 10%)
+				> *
+					flex 1
+					display flex
+					align-items center
+					justify-content center
+					font-size 12px

-			&.prev
-				box-shadow 0 0 0 4px rgba($theme-color, 0.7)
+					&:first-child
+						margin-top -($gap / 2)

-			&.isEnded
-				border-color #ddd
+					&:last-child
+						margin-bottom -($gap / 2)

-			&.none
-				border-color transparent !important
+			> .cells
+				flex 1
+				display grid
+				grid-gap $gap

-			> img
-				display block
-				width 100%
-				height 100%
+				> div
+					background transparent
+					border-radius 6px
+					overflow hidden
+
+					*
+						pointer-events none
+						user-select none
+
+					&.empty
+						border solid 2px #eee
+
+					&.empty.can
+						background #eee
+
+					&.empty.myTurn
+						border-color #ddd
+
+						&.can
+							background #eee
+							cursor pointer
+
+							&:hover
+								border-color darken($theme-color, 10%)
+								background $theme-color
+
+							&:active
+								background darken($theme-color, 10%)
+
+					&.prev
+						box-shadow 0 0 0 4px rgba($theme-color, 0.7)
+
+					&.isEnded
+						border-color #ddd
+
+					&.none
+						border-color transparent !important
+
+					> img
+						display block
+						width 100%
+						height 100%

 	> .graph
 		display grid
--- a/src/client/app/common/views/components/games/reversi/reversi.gameroom.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.gameroom.vue
@@ -7,9 +7,9 @@

 <script lang="ts">
 import Vue from 'vue';
-import XGame from './othello.game.vue';
-import XRoom from './othello.room.vue';
-import { OthelloGameStream } from '../../scripts/streaming/othello-game';
+import XGame from './reversi.game.vue';
+import XRoom from './reversi.room.vue';
+import { ReversiGameStream } from '../../../../scripts/streaming/games/reversi/reversi-game';

 export default Vue.extend({
 	components: {
@@ -25,7 +25,7 @@ export default Vue.extend({
 	},
 	created() {
 		this.g = this.game;
-		this.connection = new OthelloGameStream((this as any).os, (this as any).os.i, this.game);
+		this.connection = new ReversiGameStream((this as any).os, this.$store.state.i, this.game);
 		this.connection.on('started', this.onStarted);
 	},
 	beforeDestroy() {
--- a/src/client/app/common/views/components/games/reversi/reversi.room.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.room.vue
@@ -94,7 +94,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import * as maps from '../../../../../othello/maps';
+import * as maps from '../../../../../../../games/reversi/maps';

 export default Vue.extend({
 	props: ['game', 'connection'],
@@ -116,13 +116,13 @@ export default Vue.extend({
 			return categories.filter((item, pos) => categories.indexOf(item) == pos);
 		},
 		isAccepted(): boolean {
-			if (this.game.user1Id == (this as any).os.i.id && this.game.user1Accepted) return true;
-			if (this.game.user2Id == (this as any).os.i.id && this.game.user2Accepted) return true;
+			if (this.game.user1Id == this.$store.state.i.id && this.game.user1Accepted) return true;
+			if (this.game.user2Id == this.$store.state.i.id && this.game.user2Accepted) return true;
 			return false;
 		},
 		isOpAccepted(): boolean {
-			if (this.game.user1Id != (this as any).os.i.id && this.game.user1Accepted) return true;
-			if (this.game.user2Id != (this as any).os.i.id && this.game.user2Accepted) return true;
+			if (this.game.user1Id != this.$store.state.i.id && this.game.user1Accepted) return true;
+			if (this.game.user2Id != this.$store.state.i.id && this.game.user2Accepted) return true;
 			return false;
 		}
 	},
@@ -133,8 +133,8 @@ export default Vue.extend({
 		this.connection.on('init-form', this.onInitForm);
 		this.connection.on('message', this.onMessage);

-		if (this.game.user1Id != (this as any).os.i.id && this.game.settings.form1) this.form = this.game.settings.form1;
-		if (this.game.user2Id != (this as any).os.i.id && this.game.settings.form2) this.form = this.game.settings.form2;
+		if (this.game.user1Id != this.$store.state.i.id && this.game.settings.form1) this.form = this.game.settings.form1;
+		if (this.game.user2Id != this.$store.state.i.id && this.game.settings.form2) this.form = this.game.settings.form2;
 	},

 	beforeDestroy() {
@@ -185,12 +185,12 @@ export default Vue.extend({
 		},

 		onInitForm(x) {
-			if (x.userId == (this as any).os.i.id) return;
+			if (x.userId == this.$store.state.i.id) return;
 			this.form = x.form;
 		},

 		onMessage(x) {
-			if (x.userId == (this as any).os.i.id) return;
+			if (x.userId == this.$store.state.i.id) return;
 			this.messages.unshift(x.message);
 		},

--- a/src/client/app/common/views/components/games/reversi/reversi.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="mk-othello">
+<div class="mk-reversi">
 	<div v-if="game">
 		<x-gameroom :game="game"/>
 	</div>
@@ -10,15 +10,15 @@
 		</div>
 	</div>
 	<div class="index" v-else>
-		<h1>Misskey %fa:circle%thell%fa:circle R%</h1>
-		<p>他のMisskeyユーザーとオセロで対戦しよう</p>
+		<h1>Misskey Reversi</h1>
+		<p>他のMisskeyユーザーとリバーシで対戦しよう</p>
 		<div class="play">
 			<el-button round>フリーマッチ(準備中)</el-button>
 			<el-button type="primary" round @click="match">指名</el-button>
 			<details>
 				<summary>遊び方</summary>
 				<div>
-					<p>オセロは、相手と交互に石をボードに置いてゆき、相手の石を挟んでひっくり返しながら、最終的に残った石が多い方が勝ちというボードゲームです。</p>
+					<p>リバーシは、相手と交互に石をボードに置いてゆき、相手の石を挟んでひっくり返しながら、最終的に残った石が多い方が勝ちというボードゲームです。</p>
 					<dl>
 						<dt><b>フリーマッチ</b></dt>
 						<dd>ランダムなユーザーと対戦するモードです。</dd>
@@ -39,7 +39,7 @@
 		</section>
 		<section v-if="myGames.length > 0">
 			<h2>自分の対局</h2>
-			<a class="game" v-for="g in myGames" tabindex="-1" @click.prevent="go(g)" :href="`/othello/${g.id}`">
+			<a class="game" v-for="g in myGames" tabindex="-1" @click.prevent="go(g)" :href="`/reversi/${g.id}`">
 				<mk-avatar class="avatar" :user="g.user1"/>
 				<mk-avatar class="avatar" :user="g.user2"/>
 				<span><b>{{ g.user1.name }}</b> vs <b>{{ g.user2.name }}</b></span>
@@ -48,7 +48,7 @@
 		</section>
 		<section v-if="games.length > 0">
 			<h2>みんなの対局</h2>
-			<a class="game" v-for="g in games" tabindex="-1" @click.prevent="go(g)" :href="`/othello/${g.id}`">
+			<a class="game" v-for="g in games" tabindex="-1" @click.prevent="go(g)" :href="`/reversi/${g.id}`">
 				<mk-avatar class="avatar" :user="g.user1"/>
 				<mk-avatar class="avatar" :user="g.user2"/>
 				<span><b>{{ g.user1.name }}</b> vs <b>{{ g.user2.name }}</b></span>
@@ -61,7 +61,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import XGameroom from './othello.gameroom.vue';
+import XGameroom from './reversi.gameroom.vue';

 export default Vue.extend({
 	components: {
@@ -93,24 +93,24 @@ export default Vue.extend({
 		}
 	},
 	mounted() {
-		this.connection = (this as any).os.streams.othelloStream.getConnection();
-		this.connectionId = (this as any).os.streams.othelloStream.use();
+		this.connection = (this as any).os.streams.reversiStream.getConnection();
+		this.connectionId = (this as any).os.streams.reversiStream.use();

 		this.connection.on('matched', this.onMatched);
 		this.connection.on('invited', this.onInvited);

-		(this as any).api('othello/games', {
+		(this as any).api('games/reversi/games', {
 			my: true
 		}).then(games => {
 			this.myGames = games;
 		});

-		(this as any).api('othello/games').then(games => {
+		(this as any).api('games/reversi/games').then(games => {
 			this.games = games;
 			this.gamesFetching = false;
 		});

-		(this as any).api('othello/invitations').then(invitations => {
+		(this as any).api('games/reversi/invitations').then(invitations => {
 			this.invitations = this.invitations.concat(invitations);
 		});

@@ -126,13 +126,13 @@ export default Vue.extend({
 	beforeDestroy() {
 		this.connection.off('matched', this.onMatched);
 		this.connection.off('invited', this.onInvited);
-		(this as any).os.streams.othelloStream.dispose(this.connectionId);
+		(this as any).os.streams.reversiStream.dispose(this.connectionId);

 		clearInterval(this.pingClock);
 	},
 	methods: {
 		go(game) {
-			(this as any).api('othello/games/show', {
+			(this as any).api('games/reversi/games/show', {
 				gameId: game.id
 			}).then(game => {
 				this.matching = null;
@@ -146,7 +146,7 @@ export default Vue.extend({
 				(this as any).api('users/show', {
 					username
 				}).then(user => {
-					(this as any).api('othello/match', {
+					(this as any).api('games/reversi/match', {
 						userId: user.id
 					}).then(res => {
 						if (res == null) {
@@ -160,10 +160,10 @@ export default Vue.extend({
 		},
 		cancel() {
 			this.matching = null;
-			(this as any).api('othello/match/cancel');
+			(this as any).api('games/reversi/match/cancel');
 		},
 		accept(invitation) {
-			(this as any).api('othello/match', {
+			(this as any).api('games/reversi/match', {
 				userId: invitation.parent.id
 			}).then(game => {
 				if (game) {
@@ -186,7 +186,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
@import '~const.styl'

-.mk-othello
+.mk-reversi
 	color #677f84
 	background #fff

--- a/src/client/app/common/views/components/google.vue
+++ b/src/client/app/common/views/components/google.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="mk-google">
 	<input type="search" v-model="query" :placeholder="q">
-	<button @click="search">検索</button>
+	<button @click="search">%fa:search% %i18n:common.search%</button>
 </div>
 </template>

--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@@ -1,12 +1,15 @@
 import Vue from 'vue';

+import analogClock from './analog-clock.vue';
+import menu from './menu.vue';
+import noteHeader from './note-header.vue';
 import signin from './signin.vue';
 import signup from './signup.vue';
 import forkit from './forkit.vue';
 import acct from './acct.vue';
 import avatar from './avatar.vue';
 import nav from './nav.vue';
-import noteHtml from './note-html';
+import misskeyFlavoredMarkdown from './misskey-flavored-markdown';
 import poll from './poll.vue';
 import pollEditor from './poll-editor.vue';
 import reactionIcon from './reaction-icon.vue';
@@ -24,16 +27,27 @@ import urlPreview from './url-preview.vue';
 import twitterSetting from './twitter-setting.vue';
 import fileTypeIcon from './file-type-icon.vue';
 import Switch from './switch.vue';
-import Othello from './othello.vue';
+import Reversi from './games/reversi/reversi.vue';
 import welcomeTimeline from './welcome-timeline.vue';
+import uiInput from './ui/input.vue';
+import uiButton from './ui/button.vue';
+import uiCard from './ui/card.vue';
+import uiForm from './ui/form.vue';
+import uiTextarea from './ui/textarea.vue';
+import uiSwitch from './ui/switch.vue';
+import uiRadio from './ui/radio.vue';
+import uiSelect from './ui/select.vue';

+Vue.component('mk-analog-clock', analogClock);
+Vue.component('mk-menu', menu);
+Vue.component('mk-note-header', noteHeader);
 Vue.component('mk-signin', signin);
 Vue.component('mk-signup', signup);
 Vue.component('mk-forkit', forkit);
 Vue.component('mk-acct', acct);
 Vue.component('mk-avatar', avatar);
 Vue.component('mk-nav', nav);
-Vue.component('mk-note-html', noteHtml);
+Vue.component('misskey-flavored-markdown', misskeyFlavoredMarkdown);
 Vue.component('mk-poll', poll);
 Vue.component('mk-poll-editor', pollEditor);
 Vue.component('mk-reaction-icon', reactionIcon);
@@ -51,5 +65,13 @@ Vue.component('mk-url-preview', urlPreview);
 Vue.component('mk-twitter-setting', twitterSetting);
 Vue.component('mk-file-type-icon', fileTypeIcon);
 Vue.component('mk-switch', Switch);
-Vue.component('mk-othello', Othello);
+Vue.component('mk-reversi', Reversi);
 Vue.component('mk-welcome-timeline', welcomeTimeline);
+Vue.component('ui-input', uiInput);
+Vue.component('ui-button', uiButton);
+Vue.component('ui-card', uiCard);
+Vue.component('ui-form', uiForm);
+Vue.component('ui-textarea', uiTextarea);
+Vue.component('ui-switch', uiSwitch);
+Vue.component('ui-radio', uiRadio);
+Vue.component('ui-select', uiSelect);
--- a/src/client/app/common/views/components/media-list.vue
+++ b/src/client/app/common/views/components/media-list.vue
@@ -1,9 +1,11 @@
 <template>
-<div class="mk-media-list" :data-count="mediaList.length">
-	<template v-for="media in mediaList">
-		<mk-media-video :video="media" :key="media.id" v-if="media.type.startsWith('video')" :inline-playable="mediaList.length === 1"/>
-		<mk-media-image :image="media" :key="media.id" v-else :raw="raw"/>
-	</template>
+<div class="mk-media-list">
+	<div :data-count="mediaList.length" ref="grid">
+		<template v-for="media in mediaList">
+			<mk-media-video :video="media" :key="media.id" v-if="media.type.startsWith('video')" :inline-playable="mediaList.length === 1"/>
+			<mk-media-image :image="media" :key="media.id" v-else :raw="raw"/>
+		</template>
+	</div>
 </div>
 </template>

@@ -18,47 +20,60 @@ export default Vue.extend({
 		raw: {
 			default: false
 		}
+	},
+	mounted() {
+		// for Safari bug
+		this.$refs.grid.style.height = this.$refs.grid.clientHeight ? `${this.$refs.grid.clientHeight}px` : '128px';
 	}
 });
 </script>

 <style lang="stylus" scoped>
 .mk-media-list
-	display grid
-	grid-gap 4px
-	height 256px
+	width 100%

-	@media (max-width 500px)
-		height 192px
+	&:before
+		content ''
+		display block
+		padding-top 56.25% // 16:9
+
+	> div
+		position absolute
+		top 0
+		right 0
+		bottom 0
+		left 0
+		display grid
+		grid-gap 4px
+
+		&[data-count="1"]
+			grid-template-rows 1fr
+		&[data-count="2"]
+			grid-template-columns 1fr 1fr
+			grid-template-rows 1fr
+		&[data-count="3"]
+			grid-template-columns 1fr 0.5fr
+			grid-template-rows 1fr 1fr
+			:nth-child(1)
+				grid-row 1 / 3
+			:nth-child(3)
+				grid-column 2 / 3
+				grid-row 2 / 3
+		&[data-count="4"]
+			grid-template-columns 1fr 1fr
+			grid-template-rows 1fr 1fr

-	&[data-count="1"]
-		grid-template-rows 1fr
-	&[data-count="2"]
-		grid-template-columns 1fr 1fr
-		grid-template-rows 1fr
-	&[data-count="3"]
-		grid-template-columns 1fr 0.5fr
-		grid-template-rows 1fr 1fr
 		:nth-child(1)
-			grid-row 1 / 3
-		:nth-child(3)
+			grid-column 1 / 2
+			grid-row 1 / 2
+		:nth-child(2)
 			grid-column 2 / 3
-			grid-row 2/3
-	&[data-count="4"]
-		grid-template-columns 1fr 1fr
-		grid-template-rows 1fr 1fr
-
-	:nth-child(1)
-		grid-column 1 / 2
-		grid-row 1 / 2
-	:nth-child(2)
-		grid-column 2 / 3
-		grid-row 1 / 2
-	:nth-child(3)
-		grid-column 1 / 2
-		grid-row 2 / 3
-	:nth-child(4)
-		grid-column 2 / 3
-		grid-row 2 / 3
+			grid-row 1 / 2
+		:nth-child(3)
+			grid-column 1 / 2
+			grid-row 2 / 3
+		:nth-child(4)
+			grid-column 2 / 3
+			grid-row 2 / 3

 </style>
--- a/src/client/app/common/views/components/menu.vue
+++ b/src/client/app/common/views/components/menu.vue
@@ -0,0 +1,196 @@
+<template>
+<div class="mk-menu">
+	<div class="backdrop" ref="backdrop" @click="close"></div>
+	<div class="popover" :class="{ hukidasi }" ref="popover">
+		<template v-for="item in items">
+			<div v-if="item === null"></div>
+			<button v-if="item" @click="clicked(item.action)" v-html="item.icon ? item.icon + ' ' + item.text : item.text"></button>
+		</template>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import * as anime from 'animejs';
+
+export default Vue.extend({
+	props: {
+		source: {
+			required: true
+		},
+		items: {
+			type: Array,
+			required: true
+		},
+		compact: {
+			type: Boolean,
+			required: false,
+			default: false
+		}
+	},
+	data() {
+		return {
+			hukidasi: !this.compact
+		};
+	},
+	mounted() {
+		this.$nextTick(() => {
+			const popover = this.$refs.popover as any;
+
+			const rect = this.source.getBoundingClientRect();
+			const width = popover.offsetWidth;
+			const height = popover.offsetHeight;
+
+			let left;
+			let top;
+
+			if (this.compact) {
+				const x = rect.left + window.pageXOffset + (this.source.offsetWidth / 2);
+				const y = rect.top + window.pageYOffset + (this.source.offsetHeight / 2);
+				left = (x - (width / 2));
+				top = (y - (height / 2));
+			} else {
+				const x = rect.left + window.pageXOffset + (this.source.offsetWidth / 2);
+				const y = rect.top + window.pageYOffset + this.source.offsetHeight;
+				left = (x - (width / 2));
+				top = y;
+			}
+
+			if (left + width - window.pageXOffset > window.innerWidth) {
+				left = window.innerWidth - width + window.pageXOffset;
+				this.hukidasi = false;
+			}
+
+			if (top + height - window.pageYOffset > window.innerHeight) {
+				top = window.innerHeight - height + window.pageYOffset;
+				this.hukidasi = false;
+			}
+
+			popover.style.left = left + 'px';
+			popover.style.top = top + 'px';
+
+			anime({
+				targets: this.$refs.backdrop,
+				opacity: 1,
+				duration: 100,
+				easing: 'linear'
+			});
+
+			anime({
+				targets: this.$refs.popover,
+				opacity: 1,
+				scale: [0.5, 1],
+				duration: 500
+			});
+		});
+	},
+	methods: {
+		clicked(fn) {
+			fn();
+			this.close();
+		},
+		close() {
+			(this.$refs.backdrop as any).style.pointerEvents = 'none';
+			anime({
+				targets: this.$refs.backdrop,
+				opacity: 0,
+				duration: 200,
+				easing: 'linear'
+			});
+
+			(this.$refs.popover as any).style.pointerEvents = 'none';
+			anime({
+				targets: this.$refs.popover,
+				opacity: 0,
+				scale: 0.5,
+				duration: 200,
+				easing: 'easeInBack',
+				complete: () => {
+					this.$emit('closed');
+					this.$destroy();
+				}
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+$border-color = rgba(27, 31, 35, 0.15)
+
+.mk-menu
+	position initial
+
+	> .backdrop
+		position fixed
+		top 0
+		left 0
+		z-index 10000
+		width 100%
+		height 100%
+		background rgba(#000, 0.1)
+		opacity 0
+
+	> .popover
+		position absolute
+		z-index 10001
+		padding 8px 0
+		background #fff
+		border 1px solid $border-color
+		border-radius 4px
+		box-shadow 0 3px 12px rgba(27, 31, 35, 0.15)
+		transform scale(0.5)
+		opacity 0
+
+		$balloon-size = 16px
+
+		&.hukidasi
+			margin-top $balloon-size
+			transform-origin center -($balloon-size)
+
+			&:before
+			&:after
+				content ""
+				display block
+				position absolute
+				pointer-events none
+
+			&:before
+				top -($balloon-size * 2)
+				left s('calc(50% - %s)', $balloon-size)
+				border-top solid $balloon-size transparent
+				border-left solid $balloon-size transparent
+				border-right solid $balloon-size transparent
+				border-bottom solid $balloon-size $border-color
+
+			&:after
+				top -($balloon-size * 2) + 1.5px
+				left s('calc(50% - %s)', $balloon-size)
+				border-top solid $balloon-size transparent
+				border-left solid $balloon-size transparent
+				border-right solid $balloon-size transparent
+				border-bottom solid $balloon-size #fff
+
+		> button
+			display block
+			padding 8px 16px
+			width 100%
+
+			&:hover
+				color $theme-color-foreground
+				background $theme-color
+				text-decoration none
+
+			&:active
+				color $theme-color-foreground
+				background darken($theme-color, 10%)
+
+		> div
+			margin 8px 0
+			height 1px
+			background #eee
+
+</style>
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@@ -3,12 +3,11 @@
 	<mk-avatar class="avatar" :user="message.user" target="_blank"/>
 	<div class="content">
 		<div class="balloon" :data-no-text="message.text == null">
-			<p class="read" v-if="isMe && message.isRead">%i18n:@is-read%</p>
 			<button class="delete-button" v-if="isMe" title="%i18n:common.delete%">
 				<img src="/assets/desktop/messaging/delete.png" alt="Delete"/>
 			</button>
 			<div class="content" v-if="!message.isDeleted">
-				<mk-note-html class="text" v-if="message.text" ref="text" :text="message.text" :i="os.i"/>
+				<misskey-flavored-markdown class="text" v-if="message.text" ref="text" :text="message.text" :i="$store.state.i"/>
 				<div class="file" v-if="message.file">
 					<a :href="message.file.url" target="_blank" :title="message.file.name">
 						<img v-if="message.file.type.split('/')[0] == 'image'" :src="message.file.url" :alt="message.file.name"/>
@@ -23,6 +22,7 @@
 		<div></div>
 		<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
 		<footer>
+			<span class="read" v-if="isMe && message.isRead">%i18n:@is-read%</span>
 			<mk-time :time="message.createdAt"/>
 			<template v-if="message.is_edited">%fa:pencil-alt%</template>
 		</footer>
@@ -32,7 +32,7 @@

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

 export default Vue.extend({
 	props: {
@@ -42,7 +42,7 @@ export default Vue.extend({
 	},
 	computed: {
 		isMe(): boolean {
-			return this.message.userId == (this as any).os.i.id;
+			return this.message.userId == this.$store.state.i.id;
 		},
 		urls(): string[] {
 			if (this.message.text) {
@@ -120,17 +120,6 @@ root(isDark)
 					height 16px
 					cursor pointer

-			> .read
-				user-select none
-				display block
-				position absolute
-				z-index 1
-				bottom -4px
-				left -12px
-				margin 0
-				color isDark ? rgba(#fff, 0.5) : rgba(#000, 0.5)
-				font-size 11px
-
 			> .content

 				> .is-deleted
@@ -186,11 +175,14 @@ root(isDark)
 			margin 8px 0

 		> footer
-			display block
+			display flex
 			margin 2px 0 0 0
-			font-size 10px
+			font-size 11px
 			color isDark ? rgba(#fff, 0.4) : rgba(#000, 0.4)

+			> .read
+				margin 0 8px 0 0
+
 			> [data-fa]
 				margin-left 4px

@@ -222,7 +214,7 @@ root(isDark)
 							color #fff

 			> footer
-				text-align left
+				justify-content left

 	&[data-is-me]
 		> .avatar
@@ -256,7 +248,7 @@ root(isDark)
 							color #fff !important

 			> footer
-				text-align right
+				justify-content right

 	&[data-is-deleted]
 		> .baloon
--- a/src/client/app/common/views/components/messaging-room.vue
+++ b/src/client/app/common/views/components/messaging-room.vue
@@ -72,7 +72,7 @@ export default Vue.extend({
 	},

 	mounted() {
-		this.connection = new MessagingStream((this as any).os, (this as any).os.i, this.user.id);
+		this.connection = new MessagingStream((this as any).os, this.$store.state.i, this.user.id);

 		this.connection.on('message', this.onMessage);
 		this.connection.on('read', this.onRead);
@@ -164,7 +164,7 @@ export default Vue.extend({
 			const isBottom = this.isBottom();

 			this.messages.push(message);
-			if (message.userId != (this as any).os.i.id && !document.hidden) {
+			if (message.userId != this.$store.state.i.id && !document.hidden) {
 				this.connection.send({
 					type: 'read',
 					id: message.id
@@ -176,7 +176,7 @@ export default Vue.extend({
 				this.$nextTick(() => {
 					this.scrollToBottom();
 				});
-			} else if (message.userId != (this as any).os.i.id) {
+			} else if (message.userId != this.$store.state.i.id) {
 				// Notify
 				this.notifyNewMessage();
 			}
@@ -229,7 +229,7 @@ export default Vue.extend({
 		onVisibilitychange() {
 			if (document.hidden) return;
 			this.messages.forEach(message => {
-				if (message.userId !== (this as any).os.i.id && !message.isRead) {
+				if (message.userId !== this.$store.state.i.id && !message.isRead) {
 					this.connection.send({
 						type: 'read',
 						id: message.id
@@ -255,7 +255,8 @@ root(isDark)
 		width 100%
 		max-width 600px
 		margin 0 auto
-		flex 1
+		flex 1 1 0
+		overflow-y auto

 		> .init
 			width 100%
@@ -263,7 +264,7 @@ root(isDark)
 			padding 16px 8px 8px 8px
 			text-align center
 			font-size 0.8em
-			color rgba(#000, 0.4)
+			color rgba(isDark ? #fff : #000, 0.4)

 			[data-fa]
 				margin-right 4px
@@ -341,10 +342,6 @@ root(isDark)
 				background isDark ? #191b22 : #fff

 	> footer
-		position -webkit-sticky
-		position sticky
-		z-index 2
-		bottom 0
 		width 100%
 		max-width 600px
 		margin 0 auto
--- a/src/client/app/common/views/components/messaging.vue
+++ b/src/client/app/common/views/components/messaging.vue
@@ -51,7 +51,7 @@

 <script lang="ts">
 import Vue from 'vue';
-import getAcct from '../../../../../acct/render';
+import getAcct from '../../../../../misc/acct/render';

 export default Vue.extend({
 	props: {
@@ -95,7 +95,7 @@ export default Vue.extend({
 	methods: {
 		getAcct,
 		isMe(message) {
-			return message.userId == (this as any).os.i.id;
+			return message.userId == this.$store.state.i.id;
 		},
 		onMessage(message) {
 			this.messages = this.messages.filter(m => !(
--- a/src/client/app/common/views/components/misskey-flavored-markdown.ts
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import * as emojilib from 'emojilib';
-import parse from '../../../../../text/parse';
-import getAcct from '../../../../../acct/render';
+import parse from '../../../../../mfm/parse';
+import getAcct from '../../../../../misc/acct/render';
 import { url } from '../../../config';
 import MkUrl from './url.vue';
 import MkGoogle from './google.vue';
@@ -10,7 +10,7 @@ const flatten = list => list.reduce(
 	(a, b) => a.concat(Array.isArray(b) ? flatten(b) : b), []
 );

-export default Vue.component('mk-note-html', {
+export default Vue.component('misskey-flavored-markdown', {
 	props: {
 		text: {
 			type: String,
@@ -92,7 +92,7 @@ export default Vue.component('mk-note-html', {
 				case 'hashtag':
 					return createElement('a', {
 						attrs: {
-							href: `${url}/search?q=${token.content}`,
+							href: `${url}/tags/${token.hashtag}`,
 							target: '_blank'
 						}
 					}, token.content);
--- a/src/client/app/common/views/components/nav.vue
+++ b/src/client/app/common/views/components/nav.vue
@@ -2,9 +2,9 @@
 <span class="mk-nav">
 	<a :href="aboutUrl">%i18n:@about%</a>
 	<i>・</i>
-	<a href="https://github.com/syuilo/misskey">%i18n:@repository%</a>
+	<a :href="repositoryUrl">%i18n:@repository%</a>
 	<i>・</i>
-	<a href="https://github.com/syuilo/misskey/issues/new" target="_blank">%i18n:@feedback%</a>
+	<a :href="feedbackUrl" target="_blank">%i18n:@feedback%</a>
 	<i>・</i>
 	<a :href="devUrl">%i18n:@develop%</a>
 	<i>・</i>
@@ -14,7 +14,7 @@

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

 export default Vue.extend({
 	data() {
@@ -22,7 +22,9 @@ export default Vue.extend({
 			aboutUrl: `${docsUrl}/${lang}/about`,
 			statsUrl,
 			statusUrl,
-			devUrl
+			devUrl,
+			repositoryUrl: repositoryUrl || `https://github.com/syuilo/misskey`,
+			feedbackUrl: feedbackUrl || `https://github.com/syuilo/misskey/issues/new`
 		}
 	}
 });
--- a/src/client/app/common/views/components/note-header.vue
+++ b/src/client/app/common/views/components/note-header.vue
@@ -0,0 +1,119 @@
+<template>
+<header class="bvonvjxbwzaiskogyhbwgyxvcgserpmu">
+	<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle == 'smart'"/>
+	<router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id">{{ note.user | userName }}</router-link>
+	<span class="is-admin" v-if="note.user.isAdmin">admin</span>
+	<span class="is-bot" v-if="note.user.isBot">bot</span>
+	<span class="is-cat" v-if="note.user.isCat">cat</span>
+	<span class="username"><mk-acct :user="note.user"/></span>
+	<div class="info">
+		<span class="app" v-if="note.app && !mini">via <b>{{ note.app.name }}</b></span>
+		<span class="mobile" v-if="note.viaMobile">%fa:mobile-alt%</span>
+		<router-link class="created-at" :to="note | notePage">
+			<mk-time :time="note.createdAt"/>
+		</router-link>
+		<span class="visibility" v-if="note.visibility != 'public'">
+			<template v-if="note.visibility == 'home'">%fa:home%</template>
+			<template v-if="note.visibility == 'followers'">%fa:unlock%</template>
+			<template v-if="note.visibility == 'specified'">%fa:envelope%</template>
+			<template v-if="note.visibility == 'private'">%fa:lock%</template>
+		</span>
+	</div>
+</header>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		note: {
+			type: Object,
+			required: true
+		},
+		mini: {
+			type: Boolean,
+			required: false,
+			default: false
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+root(isDark)
+	display flex
+	align-items baseline
+	white-space nowrap
+
+	> .avatar
+		flex-shrink 0
+		margin-right 8px
+		width 20px
+		height 20px
+		border-radius 100%
+
+	> .name
+		display block
+		margin 0 .5em 0 0
+		padding 0
+		overflow hidden
+		color isDark ? #fff : #627079
+		font-size 1em
+		font-weight bold
+		text-decoration none
+		text-overflow ellipsis
+
+		&:hover
+			text-decoration underline
+
+	> .is-admin
+	> .is-bot
+	> .is-cat
+		flex-shrink 0
+		align-self center
+		margin 0 .5em 0 0
+		padding 1px 6px
+		font-size 80%
+		color isDark ? #758188 : #aaa
+		border solid 1px isDark ? #57616f : #ddd
+		border-radius 3px
+
+		&.is-admin
+			border-color isDark ? #d42c41 : #f56a7b
+			color isDark ? #d42c41 : #f56a7b
+
+	> .username
+		margin 0 .5em 0 0
+		overflow hidden
+		text-overflow ellipsis
+		color isDark ? #606984 : #ccc
+		flex-shrink 2147483647
+
+	> .info
+		margin-left auto
+		font-size 0.9em
+
+		> *
+			color isDark ? #606984 : #c0c0c0
+
+		> .mobile
+			margin-right 8px
+
+		> .app
+			margin-right 8px
+			padding-right 8px
+			border-right solid 1px isDark ? #1c2023 : #eaeaea
+
+		> .visibility
+			margin-left 8px
+
+.bvonvjxbwzaiskogyhbwgyxvcgserpmu[data-darkmode]
+	root(true)
+
+.bvonvjxbwzaiskogyhbwgyxvcgserpmu:not([data-darkmode])
+	root(false)
+
+</style>
--- a/src/client/app/common/views/components/note-menu.vue
+++ b/src/client/app/common/views/components/note-menu.vue
@@ -1,54 +1,45 @@
 <template>
-<div class="mk-note-menu">
-	<div class="backdrop" ref="backdrop" @click="close"></div>
-	<div class="popover" :class="{ compact }" ref="popover">
-		<button @click="favorite">%i18n:@favorite%</button>
-		<button v-if="note.userId == os.i.id" @click="pin">%i18n:@pin%</button>
-		<a v-if="note.uri" :href="note.uri" target="_blank">%i18n:@remote%</a>
-	</div>
+<div style="position:initial">
+	<mk-menu :source="source" :compact="compact" :items="items" @closed="closed"/>
 </div>
 </template>

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

 export default Vue.extend({
 	props: ['note', 'source', 'compact'],
-	mounted() {
-		this.$nextTick(() => {
-			const popover = this.$refs.popover as any;
-
-			const rect = this.source.getBoundingClientRect();
-			const width = popover.offsetWidth;
-			const height = popover.offsetHeight;
-
-			if (this.compact) {
-				const x = rect.left + window.pageXOffset + (this.source.offsetWidth / 2);
-				const y = rect.top + window.pageYOffset + (this.source.offsetHeight / 2);
-				popover.style.left = (x - (width / 2)) + 'px';
-				popover.style.top = (y - (height / 2)) + 'px';
-			} else {
-				const x = rect.left + window.pageXOffset + (this.source.offsetWidth / 2);
-				const y = rect.top + window.pageYOffset + this.source.offsetHeight;
-				popover.style.left = (x - (width / 2)) + 'px';
-				popover.style.top = y + 'px';
+	computed: {
+		items() {
+			const items = [];
+			items.push({
+				icon: '%fa:star%',
+				text: '%i18n:@favorite%',
+				action: this.favorite
+			});
+			if (this.note.userId == this.$store.state.i.id) {
+				items.push({
+					icon: '%fa:thumbtack%',
+					text: '%i18n:@pin%',
+					action: this.pin
+				});
+				items.push({
+					icon: '%fa:trash-alt R%',
+					text: '%i18n:@delete%',
+					action: this.del
+				});
 			}
-
-			anime({
-				targets: this.$refs.backdrop,
-				opacity: 1,
-				duration: 100,
-				easing: 'linear'
-			});
-
-			anime({
-				targets: this.$refs.popover,
-				opacity: 1,
-				scale: [0.5, 1],
-				duration: 500
-			});
-		});
+			if (this.note.uri) {
+				items.push({
+					icon: '%fa:external-link-square-alt%',
+					text: '%i18n:@remote%',
+					action: () => {
+						window.open(this.note.uri, '_blank');
+					}
+				});
+			}
+			return items;
+		}
 	},
 	methods: {
 		pin() {
@@ -59,6 +50,15 @@ export default Vue.extend({
 			});
 		},

+		del() {
+			if (!window.confirm('%i18n:@delete-confirm%')) return;
+			(this as any).api('notes/delete', {
+				noteId: this.note.id
+			}).then(() => {
+				this.$destroy();
+			});
+		},
+
 		favorite() {
 			(this as any).api('notes/favorites/create', {
 				noteId: this.note.id
@@ -67,99 +67,11 @@ export default Vue.extend({
 			});
 		},

-		close() {
-			(this.$refs.backdrop as any).style.pointerEvents = 'none';
-			anime({
-				targets: this.$refs.backdrop,
-				opacity: 0,
-				duration: 200,
-				easing: 'linear'
-			});
-
-			(this.$refs.popover as any).style.pointerEvents = 'none';
-			anime({
-				targets: this.$refs.popover,
-				opacity: 0,
-				scale: 0.5,
-				duration: 200,
-				easing: 'easeInBack',
-				complete: () => this.$destroy()
+		closed() {
+			this.$nextTick(() => {
+				this.$destroy();
 			});
 		}
 	}
 });
 </script>
-
-<style lang="stylus" scoped>
-@import '~const.styl'
-
-$border-color = rgba(27, 31, 35, 0.15)
-
-.mk-note-menu
-	position initial
-
-	> .backdrop
-		position fixed
-		top 0
-		left 0
-		z-index 10000
-		width 100%
-		height 100%
-		background rgba(#000, 0.1)
-		opacity 0
-
-	> .popover
-		position absolute
-		z-index 10001
-		padding 8px 0
-		background #fff
-		border 1px solid $border-color
-		border-radius 4px
-		box-shadow 0 3px 12px rgba(27, 31, 35, 0.15)
-		transform scale(0.5)
-		opacity 0
-
-		$balloon-size = 16px
-
-		&:not(.compact)
-			margin-top $balloon-size
-			transform-origin center -($balloon-size)
-
-			&:before
-				content ""
-				display block
-				position absolute
-				top -($balloon-size * 2)
-				left s('calc(50% - %s)', $balloon-size)
-				border-top solid $balloon-size transparent
-				border-left solid $balloon-size transparent
-				border-right solid $balloon-size transparent
-				border-bottom solid $balloon-size $border-color
-
-			&:after
-				content ""
-				display block
-				position absolute
-				top -($balloon-size * 2) + 1.5px
-				left s('calc(50% - %s)', $balloon-size)
-				border-top solid $balloon-size transparent
-				border-left solid $balloon-size transparent
-				border-right solid $balloon-size transparent
-				border-bottom solid $balloon-size #fff
-
-		> button
-		> a
-			display block
-			padding 8px 16px
-			width 100%
-
-			&:hover
-				color $theme-color-foreground
-				background $theme-color
-				text-decoration none
-
-			&:active
-				color $theme-color-foreground
-				background darken($theme-color, 10%)
-
-</style>
--- a/src/client/app/common/views/components/reaction-icon.vue
+++ b/src/client/app/common/views/components/reaction-icon.vue
@@ -8,7 +8,10 @@
 	<img v-if="reaction == 'congrats'" src="/assets/reactions/congrats.png" alt="%i18n:common.reactions.congrats%">
 	<img v-if="reaction == 'angry'" src="/assets/reactions/angry.png" alt="%i18n:common.reactions.angry%">
 	<img v-if="reaction == 'confused'" src="/assets/reactions/confused.png" alt="%i18n:common.reactions.confused%">
-	<img v-if="reaction == 'pudding'" src="/assets/reactions/pudding.png" alt="%i18n:common.reactions.pudding%">
+	<template v-if="reaction == 'pudding'">
+		<img v-if="$store.getters.isSignedIn && $store.state.settings.iLikeSushi" src="/assets/reactions/sushi.png" alt="%i18n:common.reactions.pudding%">
+		<img v-else src="/assets/reactions/pudding.png" alt="%i18n:common.reactions.pudding%">
+	</template>
 </span>
 </template>

--- a/src/client/app/common/views/components/reaction-picker.vue
+++ b/src/client/app/common/views/components/reaction-picker.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="mk-reaction-picker">
 	<div class="backdrop" ref="backdrop" @click="close"></div>
-	<div class="popover" :class="{ compact }" ref="popover">
+	<div class="popover" :class="{ compact, big }" ref="popover">
 		<p v-if="!compact">{{ title }}</p>
 		<div>
 			<button @click="react('like')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="1" title="%i18n:common.reactions.like%"><mk-reaction-icon reaction='like'/></button>
@@ -25,7 +25,28 @@ import * as anime from 'animejs';
 const placeholder = '%i18n:@choose-reaction%';

 export default Vue.extend({
-	props: ['note', 'source', 'compact', 'cb'],
+	props: {
+		note: {
+			type: Object,
+			required: true
+		},
+		source: {
+			required: true
+		},
+		compact: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+		cb: {
+			required: false
+		},
+		big: {
+			type: Boolean,
+			required: false,
+			default: false
+		}
+	},
 	data() {
 		return {
 			title: placeholder
@@ -162,6 +183,16 @@ root(isDark)
 				border-right solid $balloon-size transparent
 				border-bottom solid $balloon-size $bgcolor

+		&.big
+			> div
+				width 280px
+
+				> button
+					width 50px
+					height 50px
+					font-size 28px
+					border-radius 4px
+
 		> p
 			display block
 			margin 0
--- a/src/client/app/common/views/components/signin.vue
+++ b/src/client/app/common/views/components/signin.vue
@@ -1,24 +1,33 @@
 <template>
 <form class="mk-signin" :class="{ signing }" @submit.prevent="onSubmit">
-	<label class="user-name">
-		<input v-model="username" type="text" pattern="^[a-zA-Z0-9_]+$" placeholder="%i18n:@username%" autofocus required @change="onUsernameChange"/>%fa:at%
-	</label>
-	<label class="password">
-		<input v-model="password" type="password" placeholder="%i18n:@password%" required/>%fa:lock%
-	</label>
-	<label class="token" v-if="user && user.twoFactorEnabled">
-		<input v-model="token" type="number" placeholder="%i18n:@token%" required/>%fa:lock%
-	</label>
-	<button type="submit" :disabled="signing">{{ signing ? '%i18n:@signing-in%' : '%i18n:@signin%' }}</button>
-	もしくは <a :href="`${apiUrl}/signin/twitter`">Twitterでログイン</a>
+	<div class="avatar" :style="{ backgroundImage: user ? `url('${ user.avatarUrl }')` : null }" v-show="withAvatar"></div>
+	<ui-input v-model="username" type="text" pattern="^[a-zA-Z0-9_]+$" spellcheck="false" autofocus required @input="onUsernameChange">
+		<span>%i18n:@username%</span>
+		<span slot="prefix">@</span>
+		<span slot="suffix">@{{ host }}</span>
+	</ui-input>
+	<ui-input v-model="password" type="password" required>
+		<span>%i18n:@password%</span>
+		<span slot="prefix">%fa:lock%</span>
+	</ui-input>
+	<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required/>
+	<ui-button type="submit" :disabled="signing">{{ signing ? '%i18n:@signing-in%' : '%i18n:@signin%' }}</ui-button>
+	<p style="margin: 8px 0;">または<a :href="`${apiUrl}/signin/twitter`">Twitterでログイン</a></p>
 </form>
 </template>

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

 export default Vue.extend({
+	props: {
+		withAvatar: {
+			type: Boolean,
+			required: false,
+			default: true
+		}
+	},
 	data() {
 		return {
 			signing: false,
@@ -27,6 +36,7 @@ export default Vue.extend({
 			password: '',
 			token: '',
 			apiUrl,
+			host
 		};
 	},
 	methods: {
@@ -35,6 +45,8 @@ export default Vue.extend({
 				username: this.username
 			}).then(user => {
 				this.user = user;
+			}, () => {
+				this.user = null;
 			});
 		},
 		onSubmit() {
@@ -59,84 +71,19 @@ export default Vue.extend({
@import '~const.styl'

 .mk-signin
+	color #555
+
 	&.signing
 		&, *
 			cursor wait !important

-	label
-		display block
-		margin 12px 0
-
-		[data-fa]
-			display block
-			pointer-events none
-			position absolute
-			bottom 0
-			top 0
-			left 0
-			z-index 1
-			margin auto
-			padding 0 16px
-			height 1em
-			color #898786
-
-		input[type=text]
-		input[type=password]
-		input[type=number]
-			user-select text
-			display inline-block
-			cursor auto
-			padding 0 0 0 38px
-			margin 0
-			width 100%
-			line-height 44px
-			font-size 1em
-			color rgba(#000, 0.7)
-			background #fff
-			outline none
-			border solid 1px #eee
-			border-radius 4px
-
-			&:hover
-				background rgba(255, 255, 255, 0.7)
-				border-color #ddd
-
-				& + i
-					color #797776
-
-			&:focus
-				background #fff
-				border-color #ccc
-
-				& + i
-					color #797776
-
-	[type=submit]
-		cursor pointer
-		padding 16px
-		margin -6px 0 0 0
-		width 100%
-		font-size 1.2em
-		color rgba(#000, 0.5)
-		outline none
-		border none
-		border-radius 0
-		background transparent
-		transition all .5s ease
-
-		&:hover
-			color $theme-color
-			transition all .2s ease
-
-		&:focus
-			color $theme-color
-			transition all .2s ease
-
-		&:active
-			color darken($theme-color, 30%)
-			transition all .2s ease
-
-		&:disabled
-			opacity 0.7
+	> .avatar
+		margin 16px auto 0 auto
+		width 64px
+		height 64px
+		background #ddd
+		background-position center
+		background-size cover
+		border-radius 100%

 </style>
--- a/src/client/app/common/views/components/signup.vue
+++ b/src/client/app/common/views/components/signup.vue
@@ -1,60 +1,58 @@
 <template>
-<form class="mk-signup" @submit.prevent="onSubmit" autocomplete="off">
-	<label class="username">
-		<p class="caption">%fa:at%%i18n:@username%</p>
-		<input v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" placeholder="a~z、A~Z、0~9、-" autocomplete="off" required @input="onChangeUsername"/>
-		<p class="profile-page-url-preview" v-if="shouldShowProfileUrl">{{ `${url}/@${username}` }}</p>
-		<p class="info" v-if="usernameState == 'wait'" style="color:#999">%fa:spinner .pulse .fw%%i18n:@checking%</p>
-		<p class="info" v-if="usernameState == 'ok'" style="color:#3CB7B5">%fa:check .fw%%i18n:@available%</p>
-		<p class="info" v-if="usernameState == 'unavailable'" style="color:#FF1161">%fa:exclamation-triangle .fw%%i18n:@unavailable%</p>
-		<p class="info" v-if="usernameState == 'error'" style="color:#FF1161">%fa:exclamation-triangle .fw%%i18n:@error%</p>
-		<p class="info" v-if="usernameState == 'invalid-format'" style="color:#FF1161">%fa:exclamation-triangle .fw%%i18n:@invalid-format%</p>
-		<p class="info" v-if="usernameState == 'min-range'" style="color:#FF1161">%fa:exclamation-triangle .fw%%i18n:@too-short%</p>
-		<p class="info" v-if="usernameState == 'max-range'" style="color:#FF1161">%fa:exclamation-triangle .fw%%i18n:@too-long%</p>
-	</label>
-	<label class="password">
-		<p class="caption">%fa:lock%%i18n:@password%</p>
-		<input v-model="password" type="password" placeholder="%i18n:@password-placeholder%" autocomplete="off" required @input="onChangePassword"/>
-		<div class="meter" v-show="passwordStrength != ''" :data-strength="passwordStrength">
-			<div class="value" ref="passwordMetar"></div>
+<form class="mk-signup" @submit.prevent="onSubmit" :autocomplete="Math.random()">
+	<ui-input v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @input="onChangeUsername">
+		<span>%i18n:@username%</span>
+		<span slot="prefix">@</span>
+		<span slot="suffix">@{{ host }}</span>
+		<p slot="text" v-if="usernameState == 'wait'" style="color:#999">%fa:spinner .pulse .fw% %i18n:@checking%</p>
+		<p slot="text" v-if="usernameState == 'ok'" style="color:#3CB7B5">%fa:check .fw% %i18n:@available%</p>
+		<p slot="text" v-if="usernameState == 'unavailable'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@unavailable%</p>
+		<p slot="text" v-if="usernameState == 'error'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@error%</p>
+		<p slot="text" v-if="usernameState == 'invalid-format'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@invalid-format%</p>
+		<p slot="text" v-if="usernameState == 'min-range'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@too-short%</p>
+		<p slot="text" v-if="usernameState == 'max-range'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@too-long%</p>
+	</ui-input>
+	<ui-input v-model="password" type="password" :autocomplete="Math.random()" required @input="onChangePassword" :with-password-meter="true">
+		<span>%i18n:@password%</span>
+		<span slot="prefix">%fa:lock%</span>
+		<div slot="text">
+			<p slot="text" v-if="passwordStrength == 'low'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@weak-password%</p>
+			<p slot="text" v-if="passwordStrength == 'medium'" style="color:#3CB7B5">%fa:check .fw% %i18n:@normal-password%</p>
+			<p slot="text" v-if="passwordStrength == 'high'" style="color:#3CB7B5">%fa:check .fw% %i18n:@strong-password%</p>
 		</div>
-		<p class="info" v-if="passwordStrength == 'low'" style="color:#FF1161">%fa:exclamation-triangle .fw%%i18n:@weak-password%</p>
-		<p class="info" v-if="passwordStrength == 'medium'" style="color:#3CB7B5">%fa:check .fw%%i18n:@normal-password%</p>
-		<p class="info" v-if="passwordStrength == 'high'" style="color:#3CB7B5">%fa:check .fw%%i18n:@strong-password%</p>
-	</label>
-	<label class="retype-password">
-		<p class="caption">%fa:lock%%i18n:@password%(%i18n:@retype%)</p>
-		<input v-model="retypedPassword" type="password" placeholder="%i18n:@retype-placeholder%" autocomplete="off" required @input="onChangePasswordRetype"/>
-		<p class="info" v-if="passwordRetypeState == 'match'" style="color:#3CB7B5">%fa:check .fw%%i18n:@password-matched%</p>
-		<p class="info" v-if="passwordRetypeState == 'not-match'" style="color:#FF1161">%fa:exclamation-triangle .fw%%i18n:@password-not-matched%</p>
-	</label>
-	<label class="recaptcha">
-		<p class="caption"><template v-if="recaptchaed">%fa:toggle-on%</template><template v-if="!recaptchaed">%fa:toggle-off%</template>%i18n:@recaptcha%</p>
-		<div class="g-recaptcha" data-callback="onRecaptchaed" data-expired-callback="onRecaptchaExpired" :data-sitekey="recaptchaSitekey"></div>
-	</label>
-	<label class="agree-tou">
-		<input name="agree-tou" type="checkbox" autocomplete="off" required/>
+	</ui-input>
+	<ui-input v-model="retypedPassword" type="password" :autocomplete="Math.random()" required @input="onChangePasswordRetype">
+		<span>%i18n:@password% (%i18n:@retype%)</span>
+		<span slot="prefix">%fa:lock%</span>
+		<div slot="text">
+			<p slot="text" v-if="passwordRetypeState == 'match'" style="color:#3CB7B5">%fa:check .fw% %i18n:@password-matched%</p>
+			<p slot="text" v-if="passwordRetypeState == 'not-match'" style="color:#FF1161">%fa:exclamation-triangle .fw% %i18n:@password-not-matched%</p>
+		</div>
+	</ui-input>
+	<div class="g-recaptcha" :data-sitekey="recaptchaSitekey" style="margin: 16px 0;"></div>
+	<label class="agree-tou" style="display: block; margin: 16px 0;">
+		<input name="agree-tou" type="checkbox" required/>
 		<p><a :href="touUrl" target="_blank">利用規約</a>に同意する</p>
 	</label>
-	<button type="submit">%i18n:@create%</button>
+	<ui-button type="submit">%i18n:@create%</ui-button>
 </form>
 </template>

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

 export default Vue.extend({
 	data() {
 		return {
+			host,
 			username: '',
 			password: '',
 			retypedPassword: '',
 			url,
 			touUrl: `${docsUrl}/${lang}/tou`,
 			recaptchaSitekey,
-			recaptchaed: false,
 			usernameState: null,
 			passwordStrength: '',
 			passwordRetypeState: null
@@ -104,7 +102,6 @@ export default Vue.extend({

 			const strength = getPasswordStrength(this.password);
 			this.passwordStrength = strength > 0.7 ? 'high' : strength > 0.3 ? 'medium' : 'low';
-			(this.$refs.passwordMetar as any).style.width = `${strength * 100}%`;
 		},
 		onChangePasswordRetype() {
 			if (this.retypedPassword == '') {
@@ -130,19 +127,9 @@ export default Vue.extend({
 				alert('%i18n:@some-error%');

 				(window as any).grecaptcha.reset();
-				this.recaptchaed = false;
 			});
 		}
 	},
-	created() {
-		(window as any).onRecaptchaed = () => {
-			this.recaptchaed = true;
-		};
-
-		(window as any).onRecaptchaExpired = () => {
-			this.recaptchaed = false;
-		};
-	},
 	mounted() {
 		const head = document.getElementsByTagName('head')[0];
 		const script = document.createElement('script');
@@ -158,100 +145,6 @@ export default Vue.extend({
 .mk-signup
 	min-width 302px

-	label
-		display block
-		margin 0 0 16px 0
-
-		> .caption
-			margin 0 0 4px 0
-			color #828888
-			font-size 0.95em
-
-			> [data-fa]
-				margin-right 0.25em
-				color #96adac
-
-		> .info
-			display block
-			margin 4px 0
-			font-size 0.8em
-
-			> [data-fa]
-				margin-right 0.3em
-
-		&.username
-			.profile-page-url-preview
-				display block
-				margin 4px 8px 0 4px
-				font-size 0.8em
-				color #888
-
-				&:empty
-					display none
-
-				&:not(:empty) + .info
-					margin-top 0
-
-		&.password
-			.meter
-				display block
-				margin-top 8px
-				width 100%
-				height 8px
-
-				&[data-strength='']
-					display none
-
-				&[data-strength='low']
-					> .value
-						background #d73612
-
-				&[data-strength='medium']
-					> .value
-						background #d7ca12
-
-				&[data-strength='high']
-					> .value
-						background #61bb22
-
-				> .value
-					display block
-					width 0%
-					height 100%
-					background transparent
-					border-radius 4px
-					transition all 0.1s ease
-
-	[type=text], [type=password]
-		user-select text
-		display inline-block
-		cursor auto
-		padding 0 12px
-		margin 0
-		width 100%
-		line-height 44px
-		font-size 1em
-		color #333 !important
-		background #fff !important
-		outline none
-		border solid 1px rgba(#000, 0.1)
-		border-radius 4px
-		box-shadow 0 0 0 114514px #fff inset
-		transition all .3s ease
-
-		&:hover
-			border-color rgba(#000, 0.2)
-			transition all .1s ease
-
-		&:focus
-			color $theme-color !important
-			border-color $theme-color
-			box-shadow 0 0 0 1024px #fff inset, 0 0 0 4px rgba($theme-color, 10%)
-			transition all 0s ease
-
-		&:disabled
-			opacity 0.5
-
 	.agree-tou
 		padding 4px
 		border-radius 4px
@@ -269,19 +162,4 @@ export default Vue.extend({
 			display inline
 			color #555

-	button
-		margin 0
-		padding 16px
-		width 100%
-		font-size 1em
-		color #fff
-		background $theme-color
-		border-radius 3px
-
-		&:hover
-			background lighten($theme-color, 5%)
-
-		&:active
-			background darken($theme-color, 5%)
-
 </style>
--- a/src/client/app/common/views/components/time.vue
+++ b/src/client/app/common/views/components/time.vue
@@ -58,18 +58,21 @@ export default Vue.extend({
 	},
 	created() {
 		if (this.mode == 'relative' || this.mode == 'detail') {
-			this.tick();
-			this.tickId = setInterval(this.tick, 1000);
+			this.tickId = window.requestAnimationFrame(this.tick);
 		}
 	},
 	destroyed() {
 		if (this.mode === 'relative' || this.mode === 'detail') {
-			clearInterval(this.tickId);
+			window.clearTimeout(this.tickId);
 		}
 	},
 	methods: {
 		tick() {
 			this.now = new Date();
+
+			this.tickId = setTimeout(() => {
+				window.requestAnimationFrame(this.tick);
+			}, 10000);
 		}
 	}
 });
--- a/src/client/app/common/views/components/twitter-setting.vue
+++ b/src/client/app/common/views/components/twitter-setting.vue
@@ -1,13 +1,13 @@
 <template>
 <div class="mk-twitter-setting">
 	<p>%i18n:@description%<a :href="`${docsUrl}/link-to-twitter`" target="_blank">%i18n:@detail%</a></p>
-	<p class="account" v-if="os.i.twitter" :title="`Twitter ID: ${os.i.twitter.userId}`">%i18n:@connected-to%: <a :href="`https://twitter.com/${os.i.twitter.screenName}`" target="_blank">@{{ os.i.twitter.screenName }}</a></p>
+	<p class="account" v-if="$store.state.i.twitter" :title="`Twitter ID: ${$store.state.i.twitter.userId}`">%i18n:@connected-to%: <a :href="`https://twitter.com/${$store.state.i.twitter.screenName}`" target="_blank">@{{ $store.state.i.twitter.screenName }}</a></p>
 	<p>
-		<a :href="`${apiUrl}/connect/twitter`" target="_blank" @click.prevent="connect">{{ os.i.twitter ? '%i18n:@reconnect%' : '%i18n:@connect%' }}</a>
-		<span v-if="os.i.twitter"> or </span>
-		<a :href="`${apiUrl}/disconnect/twitter`" target="_blank" v-if="os.i.twitter" @click.prevent="disconnect">%i18n:@disconnect%</a>
+		<a :href="`${apiUrl}/connect/twitter`" target="_blank" @click.prevent="connect">{{ $store.state.i.twitter ? '%i18n:@reconnect%' : '%i18n:@connect%' }}</a>
+		<span v-if="$store.state.i.twitter"> or </span>
+		<a :href="`${apiUrl}/disconnect/twitter`" target="_blank" v-if="$store.state.i.twitter" @click.prevent="disconnect">%i18n:@disconnect%</a>
 	</p>
-	<p class="id" v-if="os.i.twitter">Twitter ID: {{ os.i.twitter.userId }}</p>
+	<p class="id" v-if="$store.state.i.twitter">Twitter ID: {{ $store.state.i.twitter.userId }}</p>
 </div>
 </template>

@@ -24,8 +24,8 @@ export default Vue.extend({
 		};
 	},
 	mounted() {
-		this.$watch('os.i', () => {
-			if ((this as any).os.i.twitter) {
+		this.$watch('$store.state.i', () => {
+			if (this.$store.state.i.twitter) {
 				if (this.form) this.form.close();
 			}
 		}, {
--- a/src/client/app/common/views/components/ui/button.vue
+++ b/src/client/app/common/views/components/ui/button.vue
@@ -0,0 +1,82 @@
+<template>
+<div class="ui-button" :class="[styl]">
+	<button :type="type" @click="$emit('click')">
+		<slot></slot>
+	</button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+export default Vue.extend({
+	props: {
+		type: {
+			type: String,
+			required: false
+		}
+	},
+	data() {
+		return {
+			styl: 'fill'
+		};
+	},
+	inject: {
+		isCardChild: { default: false }
+	},
+	created() {
+		if (this.isCardChild) {
+			this.styl = 'line';
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+root(isDark, fill)
+	> button
+		display block
+		width 100%
+		margin 0
+		padding 0
+		font-weight bold
+		font-size 16px
+		line-height 44px
+		border none
+		border-radius 6px
+		outline none
+		box-shadow none
+
+		if fill
+			color $theme-color-foreground
+			background $theme-color
+
+			&:hover
+				background lighten($theme-color, 5%)
+
+			&:active
+				background darken($theme-color, 5%)
+		else
+			color $theme-color
+			background none
+
+			&:hover
+				color darken($theme-color, 5%)
+
+			&:active
+				background rgba($theme-color, 0.3)
+
+.ui-button[data-darkmode]
+	&.fill
+		root(true, true)
+	&:not(.fill)
+		root(true, false)
+
+.ui-button:not([data-darkmode])
+	&.fill
+		root(false, true)
+	&:not(.fill)
+		root(false, false)
+
+</style>
--- a/src/client/app/common/views/components/ui/card.vue
+++ b/src/client/app/common/views/components/ui/card.vue
@@ -0,0 +1,46 @@
+<template>
+<div class="ui-card">
+	<header>
+		<slot name="title"></slot>
+	</header>
+
+	<slot></slot>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+export default Vue.extend({
+	provide() {
+		return {
+			isCardChild: true
+		};
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+root(isDark)
+	margin 16px
+	padding 16px
+	color isDark ? #fff : #000
+	background isDark ? #282C37 : #fff
+	box-shadow 0 3px 1px -2px rgba(#000, 0.2), 0 2px 2px 0 rgba(#000, 0.14), 0 1px 5px 0 rgba(#000, 0.12)
+
+	@media (min-width 500px)
+		padding 32px
+
+	> header
+		font-weight normal
+		font-size 24px
+		color isDark ? #fff : #444
+
+.ui-card[data-darkmode]
+	root(true)
+
+.ui-card:not([data-darkmode])
+	root(false)
+
+</style>
--- a/src/client/app/common/views/components/ui/form.vue
+++ b/src/client/app/common/views/components/ui/form.vue
@@ -0,0 +1,30 @@
+<template>
+<div class="ui-form">
+	<fieldset :disabled="disabled">
+		<slot></slot>
+	</fieldset>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+export default Vue.extend({
+	props: {
+		disabled: {
+			type: Boolean,
+			required: false
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+.ui-form
+	> fieldset
+		margin 0
+		padding 0
+		border none
+
+</style>
--- a/src/client/app/common/views/components/ui/input.vue
+++ b/src/client/app/common/views/components/ui/input.vue
@@ -0,0 +1,350 @@
+<template>
+<div class="ui-input" :class="[{ focused, filled }, styl]">
+	<div class="icon" ref="icon"><slot name="icon"></slot></div>
+	<div class="input">
+		<div class="password-meter" v-if="withPasswordMeter" v-show="passwordStrength != ''" :data-strength="passwordStrength">
+			<div class="value" ref="passwordMetar"></div>
+		</div>
+		<span class="label" ref="label"><slot></slot></span>
+		<div class="prefix" ref="prefix"><slot name="prefix"></slot></div>
+		<template v-if="type != 'file'">
+			<input ref="input"
+					:type="type"
+					v-model="v"
+					:required="required"
+					:readonly="readonly"
+					:pattern="pattern"
+					:autocomplete="autocomplete"
+					:spellcheck="spellcheck"
+					@focus="focused = true"
+					@blur="focused = false">
+		</template>
+		<template v-else>
+			<input ref="input"
+					type="text"
+					:value="placeholder"
+					readonly
+					@click="chooseFile">
+			<input ref="file"
+					type="file"
+					:value="value"
+					@change="onChangeFile">
+		</template>
+		<div class="suffix" ref="suffix"><slot name="suffix"></slot></div>
+	</div>
+	<div class="text"><slot name="text"></slot></div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+const getPasswordStrength = require('syuilo-password-strength');
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: false
+		},
+		type: {
+			type: String,
+			required: false
+		},
+		required: {
+			type: Boolean,
+			required: false
+		},
+		readonly: {
+			type: Boolean,
+			required: false
+		},
+		pattern: {
+			type: String,
+			required: false
+		},
+		autocomplete: {
+			required: false
+		},
+		spellcheck: {
+			required: false
+		},
+		withPasswordMeter: {
+			type: Boolean,
+			required: false,
+			default: false
+		}
+	},
+	data() {
+		return {
+			v: this.value,
+			focused: false,
+			passwordStrength: '',
+			styl: 'fill'
+		};
+	},
+	computed: {
+		filled(): boolean {
+			return this.v != '' && this.v != null;
+		},
+		placeholder(): string {
+			if (this.type != 'file') return null;
+			if (this.v == null) return null;
+
+			if (typeof this.v == 'string') return this.v;
+
+			if (Array.isArray(this.v)) {
+				return this.v.map(file => file.name).join(', ');
+			} else {
+				return this.v.name;
+			}
+		}
+	},
+	watch: {
+		value(v) {
+			this.v = v;
+		},
+		v(v) {
+			this.$emit('input', v);
+
+			if (this.withPasswordMeter) {
+				if (v == '') {
+					this.passwordStrength = '';
+					return;
+				}
+
+				const strength = getPasswordStrength(v);
+				this.passwordStrength = strength > 0.7 ? 'high' : strength > 0.3 ? 'medium' : 'low';
+				(this.$refs.passwordMetar as any).style.width = `${strength * 100}%`;
+			}
+		}
+	},
+	inject: {
+		isCardChild: { default: false }
+	},
+	created() {
+		if (this.isCardChild) {
+			this.styl = 'line';
+		}
+	},
+	mounted() {
+		if (this.$refs.prefix) {
+			this.$refs.label.style.left = (this.$refs.prefix.offsetLeft + this.$refs.prefix.offsetWidth) + 'px';
+			if (this.$refs.prefix.offsetWidth) {
+				this.$refs.input.style.paddingLeft = this.$refs.prefix.offsetWidth + 'px';
+			}
+		}
+		if (this.$refs.suffix) {
+			if (this.$refs.suffix.offsetWidth) {
+				this.$refs.input.style.paddingRight = this.$refs.suffix.offsetWidth + 'px';
+			}
+		}
+	},
+	methods: {
+		focus() {
+			this.$refs.input.focus();
+		},
+		chooseFile() {
+			this.$refs.file.click();
+		},
+		onChangeFile() {
+			this.v = Array.from((this.$refs.file as any).files);
+			this.$emit('input', this.v);
+			this.$emit('change', this.v);
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+root(isDark, fill)
+	margin 32px 0
+
+	> .icon
+		position absolute
+		top 0
+		left 0
+		width 24px
+		text-align center
+		line-height 32px
+		color isDark ? rgba(#fff, 0.7) : rgba(#000, 0.54)
+
+		&:not(:empty) + .input
+			margin-left 28px
+
+	> .input
+
+		if !fill
+			&:before
+				content ''
+				display block
+				position absolute
+				bottom 0
+				left 0
+				right 0
+				height 1px
+				background isDark ? rgba(#fff, 0.7) : rgba(#000, 0.42)
+
+			&:after
+				content ''
+				display block
+				position absolute
+				bottom 0
+				left 0
+				right 0
+				height 2px
+				background $theme-color
+				opacity 0
+				transform scaleX(0.12)
+				transition border 0.3s cubic-bezier(0.4, 0, 0.2, 1), opacity 0.3s cubic-bezier(0.4, 0, 0.2, 1), transform 0.3s cubic-bezier(0.4, 0, 0.2, 1)
+				will-change border opacity transform
+
+		> .password-meter
+			position absolute
+			top 0
+			left 0
+			width 100%
+			height 100%
+			border-radius 6px
+			overflow hidden
+			opacity 0.3
+
+			&[data-strength='']
+				display none
+
+			&[data-strength='low']
+				> .value
+					background #d73612
+
+			&[data-strength='medium']
+				> .value
+					background #d7ca12
+
+			&[data-strength='high']
+				> .value
+					background #61bb22
+
+			> .value
+				display block
+				width 0%
+				height 100%
+				background transparent
+				border-radius 6px
+				transition all 0.1s ease
+
+		> .label
+			position absolute
+			z-index 1
+			top fill ? 6px : 0
+			left 0
+			pointer-events none
+			transition 0.4s cubic-bezier(0.25, 0.8, 0.25, 1)
+			transition-duration 0.3s
+			font-size 16px
+			line-height 32px
+			color isDark ? rgba(#fff, 0.7) : rgba(#000, 0.54)
+			pointer-events none
+			//will-change transform
+			transform-origin top left
+			transform scale(1)
+
+		> input
+			display block
+			width 100%
+			margin 0
+			padding 0
+			font inherit
+			font-weight fill ? bold : normal
+			font-size 16px
+			line-height 32px
+			color isDark ? #fff : #000
+			background transparent
+			border none
+			border-radius 0
+			outline none
+			box-shadow none
+
+			if fill
+				padding 6px 12px
+				background rgba(#000, 0.035)
+				border-radius 6px
+
+			&[type='file']
+				display none
+
+		> .prefix
+		> .suffix
+			display block
+			position absolute
+			z-index 1
+			top 0
+			font-size 16px
+			line-height fill ? 44px : 32px
+			color isDark ? rgba(#fff, 0.7) : rgba(#000, 0.54)
+			pointer-events none
+
+			&:empty
+				display none
+
+			> *
+				display block
+				min-width 16px
+				max-width 150px
+				overflow hidden
+				white-space nowrap
+				text-overflow ellipsis
+
+		> .prefix
+			left 0
+			padding-right 4px
+
+			if fill
+				padding-left 12px
+
+		> .suffix
+			right 0
+			padding-left 4px
+
+			if fill
+				padding-right 12px
+
+	> .text
+		margin 6px 0
+		font-size 13px
+
+		*
+			margin 0
+
+	&.focused
+		> .input
+			if fill
+				background rgba(#000, 0.05)
+			else
+				&:after
+					opacity 1
+					transform scaleX(1)
+
+			> .label
+				color $theme-color
+
+	&.focused
+	&.filled
+		> .input
+			> .label
+				top fill ? -24px : -17px
+				left 0 !important
+				transform scale(0.75)
+
+.ui-input[data-darkmode]
+	&.fill
+		root(true, true)
+	&:not(.fill)
+		root(true, false)
+
+.ui-input:not([data-darkmode])
+	&.fill
+		root(false, true)
+	&:not(.fill)
+		root(false, false)
+
+</style>
--- a/src/client/app/common/views/components/ui/radio.vue
+++ b/src/client/app/common/views/components/ui/radio.vue
@@ -0,0 +1,120 @@
+<template>
+<div
+	class="ui-radio"
+	:class="{ disabled, checked }"
+	:aria-checked="checked"
+	:aria-disabled="disabled"
+	@click="toggle"
+>
+	<input type="radio"
+		:disabled="disabled"
+	>
+	<span class="button">
+		<span></span>
+	</span>
+	<span class="label"><slot></slot></span>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+export default Vue.extend({
+	model: {
+		prop: 'model',
+		event: 'change'
+	},
+	props: {
+		model: {
+			type: String,
+			required: false
+		},
+		value: {
+			type: String,
+			required: false
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		}
+	},
+	computed: {
+		checked(): boolean {
+			return this.model === this.value;
+		}
+	},
+	methods: {
+		toggle() {
+			this.$emit('change', this.value);
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+root(isDark)
+	display inline-block
+	margin 32px 32px 32px 0
+	cursor pointer
+	transition all 0.3s
+
+	> *
+		user-select none
+
+	&.disabled
+		opacity 0.6
+		cursor not-allowed
+
+	&.checked
+		> .button
+			border-color $theme-color
+
+			&:after
+				background-color $theme-color
+				transform scale(1)
+				opacity 1
+
+	> input
+		position absolute
+		width 0
+		height 0
+		opacity 0
+		margin 0
+
+	> .button
+		position absolute
+		width 20px
+		height 20px
+		background none
+		border solid 2px isDark ? rgba(#fff, 0.7) : rgba(#000, 0.54)
+		border-radius 100%
+		transition inherit
+
+		&:after
+			content ''
+			display block
+			position absolute
+			top 3px
+			right 3px
+			bottom 3px
+			left 3px
+			border-radius 100%
+			opacity 0
+			transform scale(0)
+			transition 0.4s cubic-bezier(0.25, 0.8, 0.25, 1)
+
+	> .label
+		margin-left 28px
+		display block
+		font-size 16px
+		line-height 20px
+		cursor pointer
+
+.ui-radio[data-darkmode]
+	root(true)
+
+.ui-radio:not([data-darkmode])
+	root(false)
+
+</style>
--- a/src/client/app/common/views/components/ui/select.vue
+++ b/src/client/app/common/views/components/ui/select.vue
@@ -0,0 +1,215 @@
+<template>
+<div class="ui-select" :class="[{ focused, filled }, styl]">
+	<div class="icon" ref="icon"><slot name="icon"></slot></div>
+	<div class="input" @click="focus">
+		<span class="label" ref="label"><slot name="label"></slot></span>
+		<div class="prefix" ref="prefix"><slot name="prefix"></slot></div>
+		<select ref="input"
+				:value="v"
+				:required="required"
+				@input="$emit('input', $event.target.value)"
+				@focus="focused = true"
+				@blur="focused = false">
+			<slot></slot>
+		</select>
+		<div class="suffix"><slot name="suffix"></slot></div>
+	</div>
+	<div class="text"><slot name="text"></slot></div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: false
+		},
+		required: {
+			type: Boolean,
+			required: false
+		}
+	},
+	data() {
+		return {
+			v: this.value,
+			focused: false,
+			styl: 'fill'
+		};
+	},
+	computed: {
+		filled(): boolean {
+			return this.v != '' && this.v != null;
+		}
+	},
+	watch: {
+		value(v) {
+			this.v = v;
+		}
+	},
+	inject: {
+		isCardChild: { default: false }
+	},
+	created() {
+		if (this.isCardChild) {
+			this.styl = 'line';
+		}
+	},
+	mounted() {
+		if (this.$refs.prefix) {
+			this.$refs.label.style.left = (this.$refs.prefix.offsetLeft + this.$refs.prefix.offsetWidth) + 'px';
+		}
+	},
+	methods: {
+		focus() {
+			this.$refs.input.focus();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+root(isDark, fill)
+	margin 32px 0
+
+	> .icon
+		position absolute
+		top 0
+		left 0
+		width 24px
+		text-align center
+		line-height 32px
+		color rgba(#000, 0.54)
+
+		&:not(:empty) + .input
+			margin-left 28px
+
+	> .input
+		display flex
+
+		if fill
+			padding 6px 12px
+			background rgba(#000, 0.035)
+			border-radius 6px
+		else
+			&:before
+				content ''
+				display block
+				position absolute
+				bottom 0
+				left 0
+				right 0
+				height 1px
+				background isDark ? rgba(#fff, 0.7) : rgba(#000, 0.42)
+
+			&:after
+				content ''
+				display block
+				position absolute
+				bottom 0
+				left 0
+				right 0
+				height 2px
+				background $theme-color
+				opacity 0
+				transform scaleX(0.12)
+				transition border 0.3s cubic-bezier(0.4, 0, 0.2, 1), opacity 0.3s cubic-bezier(0.4, 0, 0.2, 1), transform 0.3s cubic-bezier(0.4, 0, 0.2, 1)
+				will-change border opacity transform
+
+		> .label
+			position absolute
+			top fill ? 6px : 0
+			left 0
+			pointer-events none
+			transition 0.4s cubic-bezier(0.25, 0.8, 0.25, 1)
+			transition-duration 0.3s
+			font-size 16px
+			line-height 32px
+			color rgba(#000, 0.54)
+			pointer-events none
+			//will-change transform
+			transform-origin top left
+			transform scale(1)
+
+		> select
+			display block
+			flex 1
+			width 100%
+			padding 0
+			font inherit
+			font-weight fill ? bold : normal
+			font-size 16px
+			height 32px
+			color isDark ? #fff : #000
+			background transparent
+			border none
+			border-radius 0
+			outline none
+			box-shadow none
+
+			*
+				color #000
+
+		> .prefix
+		> .suffix
+			display block
+			align-self center
+			justify-self center
+			font-size 16px
+			line-height 32px
+			color rgba(#000, 0.54)
+			pointer-events none
+
+			> *
+				display block
+				min-width 16px
+
+		> .prefix
+			padding-right 4px
+
+		> .suffix
+			padding-left 4px
+
+	> .text
+		margin 6px 0
+		font-size 13px
+
+		*
+			margin 0
+
+	&.focused
+		> .input
+			if fill
+				background rgba(#000, 0.05)
+			else
+				&:after
+					opacity 1
+					transform scaleX(1)
+
+			> .label
+				color $theme-color
+
+	&.focused
+	&.filled
+		> .input
+			> .label
+				top fill ? -24px : -17px
+				left 0 !important
+				transform scale(0.75)
+
+.ui-select[data-darkmode]
+	&.fill
+		root(true, true)
+	&:not(.fill)
+		root(true, false)
+
+.ui-select:not([data-darkmode])
+	&.fill
+		root(false, true)
+	&:not(.fill)
+		root(false, false)
+
+</style>
--- a/src/client/app/common/views/components/ui/switch.vue
+++ b/src/client/app/common/views/components/ui/switch.vue
@@ -0,0 +1,135 @@
+<template>
+<div
+	class="ui-switch"
+	:class="{ disabled, checked }"
+	role="switch"
+	:aria-checked="checked"
+	:aria-disabled="disabled"
+	@click="toggle"
+>
+	<input
+		type="checkbox"
+		ref="input"
+		:disabled="disabled"
+		@keydown.enter="toggle"
+	>
+	<span class="button">
+		<span></span>
+	</span>
+	<span class="label">
+		<span :aria-hidden="!checked"><slot></slot></span>
+		<p :aria-hidden="!checked">
+			<slot name="text"></slot>
+		</p>
+	</span>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+export default Vue.extend({
+	model: {
+		prop: 'value',
+		event: 'change'
+	},
+	props: {
+		value: {
+			type: Boolean,
+			default: false
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		}
+	},
+	computed: {
+		checked(): boolean {
+			return this.value;
+		}
+	},
+	methods: {
+		toggle() {
+			this.$emit('change', !this.checked);
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+root(isDark)
+	display flex
+	margin 32px 0
+	cursor pointer
+	transition all 0.3s
+
+	> *
+		user-select none
+
+	&.disabled
+		opacity 0.6
+		cursor not-allowed
+
+	&.checked
+		> .button
+			background-color rgba($theme-color, 0.4)
+			border-color rgba($theme-color, 0.4)
+
+			> *
+				background-color $theme-color
+				transform translateX(14px)
+
+	> input
+		position absolute
+		width 0
+		height 0
+		opacity 0
+		margin 0
+
+	> .button
+		display inline-block
+		margin 3px 0 0 0
+		width 34px
+		height 14px
+		background isDark ? rgba(#fff, 0.15) : rgba(#000, 0.25)
+		outline none
+		border-radius 14px
+		transition inherit
+
+		> *
+			position absolute
+			top -3px
+			left 0
+			border-radius 100%
+			transition background-color 0.3s, transform 0.3s
+			width 20px
+			height 20px
+			background-color #fff
+			box-shadow 0 2px 1px -1px rgba(#000, 0.2), 0 1px 1px 0 rgba(#000, 0.14), 0 1px 3px 0 rgba(#000, 0.12)
+
+	> .label
+		margin-left 8px
+		display block
+		font-size 16px
+		cursor pointer
+		transition inherit
+
+		> span
+			display block
+			line-height 20px
+			color isDark ? #c4ccd2 : rgba(#000, 0.75)
+			transition inherit
+
+		> p
+			margin 0
+			//font-size 90%
+			color isDark ? #78858e : #9daab3
+
+.ui-switch[data-darkmode]
+	root(true)
+
+.ui-switch:not([data-darkmode])
+	root(false)
+
+</style>
--- a/src/client/app/common/views/components/ui/textarea.vue
+++ b/src/client/app/common/views/components/ui/textarea.vue
@@ -0,0 +1,174 @@
+<template>
+<div class="ui-textarea" :class="{ focused, filled }">
+	<div class="input">
+		<span class="label" ref="label"><slot></slot></span>
+		<textarea ref="input"
+				:value="value"
+				:required="required"
+				:readonly="readonly"
+				:pattern="pattern"
+				:autocomplete="autocomplete"
+				@input="$emit('input', $event.target.value)"
+				@focus="focused = true"
+				@blur="focused = false">
+		</textarea>
+	</div>
+	<div class="text"><slot name="text"></slot></div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+const getPasswordStrength = require('syuilo-password-strength');
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: false
+		},
+		required: {
+			type: Boolean,
+			required: false
+		},
+		readonly: {
+			type: Boolean,
+			required: false
+		},
+		pattern: {
+			type: String,
+			required: false
+		},
+		autocomplete: {
+			type: String,
+			required: false
+		}
+	},
+	data() {
+		return {
+			focused: false,
+			passwordStrength: ''
+		}
+	},
+	computed: {
+		filled(): boolean {
+			return this.value != '' && this.value != null;
+		}
+	},
+	methods: {
+		focus() {
+			this.$refs.input.focus();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+root(isDark, fill)
+	margin 42px 0 32px 0
+
+	> .input
+		padding 12px
+
+		if fill
+			background rgba(#000, 0.035)
+			border-radius 6px
+		else
+			&:before
+				content ''
+				display block
+				position absolute
+				top 0
+				bottom 0
+				left 0
+				right 0
+				background none
+				border solid 1px isDark ? rgba(#fff, 0.7) : rgba(#000, 0.42)
+				border-radius 3px
+				pointer-events none
+
+			&:after
+				content ''
+				display block
+				position absolute
+				top 0
+				bottom 0
+				left 0
+				right 0
+				background none
+				border solid 2px $theme-color
+				border-radius 3px
+				opacity 0
+				transition opacity 0.3s cubic-bezier(0.4, 0, 0.2, 1)
+				pointer-events none
+
+		> .label
+			position absolute
+			top 6px
+			left 12px
+			pointer-events none
+			transition 0.4s cubic-bezier(0.25, 0.8, 0.25, 1)
+			transition-duration 0.3s
+			font-size 16px
+			line-height 32px
+			color isDark ? rgba(#fff, 0.7) : rgba(#000, 0.54)
+			pointer-events none
+			//will-change transform
+			transform-origin top left
+			transform scale(1)
+
+		> textarea
+			display block
+			width 100%
+			min-height 100px
+			padding 0
+			font inherit
+			font-weight fill ? bold : normal
+			font-size 16px
+			color isDark ? #fff : #000
+			background transparent
+			border none
+			border-radius 0
+			outline none
+			box-shadow none
+
+	> .text
+		margin 6px 0
+		font-size 13px
+
+		*
+			margin 0
+
+	&.focused
+		> .input
+			if fill
+				background rgba(#000, 0.05)
+			else
+				&:after
+					opacity 1
+
+			> .label
+				color $theme-color
+
+	&.focused
+	&.filled
+		> .input
+			> .label
+				top -24px
+				left 0 !important
+				transform scale(0.75)
+
+.ui-textarea[data-darkmode]
+	&.fill
+		root(true, true)
+	&:not(.fill)
+		root(true, false)
+
+.ui-textarea:not([data-darkmode])
+	&.fill
+		root(false, true)
+	&:not(.fill)
+		root(false, false)
+
+</style>
--- a/src/client/app/common/views/components/uploader.vue
+++ b/src/client/app/common/views/components/uploader.vue
@@ -50,7 +50,7 @@ export default Vue.extend({
 			reader.readAsDataURL(file);

 			const data = new FormData();
-			data.append('i', (this as any).os.i.token);
+			data.append('i', this.$store.state.i.token);
 			data.append('file', file);

 			if (folder) data.append('folderId', folder);
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<?xml version="1.0" standalone="no"?><!-- Generator: Gravit.io --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="isolation:isolate" viewBox="0 0 512 512" width="512" height="512"><defs><clipPath id="_clipPath_P6eAE2OaBltOJ3gHGVajfqsOnfv4xIns"><rect width="512" height="512"/></clipPath></defs><g clip-path="url(#_clipPath_P6eAE2OaBltOJ3gHGVajfqsOnfv4xIns)"><clipPath id="_clipPath_P6q7MZAUp3XpQhVgs2GuAbegX9v4gkom"><rect x="0" y="0" width="512" height="512" transform="matrix(1,0,0,1,0,0)" fill="rgb(255,255,255)"/></clipPath><g clip-path="url(#_clipPath_P6q7MZAUp3XpQhVgs2GuAbegX9v4gkom)"><g id="Group"><g id="g4502"><g id="g5125"><g id="text4489"><path d=" M 190.093 359.243 C 167.923 359.32 148.881 345.963 139.9 330.409 C 135.104 323.615 125.617 321.198 125.482 330.409 L 125.482 372.939 C 125.482 390.026 119.253 404.799 106.794 417.258 C 94.69 429.362 79.917 435.413 62.474 435.413 C 45.387 435.413 30.614 429.362 18.155 417.258 C 6.052 404.799 0 390.026 0 372.939 L 0 139.061 C 0 125.89 3.738 113.965 11.213 103.285 C 19.045 92.25 29.012 84.596 41.116 80.325 C 47.879 77.833 54.999 76.587 62.474 76.587 C 81.697 76.587 97.716 84.062 110.531 99.013 C 117.295 106.489 121.211 110.405 122.279 110.761 C 122.279 110.761 173.043 172.145 174.467 173.213 C 175.891 174.281 180.073 182.446 190.093 182.446 C 200.112 182.446 204.829 174.281 206.253 173.213 C 207.676 172.145 258.44 110.761 258.44 110.761 C 258.796 111.117 262.534 107.201 269.654 99.013 C 282.825 84.062 299.022 76.587 318.245 76.587 C 325.364 76.587 332.484 77.833 339.603 80.325 C 351.707 84.596 361.496 92.25 368.972 103.285 C 376.803 113.965 380.719 125.89 380.719 139.061 L 380.719 372.939 C 380.719 390.026 374.489 404.799 362.03 417.258 C 349.927 429.362 335.154 435.413 317.711 435.413 C 300.624 435.413 285.851 429.362 273.391 417.258 C 261.288 404.799 255.237 390.026 255.237 372.939 L 255.237 330.409 C 254.184 318.802 243.925 326.116 240.285 330.409 C 230.674 348.208 212.262 359.167 190.093 359.243 Z M 457.535 184.448 Q 435.109 184.448 419.09 168.963 Q 403.605 152.944 403.605 130.518 Q 403.605 108.091 419.09 92.606 Q 435.109 76.587 457.535 76.587 Q 479.962 76.587 495.981 92.606 Q 512 108.091 512 130.518 Q 512 152.944 495.981 168.963 Q 479.962 184.448 457.535 184.448 Z M 458.069 195.128 Q 480.496 195.128 495.981 211.147 Q 512 227.166 512 249.592 L 512 381.482 Q 512 403.909 495.981 419.928 Q 480.496 435.413 458.069 435.413 Q 435.643 435.413 419.624 419.928 Q 403.605 403.909 403.605 381.482 L 403.605 249.592 Q 403.605 227.166 419.624 211.147 Q 435.643 195.128 458.069 195.128 Z " fill-rule="evenodd" fill="rgb(157,157,157)"/></g></g></g></g></g></g></svg>