11.37.0

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Danish)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Danish)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Danish)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Chinese Simplified)

.config/example.yml

@@ -79,6 +79,8 @@ redis:
   host: localhost
   port: 6379
   #pass: example-pass
+  #prefix: example-prefix
+  #db: 1
 
 #   ┌─────────────────────────────┐
 #───┘ Elasticsearch configuration └─────────────────────────────
@@ -116,8 +118,28 @@ autoAdmin: true
 # Whether disable HSTS
 #disableHsts: true
 
-# Clustering
+# Number of worker processes
 #clusterLimit: 1
 
+# Job concurrency per worker
+# deliverJobConcurrency: 128
+# inboxJobConcurrency: 16
+
 # IP address family used for outgoing request (ipv4, ipv6 or dual)
 #outgoingAddressFamily: ipv4
+
+# Syslog option
+#syslog:
+#  host: localhost
+#  port: 514
+
+# Proxy for HTTP/HTTPS
+#proxy: http://127.0.0.1:3128
+
+# Proxy for SMTP/SMTPS
+#proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
+#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
+#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
+
+# Media Proxy
+#mediaProxy: https://example.com/proxy

.gitattributes

@@ -1,5 +1,7 @@
 *.svg -diff -text
 *.psd -diff -text
 *.ai -diff -text
-yarn.lock -diff -text
-package-lock.json -diff -text
+*.mqo -diff -text
+*.glb -diff -text
+*.blend -diff -text
+*.afdesign -diff -text

.gitignore

@@ -1,5 +1,6 @@
 # Visual Studio Code
 /.vscode
+!/.vscode/extensions.json
 
 # Intelij-IDEA
 /.idea
@@ -7,9 +8,6 @@
 # Node.js
 /node_modules
 
-# yarn
-yarn.lock
-
 # config
 /.config/*
 !/.config/example.yml
@@ -32,3 +30,10 @@ api-docs.json
 .DS_Store
 /files
 ormconfig.json
+
+# blender backups
+*.blend1
+*.blend2
+*.blend3
+*.blend4
+*.blend5

.node-version

@@ -1 +1 @@
-v12.6.0
+v12.11.1

.vscode/extensions.json

@@ -2,10 +2,10 @@
 	"recommendations": [
 		"ducksoupdev.vue2",
 		"editorconfig.editorconfig",
-		"eg2.tslint",
 		"eg2.vscode-npm-script",
 		"hollowtree.vue-snippets",
 		"ms-vscode.typescript-javascript-grammar",
+		"ms-vscode.vscode-typescript-tslint-plugin",
 		"octref.vetur",
 		"sysoev.language-stylus"
 	]

CHANGELOG.md

@@ -1,21 +1,341 @@
 ChangeLog
 =========
 
-If you encounter any problems with updating, please try the following:
-1. `npm run clean` or `npm run cleanall`
-2. Retry update (Don't forget `npm i`)
+11.37.0 (2020/01/07)
+--------------------
+### ✨Improvements
+* AP引用でquoteUrlに対応
+* トークの既読を連合
+* 期限切れ/未保存リモートファイルのローカルプロキシ機能
+* ミュート/ブロックでページングと解除ができるように
+* Redis prefixにホスト名を使用するように
+* AP Resolverの長いエラーメッセージをトリムするように
+* 管理画面でstatsを継続リクエストしないように
+* 凍結ユーザーのプロファイルなどを表示しないように
+* クライアントで、thumbanilUrlが提供されていない画像はプレビューしないように
+* svgでも画像の平均色を計算するように
+* 画像の平均色を計算するとき、透過部分のある画像では一律で背景を#fff（白）に
+* Pages: 小数点を丸める関数を追加
 
-Migration
-------------------------------
-#### 1
-```
-npm i -g ts-node
-```
+### 🐛Fixes
+* カスタム絵文字リアクションの絵文字がNoteに添付されないのを修正
+* リモートプロキシ時にサムネイルのContent-Typeがおかしい問題を修正
+* /files/ 下のヘッダ設定タイミングを修正
+* イベントが同じRedisを使用する他のMisskeyインスタンスに飛んでしまう問題を修正
+* AP inbox Announce の処理の修正
+* followers, direct投稿の存在がユーザーの投稿一覧に表示されている問題を修正
+* Stacked bar chart がおかしいのを修正
+* リストのインポートがエラーが出るとそこで終わってしまう問題を修正
+* サムネイル/webpublicのファイル形式がjpeg/pngに固定されていたのをファイルを基に送出するように
+* syslogが使えない問題を修正
 
-#### 2
-```
-npm run migrate
-```
+11.36.0 (2019/11/24)
+--------------------
+### ✨Improvements
+* ジョブキューで試行回数等を表示するように
+* deliverエラー等の同じようなログが複数出てこないように、上でまとめて出すように
+* deliverエラーのログではキューの詳細情報を格納しないように
+* inbox/deliverのログに試行回数とキューが作られてからの時間を表示するように
+* 無駄なAP deliverをしないように
+* boot: remove setAttribute() calls and translate reload msg
+
+### 🐛Fixes
+* メンションの通知が届かない可能性がある問題を修正
+* ブロックや閉鎖済みインスタンスのステータスが更新されてしまう問題を修正
+* 「フォロワーを解除」アクティビティを正しく受け取らない問題を修正
+* inboxのジョブキューが表示されない問題を修正
+* ローカルにフォロワー限定投稿が流れてくる問題を修正
+* リモートユーザーのアイコンがサムネイルで表示されない問題を修正
+* DBとオブジェクトストレージのジョブキューが表示されない問題を修正
+* エラーが発生したときにサーバーがクラッシュすることがある問題を修正
+
+11.35.1 (2019/11/05)
+--------------------
+### 🐛Fixes
+* リモートのフォローボタンを押してmisskeyインスタンスを入力したとき正しく動作しない問題を修正
+* リアクション設定で改行ができない問題を修正
+* nodeinfoのmetadataを一般的なものに修正
+
+11.35.0 (2019/11/01)
+--------------------
+### ✨Improvements
+* 一対一でのトークを連合するように
+* カスタム絵文字をカテゴリ分け出来るように
+* カスタム絵文字をカテゴリ, 名前でソートするように
+* 絵文字ピッカーに最近使った絵文字を表示するように
+* 絵文字ピッカーで最後に使ったページを覚えておくように
+* 絵文字ピッカーで正方形じゃない絵文字のアスペクト比を保持するように
+* EscやBackspaceでメディアビューワが閉じれるように
+
+### 🐛Fixes
+* AP: リモートアカウントを解決するとき、そのActorにendpointsが無いとTypeErrorになる問題を修正
+* AP: 新規投稿のMFMをHTMLに変換する際、リモートユーザーへのメンションのリンク先を(できれば)urlに
+* AP: menionのclassにu-urlを付けるように
+* AP: Noteの添付ファイルを提示する時に添付順を保持するように
+* リモートユーザーの更新に失敗することがある問題を修正
+* ミュートしているユーザーのプロフィールを開くと投稿が表示されない問題を修正
+* チャートで値が減ったときの記録が正しく行われていなかった問題を修正
+* カスタム絵文字を登録できない場合がある問題を修正
+* カスタム絵文字を重複登録できないように
+* みつけるの微修正
+* プロフィールで他のユーザーにうつってもfieldsが更新されない問題を修正
+* 絵文字ピッカーでアニメーション停止オプションが効かないのを修正
+
+11.34.0 (2019/10/14)
+--------------------
+### ✨Improvements
+* みつけるに連合分を表示するように
+* リアクションピッカーをカスタマイズできるように
+* inputで不正な値を入力したときにメッセージを表示するように
+* ドライブファイルダウンロードURLにdownloadを付けないように
+* web-pushでProxyを使用するように
+
+### 🐛Fixes
+* 投稿本文が合字を含んで8192文字の場合に制限をパスしても投稿できない問題を修正
+* meta.maxNoteTextLengthをnote.textの最大サイズより大きく設定できる問題を修正
+* ページ移動等してもメニュー等が閉じずに残ってしまう問題を修正
+* ページ移動してもメディアビューワーが残ってしまう問題を修正
+* APに関する問題の修正
+* オフライン時に大室櫻子が出てこない問題を修正
+
+11.33.0 (2019/09/27)
+--------------------
+### ✨Improvements
+* 絵文字ピッカーの Unicode 12.0 対応
+* Adminページのユーザー一覧フィルターに利用可能アカウントを追加
+* お知らせウィジェットのデザインを変更
+
+### 🐛Fixes
+* ユーザーを特定のリストから外すと他のリストからも消える問題を修正
+* 任意のグループからユーザーを削除すると他のグループからでも削除されちゃうのを修正
+* 非公開の投稿にリアクションや返信がついたとき通知が正しく行われない問題を修正
+* AP: featured collectionの取り扱いが間違ってるのを修正
+* AP: 存在しないユーザーをAPで参照すると404にするべきところ500になってしまうのを修正
+* AndoridとデスクトップOSのChromeでPWAとしてインストール（ホーム画面に追加）できない問題を修正
+* /@:user/* でユーザー用のページを返さない問題を修正
+* インスタンス設定で空Arrayがうまく保存できない問題を修正
+* 絵文字サジェスト時にそれがサロゲートペアだった場合「1文字」分しかカーソルが移動しない問題を修正
+* ハッシュタグパースの修正
+* MFMでKeycap Number Signが表示できない問題を修正
+* フォローリクエストページのデザインを修正
+* selectコンポーネントに余分な下線が付く問題を修正
+
+11.32.0 (2019/09/10)
+--------------------
+### ✨Improvements
+* APでRenote/Boost取り消しをやりとりするように
+* リモートNote存在確認から作成までの間にLockをかけるように
+* 広告ブロッカーの警告を削除
+
+### 🐛Fixes
+* ミュートしているユーザーからトークメッセージが来たときに通知インジケーターが点灯する問題を修正
+* リアクションした人が10人を超えるときツールチップの表示がおかしい問題を修正
+
+11.31.4 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.3 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.2 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.1 (2019/09/03)
+--------------------
+### 🐛Fixes
+* 誰がリアクションしたか見れるやつの表示を改善
+
+11.31.0 (2019/09/02)
+--------------------
+### ✨Improvements
+* Syslogサポート
+* チャートの同期機能をAPI経由で使えるように
+* SMTPでProxyを使用できるように
+* リアクションにホバーすることで誰がリアクションしたか見れるように
+* リプライ時、返信元のlocalOnly属性を引き継ぐように
+* 引用付き、ローカルのみなどの案内文にアイコン追加
+* AP deliver/inbox job の並列度を変更できるように
+* clusterLimitの既定値を1に
+* AP inbox ジョブの並列度を下げる
+* CWが付いた投稿はAP上でNote.sensitiveフラグを付けるように
+* メモウィジェットの内容を自動で保存するように
+* ページURLが他と重複してたらエラーを投げるように
+* ページURLが空の時エラーを投げるように
+* リアクションが解除されたときはアニメーションしないように
+* 設定の各セクションごとにURLを割り当てるように
+* 管理画面の各セクションごとにURLを割り当てるように
+
+### 🐛Fixes
+* 未実装のTLのRenoteクエリを実装
+* タイムラインAPIのexcludeNsfwオプションを実装
+* ユーザーページの投稿一覧の私の投稿にRenoteが表示される問題を修正
+* meta APIでemojiプロパティに不要な情報が含まれているのを修正
+* モバイル版でドライブのファイルを削除したときの挙動がおかしい問題を修正
+* visiblity-chooserにlocalOnly属性が伝わらなかったのを修正
+* 言語指定したときコードブロックが表示されない問題を修正
+* トークのメッセージがはみ出す問題を修正
+* CWの中のサムネイルのサイズが変なのを少し修正
+* リアクションが初めて付いた時のエフェクトが消えている問題を修正
+* 無効になっているスイッチを操作できる問題を修正
+* Mキー連打で画面が真っ暗問題を修正
+* AmazonのURLプレビューが出来ない問題を修正
+* 表記ゆれを修正
+
+11.30.0 (2019/08/24)
+--------------------
+### ✨Improvements
+* Room: 家具をすべてしまうボタンを追加
+* Room: カップ麺追加
+* Room: ホログラフィックディスプレイ追加
+* Room: エナジードリンク追加
+* Room: ピンギンの色を変えられるように
+* Room: プレビューの見やすさを向上
+* Room保存時にダイアログを表示するように
+* Roomから移動するときに未保存ならば警告するように
+
+### 🐛Fixes
+* MisskeyRoomからページを戻した時、テキスト入力画面で選択位置変更ができない問題を修正
+
+11.29.0 (2019/08/19)
+--------------------
+### ✨Improvements
+* Room: ソファ追加
+* Room: 螺旋階段追加
+* Room: ゴミ箱追加
+
+### 🐛Fixes
+* Room: 部屋を離れても裏でレンダリングが続く問題を修正
+* Room: アバターのレンダリングを修正
+* Room: ライティングの調整
+
+11.28.2 (2019/08/18)
+--------------------
+### 🐛Fixes
+* 他人の部屋なのに部屋編集UIが表示されるのを修正
+* オブジェクトストレージを使用している場合Roomで画像を読み込めない問題を修正
+
+11.28.1 (2019/08/18)
+--------------------
+### 🐛Fixes
+* オブジェクトストレージを使用している場合Roomで画像を読み込めない問題を修正
+* Roomで家具を移動など確定せずに「しまう」と部屋ごと消える問題を修正
+
+11.28.0 (2019/08/18)
+--------------------
+### ✨Improvements
+* 自分の部屋を作れるように
+* Delキーを押して投稿を削除するときに確認ダイアログを出すように
+* Elasticsearchのインデックス名をconfigで変更できるように
+
+### 🐛Fixes
+* コンテンツを遡ってる途中に新しいアイテムが先頭に追加されると上限に達している場合末尾のアイテムが削除される問題を修正
+* ユーザー名が突き抜けるのを修正
+* ユーザー一覧とかでサイレンス・凍結されたユーザーの状態が表示されてなかったのを修正
+* タイトルやアイコンがきちんと設定されないことがあるのを修正
+* ドライブアップロード直後に取得できるURLがoriginalじゃない問題を修正
+* リモートユーザー向けのNoteUnreadsレコードが作成される問題を修正
+* Hashtagがupdateできない問題を修正
+* ハッシュタグの更新がタグの数だけ並列で行われてDBを重くしてしまうことがあるのを修正
+
+11.27.1 (2019/08/01)
+--------------------
+### 🐛Fixes
+* オブジェクトストレージに関する問題を修正
+
+11.27.0 (2019/07/29)
+--------------------
+### ✨Improvements
+* 「削除して編集」機能を追加
+* HTTPリクエストのKeep-AliveとPrxoy対応(サーバーのパフォーマンス向上)
+* 通知を種類でフィルタリングして表示できるように
+* モバイルで通知ページを表示することができるように
+* 非ログイン時の警告処理
+
+### 🐛Fixes
+* リモートの絵文字が更新されない問題を修正
+* リンクバリデーションリンクが一瞬表示されてしまう問題を修正
+* 選択していない状態でウィジェットが追加できる問題を修正
+
+11.26.2 (2019/07/25)
+--------------------
+### 🐛Fixes
+* すでに使われたことのあるユーザー名を再度使えないように
+* モバイルのウィジェットページが常に i/update-client-setting を呼び続ける問題を修正
+* 投稿フォームのヘッダに添付ファイル数がちゃんと表示されない問題を修正
+
+11.26.1 (2019/07/21)
+--------------------
+### 🐛Fixes
+* リモートアンケートの期限が保存されないのを修正
+* 自分をブロックしているユーザーがおすすめユーザーに表示されている問題を修正
+* スクロールしてると絵文字ピッカーの位置がずれる問題を修正
+* 投稿フォームが画面外にはみ出さないように
+* 投稿フォームの「引用付き」の表示が見づらい問題の修正
+* 投稿フォームにもうリノートや引用ノートのデータがある場合はリンクを貼っても「引用として添付しますか？」のダイアログボックスが出ないように
+* 「タイムライン上部に投稿フォームを表示する」機能の使用時、ノートを投稿しても引用ノートのデータが残る問題の修正
+* デスクトップ版のアクティビティウィジェットの日付とデータの表示が変だったのを修正
+
+11.26.0 (2019/07/19)
+--------------------
+### ✨Improvements
+* モデレーターログを記録して確認できるように
+* プロフィールに追加情報を設定できるように
+* Mastodonのリンクの所有者認証に対応
+* AP: Delete Person アクティビティを配信するように
+* AP: Delete アクティビティの後にフォロー解除するように
+* AP: アカウント削除でもDelete activityを配信するように
+* Pages: ラジオボタンを追加
+* AdminページのUsers Viewでユーザーのレコードをクリックすることですぐユーザーを照会できるように
+* AdminページのUsers Viewでユーザー一覧からユーザー名とホスト情報で検索できるように
+* 特定ホストへのメンションの特別処理をクライアントに追加
+* 設定画面でデスクトップ・モバイルモード変更時はすぐにrefreshするか伺うように
+* ペーストされたファイル名のテンプレート変更時すぐどのようになるか見れるように
+* （ｺ｀・ﾍ・´ｹ）を追加
+
+### 🐛Fixes
+* ログインのログが正しく保存されない問題を修正
+* 同じユーザー名のユーザーが作成できてしまうことがある問題を修正
+* 報告されたレポート内容が表示されない問題を修正
+* リモートのプロフィールの追加情報が表示されない問題を修正
+* 「見つける」のタグが大文字小文字区別されている問題を修正
+* 管理画面のインスタンス一覧でソートが正しく機能していない問題を修正
+* プロフィール設定でバナーに動画を設定すると以降編集ができない問題を修正
+* ウェブ検索エンジンの設定でグリッチが発生する問題を修正
+* MFMの引用がインライン表示になっている問題を修正
+* アンケートの期限入力部分のタイトル表示がおかしい問題を修正
+* 画面上の項目がすべていなくなると実際はロードされてないだけのファイルやフォルダーがあるにも関わらず「もっと読み込む」ボタンがなくなり「このフォルダーは空です」っていうplaceholderが表示されてしまう問題を修正
+* proxy-media後のContent-Typeが違う問題を修正
+* ビルド時にエラーが出るのを修正
+
+11.25.1 (2019/07/09)
+--------------------
+### 🐛Fixes
+* ページイベントが正しくストリームに流れてこない問題を修正
+* フォントの調整
+
+11.25.0 (2019/07/08)
+--------------------
+### ✨Improvements
+* パスワード無しログイン機能
+* MisskeyPagesにイベント送信ボタンを追加
+* MisskeyPagesでボタンを目立たせることができるように
+* ページをピン留めできるように
+* デッキのカラム内でページを見れるように
+* 既定のアップロード先フォルダを設定できるように
+* ファイルをペーストしてアップロードするときのファイル名をカスタマイズできるように
+* 公開以外へのリプライ時元の公開範囲で指定したユーザー情報を引き継ぐように
+* デスクトップ版を使うかモバイル版を使うか手動で設定できるように
+* フォルダーを削除できないときダイアログボックスで知らせるように
+
+### 🐛Fixes
+* postgres redis cache の option が適用されない問題を修正
+* 一部MFMテキストが折り返されず突き抜ける問題を修正
 
 11.24.2 (2019/07/05)
 --------------------
@@ -36,7 +356,10 @@ npm run migrate
 
 11.24.0 (2019/07/05)
 --------------------
-注意: このアップデート後に、`node built/tools/accept-migration Init 1000000000000`してください。
+### 注意
+- このアップデート後に、`node built/tools/accept-migration Init 1000000000000`してください。
+- プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
+
 
 ### ✨Improvements
 * WebAuthnサポート
@@ -626,9 +949,9 @@ mongodb:
   db: misskey
 ```
 3. migration ブランチに切り替え
-4. `npm i`
-5. `npm run build`
-6. `npm run migrate`
+4. `yarn install`
+5. `yarn build`
+6. `yarn migrate`
 7. master ブランチに戻す
 8. enjoy
 

CONTRIBUTING.md

@@ -7,18 +7,24 @@ Feature suggestions and bug reports are filed in https://github.com/syuilo/missk
 * Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one.
 * If you have multiple independent issues, please submit them separately.
 
+## Branches
+* **master** branch is tracking the latest release and used for production purposes.
+* **develop** branch is where we work for the next release.
+* **l10n_develop** branch is reserved for localization management.
 
 ## Localization (l10n)
 Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
 You can improve our translations with your Crowdin account.
-Changes you make in Crowdin will be merged into develop branch.
+Your changes in Crowdin are automatically submitted as a PR (with the title "New Crowdin translations") to the repository.
+The owner [@syuilo](https://github.com/syuilo) merges the PR into the develop branch before the next release.
 
-If you can't find the language you want to contribute with, please open an issue.
+If your language is not listed in Crowdin, please open an issue.
 
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
 ## Internationalization (i18n)
-Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n).
+Misskey uses the Vue.js plugin [Vue I18n](https://github.com/kazupon/vue-i18n).
+Documentation of Vue I18n is available at http://kazupon.github.io/vue-i18n/introduction.html .
 
 ## Documentation
 * Documents for contributors are located in [`/docs`](/docs).
@@ -29,9 +35,25 @@ Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n).
 * Test codes are located in [`/test`](/test).
 
 ## Continuous integration
-Misskey uses CircleCI for automated test.
+Misskey uses CircleCI for executing automated tests.
 Configuration files are located in [`/.circleci`](/.circleci).
 
+## Adding MisskeyRoom items
+* Use English for material, object and texture names.
+* Use meter for unit of length.
+* Your PR should include all source files (e.g. `.png`, `.blend`) of your models (for later editing).
+* Your PR must include the glTF binary files (`.glb`) of your models.
+* Add a locale key `room.furnitures.YOUR_ITEM` at [`/locales/ja-JP.yml`](/locales/ja-JP.yml).
+* Add a furniture definition at [`/src/client/app/common/scripts/room/furnitures.json5`](/src/client/app/common/scripts/room/furnitures.json5).
+
+If you have no experience on 3D modeling, we suggest to use the free 3DCG software [Blender](https://www.blender.org/).
+You can find information on glTF 2.0 at [glTF 2.0 — Blender Manual]( https://docs.blender.org/manual/en/dev/addons/io_scene_gltf2.html).
+
+## FAQ
+### How to resolve conflictions occurred at yarn.lock?
+
+Just execute `yarn` to fix it.
+
 ## Glossary
 ### AP
 Stands for _**A**ctivity**P**ub_.
@@ -51,11 +73,15 @@ Convert な(na) to にゃ(nya)
 #### Denyaize
 Revert Nyaize
 
-## Code style
-### セミコロンを省略しない
-ASI Hazardを避けるためでもある
+## TypeScript Coding Style
+### Do not omit semicolons
+This is to avoid Automatic Semicolon Insertion (ASI) hazard.
 
-### 中括弧を省略しない
+Ref:
+* https://www.ecma-international.org/ecma-262/#sec-automatic-semicolon-insertion
+* https://github.com/tc39/ecma262/pull/1062
+
+### Do not omit curly brackets
 Bad:
 ``` ts
 if (foo)
@@ -73,18 +99,38 @@ if (foo) {
 }
 ```
 
-ただし**`if`が一行**の時だけは省略しても良い
+As a special case, you can omit the curly brackets if
+
+* the body of the `if`-statement have only one statement and,
+* the `if`-statement does not have `else`-clause.
+
 Good:
 ``` ts
 if (foo) bar;
 ```
 
-### `export default`を使わない
-インテリセンスと相性が悪かったりするため
+Make sure that the condition and the body statement are on the same line.
 
-参考:
-* https://gfx.hatenablog.com/entry/2017/11/24/135343
+### Do not use `==` when it can simply be replaced with `===`.
+🥰
+
+### Use only boolean (or null related) values in the condition of an `if`-statement.
+Bad:
+``` ts
+if (foo.length)
+```
+
+Good:
+``` ts
+if (foo.length > 0)
+```
+
+### Do not use `export default`
+This is because the current language support does not work well with `export default`.
+
+Ref:
 * https://basarat.gitbooks.io/typescript/docs/tips/defaultIsBad.html
+* https://gfx.hatenablog.com/entry/2017/11/24/135343
 
 Bad:
 ``` ts
@@ -220,8 +266,11 @@ const user = await Users.findOne(userId).then(ensure);
 
 ### Migration作成方法
 ```
-npm i -g ts-node
-ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
+npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
 ```
 
 作成されたスクリプトは不必要な変更を含むため除去してください。
+
+## その他
+### HTMLのクラス名で follow という単語は使わない
+広告ブロッカーで誤ってブロックされる

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.6-alpine AS base
+FROM node:12.11.1-alpine AS base
 
 ENV NODE_ENV=production
 
@@ -23,9 +23,9 @@ RUN apk add --no-cache \
     zlib-dev
 
 COPY package.json ./
-RUN npm i
+RUN yarn install
 COPY . ./
-RUN npm run build
+RUN yarn build
 
 FROM base AS runner
 

README.md

@@ -1,6 +1,6 @@
 <a href="https://xn--931a.moe/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
 
-[![Misskey](/assets/title.png)](https://misskey.io/)
+[![Misskey](/assets/title.png)](https://join.misskey.page/)
 ================================================================
 
 [![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/syuilo/misskey)
@@ -10,10 +10,10 @@
 **A forever evolving, sophisticated microblogging platform.**
 
 <p align="justify">
-<a href="https://misskey.io">Misskey</a> is a decentralized microblogging platform born on Earth.
+<a href="https://join.misskey.page/">Misskey</a> is a decentralized microblogging platform born on Earth.
 Since it exists within the Fediverse (a universe where various social media platforms are organized),
 it is mutually linked with other social media platforms.
-Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://joinmisskey.github.io/">Find an instance!</a>
+Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://join.misskey.page/">Find an instance!</a>
 </p>
 
 <a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
@@ -103,84 +103,88 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 ----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5888816/36da0f7c15954df0ab13f9abdf227f66/1.jpeg?token-time=2145916800&token-hash=at8QpJXJ8C0zINY_NmoMKv-MhXVoUK-YzTgaJPJzJYU%3D" alt="Hiroshi Seki" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/27956229" alt="Oliver Maximilian Seidel" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weepjp" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/605366/c9dc408fdcbf412fb183ca5b06235f8d/1.jpeg?token-time=2145916800&token-hash=oaqsjLqOFjWN5I9hm2epOaTXaEtKwQUy5OW-EpAz6-g%3D" alt="Jon Leibowitz" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19045173/cb91c0f345c24d4ebfd05f19906d5e26/1.png?token-time=2145916800&token-hash=o_zKBytJs_AxHwSYw_5R8eD0eSJe3RoTR3kR3Q0syN0%3D" alt="kiritan" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/24430516/b1964ac5b9f746d2a12ff53dbc9aa40a/1.jpg?token-time=2145916800&token-hash=bmEiMGYpp3bS7hCCbymjGGsHBZM3AXuBOFO3Kro37PU%3D" alt="Eduardo Quiros" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/14215107/1cbe1912c26143919fa0faca16f12ce1/2.png?token-time=2145916800&token-hash=v0KzlXjyiq18u6aSxyy9qIUxSCAx-nnHlO7MzhSA6Mc%3D" alt="Nesakko" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/776209" alt="Denshi" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/557245" alt="mkatze" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13099460/43cecdbaa63a40d79bf50a96b9910b9d/1.jpe?token-time=2145916800&token-hash=bqwLTk0Wo0hUJJ8J5y7ii05bLzz-_CDA7Bo0Mp4RFU0%3D" alt="ne_moni" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/4.jpe?token-time=2145916800&token-hash=zEyJqVM7u9d8Ri-65fJYSJcWF1jBH1nJ5a3taRzrTmw%3D" alt="Melilot" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/3075183/c2ae575c604e420297f000ccc396e395/1.jpeg?token-time=2145916800&token-hash=O9qmPtpo6wWb0OuvnkEekhk_1WO2MTdytLr7ZgsAr80%3D" alt="Liaizon Wakest" width="100"></td>
 </tr><tr>
-<td><a href="https://www.patreon.com/rane_hs">Hiroshi Seki</a></td>
+<td><a href="https://www.patreon.com/user?u=27956229">Oliver Maximilian Seidel</a></td>
 <td><a href="https://www.patreon.com/weepjp">weepjp</a></td>
+<td><a href="https://www.patreon.com/jonleibowitz">Jon Leibowitz</a></td>
 <td><a href="https://www.patreon.com/user?u=19045173">kiritan</a></td>
+<td><a href="https://www.patreon.com/user?u=24430516">Eduardo Quiros</a></td>
+<td><a href="https://www.patreon.com/Nesakko">Nesakko</a></td>
 <td><a href="https://www.patreon.com/user?u=776209">Denshi</a></td>
-<td><a href="https://www.patreon.com/user?u=557245">mkatze</a></td>
-<td><a href="https://www.patreon.com/user?u=13099460">ne_moni</a></td>
-<td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
-<td><a href="https://www.patreon.com/osapon">osapon</a></td>
+<td><a href="https://www.patreon.com/wakest">Liaizon Wakest</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c8.patreon.com/2/200/557245" alt="mkatze" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/23915207/25428766ecd745478e600b3d7f871eb2/1.png?token-time=2145916800&token-hash=urCLLA4KjJZX92Y1CxcBP4d8bVTHGkiaPnQZp-Tqz68%3D" alt="kabo2468y" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/8249688/4aacf36b6b244ab1bc6653591b6640df/2.png?token-time=2145916800&token-hash=1ZEf2w6L34253cZXS_HlVevLEENWS9QqrnxGUAYblPo%3D" alt="AureoleArk" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5788159/af42076ab3354bb49803cfba65f94bee/1.jpg?token-time=2145916800&token-hash=iSaxp_Yr2-ZiU2YVi9rcpZZj9mj3UvNSMrZr4CU4qtA%3D" alt="mewl hayabusa" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1.png?token-time=2145916800&token-hash=9nEQje_eMvUjq9a7L3uBqW-MQbS-rRMaMgd7UYVoFNM%3D" alt="mydarkstar" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/12718187" alt="Peter G." width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1.jpe?token-time=2145916800&token-hash=UQRWf01TwHDV4Cls1K0YAOAjM29ssif7hLVq0ESQ0hs%3D" alt="nemu" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/17463605" alt="Sampot" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/user?u=557245">mkatze</a></td>
+<td><a href="https://www.patreon.com/user?u=23915207">kabo2468y</a></td>
+<td><a href="https://www.patreon.com/AureoleArk">AureoleArk</a></td>
+<td><a href="https://www.patreon.com/osapon">osapon</a></td>
 <td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
 <td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61</a></td>
+<td><a href="https://www.patreon.com/hs_sh_net">mewl hayabusa</a></td>
 <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
-<td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
-<td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
-<td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin</a></td>
-<td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
-<td><a href="https://www.patreon.com/user?u=17463605">Sampot</a></td>
-<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s</a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c8.patreon.com/2/200/16542964" alt="Takumi Sugita" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5827393/59893c191dda408f9cabd0f20a3a5627/1.jpeg?token-time=2145916800&token-hash=i9N05vOph-eP1LTLb9_npATjYOpntL0ZsHNaZFSsPmE%3D" alt="motcha" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13737140/1adf7835017d479280d90fe8d30aade2/1.png?token-time=2145916800&token-hash=0pdle8h5pDZrww0BDOjdz6zO-HudeGTh36a3qi1biVU%3D" alt="Satsuki Yanagi" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpe?token-time=2145916800&token-hash=CPxGQhKIlEaa6WUcgbyHixyKEhakiw9RFdOhsIJBQ_o%3D" alt="takimura" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/83884b38afc74d4cbe83c30a13b10edd/1.png?token-time=2145916800&token-hash=R5Tog8RWg0rguRoCIoir3lThokrdPvs8Utfikhc0nhY%3D" alt="Atsuko Tominaga" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1.jpe?token-time=2145916800&token-hash=EWxXhVbZYH7KB4IDT3joc8TbIg8zPO40x1r5IDn3R7c%3D" alt="Hiratake" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5923936/2a743cbfbff946c2af3f09026047c0da/2.png?token-time=2145916800&token-hash=h6yphW1qnM0n_NOWaf8qtszMRLXEwIxfk5beu4RxdT0%3D" alt="noellabo" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/2384390/5681180e1efb46a8b28e0e8d4c8b9037/1.jpg?token-time=2145916800&token-hash=SJcMy-Q1BcS940-LFUVOMfR7-5SgrzsEQGhYb3yowFk%3D" alt="CG" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.jpe?token-time=2145916800&token-hash=qA8j97lIZNc-74AuZ0p4F3ms6sKPeKjtNt2vEuwpsyo%3D" alt="Hekovic" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/10789744/97175095d8f04c0f86225ff47cb98d40/1.jpeg?token-time=2145916800&token-hash=l4AoMR7Nj7K4yAHrkrk2hAoggPkbSPm12m1nmbe9Pb8%3D" alt="Naoki Hirayama" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/619ab87cc08448439222631ebb26802f/1.gif?token-time=2145916800&token-hash=o27K7M02s1z-LkDUEO5Oa7cu-GviRXeOXxryi4o_6VU%3D" alt="Atsuko Tominaga" width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/user?u=16542964">Takumi Sugita</a></td>
+<td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin</a></td>
+<td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
+<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s</a></td>
+<td><a href="https://www.patreon.com/user?u=5827393">motcha</a></td>
 <td><a href="https://www.patreon.com/user?u=13737140">Satsuki Yanagi</a></td>
 <td><a href="https://www.patreon.com/takimura">takimura</a></td>
 <td><a href="https://www.patreon.com/user?u=16900731">Atsuko Tominaga</a></td>
+</tr></table>
+<table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5923936/2a743cbfbff946c2af3f09026047c0da/2.png?token-time=2145916800&token-hash=h6yphW1qnM0n_NOWaf8qtszMRLXEwIxfk5beu4RxdT0%3D" alt="noellabo" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/2384390/5681180e1efb46a8b28e0e8d4c8b9037/1.jpg?token-time=2145916800&token-hash=SJcMy-Q1BcS940-LFUVOMfR7-5SgrzsEQGhYb3yowFk%3D" alt="CG" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.jpe?token-time=2145916800&token-hash=qA8j97lIZNc-74AuZ0p4F3ms6sKPeKjtNt2vEuwpsyo%3D" alt="Hekovic" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1.jpeg?token-time=2145916800&token-hash=L55UhJ0rcuNAH3w_ryeeGN4hC6taoOixyAhraEi0bzw%3D" alt="dansup" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1.png?token-time=2145916800&token-hash=hBayGfOmQH3kRMdNnDe4oCZD_9fsJWSt29xXR3KRMVk%3D" alt="Nokotaro Takeda" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/23932002" alt="nenohi" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1.jpeg?token-time=2145916800&token-hash=vGe7wXGqmA8Q7m-kDNb6fyGdwk-Dxk4F-ut8ZZu51RM%3D" alt="Takashi Shibuya" width="100"></td>
+</tr><tr>
 <td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
-<td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
 <td><a href="https://www.patreon.com/noellabo">noellabo</a></td>
 <td><a href="https://www.patreon.com/Corset">CG</a></td>
 <td><a href="https://www.patreon.com/hekovic">Hekovic</a></td>
-<td><a href="https://www.patreon.com/spinlock">Naoki Hirayama</a></td>
-</tr></table>
-<table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1.jpeg?token-time=2145916800&token-hash=L55UhJ0rcuNAH3w_ryeeGN4hC6taoOixyAhraEi0bzw%3D" alt="dansup" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1.jpeg?token-time=2145916800&token-hash=d8jBQLMOHD87KtXs5C9fk1o58DMF73pQ-dYH3uZJPBE%3D" alt="Gargron" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1.png?token-time=2145916800&token-hash=hBayGfOmQH3kRMdNnDe4oCZD_9fsJWSt29xXR3KRMVk%3D" alt="Nokotaro Takeda" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1.jpeg?token-time=2145916800&token-hash=vGe7wXGqmA8Q7m-kDNb6fyGdwk-Dxk4F-ut8ZZu51RM%3D" alt="Takashi Shibuya" width="100"></td>
-</tr><tr>
 <td><a href="https://www.patreon.com/dansup">dansup</a></td>
-<td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
 <td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
+<td><a href="https://www.patreon.com/user?u=23932002">nenohi</a></td>
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>
 
-**Last updated:** Mon, 01 Jul 2019 21:44:06 UTC
+**Last updated:** Sun, 05 Jan 2020 05:37:07 UTC
 <!-- PATREON_END -->
 
 :four_leaf_clover: Copyright
 ----------------------------------------------------------------
-> Copyright (c) 2014-2019 syuilo
+> Copyright (c) 2014-2020 syuilo
 
 Misskey is open-source software licensed under the [GNU AGPLv3](LICENSE).
 

assets/icons/icon.svg

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

docs/docker.en.md

@@ -68,7 +68,7 @@ Build misskey with the following:
 *5.* Init DB
 ----------------------------------------------------------------
 ``` shell
-docker-compose run --rm web npm run init
+docker-compose run --rm web yarn run init
 ```
 
 *6.* That is it.

docs/docker.ja.md

@@ -68,7 +68,7 @@ cp docker_example.env docker.env
 *5.* データベースを初期化
 ----------------------------------------------------------------
 ``` shell
-docker-compose run --rm web npm run init
+docker-compose run --rm web yarn run init
 ```
 
 *6.* 以上です！

docs/examples/misskey.nginx

@@ -1,7 +1,7 @@
 # Sample nginx configuration for Misskey
 #
 # 1. Replace example.tld to your domain
-# 2. Copy to /etc/nginx/sites-available/ and then symlink from /etc/nginx/sites-ebabled/
+# 2. Copy to /etc/nginx/sites-available/ and then symlink from /etc/nginx/sites-enabled/
 #    or copy to /etc/nginx/conf.d/
 
 # For WebSocket
@@ -25,10 +25,9 @@ server {
 }
 
 server {
-    listen 443 http2;
-    listen [::]:443 http2;
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
     server_name example.tld;
-    ssl on;
     ssl_session_cache shared:ssl_session_cache:10m;
 
     # To use Let's Encrypt certificate

docs/setup.en.md

@@ -27,6 +27,7 @@ Please install and setup these softwares:
 * **[Redis](https://redis.io/)**
 
 ##### Optional
+* [Yarn](https://yarnpkg.com/) *Optional but recommended for security reason. If you won't install it, use `npx yarn` instead of `yarn`.*
 * [Elasticsearch](https://www.elastic.co/) - required to enable the search feature
 * [FFmpeg](https://www.ffmpeg.org/)
 
@@ -50,7 +51,7 @@ Please install and setup these softwares:
 
 5. Install misskey dependencies.
 
-	`npm install`
+	`yarn`
 
 *4.* Configure Misskey
 ----------------------------------------------------------------
@@ -65,21 +66,20 @@ Please install and setup these softwares:
 
 Build misskey with the following:
 
-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn build`
 
 If you're on Debian, you will need to install the `build-essential`, `python` package.
 
 If you're still encountering errors about some modules, use node-gyp:
 
-1. `npm install -g node-gyp`
-2. `node-gyp configure`
-3. `node-gyp build`
-4. `NODE_ENV=production npm run build`
+1. `npx node-gyp configure`
+2. `npx node-gyp build`
+3. `NODE_ENV=production yarn build`
 
 *6.* Init DB
 ----------------------------------------------------------------
 ``` shell
-npm run init
+yarn run init
 ```
 
 *7.* That is it.
@@ -130,12 +130,16 @@ You can check if the service is running with `systemctl status misskey`.
 ### How to update your Misskey server to the latest version
 1. `git checkout master`
 2. `git pull`
-3. `npm install`
-4. `NODE_ENV=production npm run build`
-5. Check [ChangeLog](../CHANGELOG.md) for migration information
+3. `yarn install`
+4. `NODE_ENV=production yarn build`
+5. `yarn migrate`
 6. Restart your Misskey process to apply changes
 7. Enjoy
 
+If you encounter any problems with updating, please try the following:
+1. `yarn clean` or `yarn cleanall`
+2. Retry update (Don't forget `yarn install`
+
 ----------------------------------------------------------------
 
 If you have any questions or troubles, feel free to contact us!

docs/setup.fr.md

@@ -27,7 +27,8 @@ Installez les paquets suivants :
 * **[Redis](https://redis.io/)**
 
 ##### Optionnels
-* [Elasticsearch](https://www.elastic.co/) - requis pour pouvoir activer la fonctionnalité de recherche
+* [Yarn](https://yarnpkg.com/) - *recommander pour des raisons de sécurité. Si vous ne l'installez pas, utilisez `npx yarn` au lieu de` yarn`.*
+* [Elasticsearch](https://www.elastic.co/) - *requis pour pouvoir activer la fonctionnalité de recherche.*
 * [FFmpeg](https://www.ffmpeg.org/)
 
 *3.* Installation de Misskey
@@ -50,7 +51,7 @@ Installez les paquets suivants :
  
 5. Installez les dépendances de misskey.
 
-	`npm install`
+	`yarn install`
 
 *4.* Création du fichier de configuration
 ----------------------------------------------------------------
@@ -65,23 +66,22 @@ Installez les paquets suivants :
 
 Construisez Misskey comme ceci :
 
-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn build`
 
 Si vous êtes sous Debian, vous serez amené à installer les paquets `build-essential` et `python`.
 
 Si vous rencontrez des erreurs concernant certains modules, utilisez node-gyp:
 
-1. `npm install -g node-gyp`
-2. `node-gyp configure`
-3. `node-gyp build`
-4. `NODE_ENV=production npm run build`
+1. `npx node-gyp configure`
+2. `npx node-gyp build`
+3. `NODE_ENV=production yarn build`
 
 *6.* C'est tout.
 ----------------------------------------------------------------
 Excellent ! Maintenant, vous avez un environnement prêt pour lancer Misskey
 
 ### Lancement conventionnel
-Lancez tout simplement `NODE_ENV=production npm start`. Bonne chance et amusez-vous bien !
+Lancez tout simplement `NODE_ENV=production yarn start`. Bonne chance et amusez-vous bien !
 
 ### Démarrage avec systemd
 
@@ -124,9 +124,9 @@ Vous pouvez vérifier si le service a démarré en utilisant la commande `system
 ### Méthode de mise à jour vers la plus récente version de Misskey
 1. `git checkout master`
 2. `git pull`
-3. `npm install`
-4. `NODE_ENV=production npm run build`
-5. Consultez [ChangeLog](../CHANGELOG.md) pour les information de migration.
+3. `yarn install`
+4. `NODE_ENV=production yarn build`
+5. `yarn migrate`
 
 ----------------------------------------------------------------
 

docs/setup.ja.md

@@ -27,6 +27,8 @@ adduser --disabled-password --disabled-login misskey
 * **[Redis](https://redis.io/)**
 
 ##### オプション
+* [Yarn](https://yarnpkg.com/)
+	* セキュリティの観点から推奨されます。 yarn をインストールしない方針の場合は、文章中の `yarn` を適宜 `npx yarn` と読み替えてください。
 * [Elasticsearch](https://www.elastic.co/)
 	* 検索機能を有効にするためにはインストールが必要です。
 * [FFmpeg](https://www.ffmpeg.org/)
@@ -51,7 +53,7 @@ adduser --disabled-password --disabled-login misskey
 
 5. Misskeyの依存パッケージをインストール
 
-	`npm install`
+	`yarn install`
 
 *4.* 設定ファイルを作成する
 ----------------------------------------------------------------
@@ -66,20 +68,19 @@ adduser --disabled-password --disabled-login misskey
 
 次のコマンドでMisskeyをビルドしてください:
 
-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn build`
 
 Debianをお使いであれば、`build-essential`パッケージをインストールする必要があります。
 
 何らかのモジュールでエラーが発生する場合はnode-gypを使ってください:
-1. `npm install -g node-gyp`
-2. `node-gyp configure`
-3. `node-gyp build`
-4. `NODE_ENV=production npm run build`
+1. `npx node-gyp configure`
+2. `npx node-gyp build`
+3. `NODE_ENV=production yarn build`
 
 *6.* データベースを初期化
 ----------------------------------------------------------------
 ``` shell
-npm run init
+yarn run init
 ```
 
 *7.* 以上です！
@@ -87,7 +88,7 @@ npm run init
 お疲れ様でした。これでMisskeyを動かす準備は整いました。
 
 ### 通常起動
-`NODE_ENV=production npm start`するだけです。GLHF!
+`NODE_ENV=production yarn start`するだけです。GLHF!
 
 ### systemdを用いた起動
 1. systemdサービスのファイルを作成
@@ -120,7 +121,7 @@ npm run init
 
 3. systemdを再読み込みしmisskeyサービスを有効化
 
-	`systemctl daemon-reload ; systemctl enable misskey`
+	`systemctl daemon-reload; systemctl enable misskey`
 
 4. misskeyサービスの起動
 
@@ -131,11 +132,11 @@ npm run init
 ### Misskeyを最新バージョンにアップデートする方法:
 1. `git checkout master`
 2. `git pull`
-3. `npm install`
-4. `NODE_ENV=production npm run build`
-5. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する
+3. `yarn install`
+4. `NODE_ENV=production yarn build`
+5. `yarn migrate`
 
-なにか問題が発生した場合は、`npm run clean`または`npm run cleanall`すると直る場合があります。
+なにか問題が発生した場合は、`yarn clean`または`yarn cleanall`すると直る場合があります。
 
 ----------------------------------------------------------------
 

gulpfile.ts

@@ -3,28 +3,22 @@
  */
 
 import * as gulp from 'gulp';
-import * as gutil from 'gulp-util';
 import * as ts from 'gulp-typescript';
 const sourcemaps = require('gulp-sourcemaps');
 import tslint from 'gulp-tslint';
-const cssnano = require('gulp-cssnano');
 const stylus = require('gulp-stylus');
-import * as uglifyComposer from 'gulp-uglify/composer';
 import * as rimraf from 'rimraf';
-import chalk from 'chalk';
-const imagemin = require('gulp-imagemin');
+import * as chalk from 'chalk';
 import * as rename from 'gulp-rename';
 import * as mocha from 'gulp-mocha';
 import * as replace from 'gulp-replace';
-const uglifyes = require('uglify-es');
+const cleanCSS = require('gulp-clean-css');
+const terser = require('gulp-terser');
 
 const locales = require('./locales');
 
-const uglify = uglifyComposer(uglifyes, console);
-
 const env = process.env.NODE_ENV || 'development';
-const isProduction = env === 'production';
-const isDebug = !isProduction;
+const isDebug = env !== 'production';
 
 if (isDebug) {
 	console.warn(chalk.yellow.bold('WARNING! NODE_ENV is not "production".'));
@@ -47,9 +41,14 @@ gulp.task('build:copy:views', () =>
 	gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views'))
 );
 
-gulp.task('build:copy', gulp.parallel('build:copy:views', () =>
+gulp.task('build:copy:fonts', () =>
+	gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/client/assets/fonts/'))
+);
+
+gulp.task('build:copy', gulp.parallel('build:copy:views', 'build:copy:fonts', () =>
 	gulp.src([
 		'./src/const.json',
+		'./src/emojilist.json',
 		'./src/server/web/views/**/*',
 		'./src/**/assets/**/*',
 		'!./src/client/app/**/assets/**/*'
@@ -92,22 +91,20 @@ gulp.task('cleanall', gulp.parallel('clean', cb =>
 ));
 
 gulp.task('build:client:script', () => {
-	const client = require('./built/client/meta.json');
+	const client = require('./built/meta.json');
 	return gulp.src(['./src/client/app/boot.js', './src/client/app/safe.js'])
 		.pipe(replace('VERSION', JSON.stringify(client.version)))
 		.pipe(replace('ENV', JSON.stringify(env)))
 		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
-		.pipe(isProduction ? uglify({
+		.pipe(terser({
 			toplevel: true
-		} as any) : gutil.noop())
+		}))
 		.pipe(gulp.dest('./built/client/assets/'));
 });
 
 gulp.task('build:client:styles', () =>
 	gulp.src('./src/client/app/init.css')
-		.pipe(isProduction
-			? (cssnano as any)()
-			: gutil.noop())
+		.pipe(cleanCSS())
 		.pipe(gulp.dest('./built/client/assets/'))
 );
 
@@ -117,7 +114,6 @@ gulp.task('copy:client', () =>
 			'./src/client/assets/**/*',
 			'./src/client/app/*/assets/**/*'
 		])
-			.pipe(isProduction ? (imagemin as any)() : gutil.noop())
 			.pipe(rename(path => {
 				path.dirname = path.dirname!.replace('assets', '.');
 			}))
@@ -127,7 +123,7 @@ gulp.task('copy:client', () =>
 gulp.task('doc', () =>
 	gulp.src('./src/docs/**/*.styl')
 		.pipe(stylus())
-		.pipe((cssnano as any)())
+		.pipe(cleanCSS())
 		.pipe(gulp.dest('./built/docs/assets/'))
 );
 

index.js

@@ -1 +1,7 @@
-require('./built').default();
+const fs = require('fs');
+
+if (fs.existsSync('./built')) {
+	require('./built').default();
+} else {
+	console.log('Built code is not found. Probably an error occurred during a build or you just forgot to build.');
+}

locales/cs-CZ.yml

@@ -18,9 +18,6 @@ common:
     drive: "Disk"
     drive-desc: "Chcete sdílet obrázek, který jste již nahráli? Chcete vaše nahrané soubory organizovat, pojmenovávat a vytvářet pro ně složky? Misskey Disk je pro vás nejlepší řešení. Je velmi snadné sdílet vaše soubory online."
     outro: "Podívejte se na unikátní vlastnosti Misskey vlastníma očima! Pokud si myslíte, že tato instance není pro vás, zkuste jiné instance, neboť Misskey je decentralizovaná sociální síť, takže můžete snadno najít své přátele. Hodně štěstí a zábavy!"
-  adblock:
-    detected: "Prosím vypněte svůj blokovač reklam"
-    warning: "Některé vlastnosti mohou být nedostupné nebo mohou způsobovat chyby, pokud máte povolený blokovač reklam. <strong>Misskey nepoužívá reklamy</strong>."
   application-authorization: "Autorizované aplikace"
   close: "Zavřít"
   do-not-copy-paste: "Prosím nezadávejte ani nevkládejte sem kód. Váš účet může být kompromitován."
@@ -34,6 +31,20 @@ common:
   signup: "Registrovat"
   signout: "Odhlásit"
   reload-to-apply-the-setting: "Pro uplatnění tohoto nastavení musíte znovu načíst tuto stránku. Chcete ji načíst teď?"
+  fetching-as-ap-object: "Načítám data z Fediversu..."
+  delete-confirm: "Opravdu chcete smazat tento příspěvek?"
+  signin-required: "Přihlašte se, prosím"
+  notification-type: "Typy oznámení"
+  notification-types:
+    all: "Všechny"
+    pollVote: "Hlasy"
+    follow: "Sledovaní"
+    receiveFollowRequest: "Žádost o sledování"
+    reply: "Odpovědi"
+    quote: "Citace"
+    renote: "Renotovat"
+    mention: "Zmínky"
+    reaction: "Reakce"
   got-it: "Rozumím!"
   customization-tips:
     title: "Tipy pro přizpůsobení"
@@ -89,7 +100,11 @@ common:
     "read:notifications": "Prohlížet oznámení"
     "write:notifications": "Pracovat s oznámeními"
     "read:reactions": "Prohlížet reakce"
+    "write:reactions": "Narabět s reakcemi"
     "write:votes": "Hlasovat"
+    "read:pages": "Zhlédnutí stránky"
+    "write:pages": "Upravit stránky"
+    "write:user-groups": "Upravit uživatelskou skupinu"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "Poznámky sledujících se zobrazí ve vaší časové ose"
     explore: "Najít uživatele"
@@ -98,20 +113,27 @@ common:
     hide-contents: "Schovat obsah"
     reply-placeholder: "Odpovědět na tento příspěvek"
     quote-placeholder: "Citovat tento příspěvek"
+    quote-attached: "Přiložit citaci"
     submit: "Odeslat"
     reply: "Odpovědět"
     renote: "Renotovat"
-    attach-media-from-local: "Uplodovat soubor z vašeho zařízení"
+    posting: "Posílání"
+    attach-media-from-local: "Nahrát soubor z vašeho zařízení"
+    attach-media-from-drive: "Přiložit soubory z vašeho Drivu"
     insert-a-kao: "v('ω')v"
     create-poll: "Vytvořit anketu"
     text-remain: "zbývá ještě {} znaků"
     recent-tags: "Nejnovější"
+    local-only-message: "Publikovat zprávu pouze lokálně"
+    click-to-tagging: "Klikni pro otágování"
     visibility: "Viditelnost"
     geolocation-alert: "Vaše zařízení nedalo k dispozici lokaci"
     error: "Chyba"
     enter-username: "Zadejte své uživatelské jméno"
+    specified-recipient: "Pro"
     add-visible-user: "Přidat uživatele"
     username-prompt: "Zadejte své uživatelské jméno"
+    enter-file-name: "Upravit název souboru"
   weekday-short:
     sunday: "Ne"
     monday: "Po"
@@ -171,6 +193,7 @@ common:
     other: "Ostatní"
     appearance: "Vzhled"
     behavior: "Chování"
+    reactions: "Reakce"
     fetch-on-scroll: "Nekonečné načítaní posuvem"
     fetch-on-scroll-desc: "Pokud budete rolovat dolů po stránce, automaticky bude načten další obsah."
     note-visibility: "Viditelnost příspěvku"
@@ -178,6 +201,9 @@ common:
     remember-note-visibility: "Zapamatovat viditelnost příspěvků"
     web-search-engine: "Webové vyhledávače"
     web-search-engine-desc: "Například: https://www.google.com/?#q={{query}}"
+    paste: "Vložit"
+    pasted-file-name-desc: "Například: \"rrrr-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "Upravit název vloženého souboru"
     keep-cw: "Zachovat varování o obsahu"
     keep-cw-desc: "Při odpovědi na příspěvek bude varování o obsahu nastaveno stejně jako původní příspěvek."
     i-like-sushi: "Mam radši sushi (než puding)"
@@ -215,7 +241,7 @@ common:
     deck-column-width-wide: "Široké"
     use-shadow: "Používat v rozhraní stíny"
     rounded-corners: "Zakulatit rohy v rozhraní"
-    circle-icons: "Používat kulaté ikony"
+    circle-icons: "Používat kulaté avatary"
     contrasted-acct: "Přidat uživatelskému účtu kontrast"
     wallpaper: "Obrázek na pozadí"
     choose-wallpaper: "Zvolit pozadí"
@@ -261,6 +287,18 @@ common:
     load-raw-images: "Zobrazovat obrázky v původní kvalitě"
     load-remote-media: "Zobrazovat média ze vzdáleného serveru"
     sync: "Synchronizace"
+    save: "Uložit"
+    saved: "Uloženo"
+    preview: "Náhled"
+    room: "Místnost"
+    _room:
+      graphicsQuality: "Kvalita grafiky"
+      _graphicsQuality:
+        ultra: "Nejvyšší"
+        high: "Vysoká"
+        medium: "Střední"
+        low: "Nízká"
+        cheep: "Nejnižší"
   search: "Hledání"
   delete: "Odstranit"
   loading: "Načítám..."
@@ -353,13 +391,16 @@ common/views/components/games/reversi/reversi.vue:
     cancel: "Zrušit"
 common/views/components/games/reversi/reversi.game.vue:
   surrender: "Vzdát se"
+  surrendered: "Vzdaním se"
   looped-map: "Zacyklená mapa"
+  can-put-everywhere: "Lze položit kamkoliv"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
   sub-title: "Hrajte Reversi s Vašimi kamarády!"
   invite: "Pozvat"
   rule: "Jak hrát"
   mode-invite: "Pozvat"
+  invitations: "Jste pozvaní ke hře!"
   my-games: "Moje hra"
   all-games: "Všechny hry"
   enter-username: "Zadejte své uživatelské jméno"
@@ -386,6 +427,7 @@ common/views/components/connect-failed.vue:
   title: "Nelze se připojit k serveru"
   description: "Nastal problém s Vaším připojením k internetu, nebo server není dostupný nebo zrovna probíhá údržba. Prosím {zkuste to znova} za pár minut."
   thanks: "Děkujeme že jste použili Misskey."
+  troubleshoot: "Odstranění problémů"
 common/views/components/connect-failed.troubleshooter.vue:
   title: "Poradce při potížích"
   network: "Síťové připojení"
@@ -394,12 +436,15 @@ common/views/components/connect-failed.troubleshooter.vue:
   checking-internet: "Ověřuji připojení k internetu."
   server: "Připojení k serveru"
   checking-server: "Spojuji se se serverem"
+  finding: "Vyšetřování problému"
+  no-network: "Žádné připojení k síti"
   no-network-desc: "Ujistěte se že jste připojeni k Internetu."
   no-internet: "Nejste připojeni k internetu"
   no-internet-desc: "Jste připojen k síti, ale zdá se že stále chybí připojení k Internetu. Prosím zkontrolujte Vaše připojení k Internetu."
   no-server: "Nelze se připojit k serveru Misskey"
   success: "Úspěšně se podařilo spojit s Misskey serverem"
   flush: "Vyčistit mezipaměť"
+  set-version: "Vyberte verzi"
 common/views/components/media-banner.vue:
   sensitive: "Choulostivý obsah"
   click-to-show: "Klikněte pro zobrazení"
@@ -451,9 +496,13 @@ common/views/components/messaging.vue:
   no-history: "Žádná historie"
   user: "Uživatel"
   group: "Skupina"
+  start-with-user: "Zahájit konverzaci s uživatelem"
+  start-with-group: "Zahájit skupinovou konverzaci"
+  select-group: "Vybrat skupinu"
 common/views/components/messaging-room.vue:
   new-message: "Máte novou zprávu"
 common/views/components/messaging-room.form.vue:
+  input-message-here: "Sem zadejte zprávu"
   send: "Odeslat"
   attach-from-local: "Přiložit soubory z Vašeho zařízení"
 common/views/components/messaging-room.message.vue:
@@ -482,6 +531,7 @@ common/views/components/note-menu.vue:
   unpin: "Odepnout"
   delete: "Odstranit"
   delete-confirm: "Opravdu chcete smazat tento příspěvek?"
+  delete-and-edit: "Smazat a upravit"
   remote: "Ukázat originální poznámku"
 common/views/components/user-menu.vue:
   mention: "Zmínění"
@@ -520,6 +570,7 @@ common/views/components/poll-editor.vue:
   deadline-date: "Termín ukončení"
   deadline-time: "Doba trvání"
   interval: "Trvání"
+  unit: "Jednotka"
   second: "Sekunda"
   minute: "Minuta"
   hour: "Hodina"
@@ -537,6 +588,14 @@ common/views/components/emoji-picker.vue:
   objects: "Objekty"
   symbols: "Symboly"
   flags: "Vlajky"
+common/views/components/settings/app-type.vue:
+  title: "Režim"
+  intro: "Můžete vybrat zdali chcete použít stolní, nebo mobilní vzhled."
+  choices:
+    auto: "Vybrat vzhled automaticky"
+    desktop: "Vždy použít stolní vzhled"
+    mobile: "Vždy použít mobilní vzhled"
+  info: "Pro aktivování změn musíte znovu načíst stránky."
 common/views/components/signin.vue:
   username: "Přezdívka"
   password: "Heslo"
@@ -547,6 +606,7 @@ common/views/components/signin.vue:
   signin-with-github: "Přihlásit se pomocí účtu GitHub"
   signin-with-discord: "Přihlásit se pomocí účtu Discord"
   login-failed: "Nelze se přihlásit. Zkontrolujte prosím své uživatelské jméno a heslo."
+  enter-2fa-code: "Vložte Váš verifikační kód"
 common/views/components/signup.vue:
   invitation-code: "Kód pozvánky"
   invitation-info: "Pokud máte pozvánku, prosím kontaktujte <a href=\"{}\">administrátora</a>."
@@ -568,6 +628,7 @@ common/views/components/signup.vue:
   password-matched: "OK"
   password-not-matched: "Neshodují se"
   recaptcha: "Potvrzení"
+  agree-to: "Souhlasím s {0}."
   tos: "Podmínky užívání"
   create: "Vytvořit účet"
   some-error: "Pokus o vytvoření účtu selhal. Prosím zkuste to znovu."
@@ -584,8 +645,10 @@ common/views/components/notification-settings.vue:
   mark-as-read-all-unread-notes: "Označit všechny příspěvky za přečtené"
   mark-as-read-all-talk-messages: "Označit všechny zprávy za přečtené"
 common/views/components/integration-settings.vue:
+  title: "Integrace"
   connect: "Připojit"
   disconnect: "Odpojit"
+  connected-to: "Jste připojen k tomuto GitHub účtu"
 common/views/components/github-setting.vue:
   description: "Jakmile spojíte Váš GitHub účet s Vaším Misskey účtem, uvidíte informace o Vašem GitHub účtu na Vašem profilu a budete se moci přihlásit skrze GitHub."
   connected-to: "Je připojen k tomuto GitHub účtu"
@@ -605,6 +668,8 @@ common/views/components/uploader.vue:
 common/views/components/visibility-chooser.vue:
   public: "Veřejné"
   home: "Domů"
+  home-desc: "Poslat pouze na domovskou časovou osu"
+  specified: "Přímá"
   specified-desc: "Poslat pouze zmíněným uživatelům"
   local-public: "Veřejná (pouze místní)"
   local-public-desc: "Nepublikovat na vzdálených serverech"
@@ -639,6 +704,7 @@ common/views/components/profile-editor.vue:
   saved: "Profil byl úspěšně aktualizován"
   uploading: "Nahrávám"
   upload-failed: "Nahrávání selhalo"
+  unable-to-process: "Operace nemohla být dokončena."
   email: "Nastavení e-mailů"
   email-address: "Emailová adresa"
   email-verified: "Váš e-mail byl ověřen"
@@ -655,6 +721,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "Nebezpečná zóna"
   delete-account: "Smazat účet"
   account-deleted: "Váš účet byl smazán. Může chvilku trvat než zmizí všechna data."
+  profile-metadata: "Metadata profilu"
+  metadata-label: "Popis"
+  metadata-content: "Obsah"
 common/views/components/user-list-editor.vue:
   users: "Uživatel"
   rename: "Přejmenovat seznam"
@@ -685,12 +754,14 @@ common/views/components/user-groups.vue:
   group-name: "Název skupiny"
   owned-groups: "Moje skupiny"
   invites: "Pozvat"
+  accept-invite: "Přidat se"
   reject-invite: "Odmítnout"
 common/views/widgets/broadcast.vue:
   fetching: "Načítám"
   no-broadcasts: "Žádná nová oznámení"
   have-a-nice-day: "Přejeme Vám příjemný den!"
   next: "Další"
+  prev: "Předchozí"
 common/views/widgets/calendar.vue:
   year: "Rok {}"
   month: "{},"
@@ -699,6 +770,7 @@ common/views/widgets/calendar.vue:
   this-month: "Měsíc:"
   this-year: "Rok:"
 common/views/widgets/photo-stream.vue:
+  title: "Foto stream"
   no-photos: "Žádné obrázky"
 common/views/widgets/posts-monitor.vue:
   title: "Grafy příspěvků"
@@ -714,6 +786,8 @@ common/views/widgets/memo.vue:
   save: "Uložit"
 common/views/widgets/slideshow.vue:
   no-image: "V této složce nebyly nalezeny žádné fotky."
+common/views/widgets/tips.vue:
+  tips-line23: "Ai-chan kawaii!"
 common/views/pages/not-found.vue:
   page-not-found: "Stránka nenalezena"
 common/views/pages/follow.vue:
@@ -728,6 +802,7 @@ desktop:
   avatar: "Avatar"
   uploading-avatar: "Nahrál nový avatar"
   avatar-updated: "Vaše avatar byl aktualizován"
+  unable-to-process: "Operace nemohla být dokončena."
   invalid-filetype: "Tento formát souboru není podporován"
 desktop/views/components/activity.chart.vue:
   total: "Černá ... Celkem"
@@ -764,7 +839,7 @@ desktop/views/components/drive.file.vue:
     rename: "Přejmenovat"
     copy-url: "Kopírovat URL"
     download: "Stáhnout"
-    else-files: "Více..."
+    else-files: "Ostatní"
     set-as-avatar: "Nastavit jako avatar"
     set-as-banner: "Nastavit jako baner"
     open-in-app: "Otevřít v aplikaci"
@@ -782,7 +857,9 @@ desktop/views/components/drive.folder.vue:
     rename: "Přejmenovat"
     rename-folder: "Přejmenovat složku"
     input-new-folder-name: "Zadejte nové jméno"
+    else-folders: "Ostatní"
 desktop/views/components/drive.vue:
+  search: "Vyhledávání"
   empty-drive-description: "Klikněte pravým tlačítkem myši pro otevření menu, nebo sem přetáhněte soubor pro nahrání."
   empty-folder: "Tato složka je prázdná"
   unable-to-process: "Operace nemohla být dokončena."
@@ -798,10 +875,13 @@ desktop/views/components/drive.vue:
     url-upload: "Nahrát z URL"
 desktop/views/components/media-video.vue:
   click-to-show: "Klikněte pro zobrazení"
+desktop/views/components/followers.vue:
+  empty: "Vypadá to že Vás nikdo nesleduje."
 desktop/views/components/game-window.vue:
   game: "Reversi"
 desktop/views/components/home.vue:
   done: "Hotovo"
+  add-widget: "Přidat widget:"
   add: "Přidat"
 desktop/views/input-dialog.vue:
   cancel: "Zrušit"
@@ -809,6 +889,7 @@ desktop/views/input-dialog.vue:
 desktop/views/components/note-detail.vue:
   private: "Tento příspěvek je soukromý"
   deleted: "Tento příspěvek byl odstraněn"
+  location: "Lokace"
   renote: "Renotovat"
   add-reaction: "Přidat reakci"
   undo-reaction: "Odebrat reakci"
@@ -823,6 +904,8 @@ desktop/views/components/note.vue:
 desktop/views/components/notes.vue:
   error: "Načítání selhalo."
   retry: "Opakovat"
+desktop/views/components/notifications.vue:
+  empty: "Žádné nové notifikace!"
 desktop/views/components/post-form.vue:
   posted: "Odesláno!"
   replied: "Odpověděno!"
@@ -847,10 +930,29 @@ desktop/views/components/renote-form-window.vue:
 desktop/views/components/settings.2fa.vue:
   detail: "Více…"
   url: "https://www.google.cz/landing/2step/"
+  register: "Přidat zařízení"
+  already-registered: "Toto zařízení je již připojené"
+  unregister: "Odebrat"
+  enter-password: "Prosím zadejte heslo"
+  authenticator: "Nejprve musíte nainstalovat Google Authenticator na Vašem zařízení:"
+  howtoinstall: "Jak nainstalovat"
   token: "Token"
+  scan: "Poté naskenujte QR kód:"
+  done: "Prosím vložte kód zobrazený na Vašem zařízení:"
+  submit: "Uložit"
+  success: "Nastavení uloženo!"
+  failed: "Nepodařilo se spárovat. Prosím zkontrolujte správnost bezpečnostního kódu."
+  totp-header: "Ověřovací aplikace"
+  security-key-header: "Bezpečnostní klíč"
+  last-used: "Naposledy použito:"
+  activate-key: "Klikněte pro aktivaci bezpečnostního klíče"
+  security-key-name: "Název klíče"
+  key-unregistered: "Bezpečnostní klíč byl odstraněn"
 common/views/components/media-image.vue:
+  sensitive: "NSFW"
   click-to-show: "Klikněte pro zobrazení"
 common/views/components/api-settings.vue:
+  caution: "Nepoužívejte tento kód v žádné jiné aplikace nebo ho sdílejte s ostatními (jinak můžete ohrozit svojí bezpečnost)."
   token: "Token:"
   enter-password: "Prosím zadejte heslo"
   console:
@@ -906,6 +1008,7 @@ desktop/views/components/ui.header.account.vue:
   lists: "Seznamy"
   groups: "Skupiny"
   admin: "Administrace"
+  room: "Místnost"
 desktop/views/components/ui.header.nav.vue:
   game: "Hry"
 desktop/views/components/ui.header.notifications.vue:
@@ -931,20 +1034,48 @@ admin/views/index.vue:
   announcements: "Oznámení"
   queue: "Fronta úloh"
   logs: "Logy"
+  db: "Databáze"
   back-to-misskey: "Zpět na Misskey"
+admin/views/db.vue:
+  tables: "Tabulky"
+  vacuum: "Vysavač"
+  vacuum-info: "Uklidí databázi. Neohrozí data a sníží využití disku. Tohle se děje automaticky a opakovaně."
+  vacuum-exclamation: "Vysavač může dočasně přetížit databázi a dočasně omezit akce uživatelů."
 admin/views/dashboard.vue:
+  dashboard: "Kontrolní panel"
   accounts: "Účty"
   notes: "Poznámky"
   drive: "Disk"
   instances: "Instance"
   this-instance: "Tato instance"
   federated: "Z fedivesmíru"
+admin/views/queue.vue:
+  title: "Ve frontě"
+  remove-all-jobs: "Vyčistit frontu"
+  jobs: "Úkoly"
+  queue: "Ve frontě"
+  domains:
+    inbox: "Obdržené"
+    db: "Databáze"
+  states:
+    active: "V procesu"
+    delayed: "Naplánováno"
+    waiting: "Ve frontě"
+  result-is-truncated: "Zkrácený výsledek"
 admin/views/logs.vue:
   logs: "Logy"
+  domain: "Doména"
+  level: "Úroveň"
   levels:
+    all: "Vše"
     info: "Informace"
+    success: "Podařilo se"
+    warning: "Varování"
     error: "Chyba"
+    debug: "Debug"
+  delete-all: "Smazat vše"
 admin/views/abuse.vue:
+  target: "Cíl"
   details: "Popis"
   remove-report: "Odstranit"
 admin/views/instance.vue:
@@ -952,17 +1083,33 @@ admin/views/instance.vue:
   instance-name: "Název instance"
   instance-description: "Popis instance"
   host: "Hostitel"
+  icon-url: "URL ikonky"
+  logo-url: "URL loga"
   banner-url: "URL pro baner"
+  error-image-url: "URL pro chybový obrázek"
   languages: "Jazyk této instance"
   languages-desc: "Můžete nastavit více než jeden, oddělte mezerami."
+  tos-url: "URL pro smluvní podmínky"
+  repository-url: "URL adresa repositáře"
+  feedback-url: "URL pro zpětnou vazbu"
   maintainer-config: "Informace o administrátorovi"
   maintainer-name: "Jméno administrátora"
   maintainer-email: "Kontakt na administrátora"
+  advanced-config: "Další nastavení"
+  object-storage-base-url: "URL"
+  object-storage-prefix: "Předpona"
   object-storage-endpoint: "Endpoint"
+  object-storage-region: "Region"
+  object-storage-port: "Port"
+  object-storage-access-key: "Přístupový klíč"
+  object-storage-secret-key: "Tajný Klíč (Secret Key)"
+  object-storage-use-ssl: "Použít SSL"
+  object-storage-s3-info-here: "zde"
   mb: "V megabajtech"
   recaptcha-config: "nastavení služby reCAPTCHA"
   recaptcha-info: "reCAPTCHA token je povinný. Můžete jej získat na https://www.google.com/recaptcha/intro/"
   enable-recaptcha: "povolit reCAPTCHA"
+  recaptcha-secret-key: "Tajný Klíč (Secret Key)"
   recaptcha-preview: "Náhled"
   twitter-integration-config: "Nastavení spojení s Twitterem"
   twitter-integration-info: "The callback URL is set on {url}."
@@ -1035,6 +1182,8 @@ admin/views/users.vue:
   reset-password-confirm: "Opravdu chcete resetovat Vaše heslo?"
   password-updated: "Heslo je nyní \"{password}\""
   update-remote-user: "Aktualizovat informace o vzdáleném účtu"
+  username: "Přezdívka"
+  host: "Hostitel"
   users:
     title: "Uživatel"
     state:
@@ -1051,6 +1200,11 @@ admin/views/users.vue:
 admin/views/moderators.vue:
   add-moderator:
     title: "Vytvořit moderátora"
+  logs:
+    title: "Logy"
+    moderator: "Moderátoři"
+    type: "Operace"
+    info: "Informace"
 admin/views/emoji.vue:
   add-emoji:
     title: "Přidat emoji"
@@ -1154,6 +1308,9 @@ desktop/views/widgets/notifications.vue:
   title: "Oznámení"
 desktop/views/widgets/polls.vue:
   title: "Ankety"
+  nothing: "Žádné nové notifikace!"
+desktop/views/widgets/trends.vue:
+  nothing: "Žádné nové notifikace!"
 desktop/views/widgets/users.vue:
   title: "Doporučení uživatelé"
 mobile/views/components/drive.vue:
@@ -1196,6 +1353,8 @@ mobile/views/components/note-sub.vue:
   admin: "admin"
   bot: "bot"
   cat: "kočka"
+mobile/views/components/notifications.vue:
+  empty: "Žádné nové notifikace!"
 mobile/views/components/sub-note-content.vue:
   private: "Tento příspěvek je soukromý"
   deleted: "Tento příspěvek byl odstraněn"
@@ -1239,9 +1398,12 @@ mobile/views/pages/note.vue:
 mobile/views/pages/games/reversi.vue:
   reversi: "Reversi"
 mobile/views/pages/search.vue:
+  search: "Vyhledávání"
   not-found: "Pro '{q}' nebyly nalezeny žádné příspěvky."
 mobile/views/pages/selectdrive.vue:
   select-file: "Vybrat soubory"
+mobile/views/pages/notifications.vue:
+  notifications: "Oznámení"
 mobile/views/pages/user/home.vue:
   activity: "Aktivita"
   frequently-replied-users: "Častá zmínění"
@@ -1265,6 +1427,8 @@ deck/deck.user-column.vue:
 dev/views/new-app.vue:
   app-name-desc: "Jméno vaší aplikace"
 pages:
+  pin-this-page: "Připnout"
+  unpin-this-page: "Odepnout"
   like: "Lajk"
   title: "Titulek"
   blocks:
@@ -1286,6 +1450,8 @@ pages:
       _action:
         _dialog:
           content: "Obsah"
+    _radioButton:
+      title: "Titulek"
   script:
     categories:
       random: "Náhodně"
@@ -1306,3 +1472,10 @@ pages:
         arg1: "Seznamy"
     types:
       array: "Seznamy"
+room:
+  translate: "Přesunout"
+  save: "Uložit"
+  saved: "Uloženo"
+  furnitures:
+    moon: "Měsíc"
+    bin: "Koš"

locales/da-DK.yml

@@ -18,9 +18,6 @@ common:
     drive: "Drev"
     drive-desc: "Vil du poste et billede, som du tidligere har uploadet? Har du brug for at navngive filer og organisere dem i mapper, som du selv har navngivet? Så er Misskey Drev den bedste løsning for dig. Den gør det så let som ingenting at dele dine filer online."
     outro: "Tjek Misskey's unikke funktioner ved at se dem med dine egne øjne. Hvis du kommer frem til, at den ene server ikke er noget for dig, så kan du prøve en anden. Misskey er et decentraliseret SNS, så du kan lettere finde frem til brugere, som du klikker med. God fornøjelse!"
-  adblock:
-    detected: "Her kan du deaktivere ad blocker."
-    warning: "Visse funktioner kan forsvinde eller medføre forstyrrelser, hvis ad blocking er aktiveret. <strong>Misskey kører ikke annoncer</strong>."
   application-authorization: "Adgangsstyring"
   close: "Luk"
   do-not-copy-paste: "Undgå venligst at skrive eller klistre kode ind her. I modsat fald kan din konto blive kompromitteret."
@@ -35,6 +32,13 @@ common:
   signout: "Log ud"
   reload-to-apply-the-setting: "Denne indstilling slår først igennem, når du har genindlæst siden. Vil du genindlæse siden nu?"
   fetching-as-ap-object: "Tilladelse til sammenkobling"
+  delete-confirm: "Er du helt sikker på, at du vil slette denne post?"
+  notification-types:
+    all: "Alle"
+    follow: "Følger"
+    reply: "Svar"
+    renote: "Gen-postering"
+    reaction: "Reaktion"
   got-it: "Det er OK"
   customization-tips:
     title: "Tips om tilpasning"
@@ -162,6 +166,7 @@ common:
     other: "Andet"
     appearance: "Udseende"
     behavior: "Opførsel"
+    reactions: "Reaktion"
     fetch-on-scroll: "Uendeligt scroll"
     fetch-on-scroll-desc: "Når du scroller ned ad siden, hentes der automatisk nyt indhold ind"
     note-visibility: "Post synlighed"
@@ -206,7 +211,7 @@ common:
     deck-column-width-wide: "Bred"
     use-shadow: "Vis skygger"
     rounded-corners: "Vis afrundede hjørner"
-    circle-icons: "Anvend cykliske ikoner"
+    circle-icons: "Anvend cykliske avatar"
     contrasted-acct: "Tilføj kontrast til brugerkontoen"
     wallpaper: "Baggrundsbillede"
     choose-wallpaper: "Vælg en baggrund"
@@ -251,6 +256,9 @@ common:
     disable-via-mobile: "Marker aldrig posten som \"fra mobil\""
     load-raw-images: "Vis vedhæftede bilag i original kvalitet"
     load-remote-media: "Vis medie-materiale fra en ekstern server"
+    save: "Gem"
+    saved: "Gemt"
+    preview: "Før-visning"
   search: "Søg"
   delete: "Slet"
   loading: "Henter"
@@ -568,6 +576,8 @@ common/views/components/emoji-picker.vue:
   objects: "Objekt"
   symbols: "Symboler"
   flags: "Flag"
+common/views/components/settings/app-type.vue:
+  info: "Du er nødt til at genindlæse siden, før ændringerne slår igennem."
 common/views/components/signin.vue:
   username: "Brugernavn"
   password: "Adgangskode"
@@ -669,7 +679,7 @@ common/views/components/profile-editor.vue:
   you-can-include-hashtags: "Du må gerne bruge hashtags i din profil beskrivelse"
   language: "Sprog"
   birthday: "Fødselsdag"
-  avatar: "Ikon"
+  avatar: "Avatar"
   banner: "Banner"
   is-cat: "Denne konto er en Kat"
   is-bot: "Denne konto er en Bot"
@@ -682,6 +692,7 @@ common/views/components/profile-editor.vue:
   saved: "Profil er opdateret med succes"
   uploading: "Overfører"
   upload-failed: "Fejl ved overførsel"
+  unable-to-process: "Handlingen kunne ikke gennemføres."
   email: "Email indstillinger"
   email-address: "Email adresse"
   email-verified: "Din email er blevet bekræftet"
@@ -701,6 +712,7 @@ common/views/components/profile-editor.vue:
   danger-zone: "Risici"
   delete-account: "Slet kontoen"
   account-deleted: "Kontoen er slettet. Det kan vare lidt, inden alle data forsvinder."
+  metadata-content: "Indhold"
 common/views/components/user-list-editor.vue:
   users: "Bruger"
   rename: "Omdøb listen"
@@ -807,6 +819,7 @@ desktop:
   uploading-avatar: "Overfør en ny avatar"
   avatar-updated: "Avatar er overført med succes"
   choose-avatar: "Vælg et billede til din avatar"
+  unable-to-process: "Handlingen kunne ikke gennemføres."
   invalid-filetype: "Denne filtype kan ikke benyttes her"
 desktop/views/components/activity.chart.vue:
   total: "Sort ... Total"
@@ -847,7 +860,7 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "Fjern markering som 'følsom'"
     copy-url: "Kopier webadresse"
     download: "Download"
-    else-files: "Andre"
+    else-files: "Avanceret"
     set-as-avatar: "Vælg som avatar"
     set-as-banner: "Vælg som banner"
     open-in-app: "Åbn i app"
@@ -866,6 +879,7 @@ desktop/views/components/drive.folder.vue:
     rename: "Omdøb"
     rename-folder: "Omdøb mappe"
     input-new-folder-name: "Angiv nyt navn"
+    else-folders: "Avanceret"
 desktop/views/components/drive.vue:
   search: "Søg"
   empty-draghover: "Smid det her! Fordi du ved, at jeg er meget sød, ikke?"
@@ -995,6 +1009,7 @@ common/views/components/drive-settings.vue:
   max: "Kapacitet"
   in-use: "I brug"
   stats: "Statistik"
+  default-upload-folder-name: "Mappe(r)"
 common/views/components/mute-and-block.vue:
   mute-and-block: "Annuller / Bloker"
   mute: "Annuller"
@@ -1004,6 +1019,8 @@ common/views/components/mute-and-block.vue:
   word-mute: "Ordfilter"
   muted-words: "Frafiltrerede ord"
   muted-words-description: "Mellemrum mellem ord vil blive håndteret, som om der står AND i mellem ordene i søgningen (dvs. alle ord skal være til stede). Linjeskift mellem ord vil føre til, at der søges med OR mellem ordene (dvs. kun det ene af ordene behøver være til stede)."
+  unmute-confirm: "Er du sikker på, at du vil fjerne annulleringen af denne bruger?"
+  unblock-confirm: "Er du sikker på, at du vil fjerne blokeringen af denne bruger?"
   save: "Gem"
 common/views/components/password-settings.vue:
   reset: "Skift adgangskode"
@@ -1139,7 +1156,6 @@ admin/views/instance.vue:
   object-storage-s3-info-here: "Her"
   object-storage-gcs-info: "Når du bruger Google Cloud Storage som eksternt lager, skal du indstille \"Terminal\" til storage.googleapis.com og forlade feltet \"Region\"."
   cache-remote-files: "Cache eksterne filer"
-  cache-remote-files-desc: "Hvis du deaktiverer denne indstilling, kan du linke direkte uden at gemme eksterne filer her. Dermed sparer du plads på din egen server. Til gengæld bliver linksene til de eksterne filer usynlige for brugere, som har deaktiveret direkte links, fordi der ikke vises miniature-billeder. Alt i alt anbefales det at aktivere denne indstilling."
   local-drive-capacity-mb: "Kapacitet på hver lokal brugers drev"
   remote-drive-capacity-mb: "Kapacitet på hver ekstern brugers drev"
   mb: "I megabytes (MB)"
@@ -1272,6 +1288,8 @@ admin/views/users.vue:
   remote-user-updated: "Informationen om den eksterne bruger er nu blevet opdateret."
   delete-all-files: "Slet alle filer"
   delete-all-files-confirm: "Er du sikker på, at alle filerne skal slettes?"
+  username: "Brugernavn"
+  host: "Vært"
   users:
     title: "Bruger"
     sort:
@@ -1302,6 +1320,11 @@ admin/views/moderators.vue:
     added: "Redaktør er oprettet"
     remove: "Fjern"
     removed: "Redaktøren er nu fjernet"
+  logs:
+    title: "Logs"
+    moderator: "Redaktører"
+    type: "Drift"
+    info: "Information"
 admin/views/emoji.vue:
   add-emoji:
     title: "Tilføj emoji"
@@ -1590,6 +1613,8 @@ mobile/views/pages/search.vue:
   not-found: "Ingen poster fundet for \"{q}\""
 mobile/views/pages/selectdrive.vue:
   select-file: "Vælg fil(er)"
+mobile/views/pages/notifications.vue:
+  notifications: "Notifikationer"
 mobile/views/pages/settings.vue:
   signed-in-as: "Logget ind som {}"
 mobile/views/pages/user.vue:
@@ -1664,6 +1689,8 @@ dev/views/new-app.vue:
   app-name: "Navn på app"
   app-name-placeholder: "F.eks. Misskey for iOS"
 pages:
+  pin-this-page: "Tilknyt til din profil"
+  unpin-this-page: "Fjern tilknytning til din profil"
   like: "Synes om"
   title: "Titel"
   blocks:
@@ -1709,6 +1736,10 @@ pages:
         _dialog:
           content: "Indhold"
         resetRandom: "Nulstil tilfældigt tal"
+    _radioButton:
+      name: "Variabel navn"
+      title: "Titel"
+      default: "Standard værdi"
   script:
     categories:
       flow: "Kontrol"
@@ -1765,6 +1796,8 @@ pages:
       _mod:
         arg1: "A"
         arg2: "B"
+      _round:
+        arg1: "Tal"
       eq: "A og B er ens"
       _eq:
         arg1: "A"
@@ -1879,3 +1912,10 @@ pages:
     enviromentVariables: "Miljø variabel"
     pageVariables: "Side element"
     argVariables: "Input slot"
+room:
+  translate: "Flyt"
+  save: "Gem"
+  saved: "Gemt"
+  furnitures:
+    moon: "Måne"
+    bin: "Skraldespand"

locales/de-DE.yml

@@ -18,9 +18,6 @@ common:
     drive: "Drive"
     drive-desc: "Du willst ein hochgeladenes Foto nochmal posten? Deine Dateien benennen und in Ordnern sortieren? Misskeys Drive ist der beste Ort dafür. Damit wird das Teilen zum Kinderspiel!"
     outro: "Probiere Misskey aus und entdecke Misskeys einzigartige Funktionen. Wenn dir diese Instanz nicht zusagt, nimm einfach eine andere. Dank Misskeys dezentralem System kannst du dich überall mit deinen Freunden verbinden. Also dann, GLHF!"
-  adblock:
-    detected: "Bitte deaktiviere den Werbeblocker."
-    warning: "<strong>Misskey hat keine Werbung.</strong> Allerdings können Werbeblocker für unerwartete Probleme und fehlende Funktionen sorgen."
   application-authorization: "Autorisierte Anwendungen"
   close: "Schließen"
   do-not-copy-paste: "Bitte keinen Code einfügen. Ihr Account könnte gefährdet werden."
@@ -35,6 +32,10 @@ common:
   signout: "Ausloggen"
   reload-to-apply-the-setting: "Die Seite muss zum Übernehmen dieser Einstellung aktualisiert werden. Soll die Seite jetzt neu geladen werden?"
   fetching-as-ap-object: "Hole Daten…"
+  delete-confirm: "Diesen Beitrag löschen?"
+  notification-types:
+    reply: "Antworten"
+    renote: "Anmerkung"
   got-it: "Verstanden!"
   customization-tips:
     title: "Anpassung-Tipps"
@@ -203,7 +204,7 @@ common:
     deck-column-width-wide: "Sehr breit"
     use-shadow: "Nutze Schatten"
     rounded-corners: "Abgerundete Ecken"
-    circle-icons: "Kreisförmige Icons"
+    circle-icons: "Kreisförmige Avatar"
     contrasted-acct: "Nutzernamen kontrastreicher darstellen"
     wallpaper: "Hintergrund"
     choose-wallpaper: "Hintergrund auswählen"
@@ -248,6 +249,9 @@ common:
     disable-via-mobile: "Beitrag nicht als „vom Handy“ markieren"
     load-raw-images: "Anhänge in voller Größe laden"
     load-remote-media: "Zeige Inhalte von fremden Servern"
+    save: "Speichern"
+    saved: "Gespeichert"
+    preview: "Vorschau"
   search: "Suche"
   delete: "Löschen"
   loading: "Laden"
@@ -565,6 +569,7 @@ common/views/components/profile-editor.vue:
   avatar: "Avatar"
   banner: "Banner"
   save: "Speichern"
+  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
   export: "Exportieren"
   import: "Importieren"
   export-targets:
@@ -598,6 +603,8 @@ common/views/widgets/memo.vue:
   save: "Speichern"
 desktop:
   banner: "Banner"
+  avatar: "Avatar"
+  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
 desktop/views/components/activity.chart.vue:
   total: "Schwarz ... komplett"
   notes: "Blau ... Hinweise"
@@ -632,7 +639,6 @@ desktop/views/components/drive.file.vue:
     rename: "Umbenennen"
     copy-url: "URL kopieren"
     download: "Download"
-    else-files: "Anderes…"
     set-as-avatar: "Als Avatar festlegen"
     set-as-banner: "Setze als Banner"
     open-in-app: "In der App öffnen"
@@ -738,6 +744,7 @@ common/views/components/drive-settings.vue:
   in-use: "benutzt"
   stats: "Statistiken"
 common/views/components/mute-and-block.vue:
+  unmute-confirm: "Stummschaltung für diesen Nutzer aufheben?"
   save: "Speichern"
 desktop/views/components/sub-note-content.vue:
   private: "Dieser Beitrag ist privat"
@@ -783,6 +790,7 @@ admin/views/drive.vue:
     local: "Lokal"
   delete: "Löschen"
 admin/views/users.vue:
+  username: "Benutzername"
   users:
     origin:
       local: "Lokal"
@@ -872,6 +880,8 @@ mobile/views/pages/note.vue:
   next: "Nächster Kommentar"
 mobile/views/pages/search.vue:
   search: "Suchen"
+mobile/views/pages/notifications.vue:
+  notifications: "Benachrichtigungen"
 mobile/views/pages/user/home.vue:
   activity: "Aktivität"
   keywords: "Schlagwörter"
@@ -911,6 +921,8 @@ dev/views/new-app.vue:
   authority-desc: "Nur die hier eingetragenen Berechtigungen, werden per API zur Verfügung stehen."
   authority-warning: "Dies kann auch nach dem erstellen der Anwendung geändert werden, allerdings werden dann alle bisher generierten Token ungültig."
 pages:
+  pin-this-page: "An die Profilseite pinnen"
+  unpin-this-page: "Lösen"
   like: "Gefällt mir"
   blocks:
     post: "\"Neuer Beitrag\"-Formular"
@@ -934,3 +946,9 @@ pages:
         arg1: "Listen"
     types:
       array: "Listen"
+room:
+  save: "Speichern"
+  saved: "Gespeichert"
+  furnitures:
+    moon: "Mond"
+    bin: "Papierkorb"

locales/en-US.yml

@@ -12,15 +12,12 @@ common:
     rich-contents: "Post"
     rich-contents-desc: "Just post your idea, hot topics, and anything you want to share. You may want to decorate your words, attach your favorite pictures, send files, including videos, or create a poll - those are some of the things you can do with Misskey!"
     reaction: "Reactions"
-    reaction-desc: "The easiest way to express your emotions. Misskey allows you to add various kinds of reactions to other's posts. The emotional experience on Misskey will never be on other SNSs, which are only able to push “likes”."
+    reaction-desc: "The easiest way to express your emotions. Misskey allows you to add various reactions to posts. Other SNSs only have a \"like\" reaction."
     ui: "Interface"
     ui-desc: "No single UI can suit everyone. Therefore, Misskey has a highly customizable UI for your tastes. You can make your home original by editing the layout of your timeline, and moving around selectable widgets that you can easily adjust to make this place your own."
     drive: "Drive"
     drive-desc: "Wanna post a picture you have already uploaded? Wish to organize, name and create a folder for your uploaded files? Misskey Drive is the best solution for you. Very easy to share your files online."
     outro: "Check Misskey-unique features by seeing them with your own eyes! If you feel like this instance is not for you, try other instances, as Misskey is a decentralized SNS, so that you can easily find your mates. Then, GLHF!"
-  adblock:
-    detected: "Please disable ad blocker."
-    warning: "Some features may be unavailable or cause malfunctions if ad blocking features are enabled. <strong>Misskey is not running ads</strong>."
   application-authorization: "Application authorizations"
   close: "Close"
   do-not-copy-paste: "Please do not enter or paste the code here. Account may be compromised."
@@ -30,11 +27,25 @@ common:
   customize-home: "Customize home layout"
   featured-notes: "Featured notes"
   dark-mode: "Dark Mode"
-  signin: "Log In"
+  signin: "Login"
   signup: "Sign up"
   signout: "Logout"
   reload-to-apply-the-setting: "You'll need to reload the page to reflect this setting. Do you want to reload it now?"
-  fetching-as-ap-object: "Inquiring to union"
+  fetching-as-ap-object: "Inquiring to fediverse"
+  unfollow-confirm: "Do you want to unfollow {name}?"
+  delete-confirm: "Are you sure you want to delete this post?"
+  signin-required: "Please login"
+  notification-type: "Notification Type"
+  notification-types:
+    all: "All"
+    pollVote: "Votes"
+    follow: "Following"
+    receiveFollowRequest: "Follow requests"
+    reply: "Reply"
+    quote: "Quote"
+    renote: "Renote"
+    mention: "Mentions"
+    reaction: "Reaction"
   got-it: "Got it!"
   customization-tips:
     title: "Customization tips"
@@ -80,7 +91,7 @@ common:
     "write:drive": "Work with the Drive"
     "read:favorites": "View Favorites"
     "write:favorites": "Work with Favorites"
-    "read:following": "View Follower info"
+    "read:following": "View your Follow info"
     "write:following": "Work with Follow info"
     "read:messaging": "View Messaging"
     "write:messaging": "Work with Messaging"
@@ -92,6 +103,12 @@ common:
     "read:reactions": "View reactions"
     "write:reactions": "Work with reactions"
     "write:votes": "Vote"
+    "read:pages": "View Pages"
+    "write:pages": "Update Pages"
+    "read:page-likes": "View Likes on Pages"
+    "write:page-likes": "Update Likes on Pages"
+    "read:user-groups": "View User groups"
+    "write:user-groups": "Edit User groups"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "Following users will show their posts in your timeline."
     explore: "Find users"
@@ -119,9 +136,11 @@ common:
     geolocation-alert: "Your device does not provide location services"
     error: "Error"
     enter-username: "Please enter username"
+    specified-recipient: "Recipient"
     add-visible-user: "Add a user"
     cw-placeholder: "Comments for the post (optional)"
     username-prompt: "Please enter username"
+    enter-file-name: "Edit file name"
   weekday-short:
     sunday: "S"
     monday: "M"
@@ -181,6 +200,8 @@ common:
     other: "Other"
     appearance: "Appearance"
     behavior: "Behavior"
+    reactions: "Reaction"
+    reactions-description: "Customize Emojis of Reaction picker delimited by line breaks"
     fetch-on-scroll: "Endless loading on scroll"
     fetch-on-scroll-desc: "When you scroll down the page, it automatically fetches additional content."
     note-visibility: "Post visibility"
@@ -188,6 +209,11 @@ common:
     remember-note-visibility: "Remember post visibility"
     web-search-engine: "Web search engine"
     web-search-engine-desc: "Example: https://www.google.com/?#q={{query}}"
+    paste: "Paste"
+    pasted-file-name: "Template for pasted file name"
+    pasted-file-name-desc: "Example: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "Edit the pasted file name"
+    paste-dialog-desc: "Display a dialog to edit the file name when you paste a file."
     keep-cw: "Preserve content warning"
     keep-cw-desc: "When replying to a post, the same content warning is set by default to the reply, as has been set by the original post."
     i-like-sushi: "I prefer sushi rather than pudding"
@@ -195,6 +221,7 @@ common:
     use-avatar-reversi-stones: "Use avatar as a stone in reversi"
     disable-animated-mfm: "Disable animated texts in a post"
     disable-showing-animated-images: "Do not play animated images"
+    enable-quick-notification-view: "Enable Quick Notification View"
     suggest-recent-hashtags: "Show recent popular hashtags on the post form"
     always-show-nsfw: "Always show NSFW contents"
     always-mark-nsfw: "Always mark posts with media attachments as NSFW"
@@ -225,7 +252,7 @@ common:
     deck-column-width-wide: "Wide"
     use-shadow: "Use shadows in the UI"
     rounded-corners: "Round the corners of the UI"
-    circle-icons: "Use circular icons"
+    circle-icons: "Use circular avatar icon"
     contrasted-acct: "Add contrast to user account"
     wallpaper: "Background image"
     choose-wallpaper: "Choose a background"
@@ -271,8 +298,21 @@ common:
     load-raw-images: "Show attached images in original quality"
     load-remote-media: "Show media from a remote server"
     sync: "Sync"
+    save: "Save"
+    saved: "Saved"
+    preview: "Preview"
     home-profile: "Home profile"
     deck-profile: "Deck profile"
+    room: "Room"
+    _room:
+      graphicsQuality: "Graphics Quality"
+      _graphicsQuality:
+        ultra: "Ultra"
+        high: "High"
+        medium: "Medium"
+        low: "Low"
+        cheep: "Cheep"
+      useOrthographicCamera: "Use Orthographic Camera"
   search: "Search"
   delete: "Delete"
   loading: "Loading"
@@ -353,10 +393,15 @@ common/views/pages/explore.vue:
   popular-users: "Popular users"
   recently-updated-users: "Recently active users"
   recently-registered-users: "Users who joined recently"
+  recently-discovered-users: "Recently Discovered Users"
   popular-tags: "Popular Tags"
   federated: "From the fediverse"
   explore: "Explore {host}"
+  explore-fediverse: "Explore Fediverse"
   users-info: "Currently, {users} users are registered here"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users} reacted with {reaction}"
+  many-users: "{users}, and {omitted} more reacted with {reaction}"
 common/views/components/url-preview.vue:
   enable-player: "Enable playback"
   disable-player: "Close the player"
@@ -522,6 +567,8 @@ common/views/components/note-menu.vue:
   unpin: "Unpin"
   delete: "Delete"
   delete-confirm: "Are you sure you want to delete this post?"
+  delete-and-edit: "Delete and Edit"
+  delete-and-edit-confirm: "Are you sure you want to delete this note and edit it? You will lose all reactions, renotes and replies to it."
   remote: "Show original note"
   pin-limit-exceeded: "You can't pin any more posts."
 common/views/components/user-menu.vue:
@@ -583,7 +630,9 @@ common/views/components/reaction-picker.vue:
   choose-reaction: "Send a reaction"
   input-reaction-placeholder: "or input Emoji"
 common/views/components/emoji-picker.vue:
+  recent-emoji: "Recently used"
   custom-emoji: "Custom Emoji"
+  no-category: "Uncategorized"
   people: "People"
   animals-and-nature: "Animals & Nature"
   food-and-drink: "Food & drink"
@@ -592,6 +641,14 @@ common/views/components/emoji-picker.vue:
   objects: "Objects"
   symbols: "Symbols"
   flags: "Flags"
+common/views/components/settings/app-type.vue:
+  title: "Mode"
+  intro: "You can specify whether you want to use the desktop, or the mobile layout."
+  choices:
+    auto: "Choose layout automatically"
+    desktop: "Always use the desktop layout"
+    mobile: "Always use the mobile layout"
+  info: "You need to reload the page for the changes to take effect."
 common/views/components/signin.vue:
   username: "Username"
   password: "Password"
@@ -601,7 +658,7 @@ common/views/components/signin.vue:
   signin-with-twitter: "Log in with Twitter"
   signin-with-github: "Sign in with GitHub"
   signin-with-discord: "Sign in with Discord"
-  login-failed: "Logging in has failed. Make sure you have entered the correct username and password."
+  login-failed: "Unable to log in. The username or password you entered is incorrect."
   tap-key: "Click on the Security Key to log in"
   enter-2fa-code: "Enter your verification code"
 common/views/components/signup.vue:
@@ -647,7 +704,7 @@ common/views/components/integration-settings.vue:
   title: "Service cooperation"
   connect: "Connect"
   disconnect: "Disconnect"
-  connected-to: "You are connected to next account"
+  connected-to: "You are connected to this account"
 common/views/components/github-setting.vue:
   description: "Once you connect your GitHub account to your Misskey account, you will be able to see information about your GitHub account on your profile, and you will be able to sign-in via GitHub."
   connected-to: "You are connected to this GitHub account"
@@ -695,7 +752,7 @@ common/views/components/profile-editor.vue:
   you-can-include-hashtags: "You can also include hashtags in your profile description."
   language: "Language"
   birthday: "Birthday"
-  avatar: "Icon"
+  avatar: "Avatar"
   banner: "Banner"
   is-cat: "This account is a Cat"
   is-bot: "This account is a Bot"
@@ -708,6 +765,9 @@ common/views/components/profile-editor.vue:
   saved: "Profile updated successfully"
   uploading: "Uploading"
   upload-failed: "Failed to upload"
+  unable-to-process: "The operation could not be completed."
+  avatar-not-an-image: "The file you specified as an avatar is not an image"
+  banner-not-an-image: "The file you specified as a banner is not an image"
   email: "Email settings"
   email-address: "Email Address"
   email-verified: "Your email has been verified."
@@ -727,6 +787,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "Cautious options"
   delete-account: "Remove the account"
   account-deleted: "The account has been deleted. It may take some time until all of the data disappears."
+  profile-metadata: "Profile metadata"
+  metadata-label: "Label"
+  metadata-content: "Content"
 common/views/components/user-list-editor.vue:
   users: "User"
   rename: "Rename list"
@@ -765,6 +828,7 @@ common/views/widgets/broadcast.vue:
   no-broadcasts: "No announcements"
   have-a-nice-day: "Have a nice day!"
   next: "Next"
+  prev: "Previous"
 common/views/widgets/calendar.vue:
   year: "Year {}"
   month: "{},"
@@ -836,6 +900,7 @@ desktop:
   uploading-avatar: "Uploading a new avatar"
   avatar-updated: "Successfully updated the avatar"
   choose-avatar: "Select an image for the avatar"
+  unable-to-process: "The operation could not be completed."
   invalid-filetype: "This filetype is not acceptable here"
 desktop/views/components/activity.chart.vue:
   total: "Black ... Total"
@@ -876,8 +941,8 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "Unmark as 'sensitive'"
     copy-url: "Copy URL"
     download: "Download"
-    else-files: "Others"
-    set-as-avatar: "Set as an avatar"
+    else-files: "Other"
+    set-as-avatar: "Set as avatar"
     set-as-banner: "Set as a banner"
     open-in-app: "Open in app"
     add-app: "Add app"
@@ -886,15 +951,20 @@ desktop/views/components/drive.file.vue:
     copied: "Copied"
     copied-url-to-clipboard: "URL has been copied to clipboard"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "Default Upload location"
   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."
   unhandled-error: "Unknown error"
+  unable-to-delete: "Unable to delete"
+  has-child-files-or-folders: "Since this folder is not empty, it can not be deleted."
   contextmenu:
     move-to-this-folder: "Move to this folder"
     show-in-new-window: "Open in new window"
     rename: "Rename"
     rename-folder: "Rename folder"
     input-new-folder-name: "Enter new name"
+    else-folders: "Other"
+    set-as-upload-folder: "Set as default upload folder"
 desktop/views/components/drive.vue:
   search: "Search"
   empty-draghover: "Drop it here! Yep, cuz you know I'm cute, right?"
@@ -987,7 +1057,7 @@ desktop/views/components/settings.2fa.vue:
   url: "https://www.google.com/landing/2step/"
   caution: "If you lose access to your registered device, you won't be able to connect to Misskey anymore!"
   register: "Register a device"
-  already-registered: "Your account is currently registered to an authenticator application"
+  already-registered: "This device is already registered"
   unregister: "Unregister"
   unregistered: "Two-factor authentication has been disabled."
   enter-password: "Enter the password"
@@ -1009,6 +1079,7 @@ desktop/views/components/settings.2fa.vue:
   register-security-key: "Complete Key registration"
   something-went-wrong: "Wow! There was a problem registering the Key:"
   key-unregistered: "The Key has been deleted"
+  use-password-less-login: "Use Password-less login"
 common/views/components/media-image.vue:
   sensitive: "NSFW"
   click-to-show: "Click to show"
@@ -1033,6 +1104,9 @@ common/views/components/drive-settings.vue:
   max: "Max"
   in-use: "In use"
   stats: "Statistics"
+  default-upload-folder: "Default upload folder location"
+  default-upload-folder-name: "Folder(s)"
+  change-default-upload-folder: "Change folder"
 common/views/components/mute-and-block.vue:
   mute-and-block: "Mute / Block"
   mute: "Mute"
@@ -1042,6 +1116,8 @@ common/views/components/mute-and-block.vue:
   word-mute: "Word mute"
   muted-words: "Muted keywords"
   muted-words-description: "Separating with spaces results in AND specifications, and delimiting with line breaks results in OR specifications"
+  unmute-confirm: "Are you certain that you want to unmute this user?"
+  unblock-confirm: "Are you certain that you want to unblock this user?"
   save: "Save"
 common/views/components/password-settings.vue:
   reset: "Change password"
@@ -1086,6 +1162,7 @@ desktop/views/components/ui.header.account.vue:
   groups: "Groups"
   follow-requests: "Follow requests"
   admin: "Admin"
+  room: "Room"
 desktop/views/components/ui.header.nav.vue:
   game: "Games"
 desktop/views/components/ui.header.notifications.vue:
@@ -1202,7 +1279,9 @@ admin/views/instance.vue:
   object-storage-s3-info-here: "here"
   object-storage-gcs-info: "If you are going to use Google Cloud Storage as Object Storage, Set the 'Endpoint' as storage.googleapis.com, and keep the 'Region' is blank."
   cache-remote-files: "Cache remote files"
-  cache-remote-files-desc: "Without this parameter, all remote files are linked to their host server directly. This will be an effective solution to save your server storage, however make remote files invisible to users who set direct-link disabled, since no thumbnail will be generated, increase traffic. It is recommended that this parameter set enabled."
+  cache-remote-files-desc: "If disabled, All remote files going to be linked to their origin server directly. This will be an effective solution to save your server storage. However, Since no thumbnail will be generated, It will make increasing data usage, and also may remote files are invisible to users who set direct-link disabled. It is recommended that this config set enabled or enabling the next config, 'Proxy remote files'."
+  proxy-remote-files: "Proxy remote files"
+  proxy-remote-files-desc: "If enabled, Remote files that not stored locally or deleted by storage overusage will be proxied locally and also thumbnails will be generated."
   local-drive-capacity-mb: "Volume of Drive per user"
   remote-drive-capacity-mb: "Volume of Drive per remote user"
   mb: "In megabytes"
@@ -1232,7 +1311,7 @@ admin/views/instance.vue:
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
   proxy-account-config: "Proxy account"
-  proxy-account-info: "Proxy account can follow a remote user to deliver activities if no one in this instance follow him or her. When you add a remote user who is followed by nobody in this instance to your list, in order to get his or her data, proxy account follow him or her instead of your following."
+  proxy-account-info: "A proxy account is an account that acts as a remote follower for users under certain conditions. For example, when a user adds a remote user to the list, the activity will not be delivered to the server if no one is following that user, so the proxy account will follow instead."
   proxy-account-username: "Proxy account user name"
   proxy-account-username-desc: "Specify the user name of the account that is used as a proxy."
   proxy-account-warn: "You must make an account having this username before this action."
@@ -1278,9 +1357,9 @@ admin/views/charts.vue:
   charts:
     federation-instances: "The number of instances: increase/decrease"
     federation-instances-total: "Total number of instances"
-    notes: "The number of posts: increase/decrease (Combined)"
-    local-notes: "The number of posts: increase/decrease (Local)"
-    remote-notes: "The number of posts: increase/decrease (Remote)"
+    notes: "Increase, or decrease in the number of posts (Combined)"
+    local-notes: "Increase, or decrease in the number of posts (Local)"
+    remote-notes: "Increase, or decrease in the number of posts (Remote)"
     notes-total: "Total posts"
     users: "The number of users: increase/decrease"
     users-total: "Total users"
@@ -1339,6 +1418,8 @@ admin/views/users.vue:
   remote-user-updated: "The information regarding the remote user has been updated."
   delete-all-files: "Delete all files"
   delete-all-files-confirm: "Are you sure that you want to delete all files?"
+  username: "Username"
+  host: "Host"
   users:
     title: "Users"
     sort:
@@ -1350,6 +1431,7 @@ admin/views/users.vue:
     state:
       title: "Sort"
       all: "All"
+      available: "Available"
       admin: "Administrator"
       moderator: "Moderator"
       adminOrModerator: "Admin/Moderator"
@@ -1369,11 +1451,18 @@ admin/views/moderators.vue:
     added: "Registered a Moderator."
     remove: "Discharge"
     removed: "The moderator has been discharged"
+  logs:
+    title: "Logs"
+    moderator: "Moderators"
+    type: "Operations"
+    at: "Timestamp"
+    info: "Information"
 admin/views/emoji.vue:
   add-emoji:
     title: "Add emoji"
     name: "Emoji name"
     name-desc: "You can use the characters a~z 0~9 _"
+    category: "Categories"
     aliases: "Aliases"
     aliases-desc: "You can add more than one, separated by spaces."
     url: "Image URL"
@@ -1449,7 +1538,7 @@ admin/views/federation.vue:
   chart-srcs:
     requests: "Requests"
     users: "Increase, or decrease in the number of users"
-    users-total: "Total number of users"
+    users-total: "Users in total"
     notes: "Increase, or decrease in the number of notes"
     notes-total: "Total number of notes"
     ff: "Increase of followers"
@@ -1657,6 +1746,8 @@ mobile/views/pages/search.vue:
   not-found: "No posts were found for '{q}'"
 mobile/views/pages/selectdrive.vue:
   select-file: "Choose files"
+mobile/views/pages/notifications.vue:
+  notifications: "Notifications"
 mobile/views/pages/settings.vue:
   signed-in-as: "Signed in as {}"
 mobile/views/pages/user.vue:
@@ -1715,6 +1806,7 @@ deck/deck.user-column.vue:
   activity: "Activity"
   timeline: "Timeline"
   pinned-notes: "Pinned posts"
+  pinned-page: "Pinned page"
 docs:
   edit-this-page-on-github: "Found an error, or do you want to contribute to the documentation?"
   edit-this-page-on-github-link: "Edit this page at GitHub!"
@@ -1746,9 +1838,14 @@ pages:
   read-page: "Viewing the source"
   page-created: "Created the page!"
   page-updated: "Updated the page"
+  name-already-exists: "The specified page name already exists"
+  title-invalid-name: "The specified page URL is invalid"
+  text-invalid-name: "Check whether that is not a blank"
   are-you-sure-delete: "Do you want to delete this page?"
   page-deleted: "The page has been deleted"
   edit-this-page: "Edit this page"
+  pin-this-page: "Pin to your profile"
+  unpin-this-page: "Unpin"
   view-source: "View Source"
   view-page: "View page"
   like: "Like"
@@ -1767,6 +1864,7 @@ pages:
   url: "Page URL"
   summary: "Summary of page"
   align-center: "Center align"
+  hide-title-when-pinned: "Hide page title when pinned to profile"
   font: "Font"
   fontSerif: "Serif"
   fontSansSerif: "Sans Serif"
@@ -1820,12 +1918,25 @@ pages:
       inc: "Increase number"
     _button:
       text: "Title"
+      colored: "Color"
       action: "Operation when the button pressed"
       _action:
         dialog: "Show a dialog"
         _dialog:
           content: "Content"
         resetRandom: "Reset a random number"
+        pushEvent: "Send an event"
+        _pushEvent:
+          event: "Name of the event"
+          message: "Message to display when pressed"
+          variable: "Variable to send"
+          no-variable: "None"
+    radioButton: "Choices"
+    _radioButton:
+      name: "Variable name"
+      title: "Title"
+      values: "Item of choices that delimited by line breaks"
+      default: "Default value"
   script:
     categories:
       flow: "Control"
@@ -1883,6 +1994,9 @@ pages:
       _mod:
         arg1: "A"
         arg2: "B"
+      round: "Round decimal"
+      _round:
+        arg1: "Number"
       eq: "A and B are equal"
       _eq:
         arg1: "A"
@@ -1998,3 +2112,64 @@ pages:
     enviromentVariables: "Environment variable"
     pageVariables: "Page element"
     argVariables: "Input slot"
+room:
+  add-furniture: "Place furniture"
+  translate: "Move"
+  rotate: "Rotate"
+  exit: "Deselect"
+  remove: "Remove"
+  save: "Save"
+  saved: "Saved"
+  clear: "Remove All"
+  clear-confirm: "Are you sure to remove all furnitures in your room?"
+  leave-confirm: "There are unsaved changes. Do you really want to leave?"
+  chooseImage: "Select an image"
+  room-type: "Room type"
+  carpet-color: "Color of carpet"
+  rooms:
+    default: "Default"
+    washitsu: "Japanese-style"
+  furnitures:
+    milk: "Milk carton"
+    bed: "Bed"
+    low-table: "Low Table"
+    desk: "Desk"
+    chair: "Chair"
+    chair2: "Chair 2"
+    fan: "Fan"
+    pc: "Computer"
+    plant: "Houseplant"
+    plant2: "Houseplant 2"
+    eraser: "Eraser"
+    pencil: "Pencil"
+    pudding: "Pudding"
+    cardboard-box: "Cardboard Box"
+    cardboard-box2: "Cardboard Box 2"
+    cardboard-box3: "Cardboard Box 3"
+    book: "Book"
+    book2: "Book 2"
+    piano: "Piano"
+    facial-tissue: "Facial tissue"
+    server: "Servers"
+    moon: "Moon"
+    corkboard: "Cork board"
+    mousepad: "Mousepad"
+    monitor: "Monitor"
+    keyboard: "Keyboard"
+    carpet-stripe: "Carpet (stripe)"
+    mat: "Mat"
+    color-box: "Bookshelf"
+    wall-clock: "Wall clock"
+    photoframe: "Picture frame"
+    cube: "Cube"
+    tv: "TV"
+    pinguin: "Penguin"
+    rubik-cube: "Rubik's Cube"
+    poster-h: "Poster (Horizontal)"
+    poster-v: "Poster (Vertical)"
+    sofa: "Sofa"
+    spiral: "Spiral Staircase"
+    bin: "Waste bin"
+    cup-noodle: "Cup noodle"
+    holo-display: "Holographic display"
+    energy-drink: "Energy drink"

locales/es-ES.yml

@@ -16,9 +16,8 @@ common:
     ui: "Interfaz"
     ui-desc: "No hay ninguna interfaz que le vaya bien a todos. Por eso, Misskey tiene una interfaz altamente personalizable para tus gustos. Puedes hacer tu página principal única editando la interfaz de tu timeline y moviendo varios widgets para conseguir hacer de este lugar uno propio."
     drive: "Drive"
-  adblock:
-    detected: "Por favor, desactive el bloqueador de publicidad."
-    warning: "<strong>Misskey no tiene anuncios publicitarios.</strong> Sin embargo, algunas características podrían no estar disponibles si el bloqueador de publicidad está habilitado."
+    drive-desc: "¿Quieres postear de nuevo la imagen que has posteado antes? Si es así, ¿Quieres separar y ordenar en carpetas los archivos que has subido? La característica Drive incorporada en la base de Misskey es la solución. Compartir archivos es simple."
+    outro: "Aún hay características que solamente están en Misskey, asegúrate de eso con tus propios ojos. Misskey es un servicio de red social distribuida, si no te gusta esta instancia, puedes probar otra instancia. Así que, ¡buena suerte!"
   application-authorization: "Autorizaciones de la aplicación."
   close: "Cerrar"
   do-not-copy-paste: "Por favor no copies código aquí. Tu cuenta puede resultar comprometida."
@@ -31,9 +30,26 @@ common:
   signin: "Iniciar sesión"
   signup: "¡Regístrate!"
   signout: "Cerrar sesión"
+  reload-to-apply-the-setting: "Para aplicar esta configuración, hay que recargar la página. ¿Quiere recargar ahora?"
+  fetching-as-ap-object: "Consultar en el fediverso"
+  unfollow-confirm: "¿Quiere dejar de seguir a {name}?"
+  delete-confirm: "¿Seguro que quieres borrar la publicación?"
+  signin-required: "Inicie sesion"
+  notification-type: "Tipo de notificación"
+  notification-types:
+    all: "Todo"
+    pollVote: "Encuestas"
+    follow: "Seguimientos"
+    receiveFollowRequest: "Solicitudes de seguimiento"
+    reply: "Responder"
+    quote: "Citas"
+    renote: "Volver a publicar"
+    mention: "Menciones"
+    reaction: "Reacciones"
   got-it: "¡Listo!"
   customization-tips:
     title: "Consejos de personalización"
+    paragraph: "<p>Se puede personalizar el inicio agregando/quitando widgets, arrastrarlos, soltarlos y ordenarlos.</p><p>Haciendo <strong>Click <strong>derecho</strong></strong>, se puede modificar la muestra de un widget</p><p>Para quitar un widget, arrastre y suelte el widget en el area que dice <strong>\"Papelera\"</strong> en el cabezal</p><p>Para acabar de personalizar, haga click en \"Listo\" arriba a la derecha</p>"
     gotit: "¡Comprendido!"
   notification:
     file-uploaded: "Archivo cargado."
@@ -71,20 +87,42 @@ common:
     "write:account": "Editar información de la cuenta"
     "read:blocks": "Ver bloques"
     "write:blocks": "Editar bloques"
+    "read:drive": "Explorar el drive"
+    "write:drive": "Administrar el drive"
     "read:favorites": "Ver favoritos"
     "write:favorites": "Editar favoritos"
     "read:following": "Ver información de seguidor"
+    "write:following": "Seguir/Dejar de seguir"
     "read:messaging": "Ver conversación"
+    "write:messaging": "Administrar coversación"
     "read:mutes": "Ver silenciados"
+    "write:mutes": "Administrar silenciados"
     "write:notes": "Crear y eliminar articulos"
     "read:notifications": "Ver notificaciones"
+    "write:notifications": "Administrar notificaciones"
     "read:reactions": "Ver reacciones"
+    "write:reactions": "Administrar reacciones"
     "write:votes": "Vota"
+    "read:pages": "Ver páginas"
+    "write:pages": "Administrar páginas"
+    "read:page-likes": "Ver páginas que te gustan"
+    "write:page-likes": "Administrar páginas que te gustan"
+    "read:user-groups": "Ver grupos de usuarios"
+    "write:user-groups": "Administrar grupos de usuarios"
+  empty-timeline-info:
+    follow-users-to-make-your-timeline: "Seguir al usuario mostrará sus posts en la linea de tiempo"
+    explore: "Explorar usuarios"
   post-form:
     reply: "Responder"
     renote: "Volver a publicar"
+    attach-media-from-local: "Agregar medios de tu dispositivo"
+    insert-a-kao: "v('ω')v"
+    recent-tags: "Reciente"
+    error: "Error"
     enter-username: "Ingresar nombre de usuario"
+    add-visible-user: "Agregar usuario"
     username-prompt: "Ingresar nombre de usuario"
+    enter-file-name: "Editar nombre del archivo"
   weekday-short:
     sunday: "domingo"
     monday: "lunes"
@@ -139,15 +177,18 @@ common:
     mute-and-block: "Silenciar/Bloquear"
     blocking: "Bloquear"
     security: "Seguridad"
+    signin: "Historial de ingresos"
     password: "Contraseña"
     other: "Otros"
     appearance: "Diseño"
     behavior: "Comportamiento"
+    reactions: "Reacciones"
     fetch-on-scroll-desc: "Cuando te deslizas al final de la página nuevo contenido se carga automáticamente."
     note-visibility: "Visibilidad de la publicación"
     default-note-visibility: "Rango de publicación predeterminado"
     web-search-engine: "Buscador web"
     web-search-engine-desc: "Ejemplo: https://www.google.com/?#q={{query}}"
+    keep-cw: "Mantener CW"
     this-setting-is-this-device-only: "Solo para este dispositivo"
     use-os-default-emojis: "Usar los emoticonos estándar del sistema operativo"
     line-width: "Grosor de línea"
@@ -172,7 +213,7 @@ common:
     deck-column-width-wide: "Ancho"
     use-shadow: "Usar sombras en la Interfaz de Usuario"
     rounded-corners: "Esquinas redondeadas en la Interfaz de Usuario"
-    circle-icons: "Usar iconos circulares"
+    circle-icons: "Usar avatar circulares"
     contrasted-acct: "Añadir contraste al nombre de usuario"
     wallpaper: "Fondo de pantalla"
     choose-wallpaper: "Escoge un fondo de pantalla"
@@ -197,6 +238,9 @@ common:
     update-available-desc: "Las actualizaciones se aplicarán cuando la página se vuelva a cargar."
     advanced-settings: "Configuraciones avanzadas"
     navbar-position-left: "Izquierda"
+    save: "Guardar"
+    saved: "Guardado"
+    preview: "Vista previa"
   search: "Buscar"
   delete: "eliminar"
   loading: "cargando"
@@ -458,6 +502,8 @@ common/views/components/emoji-picker.vue:
   objects: "Objetos"
   symbols: "Símbolos"
   flags: "Países"
+common/views/components/settings/app-type.vue:
+  info: "Necesitas recargar la página para que los cambios tengan efecto."
 common/views/components/signin.vue:
   username: "Usuario"
   password: "Contraseña"
@@ -565,6 +611,7 @@ common/views/components/profile-editor.vue:
   saved: "Perfil actualizado con exito"
   uploading: "Subiendo"
   upload-failed: "Error al subir"
+  unable-to-process: "La operación no se puede llevar a cabo"
   email: "Preferencias de correo"
   email-address: "Correo electrónico"
   email-verified: "Tu cuenta de correo ha sido verificada."
@@ -667,6 +714,7 @@ desktop:
   uploading-avatar: "Cargando un nuevo avatar"
   avatar-updated: "Avatar actualizado"
   choose-avatar: "Escoge una imagen de avatar"
+  unable-to-process: "La operación no se puede llevar a cabo"
   invalid-filetype: "Este tipo de archivo no es compatible aquí"
 desktop/views/components/activity.chart.vue:
   total: "Negro ... Total"
@@ -725,6 +773,7 @@ desktop/views/components/drive.folder.vue:
     rename: "Renombrar"
     rename-folder: "Renombrar carpeta"
     input-new-folder-name: "Escribe el nombre nuevo"
+    else-folders: "Otros"
 desktop/views/components/drive.vue:
   search: "Buscar"
   empty-draghover: "¡Saluda!"
@@ -859,6 +908,7 @@ desktop/views/components/settings.tags.vue:
 desktop/views/components/timeline.vue:
   home: "Inicio"
   local: "Local"
+  hybrid: "Social"
   global: "Global"
   list: "Listas"
   hashtag: "Hashtags"
@@ -959,12 +1009,18 @@ admin/views/drive.vue:
   mark-as-sensitive: "Marcar como 'sensible'"
   unmark-as-sensitive: "Desmarcar como 'sensible'"
 admin/views/users.vue:
+  username: "Usuario"
+  host: "Host"
   users:
     state:
       all: "Todo"
       moderator: "Moderadores"
     origin:
       local: "Local"
+admin/views/moderators.vue:
+  logs:
+    title: "Registros"
+    moderator: "Moderadores"
 admin/views/emoji.vue:
   add-emoji:
     add: "Agregar"
@@ -991,6 +1047,8 @@ admin/views/federation.vue:
     day: "Por día"
   blocked-hosts: "Bloquear"
   save: "Guardar"
+desktop/views/pages/welcome.vue:
+  timeline: "Timeline"
 desktop/views/pages/selectdrive.vue:
   cancel: "Cancelar"
 desktop/views/pages/user-list.users.vue:
@@ -1005,6 +1063,11 @@ desktop/views/pages/user/user.photos.vue:
 desktop/views/pages/user/user.header.vue:
   month: "lunes"
   day: "domingo"
+desktop/views/pages/user/user.timeline.vue:
+  default: "Posts"
+  with-replies: "Posts y respuestas"
+  with-media: "Multimedia"
+  my-posts: "Mis posts"
 desktop/views/widgets/notifications.vue:
   title: "Notificaciones"
 desktop/views/widgets/polls.vue:
@@ -1051,6 +1114,7 @@ mobile/views/components/ui.header.vue:
   welcome-back: "Bienvenido/a de vuelta,"
   adjective: "-san"
 mobile/views/components/ui.nav.vue:
+  timeline: "Timeline"
   notifications: "Notificaciones"
   follow-requests: "Solicitudes de seguimiento"
   search: "Buscar"
@@ -1065,6 +1129,7 @@ mobile/views/pages/drive.vue:
 mobile/views/pages/home.vue:
   home: "Inicio"
   local: "Local"
+  hybrid: "Social"
   global: "Global"
 mobile/views/pages/widgets.vue:
   dashboard: "Panel de control"
@@ -1076,6 +1141,10 @@ mobile/views/pages/games/reversi.vue:
   reversi: "Reversi"
 mobile/views/pages/search.vue:
   search: "Buscar"
+mobile/views/pages/notifications.vue:
+  notifications: "Notificaciones"
+mobile/views/pages/user.vue:
+  timeline: "Timeline"
 mobile/views/pages/user/home.vue:
   activity: "Actividad"
 mobile/views/pages/user/home.photos.vue:
@@ -1083,6 +1152,7 @@ mobile/views/pages/user/home.photos.vue:
 deck:
   home: "Inicio"
   local: "Local"
+  hybrid: "Social"
   hashtag: "Etiquetas"
   global: "Global"
   notifications: "Notificaciones"
@@ -1090,7 +1160,9 @@ deck:
   rename: "Renombrar"
 deck/deck.user-column.vue:
   activity: "Actividad"
+  timeline: "Timeline"
 pages:
+  pin-this-page: "Fijar en el perfil"
   like: "Me gusta"
   blocks:
     post: "Formulario"
@@ -1114,3 +1186,9 @@ pages:
         arg1: "Listas"
     types:
       array: "Listas"
+room:
+  save: "Guardar"
+  saved: "Guardado"
+  furnitures:
+    moon: "Luna"
+    bin: "Papelera"

locales/fr-FR.yml

@@ -18,9 +18,6 @@ common:
     drive: "Drive"
     drive-desc: "Vous voulez poster une photo que vous avez déjà transférée ? Vous souhaitez organiser, nommer et créer un dossier pour vos fichiers téléversés ? Misskey Drive est la meilleure solution pour vous. Très facile de partager vos fichiers en ligne."
     outro: "Découvrez vous-même les fonctionnalités de Misskey. Étant donné que Misskey est un réseau social fédéré, vous pouvez essayer d’autres instances afin de trouver vos amis si la présente instance ne vous correspond pas. Bonne chance et amusez-vous bien !"
-  adblock:
-    detected: "Veuillez désactiver votre bloqueur de publicités"
-    warning: "<strong>Misskey n’utilise pas de publicités</strong>, mais quelques options peuvent être non disponibles ou fonctionneraient mal si un bloqueur de publicités est activé."
   application-authorization: "Autorisations de l’application"
   close: "Fermer"
   do-not-copy-paste: "Veuillez ne pas entrer ou coller le code ici. Le compte pourrait être compromis."
@@ -34,9 +31,25 @@ common:
   signup: "S'enregistrer"
   signout: "Se déconnecter"
   reload-to-apply-the-setting: "Le rechargement de la page est nécessaire pour appliquer ces paramètres. Désirez-vous la recharger maintenant ?"
+  fetching-as-ap-object: "Récupération depuis le fédiverse"
+  unfollow-confirm: "Désirez-vous vous désabonner de {name} ?"
+  delete-confirm: "Supprimer cette publication ?"
+  signin-required: "Veuillez vous connecter"
+  notification-type: "Type de notifications"
+  notification-types:
+    all: "Tout"
+    pollVote: "Sondages"
+    follow: "Abonnements"
+    receiveFollowRequest: "Demandes d’abonnements"
+    reply: "Réponses"
+    quote: "Cité par"
+    renote: "Partages"
+    mention: "Mentions"
+    reaction: "Réactions"
   got-it: "J’ai compris !"
   customization-tips:
     title: "Conseils de personnalisation"
+    paragraph: "<p>La personnalisation de la page d'accueil vous permet d'ajouter/supprimer, glisser-déposer et réarranger les widgets.</p><p>Vous pouvez changer l'apparence de certain widget avec le <strong><strong>clic</strong>droit</strong>.</p><p>Pour supprimer un widget, faites glisser le widget sur <strong>la zone \"Corbeille\"</strong> dans l'en-tête.</p><p>Pour terminer la personnalisation, cliquez sur \"Terminé\" en haut à droite.</p>"
     gotit: "Compris !"
   notification:
     file-uploaded: "Le fichier a été téléversé !"
@@ -79,15 +92,23 @@ common:
     "read:favorites": "Afficher les favoris"
     "write:favorites": "Écrire des favoris"
     "read:following": "Voir les informations de l'abonné"
+    "write:following": "Suivre/Ne plus suivre"
     "read:messaging": "Lire les conversations"
     "write:messaging": "Utiliser la messagerie"
     "read:mutes": "Voir les comptes masqués"
+    "write:mutes": "Gérer les comptes muets"
     "write:notes": "Créer ou supprimer des publications"
     "read:notifications": "Afficher les notifications"
     "write:notifications": "Gérer vos notifications"
     "read:reactions": "Lire les réactions"
     "write:reactions": "Gérer vos réactions"
     "write:votes": "Vote"
+    "read:pages": "Afficher la page"
+    "write:pages": "Mettre à jour les Pages"
+    "read:page-likes": "Lire les favoris sur les Pages"
+    "write:page-likes": "Mettre à jour les favoris sur les Pages"
+    "read:user-groups": "Voir les groupes d'utilisateur·rice·s"
+    "write:user-groups": "Éditer les groupes des utilisateur·rice·s"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "Les utilisateur·rice·s suivant·e·s afficheront leurs publications sur votre fil."
     explore: "Trouver des utilisateur·rice·s"
@@ -98,6 +119,7 @@ common:
     quote-placeholder: "Citer cette note …"
     option-quote-placeholder: "Citer ce billet ... (Facultatif)"
     quote-attached: "Cité"
+    quote-question: "Souhaitez-vous ajoutez une citation ?"
     submit: "Publication"
     reply: "Répondre"
     renote: "Republier"
@@ -114,9 +136,11 @@ common:
     geolocation-alert: "Votre appareil ne prend pas en charge les services de localisation"
     error: "Erreur"
     enter-username: "Saisir un nom d'utilisateur"
+    specified-recipient: "Correspondant·e"
     add-visible-user: "Ajouter un utilisateur"
     cw-placeholder: "Commenter le contenu (optionnel)"
     username-prompt: "Saisir un nom d'utilisateur"
+    enter-file-name: "Éditer le nom du fichier"
   weekday-short:
     sunday: "D"
     monday: "L"
@@ -168,7 +192,7 @@ common:
     notification: "Notifications"
     apps: "Applications"
     tags: "Hashtags"
-    mute-and-block: "Silencés / Bloqués"
+    mute-and-block: "Masqués / Bloqués"
     blocking: "En cours blocage"
     security: "Sécurité"
     signin: "Historique des connexions"
@@ -176,6 +200,8 @@ common:
     other: "Avancé"
     appearance: "Apparence"
     behavior: "Comportement"
+    reactions: "Réaction"
+    reactions-description: "Personnaliser les émojis à afficher dans le sélecteur de réactions, délimités par les sauts de ligne."
     fetch-on-scroll: "Chargement automatique lors du défilement"
     fetch-on-scroll-desc: "Chargement automatique du contenu lors du défilement de la page."
     note-visibility: "Visibilité de la publication"
@@ -183,6 +209,10 @@ common:
     remember-note-visibility: "Se souvenir du mode de visibilité de la publication"
     web-search-engine: "Moteur de recherche Web"
     web-search-engine-desc: "Exemple : https://www.google.com/?#q={{query}}"
+    paste: "Coller"
+    pasted-file-name: "Modèle de nom de fichier collé"
+    pasted-file-name-desc: "Exemple : \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "Modifier le nom du fichier collé"
     keep-cw: "Maintenir l'avertissement de contenu"
     keep-cw-desc: "Lorsque vous répondez à un message, le même avertissement de contenu est reprit par défaut dans la réponse, le même que celui qui a été défini dans le message original."
     i-like-sushi: "Je préfère les sushis plutôt que le pudding"
@@ -190,6 +220,7 @@ common:
     use-avatar-reversi-stones: "Utiliser l’avatar comme pion dans Reversi"
     disable-animated-mfm: "Désactiver les textes animés dans les publications"
     disable-showing-animated-images: "Désactiver l'animation des images"
+    enable-quick-notification-view: "Activer l'affichage rapide des notifications"
     suggest-recent-hashtags: "Afficher les hashtags populaires dans le champs de saisie"
     always-show-nsfw: "Toujours afficher les contenus sensibles"
     always-mark-nsfw: "Toujours marquer les notes ayant des médias comme sensibles"
@@ -220,7 +251,7 @@ common:
     deck-column-width-wide: "Large"
     use-shadow: "Utiliser les ombres dans l'interface utilisateur"
     rounded-corners: "Coins arrondis de l'interface utilisateur"
-    circle-icons: "Utiliser des icônes circulaires"
+    circle-icons: "Utiliser des avatar circulaires"
     contrasted-acct: "Ajouter du contraste au nom de l’utilisateur"
     wallpaper: "Image du fond d'écran"
     choose-wallpaper: "Sélectionner un fond d'écran"
@@ -266,6 +297,21 @@ common:
     load-raw-images: "Afficher les photos jointes dans leur qualité originale"
     load-remote-media: "Afficher les médias depuis le serveur distant"
     sync: "Synchroniser"
+    save: "Enregistrer"
+    saved: "enregistré"
+    preview: "Prévisualisation"
+    home-profile: "Profil principal"
+    deck-profile: "Profil deck"
+    room: "Pièce"
+    _room:
+      graphicsQuality: "Qualité des graphismes"
+      _graphicsQuality:
+        ultra: "Très élevée"
+        high: "Élevée"
+        medium: "Moyenne"
+        low: "Basse"
+        cheep: "Minimale"
+      useOrthographicCamera: "Utiliser une caméra orthographique"
   search: "Recherche"
   delete: "Supprimer"
   loading: "Chargement en cours …"
@@ -346,10 +392,14 @@ common/views/pages/explore.vue:
   popular-users: "Utilisateur·rice·s populaires"
   recently-updated-users: "Utilisateur·rice·s actif·ve·s récemment"
   recently-registered-users: "Les nouveaux inscrits"
+  recently-discovered-users: "Utilisateurs récemment découverts"
   popular-tags: "Mots-clés populaires"
   federated: "Du Fédiverse"
   explore: "Explorer {host}"
+  explore-fediverse: "Explorer le Fédiverse"
   users-info: "Actuellement, {users} utilisateur·rice·s se sont inscrit ici"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users} ont réagit avec {reaction}"
 common/views/components/url-preview.vue:
   enable-player: "Activer la lecture"
   disable-player: "Fermer le lecteur"
@@ -387,6 +437,7 @@ common/views/components/games/reversi/reversi.room.vue:
   black-or-white: "Noirs/Blancs"
   black-is: "{} Noirs"
   rules: "Règles"
+  is-llotheo: "Celui ou celle qui a le moins de pièces gagne (Llotheo)"
   looped-map: "Carte en boucle"
   can-put-everywhere: "Peut poser partout"
   settings-of-the-bot: "Configuration du bot"
@@ -514,7 +565,10 @@ common/views/components/note-menu.vue:
   unpin: "Désépingler"
   delete: "Supprimer"
   delete-confirm: "Supprimer cette publication ?"
+  delete-and-edit: "Supprimer et réécrire"
+  delete-and-edit-confirm: "Êtes-vous sûr de vouloir effacer cette note et la modifier ? Vous perdrez toutes les réactions, renotes et réponses."
   remote: "Afficher la note originale"
+  pin-limit-exceeded: "Vous ne pouvez plus épingler davantage de publications."
 common/views/components/user-menu.vue:
   mention: "Mention"
   mute: "Silencier"
@@ -532,8 +586,11 @@ common/views/components/user-menu.vue:
   report-abuse-reported: "Transmit à l’administrateur. Merci de votre collaboration."
   silence: "Mettre en sourdine"
   unsilence: "Enlever la sourdine"
+  silence-confirm: "Êtes-vous surs de vouloir mettre cet·te utilisateur·rice en sourdine ?"
   suspend: "Suspendre"
   unsuspend: "Ne plus suspendre"
+  suspend-confirm: "Êtes-vous surs de vouloir suspendre cet·te utilisateur·rice ?"
+  unsuspend-confirm: "Êtes-vous sûr de vouloir débloquer cet utilisateur ?"
 common/views/components/poll.vue:
   vote-to: "Voter pour '{}'"
   vote-count: "{} votes"
@@ -552,9 +609,11 @@ common/views/components/poll-editor.vue:
   remove: "Supprimer ce choix"
   add: "+ Ajouter un choix"
   destroy: "Annuler ce sondage"
+  multiple: "Autoriser le multi-choix"
   expiration: "Valide jusqu'à"
   infinite: "Illimité"
   at: "Choisir une date et une durée"
+  after: "Choisir la durée"
   no-more: "Vous ne pouvez pas en ajouter davantage"
   deadline-date: "Date d’échéance"
   deadline-time: "Durée"
@@ -565,10 +624,12 @@ common/views/components/poll-editor.vue:
   hour: "Heures"
   day: "D"
 common/views/components/reaction-picker.vue:
-  choose-reaction: "Choisissez votre réaction"
+  choose-reaction: "Envoyer une réaction"
   input-reaction-placeholder: "ou insérez un émoji"
 common/views/components/emoji-picker.vue:
+  recent-emoji: "Utilisés récemment"
   custom-emoji: "Émoji personnalisé"
+  no-category: "Sans catégorie"
   people: "Personnes"
   animals-and-nature: "Animaux et nature"
   food-and-drink: "Nourriture et boisson"
@@ -577,6 +638,14 @@ common/views/components/emoji-picker.vue:
   objects: "Objets"
   symbols: "Symboles"
   flags: "Drapeaux"
+common/views/components/settings/app-type.vue:
+  title: "Mode"
+  intro: "Vous pouvez choisir, si vous voulez utiliser la disposition de bureau ou mobile."
+  choices:
+    auto: "Choisir la disposition automatiquement"
+    desktop: "Toujours utiliser la disposition de bureau"
+    mobile: "Toujours utiliser la disposition mobile"
+  info: "Le rechargement de la page est requis afin d'appliquer les modifications."
 common/views/components/signin.vue:
   username: "Nom d'utilisateur·rice"
   password: "Mot de passe"
@@ -587,6 +656,8 @@ common/views/components/signin.vue:
   signin-with-github: "Se connecter avec GitHub"
   signin-with-discord: "Se connecter avec Discord"
   login-failed: "Échec d’authentification. Veuillez vérifier que votre nom d’utilisateur et mot de passe sont corrects."
+  tap-key: "Cliquez sur la clé de sécurité pour vous connecter"
+  enter-2fa-code: "Entrez votre code de vérification"
 common/views/components/signup.vue:
   invitation-code: "Code d’invitation"
   invitation-info: "Si vous n’avez pas de code d’invitation, contactez un <a href=\"{}\">administrateur</a>."
@@ -691,6 +762,9 @@ common/views/components/profile-editor.vue:
   saved: "Profil mis à jour avec succès"
   uploading: "En cours d’envoi …"
   upload-failed: "Échec de l'envoi"
+  unable-to-process: "L'opération n'a pas pu être complétée"
+  avatar-not-an-image: "Le fichier sélectionné pour votre avatar n'est pas une image"
+  banner-not-an-image: "Le fichier sélectionné pour votre bannière n'est pas une image"
   email: "Paramètres de messagerie"
   email-address: "Adresse de courrier électronique"
   email-verified: "L’adresse du courrier électronique a été vérifiée."
@@ -710,6 +784,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "Zone de danger"
   delete-account: "Supprimer le compte"
   account-deleted: "Le compte a été supprimé. Cela peut prendre un certain temps avant que toutes les données disparaissent."
+  profile-metadata: "Métadonnées du profil"
+  metadata-label: "Étiquette"
+  metadata-content: "Contenu"
 common/views/components/user-list-editor.vue:
   users: "Utilisateur·rice"
   rename: "Renommer la liste"
@@ -723,6 +800,7 @@ common/views/components/user-group-editor.vue:
   rename: "Renommer le groupe"
   delete: "Supprimer le groupe"
   transfer: "Transférer de groupe"
+  transfer-are-you-sure: "Êtes vous surs de vouloir ajouter @$2 au groupe $1 ?"
   transferred: "Groupe transféré"
   remove-user: "Enlever un utilisateur de ce groupe"
   delete-are-you-sure: "Désirez-vous vraiment supprimer le groupe $1 ?"
@@ -747,6 +825,7 @@ common/views/widgets/broadcast.vue:
   no-broadcasts: "Aucune annonce"
   have-a-nice-day: "Passez une bonne journée !"
   next: "Suivant"
+  prev: "Précédent"
 common/views/widgets/calendar.vue:
   year: "Année {}"
   month: "{},"
@@ -791,6 +870,7 @@ common/views/widgets/tips.vue:
   tips-line19: "Plusieurs fenêtres peuvent être détachées en dehors du navigateur."
   tips-line20: "Pourcentage sur le widget calendrier qui indique le pourcentage de temps passé"
   tips-line21: "Vous pouvez aussi utiliser l'API pour développer des Bots."
+  tips-line23: "Ai-chan kawaii!"
   tips-line24: "Misskey est fonctionnel depuis 2014"
   tips-line25: "Vous pouvez recevoir les notifications de Misskey dans un navigateur web compatible"
 common/views/pages/not-found.vue:
@@ -817,6 +897,7 @@ desktop:
   uploading-avatar: "Téléversement du nouvel avatar"
   avatar-updated: "Mise à jour de l’avatar avec succès"
   choose-avatar: "Choisir un avatar"
+  unable-to-process: "L'opération n'a pas pu être complétée"
   invalid-filetype: "Ce format de fichier n’est pas pris en charge"
 desktop/views/components/activity.chart.vue:
   total: "Noirs ... Total"
@@ -857,7 +938,7 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "Ne pas marquer comme sensible"
     copy-url: "Copier l’URL"
     download: "Télécharger"
-    else-files: "Autres..."
+    else-files: "Avancé"
     set-as-avatar: "Utiliser en tant qu'avatar"
     set-as-banner: "Utiliser en tant que bannière"
     open-in-app: "Ouvrir dans l'application"
@@ -867,15 +948,20 @@ desktop/views/components/drive.file.vue:
     copied: "Copié"
     copied-url-to-clipboard: "L'URL a été copiée dans le presse-papier"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "Emplacement de téléversement par défaut"
   unable-to-process: "L'opération n'a pas pu être complétée"
   circular-reference-detected: "Le dossier de destination est un sous-dossier du dossier que vous souhaitez déplacer."
   unhandled-error: "Erreur inconnue"
+  unable-to-delete: "Ne peut pas être supprimé"
+  has-child-files-or-folders: "Ce dossier n'est pas vide, il ne peut pas être supprimé"
   contextmenu:
     move-to-this-folder: "Déplacer dans ce dossier"
     show-in-new-window: "Ouvrir dans une nouvelle fenêtre"
     rename: "Renommer"
     rename-folder: "Renommer le dossier"
     input-new-folder-name: "Entrer un nouveau nom"
+    else-folders: "Avancé"
+    set-as-upload-folder: "Spécifier en tant que dossier de téléversement par défaut"
 desktop/views/components/drive.vue:
   search: "Rechercher"
   empty-draghover: "Drop Welcome!"
@@ -920,8 +1006,8 @@ desktop/views/components/note-detail.vue:
   deleted: "cette publication a été supprimée"
   location: "Géolocalisation"
   renote: "Republier"
-  add-reaction: "Ajouter votre reaction"
-  undo-reaction: "Inverser la réaction"
+  add-reaction: "Ajouter une réaction"
+  undo-reaction: "Annuler la réaction"
 desktop/views/components/note.vue:
   reply: "Répondre"
   renote: "Partager"
@@ -981,6 +1067,15 @@ desktop/views/components/settings.2fa.vue:
   success: "Sauvegarde des paramètres avec succès !"
   failed: "L’opération a échoué. Veuillez vous assurer que le jeton a été saisi correctement."
   info: "À partir de maintenant, à chaque fois que vous vous connectez entrez votre mot de passe ainsi que le jeton généré sur votre appareil."
+  totp-header: "Application d'authentification"
+  security-key-header: "Clé de sécurité"
+  security-key: "Pour plus de sécurité, vous pouvez vous connecter à votre compte à l'aide d'une clé de sécurité matérielle qui prend en charge FIDO2. Lorsque vous vous connecterez, vous aurez besoin de la clé de sécurité enregistrée ou d'une application d'authentification avec vous."
+  last-used: "Dernière utilisation :"
+  activate-key: "Cliquez pour activer la clé de sécurité"
+  security-key-name: "Nom de la clé"
+  something-went-wrong: "Oula ! Il y a eu un problème lors de l’enregistrement de la clé."
+  key-unregistered: "La clé a été supprimée"
+  use-password-less-login: "Utiliser une connexion sans mot de passe"
 common/views/components/media-image.vue:
   sensitive: "Contenu sensible"
   click-to-show: "Cliquer pour afficher"
@@ -1005,15 +1100,20 @@ common/views/components/drive-settings.vue:
   max: "Maximale"
   in-use: "utilisé"
   stats: "Statistiques"
+  default-upload-folder: "Emplacement par défaut du dossier de transfert"
+  default-upload-folder-name: "Dossier·s"
+  change-default-upload-folder: "Changer de dossier"
 common/views/components/mute-and-block.vue:
-  mute-and-block: "Silencés / Bloqués"
-  mute: "Mettre en sourdine"
-  block: "En cours blocage"
+  mute-and-block: "Masqués / Bloqués"
+  mute: "Mis en sourdine"
+  block: "Vous avez bloqué"
   no-muted-users: "Aucun utilisateur n’est mis en sourdine"
   no-blocked-users: "Aucun utilisateur n’est bloqué"
   word-mute: "Filtre de mots"
   muted-words: "Mots masqués"
   muted-words-description: "Description des mots mis en sourdine"
+  unmute-confirm: "Ne plus masquer cet utilisateur ?"
+  unblock-confirm: "Débloquer cet utilisateur ?"
   save: "Enregistrer"
 common/views/components/password-settings.vue:
   reset: "Modifier le mot de passe"
@@ -1058,6 +1158,7 @@ desktop/views/components/ui.header.account.vue:
   groups: "Groupes"
   follow-requests: "Demandes d’abonnement"
   admin: "Admin"
+  room: "Pièce"
 desktop/views/components/ui.header.nav.vue:
   game: "Jeux"
 desktop/views/components/ui.header.notifications.vue:
@@ -1094,6 +1195,8 @@ admin/views/index.vue:
   back-to-misskey: "Retour vers Misskey"
 admin/views/db.vue:
   tables: "Tables"
+  vacuum: "Vacuum"
+  vacuum-info: "Range la base de données. Conserve les données intactes et réduit l'utilisation du disque. Cela se fait généralement automatiquement et périodiquement."
 admin/views/dashboard.vue:
   dashboard: "Tableau de bord"
   accounts: "Comptes"
@@ -1111,11 +1214,13 @@ admin/views/queue.vue:
     deliver: "Délivrées"
     inbox: "Reçues"
     db: "Base de données"
+    objectStorage: "Stockage d'objets"
   state: "État"
   states:
     active: "en cours"
     delayed: "Programmé"
     waiting: "En file d'attente"
+  result-is-truncated: "Le résultat est tronqué"
   other-queues: "Autres files d’attente"
 admin/views/logs.vue:
   logs: "Journaux"
@@ -1148,12 +1253,14 @@ admin/views/instance.vue:
   languages-desc: "Vous pouvez en définir plus d’une, séparées par des espaces."
   tos-url: "URL des conditions d'utilisation"
   repository-url: "URL du dépôt"
+  feedback-url: "URL pour les commentaires"
   maintainer-config: "Informations de l’administrateur"
   maintainer-name: "Nom de l’administrateur"
   maintainer-email: "Contact administratif"
   advanced-config: "Autres réglages"
   note-and-tl: "Notes et fils"
   drive-config: "Paramètres du lecteur"
+  use-object-storage: "Utiliser le stockage d'objets"
   object-storage-base-url: "URL"
   object-storage-prefix: "Préfixe"
   object-storage-endpoint: "Point de terminaison"
@@ -1192,6 +1299,7 @@ admin/views/instance.vue:
   discord-integration-client-id: "ID client"
   discord-integration-client-secret: "Secret client"
   proxy-account-config: "Compte proxy"
+  proxy-account-info: "Un compte proxy se comporte, dans certaines conditions, comme un·e abonné·e distant pour les utilisateurs d'autres instances.\nExemple : quand un·e utilisateur·rice distant·e est ajouté·e à une liste, ses publications ne serait pas visibles sur l'instance si personne ne le·la suit. Le compte proxy va donc le·la suivre pour que ses publications soient acheminées."
   proxy-account-username: "Nom d’utilisateur du compte proxy"
   proxy-account-username-desc: "Spécifiez le nom d’utilisateur du compte utilisé comme proxy."
   proxy-account-warn: "Avant d’entamer cette action, vous devez au préalable avoir créé un compte avec ce nom d’utilisateur."
@@ -1273,6 +1381,7 @@ admin/views/drive.vue:
   marked-as-sensitive: "Marqué comme sensible"
   unmarked-as-sensitive: "Marqué comme non sensible"
   clean-remote-files: "Nettoyer le cache des fichiers distants"
+  clean-remote-files-are-you-sure: "Êtes-vous sûr de vouloir effacer tout les fichiers distants mis en cache ?"
   clean-up: "Nettoyage"
 admin/views/users.vue:
   operation: "Actions"
@@ -1294,6 +1403,9 @@ admin/views/users.vue:
   update-remote-user: "Mettre à jour les informations de l’utilisateur·rice distant·e"
   remote-user-updated: "Les informations de l’utilisateur·rice distant·e ont étés mis à jour"
   delete-all-files: "Supprimer tous les fichiers"
+  delete-all-files-confirm: "Êtes vous surs de vouloir supprimer tous les fichiers ?"
+  username: "Nom d'utilisateur·rice"
+  host: "Hôte"
   users:
     title: "Utilisateur·rice·s"
     sort:
@@ -1305,6 +1417,7 @@ admin/views/users.vue:
     state:
       title: "État"
       all: "Tout"
+      available: "Disponible"
       admin: "Admin"
       moderator: "Modérateur"
       adminOrModerator: "Administrateur/Modérateur"
@@ -1324,11 +1437,18 @@ admin/views/moderators.vue:
     added: "Ajouté en tant que modérateur"
     remove: "Révoquer"
     removed: "Le modérateur a été révoqué"
+  logs:
+    title: "Journaux"
+    moderator: "Modérateurs"
+    type: "Actions"
+    at: "Date de modification"
+    info: "Informations"
 admin/views/emoji.vue:
   add-emoji:
     title: "Ajouter un émoji"
     name: "Nom de l’émoji"
     name-desc: "Vous pouvez utiliser les caractères a~z 0~9 _"
+    category: "Catégories"
     aliases: "Aliases"
     aliases-desc: "Vous pouvez définir plus d’un, séparés par des espaces."
     url: "URL de l’image"
@@ -1401,6 +1521,7 @@ admin/views/federation.vue:
     notes: "Augmentation/diminution du nombre des notes"
     notes-total: "Nombre total des notes"
     ff: "Augmentation des abonné·e·s"
+    ff-total: "Nombre total d'abonnements"
     drive-usage: "Augmentation et diminution de la capacité stockage"
     drive-usage-total: "Utilisation totale du stockage"
     drive-files-total: "Nombre total des fichiers sur le Drive"
@@ -1600,6 +1721,8 @@ mobile/views/pages/search.vue:
   not-found: "Aucune publication trouvée pour « {q} »."
 mobile/views/pages/selectdrive.vue:
   select-file: "Choisissez un fichier"
+mobile/views/pages/notifications.vue:
+  notifications: "Notifications"
 mobile/views/pages/settings.vue:
   signed-in-as: "Connecté·e en tant que {}"
 mobile/views/pages/user.vue:
@@ -1658,6 +1781,7 @@ deck/deck.user-column.vue:
   activity: "Activité"
   timeline: "Fil d’actualité"
   pinned-notes: "Notes épinglées"
+  pinned-page: "Page épinglée"
 docs:
   edit-this-page-on-github: "Vous avez trouvé une erreur ou vous voulez contribuer à la documentation ?"
   edit-this-page-on-github-link: "Éditez cette page sur GitHub !"
@@ -1689,12 +1813,17 @@ pages:
   read-page: "Voir la source"
   page-created: "Page a été créée !"
   page-updated: "A mis à jour la page"
+  name-already-exists: "Une page portant le même nom existe déjà"
+  title-invalid-name: "L’URL de la page spécifiée n’est pas valide"
   are-you-sure-delete: "Confirmez-vous la suppression de cette page ?"
   page-deleted: "La page a bien été supprimée."
   edit-this-page: "Éditer cette page"
+  pin-this-page: "Épingler sur votre profil"
+  unpin-this-page: "Désépingler"
   view-source: "Afficher la source"
   view-page: "Afficher la page"
   like: "Bien"
+  unlike: "Je n’aime pas"
   liked-pages: "Pages favorites"
   my-pages: "Mes pages"
   inspector: "Inspecteur"
@@ -1705,6 +1834,7 @@ pages:
   url: "URL de page"
   summary: "Résumé de page"
   align-center: "Centrée"
+  hide-title-when-pinned: "Masquer le titre de la page lorsque celle-ci est épinglée au profil"
   font: "Police de caractères"
   fontSerif: "Serif"
   fontSansSerif: "Sans Serif"
@@ -1757,12 +1887,24 @@ pages:
       inc: "Augmenter le chiffre"
     _button:
       text: "Titre"
+      colored: "Couleur"
       action: "L'opération lorsque le bouton sera pressé"
       _action:
         dialog: "Afficher une fenêtre de dialogue"
         _dialog:
           content: "Contenu"
         resetRandom: "Réinitialiser le nombre aléatoire"
+        pushEvent: "Envoyer un évènement"
+        _pushEvent:
+          event: "Nom de l'évènement"
+          message: "Message à afficher lorsque appuyé"
+          variable: "Variable à envoyer"
+          no-variable: "Aucune"
+    radioButton: "Choix"
+    _radioButton:
+      name: "Nom de la variable"
+      title: "Titre"
+      default: "Valeur par défaut"
   script:
     categories:
       flow: "Contrôle"
@@ -1773,9 +1915,11 @@ pages:
       value: "Valeur"
       fn: "Fonction"
       text: "Actions texte"
+      convert: "Convertir"
       list: "Listes"
     blocks:
       text: "Texte"
+      multiLineText: "Texte (Multi-lignes)"
       textList: "Liste de texte"
       strLen: "Longueur du texte"
       _strLen:
@@ -1783,6 +1927,8 @@ pages:
       strPick: "Extraire un caractère"
       _strPick:
         arg1: "Texte"
+        arg2: "Position du joueur"
+      strReplace: "Remplacement de texte"
       _strReplace:
         arg1: "Texte"
         arg2: "Avant le remplacement"
@@ -1812,6 +1958,8 @@ pages:
       _mod:
         arg1: "A"
         arg2: "B"
+      _round:
+        arg1: "Numérique"
       eq: "A et B sont équivalents"
       _eq:
         arg1: "A"
@@ -1844,6 +1992,7 @@ pages:
       _gtEq:
         arg1: "A"
         arg2: "B"
+      if: "Branche"
       _if:
         arg1: "Si"
         arg2: "donc"
@@ -1861,6 +2010,7 @@ pages:
       randomPick: "Choisir aléatoirement depuis la liste"
       _randomPick:
         arg1: "Listes"
+      dailyRandom: "Aléatoire (Quotidien pour chaque utilisateur)"
       _dailyRandom:
         arg1: "Probabilité"
       _dailyRannum:
@@ -1868,19 +2018,27 @@ pages:
         arg2: "Maximum"
       _dailyRandomPick:
         arg1: "Listes"
+      seedRandom: "Aléatoire (graine)"
       _seedRandom:
+        arg1: "Graine"
         arg2: "Probabilité"
+      seedRannum: "Nombre aléatoire (Graine)"
       _seedRannum:
+        arg1: "Graine"
         arg2: "Min"
         arg3: "Max"
+      seedRandomPick: "Sélection aléatoire dans une liste (Graine)"
       _seedRandomPick:
+        arg1: "Graine"
         arg2: "Listes"
+      DRPWPM: "Sélection aléatoire à partir d'une liste pondérée (mise à jour quotidienne par utilisateur)"
       _DRPWPM:
         arg1: "Liste de texte"
       pick: "Sélectionner dans la liste"
       _pick:
         arg1: "Listes"
         arg2: "Position"
+      listLen: "Longueur de la liste"
       _listLen:
         arg1: "Listes"
       number: "Numérique"
@@ -1890,12 +2048,14 @@ pages:
       numberToString: "Chiffres en chaîne"
       _numberToString:
         arg1: "Numérique"
+      splitStrByLine: "Séparer le texte par lignes"
       _splitStrByLine:
         arg1: "Texte"
       ref: "Variables"
       fn: "Fonction"
       _fn:
         slots: "Emplacement"
+        slots-info: "Veuillez délimiter chaque emplacement par un saut de ligne"
         arg1: "Sortie"
       for: "Répéter"
       _for:
@@ -1911,3 +2071,65 @@ pages:
     emptySlot: "Slot vide"
     enviromentVariables: "Variables d'environnement"
     pageVariables: "Élément de page"
+    argVariables: "Entrée vide"
+room:
+  add-furniture: "Placer des meubles"
+  translate: "Déplacer"
+  rotate: "Tourner"
+  exit: "Retour"
+  remove: "Enlever"
+  save: "Enregistrer"
+  saved: "enregistré"
+  clear: "Tout enlever"
+  clear-confirm: "Désirez-vous enlever tout les meubles de votre chambre ?"
+  leave-confirm: "Vous avez des modifications non-sauvegardées. Voulez-vous vraiment quitter ?"
+  chooseImage: "Sélectionnez une image"
+  room-type: "Type de chambre"
+  carpet-color: "Couleur du tapis"
+  rooms:
+    default: "Par défaut"
+    washitsu: "Style japonnais"
+  furnitures:
+    milk: "Lait en carton"
+    bed: "Lit"
+    low-table: "Table basse"
+    desk: "Bureau"
+    chair: "Chaise"
+    chair2: "Chaise 2"
+    fan: "Ventilateur"
+    pc: "Ordinateur"
+    plant: "Plante d’intérieur"
+    plant2: "Plante d’intérieur 2"
+    eraser: "Gomme"
+    pencil: "Crayon"
+    pudding: "Pudding"
+    cardboard-box: "Boîte en carton"
+    cardboard-box2: "Boîte en carton 2"
+    cardboard-box3: "Boîte en carton 3"
+    book: "Livre"
+    book2: "Livre 2"
+    piano: "Piano"
+    facial-tissue: "Mouchoirs en papier"
+    server: "Serveurs"
+    moon: "Lune"
+    corkboard: "Tableau en liège"
+    mousepad: "Tapis de souris"
+    monitor: "Écran"
+    keyboard: "Clavier"
+    carpet-stripe: "Tapis (zébré)"
+    mat: "Tapis"
+    color-box: "Étagère"
+    wall-clock: "Horloge murale"
+    photoframe: "Cadre photo"
+    cube: "Cube"
+    tv: "Téléviseur"
+    pinguin: "Pingouin"
+    rubik-cube: "Cube de Rubik"
+    poster-h: "Affiche (horizontale)"
+    poster-v: "Affiche (verticale)"
+    sofa: "Canapé"
+    spiral: "Escaliers en spirale"
+    bin: "Corbeille"
+    cup-noodle: "Bol de nouilles"
+    holo-display: "Affichage holographique"
+    energy-drink: "Boisson énergétique"

locales/ja-JP.yml

@@ -19,9 +19,6 @@ common:
     drive: "ドライブ"
     drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
     outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
-  adblock:
-    detected: "広告ブロッカーを無効にしてください"
-    warning: "<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。"
   application-authorization: "アプリの連携"
   close: "閉じる"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
@@ -37,6 +34,19 @@ common:
   reload-to-apply-the-setting: "この設定を反映するにはページをリロードする必要があります。今すぐリロードしますか？"
   fetching-as-ap-object: "連合に照会中"
   unfollow-confirm: "{name}さんをフォロー解除しますか？"
+  delete-confirm: "この投稿を削除しますか？"
+  signin-required: "ログインしてください"
+  notification-type: "通知の種類"
+  notification-types:
+    all: "すべて"
+    pollVote: "投票"
+    follow: "フォロー"
+    receiveFollowRequest: "フォローリクエスト"
+    reply: "返信"
+    quote: "引用"
+    renote: "Renote"
+    mention: "言及"
+    reaction: "リアクション"
 
   got-it: "わかった"
   customization-tips:
@@ -97,6 +107,12 @@ common:
     "read:reactions": "リアクションを見る"
     "write:reactions": "リアクションを操作する"
     "write:votes": "投票する"
+    "read:pages": "ページを見る"
+    "write:pages": "ページを操作する"
+    "read:page-likes": "ページのいいねを見る"
+    "write:page-likes": "ページのいいねを操作する"
+    "read:user-groups": "ユーザーグループを見る"
+    "write:user-groups": "ユーザーグループを操作する"
 
   empty-timeline-info:
     follow-users-to-make-your-timeline: "ユーザーをフォローすると投稿がタイムラインに表示されます。"
@@ -126,9 +142,11 @@ common:
     geolocation-alert: "お使いの端末は位置情報に対応していません"
     error: "エラー"
     enter-username: "ユーザー名を入力してください"
+    specified-recipient: "宛先"
     add-visible-user: "ユーザーを追加"
     cw-placeholder: "内容への注釈 (オプション)"
     username-prompt: "ユーザー名を入力してください"
+    enter-file-name: "ファイル名を編集"
 
   weekday-short:
     sunday: "日"
@@ -194,6 +212,8 @@ common:
     other: "その他"
     appearance: "デザイン"
     behavior: "動作"
+    reactions: "リアクション"
+    reactions-description: "リアクションピッカーに表示するリアクションを改行で区切って設定します。"
     fetch-on-scroll: "スクロールで自動読み込み"
     fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
     note-visibility: "投稿の公開範囲"
@@ -201,6 +221,11 @@ common:
     remember-note-visibility: "投稿の公開範囲を記憶する"
     web-search-engine: "ウェブ検索エンジン"
     web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
+    paste: "ペースト"
+    pasted-file-name: "ペーストされたファイル名のテンプレート"
+    pasted-file-name-desc: "例: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "ペースト時にファイル名を編集"
+    paste-dialog-desc: "ペースト時にファイル名を編集するダイアログを表示するようにします。"
     keep-cw: "CW保持"
     keep-cw-desc: "投稿にリプライする際、リプライ元の投稿にCWが設定されていたとき、デフォルトで同じCWを設定するようにします。"
     i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
@@ -208,6 +233,7 @@ common:
     use-avatar-reversi-stones: "リバーシの石にアバターを使う"
     disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
     disable-showing-animated-images: "アニメーション画像を再生しない"
+    enable-quick-notification-view: "通知のクイックビューを有効にする"
     suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
     always-show-nsfw: "常に閲覧注意のメディアを表示する"
     always-mark-nsfw: "常にメディアを閲覧注意として投稿"
@@ -238,7 +264,7 @@ common:
     deck-column-width-wide: "広"
     use-shadow: "UIに影を使用"
     rounded-corners: "UIの角を丸める"
-    circle-icons: "円形のアイコンを使用"
+    circle-icons: "円形のアバターを使用"
     contrasted-acct: "ユーザー名にコントラストを付ける"
     wallpaper: "壁紙"
     choose-wallpaper: "壁紙を選択"
@@ -284,8 +310,21 @@ common:
     load-raw-images: "添付された画像を高画質で表示する"
     load-remote-media: "リモートサーバーのメディアを表示する"
     sync: "同期"
+    save: "保存"
+    saved: "保存しました"
+    preview: "プレビュー"
     home-profile: "ホームのプロファイル"
     deck-profile: "デッキのプロファイル"
+    room: "ルーム"
+    _room:
+      graphicsQuality: "グラフィックの品質"
+      _graphicsQuality:
+        ultra: "最高"
+        high: "高"
+        medium: "中"
+        low: "低"
+        cheep: "最低"
+      useOrthographicCamera: "平行投影カメラを使用"
 
   search: "検索"
   delete: "削除"
@@ -375,11 +414,17 @@ common/views/pages/explore.vue:
   popular-users: "人気のユーザー"
   recently-updated-users: "最近投稿したユーザー"
   recently-registered-users: "新規ユーザー"
+  recently-discovered-users: "最近発見されたユーザー"
   popular-tags: "人気のタグ"
   federated: "連合"
   explore: "{host}を探索"
+  explore-fediverse: "Fediverseを探索"
   users-info: "現在{users}ユーザーが登録されています"
 
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users}が{reaction}をリアクション"
+  many-users: "{users}と他{omitted}人が{reaction}をリアクション"
+
 common/views/components/url-preview.vue:
   enable-player: "プレイヤーを開く"
   disable-player: "プレイヤーを閉じる"
@@ -561,6 +606,8 @@ common/views/components/note-menu.vue:
   unpin: "ピン留め解除"
   delete: "削除"
   delete-confirm: "この投稿を削除しますか？"
+  delete-and-edit: "削除して編集"
+  delete-and-edit-confirm: "この投稿を削除してもう一度編集しますか？この投稿へのリアクション、Renote、返信も全て削除されます。"
   remote: "投稿元で見る"
   pin-limit-exceeded: "これ以上ピン留めできません。"
 
@@ -627,7 +674,9 @@ common/views/components/reaction-picker.vue:
   input-reaction-placeholder: "または絵文字を入力"
 
 common/views/components/emoji-picker.vue:
+  recent-emoji: "最近使った絵文字"
   custom-emoji: "カスタム絵文字"
+  no-category: "カテゴリなし"
   people: "人"
   animals-and-nature: "動物&自然"
   food-and-drink: "食べ物&飲み物"
@@ -637,6 +686,15 @@ common/views/components/emoji-picker.vue:
   symbols: "記号"
   flags: "旗"
 
+common/views/components/settings/app-type.vue:
+  title: "モード"
+  intro: "デスクトップ版とモバイル版のどちらを使うかを指定できます。"
+  choices:
+    auto: "自動で選択"
+    desktop: "デスクトップ版に固定"
+    mobile: "モバイル版に固定"
+  info: "変更はページの再度読み込み後に反映されます。"
+
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -752,7 +810,7 @@ common/views/components/profile-editor.vue:
   you-can-include-hashtags: "ハッシュタグを含めることができます。"
   language: "言語"
   birthday: "誕生日"
-  avatar: "アイコン"
+  avatar: "アバター"
   banner: "バナー"
   is-cat: "このアカウントはCatです"
   is-bot: "このアカウントはBotです"
@@ -765,6 +823,9 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存しました"
   uploading: "アップロード中"
   upload-failed: "アップロードに失敗しました"
+  unable-to-process: "操作を完了できません"
+  avatar-not-an-image: "アバターとして指定したファイルは画像ではありません"
+  banner-not-an-image: "バナーとして指定したファイルは画像ではありません"
   email: "メール設定"
   email-address: "メールアドレス"
   email-verified: "メールアドレスが確認されました"
@@ -784,6 +845,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "危険な設定"
   delete-account: "アカウントを削除"
   account-deleted: "アカウントが削除されました。データが消えるまで時間がかかる場合があります。"
+  profile-metadata: "プロフィール補足情報"
+  metadata-label: "ラベル"
+  metadata-content: "内容"
 
 common/views/components/user-list-editor.vue:
   users: "ユーザー"
@@ -827,6 +891,7 @@ common/views/widgets/broadcast.vue:
   no-broadcasts: "お知らせはありません"
   have-a-nice-day: "良い一日を！"
   next: "次"
+  prev: "前"
 
 common/views/widgets/calendar.vue:
   year: "{}年"
@@ -910,6 +975,7 @@ desktop:
   uploading-avatar: "新しいアバターをアップロードしています"
   avatar-updated: "アバターを更新しました"
   choose-avatar: "アバターにする画像を選択"
+  unable-to-process: "操作を完了できません"
   invalid-filetype: "この形式のファイルはサポートされていません"
 
 desktop/views/components/activity.chart.vue:
@@ -949,7 +1015,7 @@ desktop/views/components/drive-window.vue:
   used: "使用中"
 
 desktop/views/components/drive.file.vue:
-  avatar: "アイコン"
+  avatar: "アバター"
   banner: "バナー"
   nsfw: "閲覧注意"
   contextmenu:
@@ -958,8 +1024,8 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "閲覧注意を解除"
     copy-url: "URLをコピー"
     download: "ダウンロード"
-    else-files: "その他..."
-    set-as-avatar: "アイコンに設定"
+    else-files: "その他"
+    set-as-avatar: "アバターに設定"
     set-as-banner: "バナーに設定"
     open-in-app: "アプリで開く"
     add-app: "アプリを追加"
@@ -969,15 +1035,20 @@ desktop/views/components/drive.file.vue:
     copied-url-to-clipboard: "URLをクリップボードにコピーしました"
 
 desktop/views/components/drive.folder.vue:
+  upload-folder: "既定アップロード先"
   unable-to-process: "操作を完了できません"
   circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
   unhandled-error: "不明なエラー"
+  unable-to-delete: "削除できません"
+  has-child-files-or-folders: "このフォルダは空でないため、削除できません。"
   contextmenu:
     move-to-this-folder: "このフォルダへ移動"
     show-in-new-window: "新しいウィンドウで表示"
     rename: "名前を変更"
     rename-folder: "フォルダ名の変更"
     input-new-folder-name: "新しいフォルダ名を入力してください"
+    else-folders: "その他"
+    set-as-upload-folder: "既定アップロード先に設定"
 
 desktop/views/components/drive.vue:
   search: "検索"
@@ -1112,6 +1183,7 @@ desktop/views/components/settings.2fa.vue:
   register-security-key: "キーの登録を完了"
   something-went-wrong: "わー！ キーを登録する際に問題が発生しました:"
   key-unregistered: "キーが削除されました"
+  use-password-less-login: "パスワードなしのログインを使用"
 
 common/views/components/media-image.vue:
   sensitive: "閲覧注意"
@@ -1140,6 +1212,9 @@ common/views/components/drive-settings.vue:
   max: "容量"
   in-use: "使用中"
   stats: "統計"
+  default-upload-folder: "既定のアップロード先フォルダ"
+  default-upload-folder-name: "フォルダ"
+  change-default-upload-folder: "フォルダを変更"
 
 common/views/components/mute-and-block.vue:
   mute-and-block: "ミュートとブロック"
@@ -1150,6 +1225,8 @@ common/views/components/mute-and-block.vue:
   word-mute: "ワードミュート"
   muted-words: "ミュートされたキーワード"
   muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
+  unmute-confirm: "このユーザーをミュート解除しますか？"
+  unblock-confirm: "このユーザーをブロック解除しますか？"
   save: "保存"
 
 common/views/components/password-settings.vue:
@@ -1201,6 +1278,7 @@ desktop/views/components/ui.header.account.vue:
   groups: "グループ"
   follow-requests: "フォロー申請"
   admin: "管理"
+  room: "ルーム"
 
 desktop/views/components/ui.header.nav.vue:
   game: "ゲーム"
@@ -1332,7 +1410,9 @@ admin/views/instance.vue:
   object-storage-s3-info-here: "こちら"
   object-storage-gcs-info: "Google Cloud Storageをオブジェクトストレージとして使用する場合、「エンドポイント」は storage.googleapis.com に設定し、「リージョン」は空欄にします。"
   cache-remote-files: "リモートのファイルをキャッシュする"
-  cache-remote-files-desc: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクするようになります。そのためサーバーのストレージを節約できますが、プライバシー設定で直リンクを無効にしているユーザーにはファイルが見えなくなったり、サムネイルが生成されないので通信量が増加します。通常はこの設定をオンにしておくことをおすすめします。"
+  cache-remote-files-desc: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクするようになります。そのためサーバーのストレージを節約できますが、プライバシー設定で直リンクを無効にしているユーザーにはファイルが見えなくなったり、サムネイルが生成されないので通信量が増加します。通常はこの設定をオンにするか次のリモートファイルのプロキシを有効にすることをおすすめします。"
+  proxy-remote-files: "リモートのファイルをプロキシする"
+  proxy-remote-files-desc: "この設定を有効にすると、未保存または保存容量超過で削除されたリモートファイルをローカルでプロキシし、サムネイルも生成するようになります。"
   local-drive-capacity-mb: "ローカルユーザーひとりあたりのドライブ容量"
   remote-drive-capacity-mb: "リモートユーザーひとりあたりのドライブ容量"
   mb: "メガバイト単位"
@@ -1472,6 +1552,8 @@ admin/views/users.vue:
   remote-user-updated: "リモートユーザー情報を更新しました"
   delete-all-files: "すべてのファイルを削除"
   delete-all-files-confirm: "すべてのファイルを削除しますか？"
+  username: "ユーザー名"
+  host: "ホスト"
   users:
     title: "ユーザー"
     sort:
@@ -1483,6 +1565,7 @@ admin/views/users.vue:
     state:
       title: "状態"
       all: "すべて"
+      available: "利用可能"
       admin: "管理者"
       moderator: "モデレーター"
       adminOrModerator: "管理者+モデレーター"
@@ -1503,12 +1586,19 @@ admin/views/moderators.vue:
     added: "モデレーターを登録しました"
     remove: "解除"
     removed: "モデレーター登録を解除しました"
+  logs:
+    title: "ログ"
+    moderator: "モデレーター"
+    type: "操作"
+    at: "日時"
+    info: "情報"
 
 admin/views/emoji.vue:
   add-emoji:
     title: "絵文字の登録"
     name: "絵文字名"
     name-desc: "a~z 0~9 _ の文字が使えます。"
+    category: "カテゴリ"
     aliases: "エイリアス"
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
@@ -1842,6 +1932,9 @@ mobile/views/pages/search.vue:
 mobile/views/pages/selectdrive.vue:
   select-file: "ファイルを選択"
 
+mobile/views/pages/notifications.vue:
+  notifications: "通知"
+
 mobile/views/pages/settings.vue:
   signed-in-as: "{}としてサインイン中"
 
@@ -1906,6 +1999,7 @@ deck/deck.user-column.vue:
   activity: "アクティビティ"
   timeline: "タイムライン"
   pinned-notes: "ピン留めされた投稿"
+  pinned-page: "ピン留めされたページ"
 
 docs:
   edit-this-page-on-github: "間違いや改善点を見つけましたか？"
@@ -1942,9 +2036,14 @@ pages:
   read-page: "ソースを表示中"
   page-created: "ページを作成しました"
   page-updated: "ページを更新しました"
+  name-already-exists: "指定されたページURLは既に存在しています"
+  title-invalid-name: "不正なページURLです"
+  text-invalid-name: "空白でないか確認してください"
   are-you-sure-delete: "このページを削除しますか？"
   page-deleted: "ページを削除しました"
   edit-this-page: "このページを編集"
+  pin-this-page: "ピン留め"
+  unpin-this-page: "ピン留め解除"
   view-source: "ソースを表示"
   view-page: "ページを見る"
   like: "いいね"
@@ -1963,6 +2062,7 @@ pages:
   url: "ページURL"
   summary: "ページの要約"
   align-center: "中央寄せ"
+  hide-title-when-pinned: "ピン留めされているときにタイトルを非表示"
   font: "フォント"
   fontSerif: "セリフ"
   fontSansSerif: "サンセリフ"
@@ -2024,12 +2124,26 @@ pages:
 
     _button:
       text: "タイトル"
+      colored: "色付き"
       action: "ボタンを押したときの動作"
       _action:
         dialog: "ダイアログを表示する"
         _dialog:
           content: "内容"
         resetRandom: "乱数をリセット"
+        pushEvent: "イベントを送信させる"
+        _pushEvent:
+          event: "イベント名"
+          message: "押したときに表示するメッセージ"
+          variable: "送信する変数"
+          no-variable: "なし"
+
+    radioButton: "選択肢"
+    _radioButton:
+      name: "変数名"
+      title: "タイトル"
+      values: "改行で区切った選択肢"
+      default: "デフォルト値"
 
   script:
     categories:
@@ -2088,6 +2202,9 @@ pages:
       _mod:
         arg1: "A"
         arg2: "B"
+      round: "小数を丸める"
+      _round:
+        arg1: "数値"
       eq: "AとBが同じ"
       _eq:
         arg1: "A"
@@ -2203,3 +2320,65 @@ pages:
     enviromentVariables: "環境変数"
     pageVariables: "ページ要素"
     argVariables: "入力スロット"
+
+room:
+  add-furniture: "家具を置く"
+  translate: "移動"
+  rotate: "回転"
+  exit: "戻る"
+  remove: "しまう"
+  save: "保存"
+  saved: "保存しました"
+  clear: "片付け"
+  clear-confirm: "全ての家具をしまいますか？"
+  leave-confirm: "未保存の変更があります、移動しますか？"
+  chooseImage: "画像を選択"
+  room-type: "部屋のタイプ"
+  carpet-color: "床の色"
+  rooms:
+    default: "デフォルト"
+    washitsu: "和室"
+  furnitures:
+    milk: "牛乳パック"
+    bed: "ベッド"
+    low-table: "ローテーブル"
+    desk: "デスク"
+    chair: "チェア"
+    chair2: "チェア2"
+    fan: "換気扇"
+    pc: "パソコン"
+    plant: "観葉植物"
+    plant2: "観葉植物2"
+    eraser: "消しゴム"
+    pencil: "鉛筆"
+    pudding: "プリン"
+    cardboard-box: "段ボール箱"
+    cardboard-box2: "段ボール箱2"
+    cardboard-box3: "段ボール箱3"
+    book: "本"
+    book2: "本2"
+    piano: "ピアノ"
+    facial-tissue: "ティッシュボックス"
+    server: "サーバー"
+    moon: "月"
+    corkboard: "コルクボード"
+    mousepad: "マウスパッド"
+    monitor: "モニター"
+    keyboard: "キーボード"
+    carpet-stripe: "カーペット(縞)"
+    mat: "マット"
+    color-box: "カラーボックス"
+    wall-clock: "壁掛け時計"
+    photoframe: "額縁"
+    cube: "キューブ"
+    tv: "テレビ"
+    pinguin: "ピンギン"
+    rubik-cube: "ルービックキューブ"
+    poster-h: "ポスター(横長)"
+    poster-v: "ポスター(縦長)"
+    sofa: "ソファ"
+    spiral: "螺旋階段"
+    bin: "ゴミ箱"
+    cup-noodle: "カップ麺"
+    holo-display: "ホログラフィックディスプレイ"
+    energy-drink: "エナジードリンク"

locales/ja-KS.yml

@@ -18,15 +18,19 @@ common:
     drive: "ドライブ"
     drive-desc: "「こないだの画像、どこやったかな……また投稿したいんやけど……」「さっきのファイルあのフォルダに直しといて」そんなこと言わんとって。Misskeyはもとからドライブ機能持っとるさかい、心配あらへん。ファイルの「わけわけ」したってな。"
     outro: "Misskeyの機能は無限大や！知らんけど。知らん言うとるやんけ、あんたが見に行けや！Misskeyは分散型SNSやから、ここがあかんくても他がある。阪神でもオリックスでもワイは応援するで！"
-  adblock:
-    detected: "広告ブロッカーを無効にしてや"
-    warning: "<strong>Misskeyは広告を掲載してへん</strong>けど、広告をブロックしはる機能がおると一部の機能が利用できんくなったり、不具合が発生するかも分からん。知らんけど。"
   application-authorization: "アプリの連携"
   close: "さいなら"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりせんといてください。アカウントが不正利用されるかも分からん。知らんけど。"
   load-more: "もっとあらへんのか！"
   enter-password: "パスワードを入れてや"
   2fa: "二段階認証"
+  delete-confirm: "この投稿を削除してもええか？"
+  notification-types:
+    all: "すべて"
+    follow: "フォロー"
+    reply: "返す"
+    renote: "Renote"
+    reaction: "リアクション"
   got-it: "ほい"
   customization-tips:
     title: "カスタマイズのヒント"
@@ -122,7 +126,11 @@ common:
     blocking: "ブロック"
     password: "パスワード"
     other: "その他"
+    reactions: "リアクション"
     timeline: "タイムライン"
+    save: "保存"
+    saved: "保存したで！"
+    preview: "試してみる"
   search: "検索"
   delete: "削除"
   loading: "読み込み中"
@@ -363,6 +371,8 @@ common/views/components/emoji-picker.vue:
   objects: "物"
   symbols: "記号"
   flags: "旗"
+common/views/components/settings/app-type.vue:
+  info: "ページもっぺん読み込んだら反映したるで。"
 common/views/components/signin.vue:
   username: "ユーザー名"
   password: "パスワード"
@@ -456,7 +466,7 @@ common/views/components/profile-editor.vue:
   description: "自己紹介"
   language: "言語"
   birthday: "誕生日"
-  avatar: "アイコン"
+  avatar: "アバター"
   banner: "バナー"
   is-cat: "このアカウントはCatやで"
   is-bot: "このアカウントはBotやで"
@@ -468,6 +478,7 @@ common/views/components/profile-editor.vue:
   saved: "プロフィールを保存したで"
   uploading: "アップロードしとります"
   upload-failed: "これアップロードでけへんわ"
+  unable-to-process: "あかん、無理やわ"
   email: "メール設定"
   email-address: "メールアドレス"
   email-verified: "このメールアドレスOKや！"
@@ -561,6 +572,7 @@ desktop:
   uploading-avatar: "新しいアバターをアップロードしとるで"
   avatar-updated: "アバターを更新したで"
   choose-avatar: "アバターにする画像選んでや"
+  unable-to-process: "あかん、無理やわ"
   invalid-filetype: "この形式のファイル無理やねん"
 desktop/views/components/activity.chart.vue:
   total: "黒いの ... 全部"
@@ -592,7 +604,7 @@ desktop/views/components/crop-window.vue:
 desktop/views/components/drive-window.vue:
   used: "使うとる"
 desktop/views/components/drive.file.vue:
-  avatar: "アイコン"
+  avatar: "アバター"
   banner: "バナー"
   nsfw: "見たらあかんで"
   contextmenu:
@@ -601,8 +613,8 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "やっぱ見せたるわ"
     copy-url: "URLをコピー"
     download: "ダウンロード"
-    else-files: "まだあんで..."
-    set-as-avatar: "アイコンにする"
+    else-files: "その他"
+    set-as-avatar: "アバターにする"
     set-as-banner: "バナーにする"
     open-in-app: "アプリで開く"
     add-app: "アプリ増やす"
@@ -620,6 +632,7 @@ desktop/views/components/drive.folder.vue:
     rename: "名前を変えるで"
     rename-folder: "フォルダ名を変えるで"
     input-new-folder-name: "新しいフォルダ名を入力してや"
+    else-folders: "その他"
 desktop/views/components/drive.vue:
   search: "検索"
   empty-draghover: "ドロップするにゃ！お魚以外なら何でもいいにゃ！"
@@ -747,6 +760,7 @@ common/views/components/drive-settings.vue:
   max: "容量"
   in-use: "使うとる"
   stats: "統計"
+  default-upload-folder-name: "フォルダ"
 common/views/components/mute-and-block.vue:
   mute-and-block: "ミュートとブロック"
   mute: "ミュート"
@@ -853,7 +867,6 @@ admin/views/instance.vue:
   drive-config: "ドライブの設定"
   object-storage-endpoint: "エンドポイント"
   cache-remote-files: "リモートのファイルをキャッシュする"
-  cache-remote-files-desc: "この設定を無効にすると、リモートファイルをこっちで保管せずに直接リンク張るようになるで。サーバーのストレージは軽くやろうけど、プライバシー設定で直リンクを向こうにしとるユーザーはファイルが見れへんし、サムネイルが無いから通信量が増えたりするから、普通はオンにしといてな。"
   local-drive-capacity-mb: "ローカルユーザーひとりあたりのドライブ容量"
   remote-drive-capacity-mb: "リモートユーザーひとりあたりのドライブ容量"
   mb: "メガバイト単位"
@@ -938,6 +951,8 @@ admin/views/users.vue:
   reset-password: "パスワードをリセット"
   password-updated: "パスワードは現在「{password} 」やで"
   suspend: "凍結"
+  username: "ユーザー名"
+  host: "ホスト"
   users:
     title: "ユーザー"
     state:
@@ -945,6 +960,11 @@ admin/views/users.vue:
       moderator: "モデレーター"
     origin:
       local: "ローカル"
+admin/views/moderators.vue:
+  logs:
+    moderator: "モデレーター"
+    type: "操作"
+    info: "情報"
 admin/views/emoji.vue:
   add-emoji:
     add: "増やす"
@@ -1161,6 +1181,8 @@ mobile/views/pages/search.vue:
   not-found: "ワイは「{q}」なんて投稿知らんわ、無いんちゃう？知らんけど。"
 mobile/views/pages/selectdrive.vue:
   select-file: "ファイル選んでや"
+mobile/views/pages/notifications.vue:
+  notifications: "通知"
 mobile/views/pages/settings.vue:
   signed-in-as: "あんたは橋の下で拾った{}や！"
 mobile/views/pages/user.vue:
@@ -1234,6 +1256,8 @@ dev/views/new-app.vue:
   authority-desc: "ここにチェックした機能しかAPIからアクセスできひんから気ぃつけてな"
   authority-warning: "アプリ作った後でも変えれるけど、新しいやつ追加したらそん時関連付いてるユーザーキーは全部ほかされるで。"
 pages:
+  pin-this-page: "ピン留め"
+  unpin-this-page: "ピン留めやめる"
   like: "ええやん"
   blocks:
     image: "画像"
@@ -1258,3 +1282,10 @@ pages:
         arg1: "リスト"
     types:
       array: "リスト"
+room:
+  translate: "移動"
+  save: "保存"
+  saved: "保存したで！"
+  furnitures:
+    moon: "月"
+    bin: "ゴミ箱"

locales/ko-KR.yml

@@ -18,9 +18,6 @@ common:
     drive: "드라이브"
     drive-desc: "이전에 올렸던 적 있는 이미지를 다시 올리고 싶을 때가 있지 않으신가요? 아니면 업로드했던 파일을 폴더로 정리하고 싶지 않으신가요? Misskey에 기본적으로 내장된 드라이브 기능으로 해결됩니다. 파일 공유도 쉽습니다."
     outro: "이외에도 Misskey에만 있는 기능이 아직도 더 있으니 부디 여러분 자신의 눈으로 확인해보시기 바랍니다. Misskey는 분산형 SNS라서 이 인스턴스가 마음에 들지 않으신다면 다른 인스턴스를 시도해보실 수도 있습니다. 그럼, GLHF!"
-  adblock:
-    detected: "광고 차단기를 해제하십시오"
-    warning: "<strong>Misskey는 광고를 게재하지 않습니다</strong>. 하지만 광고 차단 기능을 사용할 경우 일부 기능을 사용할 수 없거나 문제가 발생할 수 있습니다."
   application-authorization: "앱 연계"
   close: "닫기"
   do-not-copy-paste: "여기에 코드를 입력하거나 붙여넣지 마십시오. 계정이 무단으로 사용될 수 있습니다."
@@ -36,6 +33,19 @@ common:
   reload-to-apply-the-setting: "이 설정을 적용하려면 페이지를 새로고침해야 합니다. 바로 새로고침하시겠습니까?"
   fetching-as-ap-object: "연합에서 조회 중"
   unfollow-confirm: "{name} 님을 팔로우 해제하시겠습니까?"
+  delete-confirm: "이 글을 삭제하시겠습니까?"
+  signin-required: "로그인 해주세요"
+  notification-type: "알림의 종류"
+  notification-types:
+    all: "모두"
+    pollVote: "투표"
+    follow: "팔로잉"
+    receiveFollowRequest: "팔로우 요청"
+    reply: "답글 달기"
+    quote: "인용"
+    renote: "리노트"
+    mention: "멘션"
+    reaction: "리액션"
   got-it: "알겠습니다"
   customization-tips:
     title: "커스터마이징 도움말"
@@ -73,14 +83,14 @@ common:
   followers: "팔로워"
   favorites: "즐겨찾기"
   permissions:
-    "read:account": "계정의 정보를 볼 수 있습니다."
-    "write:account": "계정의 정보를 변경할 수 있습니다."
-    "read:blocks": "차단 목록을 볼 수 있습니다."
-    "write:blocks": "차단 목록을 조작할 수 있습니다."
-    "read:drive": "드라이브의 파일들을 볼 수 있습니다."
-    "write:drive": "드라이브의 파일들을 조작할 수 있습니다."
-    "read:favorites": "즐겨찾기 목록을 볼 수 있습니다."
-    "write:favorites": "즐겨찾기 목록을 조작할 수 있습니다."
+    "read:account": "계정 정보 보기"
+    "write:account": "계정 정보 변경"
+    "read:blocks": "차단 보기"
+    "write:blocks": "차단 수정"
+    "read:drive": "드라이브 보기"
+    "write:drive": "드라이브 수정"
+    "read:favorites": "즐겨찾기 보기"
+    "write:favorites": "즐겨찾기 수정"
     "read:following": "팔로우 정보 보기"
     "write:following": "팔로잉, 팔로우 수정"
     "read:messaging": "대화 보기"
@@ -88,11 +98,17 @@ common:
     "read:mutes": "뮤트 보기"
     "write:mutes": "뮤트 수정"
     "write:notes": "글 작성, 삭제"
-    "read:notifications": "글 보기"
+    "read:notifications": "알림 보기"
     "write:notifications": "알림 수정"
     "read:reactions": "리액션 보기"
     "write:reactions": "리액션 수정"
     "write:votes": "투표하기"
+    "read:pages": "페이지 보기"
+    "write:pages": "페이지 변경"
+    "read:page-likes": "페이지의 좋아요 보기"
+    "write:page-likes": "페이지의 좋아요 변경"
+    "read:user-groups": "유저 그룹 보기"
+    "write:user-groups": "유저 그룹을 변경"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "사용자를 팔로우하면 글이 타임라인에 표시됩니다."
     explore: "사용자 탐색"
@@ -120,9 +136,11 @@ common:
     geolocation-alert: "사용 중이신 장치에서는 위치 정보를 사용할 수 없습니다"
     error: "오류"
     enter-username: "사용자명을 입력해주세요"
+    specified-recipient: "수신인"
     add-visible-user: "사용자 추가"
     cw-placeholder: "내용에 대한 주석 (옵션)"
     username-prompt: "사용자명을 입력해주세요"
+    enter-file-name: "파일 이름 수정"
   weekday-short:
     sunday: "일"
     monday: "월"
@@ -182,6 +200,8 @@ common:
     other: "기타"
     appearance: "디자인"
     behavior: "동작"
+    reactions: "리액션"
+    reactions-description: "리액션 선택창에 표시할 리액션을 줄바꿈으로 구분해 설정합니다."
     fetch-on-scroll: "스크롤하여 자동으로 불러오기"
     fetch-on-scroll-desc: "페이지를 아래로 스크롤하였을 때 자동으로 추가 콘텐츠를 불러옵니다."
     note-visibility: "게시물의 공개 범위"
@@ -189,6 +209,11 @@ common:
     remember-note-visibility: "글의 공개 범위를 기억하기"
     web-search-engine: "웹 검색엔진"
     web-search-engine-desc: "예: https://www.google.com/?#q={{query}}"
+    paste: "붙여넣기"
+    pasted-file-name: "붙여넣은 파일의 이름 템플릿"
+    pasted-file-name-desc: "예시: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "붙여넣기 시 파일 이름을 편집"
+    paste-dialog-desc: "붙여넣기 시 파일 이름을 편집할 수 있도록 대화 상자를 표시합니다."
     keep-cw: "CW 유지"
     keep-cw-desc: "글에 답글을 달 때, 답글할 글에 CW가 설정되어 있는 경우 기본값으로 동일한 CW를 설정하도록 합니다."
     i-like-sushi: "저는 (푸딩보다 차라리) 초밥이 좋아요"
@@ -196,6 +221,7 @@ common:
     use-avatar-reversi-stones: "리버시의 돌로 아바타를 사용"
     disable-animated-mfm: "글의 문자 애니메이션을 비활성화"
     disable-showing-animated-images: "움직이는 이미지를 자동으로 재생하지 않음"
+    enable-quick-notification-view: "알림의 빠른 보기를 사용합니다"
     suggest-recent-hashtags: "최근 해시태그를 글 작성란에 표시"
     always-show-nsfw: "항상 열람주의 미디어를 표시"
     always-mark-nsfw: "항상 미디어를 열람주의로 설정하여 게시"
@@ -226,7 +252,7 @@ common:
     deck-column-width-wide: "넓음"
     use-shadow: "UI에 그림자 효과 적용"
     rounded-corners: "UI의 모서리를 둥글게 설정"
-    circle-icons: "원형 아이콘 사용"
+    circle-icons: "원형 아바타를 사용"
     contrasted-acct: "사용자명에 대비 추가"
     wallpaper: "배경"
     choose-wallpaper: "배경 설정"
@@ -272,8 +298,21 @@ common:
     load-raw-images: "첨부 이미지를 고품질로 표시"
     load-remote-media: "원격 서버의 미디어를 표시"
     sync: "동기화"
+    save: "저장"
+    saved: "저장하였습니다"
+    preview: "미리보기"
     home-profile: "홈 프로필"
     deck-profile: "덱 프로필"
+    room: "룸"
+    _room:
+      graphicsQuality: "그래픽 품질"
+      _graphicsQuality:
+        ultra: "최고"
+        high: "높음"
+        medium: "보통"
+        low: "낮음"
+        cheep: "최저"
+      useOrthographicCamera: "평행 투시 카메라를 사용"
   search: "검색"
   delete: "삭제"
   loading: "로드 중"
@@ -290,7 +329,7 @@ common:
   is-remote-user: "이 사용자 정보는 정확하지 않을 수 있습니다."
   is-remote-post: "이 글 정보는 복사본입니다."
   view-on-remote: "정확한 정보 보기"
-  renoted-by: "{user}님이 리노트"
+  renoted-by: "{user} 님이 리노트"
   no-notes: "글이 없습니다"
   turn-on-darkmode: "어둠에 삼켜져라"
   turn-off-darkmode: "빛이 있으라"
@@ -354,10 +393,15 @@ common/views/pages/explore.vue:
   popular-users: "인기 사용자"
   recently-updated-users: "최근 게시한 사용자"
   recently-registered-users: "신규 사용자"
+  recently-discovered-users: "최근 발견된 유저"
   popular-tags: "인기 태그"
   federated: "연합"
   explore: "{host}을(를) 탐색"
+  explore-fediverse: "연합 우주를 탐색"
   users-info: "현재 {users} 사용자가 등록되어 있습니다"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users}님이 {reaction} 리액션"
+  many-users: "{users}님 외 {omitted}명이 {reaction} 리액션"
 common/views/components/url-preview.vue:
   enable-player: "플레이어 열기"
   disable-player: "플레이어 닫기"
@@ -523,6 +567,8 @@ common/views/components/note-menu.vue:
   unpin: "프로필에서 고정 해제"
   delete: "삭제"
   delete-confirm: "이 글을 삭제하시겠습니까?"
+  delete-and-edit: "삭제 후 편집"
+  delete-and-edit-confirm: "이 글을 삭제한 뒤 다시 편집하시겠습니까? 이 글에 대한 리액션, 리노트, 답글 또한 모두 삭제됩니다."
   remote: "글 원본 보기"
   pin-limit-exceeded: "더 이상 고정할 수 없습니다."
 common/views/components/user-menu.vue:
@@ -584,7 +630,9 @@ common/views/components/reaction-picker.vue:
   choose-reaction: "리액션 선택"
   input-reaction-placeholder: "또는 이모지 입력"
 common/views/components/emoji-picker.vue:
+  recent-emoji: "최근 사용한 이모지"
   custom-emoji: "커스텀 이모지"
+  no-category: "카테고리 없음"
   people: "사람들"
   animals-and-nature: "동물 & 자연"
   food-and-drink: "음식 & 음료"
@@ -593,6 +641,14 @@ common/views/components/emoji-picker.vue:
   objects: "사물"
   symbols: "기호"
   flags: "깃발"
+common/views/components/settings/app-type.vue:
+  title: "모드"
+  intro: "데스크톱과 모바일 중 어떤 레이아웃을 사용할 지 지정할 수 있습니다."
+  choices:
+    auto: "자동으로 선택"
+    desktop: "데스크톱 레이아웃으로 고정"
+    mobile: "모바일 레이아웃으로 고정"
+  info: "변경사항은 페이지를 새로고침한 뒤에 반영됩니다."
 common/views/components/signin.vue:
   username: "사용자명"
   password: "비밀번호"
@@ -709,6 +765,9 @@ common/views/components/profile-editor.vue:
   saved: "프로필을 저장하였습니다"
   uploading: "업로드 중"
   upload-failed: "업로드에 실패하였습니다"
+  unable-to-process: "작업을 완료할 수 없습니다"
+  avatar-not-an-image: "아바타로 지정한 파일이 이미지 형식이 아닙니다"
+  banner-not-an-image: "배너로 지정한 파일이 이미지 형식이 아닙니다"
   email: "메일 설정"
   email-address: "메일 주소"
   email-verified: "매일 주소가 확인되었습니다"
@@ -728,6 +787,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "위험한 설정"
   delete-account: "계정 삭제"
   account-deleted: "계정이 삭제되었습니다. 데이터가 사라질 때까지 시간이 걸릴 수 있습니다."
+  profile-metadata: "프로필 추가 정보"
+  metadata-label: "라벨"
+  metadata-content: "내용"
 common/views/components/user-list-editor.vue:
   users: "사용자"
   rename: "리스트 이름 바꾸기"
@@ -766,6 +828,7 @@ common/views/widgets/broadcast.vue:
   no-broadcasts: "공지사항이 없습니다"
   have-a-nice-day: "좋은 하루 되세요!"
   next: "다음"
+  prev: "이전"
 common/views/widgets/calendar.vue:
   year: "{}년"
   month: "{}월"
@@ -837,6 +900,7 @@ desktop:
   uploading-avatar: "새로운 아바타를 업로드하고 있습니다"
   avatar-updated: "아바타가 변경되었습니다"
   choose-avatar: "아바타 이미지를 선택"
+  unable-to-process: "작업을 완료할 수 없습니다"
   invalid-filetype: "이 형식의 파일은 지원되지 않습니다"
 desktop/views/components/activity.chart.vue:
   total: "검은색 ... 전체"
@@ -877,8 +941,8 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "열람주의 해제"
     copy-url: "URL 복사"
     download: "다운로드"
-    else-files: "기타..."
-    set-as-avatar: "아이콘으로 설정"
+    else-files: "기타"
+    set-as-avatar: "아바타로 설정"
     set-as-banner: "배너로 설정"
     open-in-app: "앱에서 열기"
     add-app: "앱 추가"
@@ -887,15 +951,20 @@ desktop/views/components/drive.file.vue:
     copied: "복사 완료"
     copied-url-to-clipboard: "URL을 클립보드에 복사하였습니다"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "기본 업로드 위치"
   unable-to-process: "작업을 완료할 수 없습니다"
   circular-reference-detected: "대상 폴더가 이동할 폴더의 하위 폴더입니다."
   unhandled-error: "알 수 없는 오류"
+  unable-to-delete: "삭제할 수 없습니다"
+  has-child-files-or-folders: "이 폴더는 비어있지 않기 때문에 삭제할 수 없습니다."
   contextmenu:
     move-to-this-folder: "이 폴더로 이동"
     show-in-new-window: "새 창으로 보기"
     rename: "이름 변경"
     rename-folder: "폴더 이름 변경"
     input-new-folder-name: "새 폴더 이름을 입력하여 주십시오"
+    else-folders: "기타"
+    set-as-upload-folder: "기본 업로드 위치로 설정"
 desktop/views/components/drive.vue:
   search: "검색"
   empty-draghover: "끌어놓으신 거 맞나요? 괜찮아요, 저는 귀여우니까요"
@@ -1010,6 +1079,7 @@ desktop/views/components/settings.2fa.vue:
   register-security-key: "키 등록 완료"
   something-went-wrong: "으악! 키를 등록하는 도중 문제가 발생하였습니다:"
   key-unregistered: "키가 등록되어 있지 않습니다"
+  use-password-less-login: "비밀번호 없는 로그인 사용"
 common/views/components/media-image.vue:
   sensitive: "열람주의"
   click-to-show: "클릭하여 보기"
@@ -1034,6 +1104,9 @@ common/views/components/drive-settings.vue:
   max: "최대 용량"
   in-use: "사용중"
   stats: "통계"
+  default-upload-folder: "기본 업로드 폴더 위치"
+  default-upload-folder-name: "폴더"
+  change-default-upload-folder: "폴더 변경"
 common/views/components/mute-and-block.vue:
   mute-and-block: "뮤트 및 차단"
   mute: "뮤트"
@@ -1043,6 +1116,8 @@ common/views/components/mute-and-block.vue:
   word-mute: "단어 뮤트"
   muted-words: "뮤트된 키워드"
   muted-words-description: "공백으로 구분하는 경우 AND로 지정되며, 줄바꿈으로 구분하는 경우 OR로 지정됩니다"
+  unmute-confirm: "이 사용자를 뮤트 해제하시겠습니까?"
+  unblock-confirm: "이 사용자를 차단 해제하시겠습니까?"
   save: "저장"
 common/views/components/password-settings.vue:
   reset: "비밀번호 변경"
@@ -1087,6 +1162,7 @@ desktop/views/components/ui.header.account.vue:
   groups: "그룹"
   follow-requests: "팔로우 요청"
   admin: "관리"
+  room: "룸"
 desktop/views/components/ui.header.nav.vue:
   game: "게임"
 desktop/views/components/ui.header.notifications.vue:
@@ -1203,7 +1279,9 @@ admin/views/instance.vue:
   object-storage-s3-info-here: "이곳"
   object-storage-gcs-info: "Google Cloud Storage를 오브젝트 스토리지로 사용하는 경우, 「엔드포인트」는 storage.googleapis.com 으로 설정하고, 「리전」 란은 비웁니다."
   cache-remote-files: "원격 파일을 캐시"
-  cache-remote-files-desc: "이 설정을 해지하면 원격 파일을 캐시하지 않고 해당 파일을 직접 링크하게 됩니다. 그에 따라 서버의 저장 공간을 절약할 수 있지만, 프라이버시 설정에서 직접 링크를 무효로 설정한 사용자에게는 파일이 보이지 않거나, 썸네일이 생성되지 않기 때문에 통신량이 증가합니다. 일반적으로 이 설정을 ON으로 두는 것을 추천합니다."
+  cache-remote-files-desc: "이 설정을 해지하면 원격 파일을 캐시하지 않고 해당 파일을 직접 링크하게 됩니다. 그에 따라 서버의 저장 공간을 절약할 수 있지만, 프라이버시 설정에서 직접 링크를 무효로 설정한 사용자에게는 파일이 보이지 않거나, 썸네일이 생성되지 않기 때문에 통신량이 증가합니다. 보통은 이 설정을 사용하거나 아래의 원격 파일 프록시를 설정하는 것을 추천합니다."
+  proxy-remote-files: "원격 파일 프록시"
+  proxy-remote-files-desc: "이 설정을 사용하면, 저장되지 않았거나 용량 초과로 삭제된 원격 파일을 로컬에서 프록시하여 썸네일을 생성하게 됩니다."
   local-drive-capacity-mb: "로컬 사용자 한 명당 드라이브 용량"
   remote-drive-capacity-mb: "원격 사용자 한 명당 드라이브 용량"
   mb: "메가바이트 단위"
@@ -1340,6 +1418,8 @@ admin/views/users.vue:
   remote-user-updated: "원격 사용자 정보를 갱신하였습니다"
   delete-all-files: "모든 파일 삭제"
   delete-all-files-confirm: "모든 파일을 삭제하시겠습니까?"
+  username: "사용자명"
+  host: "호스트"
   users:
     title: "사용자"
     sort:
@@ -1351,6 +1431,7 @@ admin/views/users.vue:
     state:
       title: "상태"
       all: "모두"
+      available: "이용 가능"
       admin: "관리자"
       moderator: "모더레이터"
       adminOrModerator: "관리자+모더레이터"
@@ -1370,11 +1451,18 @@ admin/views/moderators.vue:
     added: "모더레이터를 등록하였습니다"
     remove: "해제"
     removed: "모더레이터 등록을 해제했습니다"
+  logs:
+    title: "로그"
+    moderator: "모더레이터"
+    type: "작업"
+    at: "일시"
+    info: "정보"
 admin/views/emoji.vue:
   add-emoji:
     title: "이모지 등록"
     name: "이모지 이름"
     name-desc: "a~z 0~9 _ 의 문자를 사용할 수 있습니다."
+    category: "카테고리"
     aliases: "별칭"
     aliases-desc: "공백으로 구분하여 여러 개 설정할 수 있습니다."
     url: "이모지 이미지 URL"
@@ -1658,6 +1746,8 @@ mobile/views/pages/search.vue:
   not-found: "\"{q}\" 와 일치하는 글을 찾을 수 없습니다."
 mobile/views/pages/selectdrive.vue:
   select-file: "파일 선택"
+mobile/views/pages/notifications.vue:
+  notifications: "알림"
 mobile/views/pages/settings.vue:
   signed-in-as: "{}(으)로 로그인"
 mobile/views/pages/user.vue:
@@ -1716,6 +1806,7 @@ deck/deck.user-column.vue:
   activity: "활동"
   timeline: "타임라인"
   pinned-notes: "고정해놓은 글"
+  pinned-page: "고정해놓은 페이지"
 docs:
   edit-this-page-on-github: "틀린 점이나 개선할 점을 찾으셨나요?"
   edit-this-page-on-github-link: "이 페이지를 GitHub에서 편집"
@@ -1747,9 +1838,14 @@ pages:
   read-page: "소스 표시중"
   page-created: "페이지를 만들었습니다"
   page-updated: "페이지를 수정했습니다"
+  name-already-exists: "지정한 페이지 URL은 이미 존재합니다"
+  title-invalid-name: "유효하지 않은 페이지 URL입니다"
+  text-invalid-name: "비어있지 않은지 확인해주세요"
   are-you-sure-delete: "이 페이지를 삭제하시겠습니까?"
   page-deleted: "페이지가 삭제되었습니다"
   edit-this-page: "이 페이지를 편집"
+  pin-this-page: "프로필에 고정"
+  unpin-this-page: "프로필에서 고정 해제"
   view-source: "소스 보기"
   view-page: "페이지 보기"
   like: "좋아요"
@@ -1768,6 +1864,7 @@ pages:
   url: "페이지 URL"
   summary: "페이지 요약"
   align-center: "가운데 정렬"
+  hide-title-when-pinned: "프로필에 고정해놓은 경우 타이틀을 표시하지 않음"
   font: "글꼴"
   fontSerif: "세리프"
   fontSansSerif: "산 세리프"
@@ -1821,12 +1918,25 @@ pages:
       inc: "증가치"
     _button:
       text: "제목"
+      colored: "색상"
       action: "버튼을 눌렀을 때의 동작"
       _action:
         dialog: "대화상자를 표시"
         _dialog:
           content: "내용"
         resetRandom: "난수를 초기화"
+        pushEvent: "이벤트 보내기"
+        _pushEvent:
+          event: "이벤트 이름"
+          message: "눌렀을 때 표시할 메시지"
+          variable: "보낼 변수"
+          no-variable: "없음"
+    radioButton: "선택지"
+    _radioButton:
+      name: "변수명"
+      title: "제목"
+      values: "줄바꿈으로 구분된 선택지"
+      default: "기본값"
   script:
     categories:
       flow: "흐름 제어"
@@ -1884,6 +1994,9 @@ pages:
       _mod:
         arg1: "A"
         arg2: "B"
+      round: "소수점을 반올림"
+      _round:
+        arg1: "수치"
       eq: "A와 B가 동일"
       _eq:
         arg1: "A"
@@ -1999,3 +2112,64 @@ pages:
     enviromentVariables: "환경 변수"
     pageVariables: "페이지 요소"
     argVariables: "입력 슬롯"
+room:
+  add-furniture: "가구를 배치"
+  translate: "이동"
+  rotate: "회전"
+  exit: "선택 해제"
+  remove: "치우기"
+  save: "저장"
+  saved: "저장하였습니다"
+  clear: "모두 치우기"
+  clear-confirm: "정말 방 안의 모든 가구를 치우시겠습니까?"
+  leave-confirm: "저장되지 않은 변경 사항이 있습니다. 정말 나가시겠습니까?"
+  chooseImage: "이미지 선택"
+  room-type: "룸 종류"
+  carpet-color: "바닥 색상"
+  rooms:
+    default: "기본"
+    washitsu: "일본식"
+  furnitures:
+    milk: "우유 팩"
+    bed: "침대"
+    low-table: "낮은 테이블"
+    desk: "책상"
+    chair: "의자"
+    chair2: "의자 2"
+    fan: "환기구"
+    pc: "컴퓨터"
+    plant: "관엽식물"
+    plant2: "관엽식물 2"
+    eraser: "지우개"
+    pencil: "연필"
+    pudding: "푸딩"
+    cardboard-box: "골판지 상자"
+    cardboard-box2: "골판지 상자 2"
+    cardboard-box3: "골판지 상자 3"
+    book: "책"
+    book2: "책 2"
+    piano: "피아노"
+    facial-tissue: "휴지 상자"
+    server: "서버"
+    moon: "달"
+    corkboard: "게시판"
+    mousepad: "마우스 패드"
+    monitor: "모니터"
+    keyboard: "키보드"
+    carpet-stripe: "카페트 (줄무늬)"
+    mat: "매트"
+    color-box: "책장"
+    wall-clock: "벽걸이 시계"
+    photoframe: "액자"
+    cube: "큐브"
+    tv: "TV"
+    pinguin: "펭귄"
+    rubik-cube: "루빅스 큐브"
+    poster-h: "포스터 (가로)"
+    poster-v: "포스터 (세로)"
+    sofa: "소파"
+    spiral: "나선형 계단"
+    bin: "휴지통"
+    cup-noodle: "컵라면"
+    holo-display: "홀로그램"
+    energy-drink: "에너지 드링크"

locales/nl-NL.yml

@@ -3,11 +3,58 @@ meta:
   lang: "Nederlands"
 common:
   misskey: "Deel alles met anderen die ook Misskey gebruiken."
+  about-title: "Een ster van het fediverse"
+  about: "Bedankt voor het ontdekken van Misskey. Misskey is een <b>gedecentraliseerd microblogging platform</b> geboren op aarde. Omdat het bestaat binnen het Fediverse (een georganiseerd universum van verschillende sociale mediaplatformen), staat het verbonden met andere sociale medieplatformen. Neem een pauze van de stedelijke drukte, en duik in het nieuwe intenet?"
   intro:
+    title: "Wat is Misskey?"
+    about: "Misskey is een open source <b>gedecentraliseerd blogplatform</b>. Het heeft een gesofisticeerde, volledig aanpasbare gebruikersinterface, uitgebreide reactiemogelijkheden voor posts, gratis geïntegreerd bestandsoplagbeheer en andere geavanceerde mogelijkheden. Daarnaast staat Misskey verbonden aan een netwerksysteem genaam het \"Fediverse\", hiermee kunnen we communiceren met andere gebruikers op andere SNSs. Dit betekent dat wanneer je iets post het niet enkel verstuurd wordt naar andere Misskey gebruikers, maar ook naar gebruikers op Mastodon en Pleroma. Stel je voor dat een planeet een radiosignaal verzendt naar een andere planeet als manier van communiceren."
+    features: "Kenmerken"
     rich-contents: "Bericht"
+    rich-contents-desc: "Post jouw idee, hot topic, wat je ook maar wil delen. Maak jouw teksten aantrekkelijk met je favoriete foto's, verzend bestanden, zelfs video's, of maak een poll. Dit zijn enkele van de mogelijkheden die Misskey aanbiedt!"
     reaction: "Reactie"
+    reaction-desc: "Dé makkelijkste manier om jouw gevoelens uit te drukken. Met Misskey kan je verschillende reacties toevoegen aan jouw posts. Andere SNSs hebben enkel maar een \"vind ik leuk\" reactie."
+    ui: "Interface"
+    ui-desc: "Niet één UI past nij iedereen. Daarom heeft Misskey een uitgebreide keuze om de UI naar jouw hand te zetten. Je kan jouw nieuwe thuis zo origineel maken als je zelf wil door jouw tijdslijn aan te passen door widgets te verplaatsen en hun look te veranderen. Zo maak je van Misskey jouw eigen stek."
+    drive: "Drive"
+    drive-desc: "Wil je een foto posten die je reeds het geüpload? Wens je georganiseerde map met zelfgekozen naam maken voor al jouw bestanden? De beste oplossing voor jou  is Misskey Drive. Dit maakt het supermakkelijk om jouw bestanden online te delen."
+  application-authorization: "Geauthoriseerde applicaties"
   close: "Sluiten"
+  do-not-copy-paste: "Gelieve de code hier niet in te geven of te plakken. De account kan gecompromiseerd zijn."
+  load-more: "Laad meer resultaten"
   enter-password: "Voer het wachtwoord in"
+  2fa: "Tweestapsverificatie"
+  customize-home: "Layout aanpassen"
+  featured-notes: "Uitgelicht"
+  dark-mode: "Donker thema"
+  signin: "Aanmelden"
+  signup: "Registreren"
+  signout: "Afmelden"
+  reload-to-apply-the-setting: "Herlaad de pagina om je aanpassingen te bekijken. Wil je de pagina nu herladen?"
+  fetching-as-ap-object: "Verzenden naar Fediverse"
+  unfollow-confirm: "Wil stoppen met {name} te volgen?"
+  delete-confirm: "Ben je zeker dat je dit bericht wil verwijderen?"
+  signin-required: "Gelieve in te loggen"
+  notification-type: "Notificatietype"
+  notification-types:
+    all: "Alle"
+    pollVote: "Stemmen"
+    follow: "Volgend"
+    receiveFollowRequest: "Volgverzoeken"
+    reply: "Beantwoorden"
+    quote: "Bron"
+    mention: "Vermeldingen"
+    reaction: "Reactie"
+  got-it: "Ik snap het!"
+  customization-tips:
+    title: "Aanpassingstips"
+    gotit: "Ik snap het!"
+  notification:
+    file-uploaded: "Je bestand is geüpload"
+    message-from: "Bericht van {}:"
+    reversi-invited: "Uitgenodigd voor spel"
+    notified-by: "Bemerkt door: {}"
+    reply-from: "Antwoord van: {}"
+    quoted-by: "Geciteerd door: {}"
   time:
     unknown: "onbekend"
     future: "toekomstig"
@@ -19,7 +66,13 @@ common:
     weeks_ago: "{}week/weken geleden"
     months_ago: "{}maand(en) geleden"
     years_ago: "{}jaar geleden"
+  month-and-day: "{day} {month}"
+  trash: "Prullenbak"
+  drive: "Drive"
+  pages: "Pagina's"
+  messaging: "Gesprekken"
   home: "Startpagina"
+  deck: "Deck"
   timeline: "Tijdlijn"
   followers: "Volgers"
   favorites: "Deze notitie toevoegen aan favorieten"
@@ -54,7 +107,11 @@ common:
     profile: "Je profiel"
     notification: "Meldingen"
     password: "Wachtwoord"
+    reactions: "Reactie"
+    deck-column-align-center: "Centreren"
+    deck-column-align-left: "Links"
     timeline: "Tijdlijn"
+    navbar-position-left: "Links"
   search: "Zoeken"
   delete: "Verwijderen"
   loading: "Bezig met laden"
@@ -199,6 +256,7 @@ common/views/components/profile-editor.vue:
   name: "Naam"
   avatar: "Gebruikersafbeelding"
   banner: "Omslagfoto"
+  unable-to-process: "De operatie kan niet worden voltooid."
   export-targets:
     following-list: "Volgend"
     user-lists: "Lijsten"
@@ -226,6 +284,8 @@ common/views/pages/follow.vue:
   follow: "Volgend"
 desktop:
   banner: "Omslagfoto"
+  avatar: "Gebruikersafbeelding"
+  unable-to-process: "De operatie kan niet worden voltooid."
 desktop/views/components/activity.chart.vue:
   total: "Zwart ... totaal"
   notes: "Blauw ... notities"
@@ -260,7 +320,6 @@ desktop/views/components/drive.file.vue:
     rename: "Naam wijzigen"
     copy-url: "URL kopiëren"
     download: "Downloaden"
-    else-files: "Overig"
     set-as-avatar: "Instellen als gebruikersafbeelding"
     set-as-banner: "Instellen als omslagfoto"
     open-in-app: "Openen in app"
@@ -377,6 +436,7 @@ common/views/components/api-settings.vue:
 common/views/components/drive-settings.vue:
   in-use: "gebruikt"
   stats: "Statistieken"
+  default-upload-folder-name: "Map(pen)"
 desktop/views/components/sub-note-content.vue:
   private: "(dit bericht is privé)"
   poll: "Peilingen"
@@ -415,16 +475,19 @@ admin/views/index.vue:
   users: "Gebruiker"
 admin/views/dashboard.vue:
   notes: "Bericht"
+  drive: "Drive"
 admin/views/abuse.vue:
   remove-report: "Verwijderen"
 admin/views/charts.vue:
   notes: "Bericht"
   users: "Gebruiker"
+  drive: "Drive"
 admin/views/drive.vue:
   origin:
     local: "Lokaal"
   delete: "Verwijderen"
 admin/views/users.vue:
+  username: "Gebruikersnaam"
   users:
     title: "Gebruiker"
     state:
@@ -554,6 +617,7 @@ mobile/views/pages/home.vue:
   global: "Algemeen"
 mobile/views/pages/widgets.vue:
   add-widget: "Toevoegen"
+  customization-tips: "Aanpassingstips"
 mobile/views/pages/widgets/activity.vue:
   activity: "Activiteit"
 mobile/views/pages/note.vue:
@@ -566,6 +630,8 @@ mobile/views/pages/search.vue:
   search: "Zoeken"
 mobile/views/pages/selectdrive.vue:
   select-file: "Kies een bestand"
+mobile/views/pages/notifications.vue:
+  notifications: "Meldingen"
 mobile/views/pages/settings.vue:
   signed-in-as: "Ingelogd als {}"
 mobile/views/pages/user.vue:
@@ -606,6 +672,7 @@ docs:
   edit-this-page-on-github: "Heb je een fout ontdekt of wil je bijdragen aan de documentatie? "
   edit-this-page-on-github-link: "Bewerk deze pagina op GitHub!"
 pages:
+  pin-this-page: "Vastmaken aan profielpagina"
   like: "Leuk"
   blocks:
     image: "Afbeeldingen"
@@ -627,3 +694,8 @@ pages:
         arg1: "Lijsten"
     types:
       array: "Lijsten"
+room:
+  translate: "Verplaatsen"
+  furnitures:
+    moon: "Maan"
+    bin: "Prullenbak"

locales/no-NO.yml

@@ -11,6 +11,10 @@ common:
     rich-contents: "Innlegg"
     drive: "Disk"
   close: "Lukk"
+  notification-types:
+    all: "Alle"
+    follow: "Følger"
+    reply: "Svar"
   got-it: "Skjønner!"
   notification:
     file-uploaded: "Filen ble lastet opp!"
@@ -78,6 +82,7 @@ common:
   _settings:
     notification: "Notifikasjon"
     password: "Passord"
+    save: "Lagre"
   search: "Søk"
   delete: "Slett"
   loading: "Laster inn..."
@@ -286,6 +291,7 @@ common/views/components/api-settings.vue:
 common/views/components/drive-settings.vue:
   in-use: "brukt"
   stats: "Statistikk"
+  default-upload-folder-name: "Mappe(r)"
 common/views/components/mute-and-block.vue:
   save: "Lagre"
 desktop/views/components/settings.tags.vue:
@@ -344,12 +350,16 @@ admin/views/drive.vue:
     local: "Lokalt"
   delete: "Slett"
 admin/views/users.vue:
+  username: "Brukernavn"
   users:
     title: "Bruker"
     state:
       all: "Alle"
     origin:
       local: "Lokalt"
+admin/views/moderators.vue:
+  logs:
+    info: "Informasjon"
 admin/views/emoji.vue:
   add-emoji:
     add: "Legg til"
@@ -461,6 +471,8 @@ mobile/views/pages/games/reversi.vue:
   reversi: "Reversi"
 mobile/views/pages/search.vue:
   search: "Søk"
+mobile/views/pages/notifications.vue:
+  notifications: "Notifikasjon"
 mobile/views/pages/user.vue:
   following: "Følger"
   followers: "Følgere"
@@ -484,6 +496,7 @@ deck/deck.user-column.vue:
   followers: "Følgere"
   images: "Bilder"
 pages:
+  pin-this-page: "Fest til profilen din"
   like: "Lik"
   blocks:
     image: "Bilder"
@@ -507,3 +520,9 @@ pages:
         arg1: "Lister"
     types:
       array: "Lister"
+room:
+  translate: "Flytt"
+  save: "Lagre"
+  furnitures:
+    moon: "Måne"
+    bin: "Papirkurv"

locales/pl-PL.yml

@@ -14,9 +14,6 @@ common:
     ui: "Interfejs"
     drive: "Dysk"
     drive-desc: "Chcesz opublikować zdjęcie, które już przesłałeś? Chcesz uporządkować, nazwać i utworzyć folder dla przesłanych plików? Dysk Misskey to najlepsze rozwiązanie dla Ciebie. Bardzo łatwo udostępniać swoje pliki online."
-  adblock:
-    detected: "Spróbuj wyłączyć blokadę reklam."
-    warning: "<strong>Misskey nie zawiera reklam</strong>, ale część funkcji może nie działać prawidłowo z włączonym blokowaniem reklam."
   application-authorization: "Współpraca aplikacji"
   close: "Zamknij"
   load-more: "Załaduj więcej"
@@ -28,6 +25,18 @@ common:
   signin: "Zaloguj się"
   signup: "Rejestracja"
   signout: "Wyloguj się"
+  delete-confirm: "Czy na pewno chcesz usunąć ten wpis?"
+  notification-type: "Typy powiadomień"
+  notification-types:
+    all: "Wszyscy"
+    pollVote: "Głosy"
+    follow: "Śledzeni"
+    receiveFollowRequest: "Prośby o śledzenie"
+    reply: "Odpowiedzi"
+    quote: "Cytat"
+    renote: "Udostępnij"
+    mention: "Wzmianki"
+    reaction: "Reakcje"
   got-it: "Rozumiem!"
   customization-tips:
     title: "Wskazówki o dostosowywaniu"
@@ -86,8 +95,10 @@ common:
     visibility: "Widoczność"
     error: "Błąd"
     enter-username: "Wprowadź nazwę użytkownika"
+    specified-recipient: "Adresat"
     add-visible-user: "Dodaj użytkownika"
     username-prompt: "Wprowadź nazwę użytkownika"
+    enter-file-name: "Wprowadź nazwę pliku"
   weekday-short:
     sunday: "N"
     monday: "Pn"
@@ -146,10 +157,13 @@ common:
     other: "Inne"
     appearance: "Wygląd"
     behavior: "Zachowanie"
+    reactions: "Reakcja"
     fetch-on-scroll: "Automatycznie ładuj po przeciągnięciu w dół"
     note-visibility: "Widoczność wpisów"
     remember-note-visibility: "Zapamiętaj widoczność wpisów"
     web-search-engine: "Wyszukiwarka internetowa"
+    web-search-engine-desc: "Wzór: https://www.google.com/?#q={{query}}"
+    paste: "Wklej"
     line-width: "Szerokości linii"
     line-width-thin: "Cienka"
     line-width-normal: "Normalna"
@@ -178,6 +192,9 @@ common:
     version: "Wersja:"
     do-update: "Sprawdź dostępność nowych aktualizacji"
     navbar-position-left: "Z lewej"
+    save: "Zapisz"
+    saved: "Zapisano"
+    preview: "Pokaż podgląd"
   search: "Szukaj"
   delete: "Usuń"
   loading: "Ładowanie"
@@ -414,6 +431,8 @@ common/views/components/emoji-picker.vue:
   objects: "Rzeczy"
   symbols: "Symbole"
   flags: "Flagi"
+common/views/components/settings/app-type.vue:
+  info: "Musisz odświeżyć stronę, aby zmiany zostały uwzględnione."
 common/views/components/signin.vue:
   username: "Nazwa użytkownika"
   password: "Hasło"
@@ -514,6 +533,7 @@ common/views/components/profile-editor.vue:
   saved: "Pomyślnie zaktualizowano profil"
   uploading: "Wysyłanie"
   upload-failed: "Wysyłanie nie powiodło się"
+  unable-to-process: "Nie udało się ukończyć działania."
   email: "Ustawienia e-mail"
   email-address: "Adres e-mail"
   email-verified: "Twój adres e-mail został zweryfikowany."
@@ -608,6 +628,7 @@ desktop:
   uploading-avatar: "Wysyłanie awatara"
   avatar-updated: "Wysłano awatar"
   choose-avatar: "Wybierz awatar"
+  unable-to-process: "Nie udało się ukończyć działania."
 desktop/views/components/activity.chart.vue:
   total: "Czarny … Łącznie"
   notes: "Niebieski … Wpisy"
@@ -666,6 +687,7 @@ desktop/views/components/drive.folder.vue:
     rename: "Zmień nazwę"
     rename-folder: "Zmień nazwę katalogu"
     input-new-folder-name: "Wprowadź nową nazwę"
+    else-folders: "Inne"
 desktop/views/components/drive.vue:
   search: "Szukaj"
   empty-draghover: "Przeciągnij tutaj!"
@@ -785,6 +807,7 @@ common/views/components/drive-settings.vue:
   max: "Max"
   in-use: "użyto"
   stats: "Statystyki"
+  default-upload-folder-name: "Katalog(i)"
 common/views/components/mute-and-block.vue:
   mute-and-block: "Wycisz / Zablokuj"
   mute: "Wycisz"
@@ -904,6 +927,7 @@ admin/views/drive.vue:
   unmark-as-sensitive: "Cofnij oznaczenie jako zawartość wrażliwą"
 admin/views/users.vue:
   user-not-found: "Nie znaleziono użytkownika"
+  username: "Nazwa użytkownika"
   users:
     title: "Użytkownicy"
     sort:
@@ -919,6 +943,9 @@ admin/views/users.vue:
 admin/views/moderators.vue:
   add-moderator:
     add: "Zarejestruj się"
+  logs:
+    moderator: "Moderatorzy"
+    info: "Informacje"
 admin/views/emoji.vue:
   add-emoji:
     name: "Nazwa Emoji"
@@ -1125,6 +1152,8 @@ mobile/views/pages/search.vue:
   search: "Szukaj"
 mobile/views/pages/selectdrive.vue:
   select-file: "Wybierz plik"
+mobile/views/pages/notifications.vue:
+  notifications: "Powiadomienia"
 mobile/views/pages/settings.vue:
   signed-in-as: "Zalogowany jako {}"
 mobile/views/pages/user.vue:
@@ -1189,6 +1218,8 @@ dev/views/new-app.vue:
   app-name: "Nazwa Aplikacji"
   authority: "Uprawnienia"
 pages:
+  pin-this-page: "Przypnij do profilu"
+  unpin-this-page: "Odepnij"
   like: "Lubię"
   title: "Tytuł"
   blocks:
@@ -1206,6 +1237,8 @@ pages:
       text: "Tytuł"
     _button:
       text: "Tytuł"
+    _radioButton:
+      title: "Tytuł"
   script:
     categories:
       random: "Losowy"
@@ -1226,3 +1259,10 @@ pages:
         arg1: "Listy"
     types:
       array: "Listy"
+room:
+  translate: "Przenieś"
+  save: "Zapisz"
+  saved: "Zapisano"
+  furnitures:
+    moon: "Księżyc"
+    bin: "Kosz"

locales/pt-PT.yml

@@ -12,12 +12,12 @@ common:
     rich-contents: "Post"
     rich-contents-desc: "Apenas poste suas ideias, temas do momento e qualquer coisa que você queira compartilhar. Você pode querer decorar suas palavras, anexar suas imagens favoritas, enviar arquivos, inclusive vídeos ou criar uma enquete. Essas são as coisas que você pode fazer em Misskey."
     reaction: "Reações"
-  adblock:
-    detected: "Por favor, desative o bloqueador de anúncios."
-    warning: "Alguns recursos podem não estar disponíveis ou apresentar mal funcionamento se o bloqueio de anúncios estiver ativado. <strong>Misskey não está usando anúncios</strong>"
+    reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません"
   application-authorization: "Aplicativos autorizados"
   close: "Fechar"
   do-not-copy-paste: "Por favor, não digite ou copie o código aqui. A conta pode ser comprometida."
+  notification-types:
+    follow: "Seguindo"
   got-it: "Entendi!"
   customization-tips:
     title: "Dicas de personalização"
@@ -282,3 +282,7 @@ pages:
   blocks:
     image: "Imagens"
     post: "Formulário de publicação"
+room:
+  furnitures:
+    moon: "Lua"
+    bin: "Lixo"

locales/ru-RU.yml

@@ -12,15 +12,12 @@ common:
     rich-contents: "Посты"
     rich-contents-desc: "Просто выложи свою идею, актуальные темы и всё, что тебе хочется показать миру. Ты можешь декорировать свои слова, прикреплять свои любимые картинки, отправлять файлы с фильмами и создать голосование - это те вещи, которые ты можешь сделать с помощью Misskey!"
     reaction: "Реакции"
-    reaction-desc: "Самый лёгкий способ выразить свои эмоции. Misskey позволяет добавлять различные виды реакций к постам других людей. Эмоциональный опыт из Misskey никогда не появится в других социальных сетях, позволяющих только жать “лайки”."
+    reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません。"
     ui: "Интерфейс"
     ui-desc: "Нет такого интерфейса, понравившегося всем. Поэтому у Misskey имеется пользовательский интерфейс, широко настраиваемый под ваши вкусы. Создай себе уникальную домашнюю страницу редактируя, подстраивая оформление ленты и размещая виджеты, которые тоже можно кастомизировать."
     drive: "Хранилище файлов"
     drive-desc: "Хотите запостить картинку, которую уже отправляли ранее? Хочется сортировать, переименовать и создать папку для ваших выложенных файлов? Тогда Misskey Drive - это лучшее решение для вас. Очень лёгкий способ делиться своими файлами онлайн."
     outro: "Попробуйте будущие, уникальные для Misskey функции своими глазами! Если чувствуете, что это не в вашем вкусе, то попробуйте другие инстанции, ведь Misskey - это децентрализованная социальная сеть, так что ты можешь с лёгкостью найти себе товарищей. И наконец, GLHF!"
-  adblock:
-    detected: "Пожалуйста, отключите блокировщик рекламы."
-    warning: "Некоторые функции перестанут быть доступными или будут работать неправильно, если включена блокировка рекламы. <strong>В Misskey нет рекламы</strong>."
   application-authorization: "Авторизация приложений"
   close: "Закрыть"
   do-not-copy-paste: "Пожалуйста, не вводите и не вставляйте сюда код. Аккаунту может угрожать опасность."
@@ -28,6 +25,7 @@ common:
   enter-password: "Пожалуйста, введите ваш пароль"
   2fa: "Двухфакторная аутентификация"
   customize-home: "Настройка домашней страницы"
+  featured-notes: "Рекомендуемые"
   dark-mode: "Тёмная тема"
   signin: "Войти"
   signup: "Регистрация"
@@ -167,3 +165,7 @@ pages:
       random: "Случайно"
     blocks:
       random: "Случайно"
+room:
+  furnitures:
+    moon: "Луна"
+    bin: "Мусорное ведро"

locales/zh-CN.yml

@@ -2,12 +2,12 @@
 meta:
   lang: "中文(简体)"
 common:
-  misskey: "Fediverse中的一颗⭐"
-  about-title: "Fediverse中的一颗⭐"
-  about: "非常感谢您找到了Misskey。 Misskey是诞生于地球的<b>分布式微博SNS</b>。因为她处于Fediverse(由各种SNS组成的宇宙)中，所以她与其他SNS相互连接。想要远离喧嚣的城市，不如深入这个新的互联网来探索一下吧。"
+  misskey: "联邦宇宙中的一颗⭐"
+  about-title: "联邦宇宙中的一颗⭐"
+  about: "非常感谢您找到了Misskey。 Misskey是诞生于地球的<b>分布式微博SNS</b>。因为她处于联邦宇宙(由各种SNS组成的宇宙)中，所以她与其他SNS相互连接。为什么不试试远离喧嚣的城市，潜入这片新的网络海洋之中呢？"
   intro:
     title: "什么是 Misskey 呢?"
-    about: "Misskey是开源的<b>分散式微博SNS</b>。复杂的完全可定制的Ui，各种各样的帖子反应，提供集成管理系统和其他先进功能的免费文件存储。此外，称为“Fediverse”的网络系统使我们能够与其他SNS的用户进行通信。比如，如果你张贴一些东西，那么你的帖子不仅会发送给Misskey，还会发送到其他SNS平台。想象一下，正如一颗行星和另一颗行星通过电磁波来进行通信一样。"
+    about: "Misskey是开源的<b>分散式微博SNS</b>。丰富且可以高度定制的Ui，对别人的帖子进行各种回应，集成管理系统的网盘等先进功能。此外，称为“联邦世界”的网络系统使我们能够与其他SNS的用户进行通信。比如，如果你发布一个帖子，那么你的帖子不仅会发送给Misskey，还会发送到其他SNS平台。想象一下，正如一颗行星和另一颗行星通过电磁波来进行通信一样。"
     features: "功能"
     rich-contents: "发布"
     rich-contents-desc: "请分享您的想法，热门话题，以及任何您想与大家分享的内容。如果有需要的话，您可以使用各种语法来修饰文章，发布问卷调查，或者添加各种您喜欢的图像和视频等文件。"
@@ -16,11 +16,8 @@ common:
     ui: "交互界面"
     ui-desc: "世界上没有一个UI可以适合每一个人. 所以, Misskey 提供一个可以高度定制的UI交互界面. 您可以通过编辑, 调整布局, 放置可选择的小部件来轻松定制您的专属UI界面。"
     drive: "网盘"
-    drive-desc: "想要发布一张您已经上传过的照片吗？想要管理文件或为上传的文件创建文件夹吗？Misskey的网盘是一个最好的解决方案。"
+    drive-desc: "想要发布一张您已经上传过的照片吗？想要管理文件或为上传的文件创建文件夹吗？Misskey的内置网盘将为您完美解决这些问题。简单地分享您的文件。"
     outro: "Misskey还有其他更多功能，请亲身体验一下吧。因为 Misskey 是一个分布式的 SNS，如果您感觉某个功能不适合自己，试试其他的吧。祝您玩得开心！"
-  adblock:
-    detected: "请关闭广告拦截器"
-    warning: "<strong>Misskey不会发布广告</strong>如果您启用广告拦截器, 可能会导致某些功能无法正常使用。"
   application-authorization: "应用程序授权"
   close: "关闭"
   do-not-copy-paste: "请不要在这里输入或粘贴代码。您帐户可能会受到损害。"
@@ -35,6 +32,20 @@ common:
   signout: "退出"
   reload-to-apply-the-setting: "必须重新加载页面以应用此设置。 确实要立即重新加载吗？"
   fetching-as-ap-object: "联合查询"
+  unfollow-confirm: "取消对{name}的关注？"
+  delete-confirm: "确定删除这个投稿吗?"
+  signin-required: "请先登录"
+  notification-type: "通知类型"
+  notification-types:
+    all: "所有"
+    pollVote: "投票"
+    follow: "关注中"
+    receiveFollowRequest: "关注请求"
+    reply: "回复"
+    quote: "引用"
+    renote: "转推"
+    mention: "提及"
+    reaction: "回应"
   got-it: "知道了"
   customization-tips:
     title: "自定义提示"
@@ -92,6 +103,12 @@ common:
     "read:reactions": "查看回应"
     "write:reactions": "回应操作"
     "write:votes": "投票"
+    "read:pages": "查看页面"
+    "write:pages": "操作页面"
+    "read:page-likes": "查看喜欢的页面"
+    "write:page-likes": "操作喜欢的页面"
+    "read:user-groups": "查看用户组"
+    "write:user-groups": "操作用户组"
   empty-timeline-info:
     follow-users-to-make-your-timeline: "关注其他用户时，帖子将显示在时间线中。"
     explore: "查找用户"
@@ -119,9 +136,11 @@ common:
     geolocation-alert: "您的设备不支持定位服务"
     error: "错误"
     enter-username: "输入用户名"
+    specified-recipient: "收件人"
     add-visible-user: "添加用户"
     cw-placeholder: "评论帖子(可选)"
     username-prompt: "输入用户名"
+    enter-file-name: "编辑文件名"
   weekday-short:
     sunday: "日"
     monday: "一"
@@ -172,7 +191,7 @@ common:
     profile: "个人资料"
     notification: "通知"
     apps: "应用程序"
-    tags: "哈希标签"
+    tags: "话题标签"
     mute-and-block: "屏蔽/拉黑"
     blocking: "拉黑"
     security: "安全性"
@@ -181,6 +200,8 @@ common:
     other: "其他"
     appearance: "设计"
     behavior: "行为"
+    reactions: "回应"
+    reactions-description: "快速选择回应中的自定义表情符号，以换行符分隔。"
     fetch-on-scroll: "向下滚动时自动加载"
     fetch-on-scroll-desc: "向下滚动页面时，它会自动提取其他内容。"
     note-visibility: "帖子可见性"
@@ -188,6 +209,11 @@ common:
     remember-note-visibility: "记住帖子可见性"
     web-search-engine: "搜索引擎"
     web-search-engine-desc: "例如: https://www.google.com/?#q={{query}}"
+    paste: "粘贴"
+    pasted-file-name: "粘贴的文件名模板"
+    pasted-file-name-desc: "例: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "粘贴时编辑文件名"
+    paste-dialog-desc: "粘贴时显示编辑文件名的对话框"
     keep-cw: "保留内容警告"
     keep-cw-desc: "在回复帖子时，如果原帖设置了内容警告，默认情况下回帖也会设置相同的内容警告。"
     i-like-sushi: "相比于布丁来说, 我更喜欢寿司。"
@@ -195,6 +221,7 @@ common:
     use-avatar-reversi-stones: "用头像作为黑白棋的棋子"
     disable-animated-mfm: "在帖子中禁用动画文本"
     disable-showing-animated-images: "不播放动画"
+    enable-quick-notification-view: "启用通知快速查看"
     suggest-recent-hashtags: "在帖子表单上显示最近流行的哈希标签"
     always-show-nsfw: "总是显示 NSFW 的内容"
     always-mark-nsfw: "总是用 NSFW 来标记附件"
@@ -225,7 +252,7 @@ common:
     deck-column-width-wide: "宽"
     use-shadow: "在UI中使用阴影效果"
     rounded-corners: "UI界面圆角效果"
-    circle-icons: "使用圆形图标"
+    circle-icons: "使用圆形头像"
     contrasted-acct: "增加用户名的对比度"
     wallpaper: "壁纸"
     choose-wallpaper: "选择壁纸"
@@ -271,8 +298,21 @@ common:
     load-raw-images: "以原始质量显示附加图像"
     load-remote-media: "显示来自远程服务器的媒体"
     sync: "同步"
+    save: "保存"
+    saved: "已保存"
+    preview: "预览"
     home-profile: "定制首页数据"
     deck-profile: "定制Deck数据"
+    room: "房间"
+    _room:
+      graphicsQuality: "图形质量"
+      _graphicsQuality:
+        ultra: "最高"
+        high: "高"
+        medium: "中"
+        low: "低"
+        cheep: "最低"
+      useOrthographicCamera: "使用正交相机"
   search: "搜索"
   delete: "删除"
   loading: "正在加载中"
@@ -324,7 +364,7 @@ common:
     notifications: "通知"
     users: "推荐用户"
     polls: "调查问卷"
-    post-form: "投稿形式"
+    post-form: "投稿窗口"
     server: "服务器信息"
     nav: "导航"
     tips: "提示"
@@ -353,10 +393,15 @@ common/views/pages/explore.vue:
   popular-users: "热门用户"
   recently-updated-users: "活跃用户"
   recently-registered-users: "新用户"
+  recently-discovered-users: "最近发现的用户"
   popular-tags: "热门标签"
-  federated: "联合"
+  federated: "联邦"
   explore: "查找{host}"
+  explore-fediverse: "探索Fediverse"
   users-info: "当前有{users}个注册用户"
+common/views/components/reactions-viewer.details.vue:
+  few-users: "{users}作出了{reaction}的回应"
+  many-users: "{users}和其他{omitted}人做出了{reaction}的回应"
 common/views/components/url-preview.vue:
   enable-player: "打开播放器"
   disable-player: "关闭播放器"
@@ -522,7 +567,10 @@ common/views/components/note-menu.vue:
   unpin: "取消置顶"
   delete: "删除"
   delete-confirm: "确定删除这个投稿吗?"
+  delete-and-edit: "删除和编辑"
+  delete-and-edit-confirm: "要删除此帖并再次编辑吗？对此帖的所有回应，转推和回复也将被删除。"
   remote: "显示原始投稿"
+  pin-limit-exceeded: "无法置顶更多了。"
 common/views/components/user-menu.vue:
   mention: "提到"
   mute: "屏蔽"
@@ -582,7 +630,9 @@ common/views/components/reaction-picker.vue:
   choose-reaction: "选择回应"
   input-reaction-placeholder: "表情符号输入"
 common/views/components/emoji-picker.vue:
+  recent-emoji: "最近使用的表情符号"
   custom-emoji: "自定义表情符号"
+  no-category: "未分类"
   people: "人"
   animals-and-nature: "动物与自然"
   food-and-drink: "食物与饮品"
@@ -591,16 +641,26 @@ common/views/components/emoji-picker.vue:
   objects: "物品"
   symbols: "符号"
   flags: "旗帜"
+common/views/components/settings/app-type.vue:
+  title: "模式"
+  intro: "您可以指定使用桌面版或移动版。"
+  choices:
+    auto: "自动选择"
+    desktop: "固定为桌面版"
+    mobile: "固定为移动版"
+  info: "更改将在刷新页面后生效。"
 common/views/components/signin.vue:
   username: "用户名"
   password: "密码"
   token: "Token (令牌)"
-  signing-in: "正在登录..."
+  signing-in: "在弄了在弄了..."
   or: "或者"
   signin-with-twitter: "用 Twitter 登录"
   signin-with-github: "用 GitHub 登录"
   signin-with-discord: "用 Discord 登录"
   login-failed: "登录失败。请检查用户名和密码。"
+  tap-key: "点击安全密钥登录"
+  enter-2fa-code: "输入验证码"
 common/views/components/signup.vue:
   invitation-code: "邀请码"
   invitation-info: "如果您没有邀请码，请联系<a href=\"{}\">管理员</a>。"
@@ -705,6 +765,9 @@ common/views/components/profile-editor.vue:
   saved: "您的个人资料已保存"
   uploading: "正在上传"
   upload-failed: "上传失败"
+  unable-to-process: "无法完成操作"
+  avatar-not-an-image: "选择的头像文件不是图片格式"
+  banner-not-an-image: "选择的横幅背景不是图片格式"
   email: "邮件设置"
   email-address: "电子邮件地址"
   email-verified: "电子邮件地址已验证"
@@ -724,6 +787,9 @@ common/views/components/profile-editor.vue:
   danger-zone: "危险选项"
   delete-account: "删除帐户"
   account-deleted: "帐户已被删除。 数据会在一段时间之后清除。"
+  profile-metadata: "个人资料补充信息"
+  metadata-label: "标签"
+  metadata-content: "内容"
 common/views/components/user-list-editor.vue:
   users: "用户"
   rename: "重命名列表"
@@ -762,6 +828,7 @@ common/views/widgets/broadcast.vue:
   no-broadcasts: "没有公告"
   have-a-nice-day: "祝你有愉快的一天！"
   next: "下一个"
+  prev: "上一首"
 common/views/widgets/calendar.vue:
   year: "{}年"
   month: "{}月"
@@ -833,6 +900,7 @@ desktop:
   uploading-avatar: "上传一个新的头像"
   avatar-updated: "成功上传头像"
   choose-avatar: "选择作为头像的图片"
+  unable-to-process: "无法完成操作"
   invalid-filetype: "不接受此文件类型"
 desktop/views/components/activity.chart.vue:
   total: "黑 ... 总计"
@@ -873,8 +941,8 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "取消标记为“敏感”"
     copy-url: "复制链接"
     download: "下载"
-    else-files: "其他..."
-    set-as-avatar: "设置为头像"
+    else-files: "其他"
+    set-as-avatar: "设为头像"
     set-as-banner: "设置为背景"
     open-in-app: "在应用程序中打开"
     add-app: "添加应用"
@@ -883,15 +951,20 @@ desktop/views/components/drive.file.vue:
     copied: "已复制"
     copied-url-to-clipboard: "已复制链接到剪贴板"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "默认上传文件夹"
   unable-to-process: "无法完成操作"
   circular-reference-detected: "目标文件夹是您要移动的文件夹的子文件夹。"
   unhandled-error: "未知错误"
+  unable-to-delete: "无法删除"
+  has-child-files-or-folders: "此文件夹不为空，无法删除。"
   contextmenu:
     move-to-this-folder: "移动到此文件夹"
     show-in-new-window: "在新窗口打开"
     rename: "重命名"
     rename-folder: "重命名文件夹"
     input-new-folder-name: "请输入新文件名"
+    else-folders: "其他"
+    set-as-upload-folder: "设置为默认上传文件夹"
 desktop/views/components/drive.vue:
   search: "搜索"
   empty-draghover: "放在这里！因为你知道我很可爱，对吗？"
@@ -997,6 +1070,16 @@ desktop/views/components/settings.2fa.vue:
   success: "设置完成"
   failed: "设置失败, 请确保您的密钥是正确的。"
   info: "从下次登录Misskey时，您的设备上显示的令牌以及密码也是必需的。"
+  totp-header: "身份验证 App"
+  security-key-header: "安全密钥"
+  security-key: "为了增强安全性，您可以使用支持FIDO2的硬件安全密钥登录您的帐户。 登录时，您将需要注册安全密钥或身份验证应用。"
+  last-used: "最后使用："
+  activate-key: "单击以激活您的安全密钥"
+  security-key-name: "密钥名称"
+  register-security-key: "安全密钥注册完成"
+  something-went-wrong: "糟糕！安全密钥注册出现问题："
+  key-unregistered: "安全密钥已被删除。"
+  use-password-less-login: "使用免密码登录"
 common/views/components/media-image.vue:
   sensitive: "阅读注意"
   click-to-show: "点击查看"
@@ -1021,6 +1104,9 @@ common/views/components/drive-settings.vue:
   max: "容量"
   in-use: "已使用"
   stats: "统计"
+  default-upload-folder: "默认上传文件夹"
+  default-upload-folder-name: "文件夹"
+  change-default-upload-folder: "更改文件夹"
 common/views/components/mute-and-block.vue:
   mute-and-block: "屏蔽/拉黑"
   mute: "屏蔽"
@@ -1030,6 +1116,8 @@ common/views/components/mute-and-block.vue:
   word-mute: "文字屏蔽"
   muted-words: "屏蔽关键字"
   muted-words-description: "使用空格分隔会产生AND规范，并且使用换行符分隔会产生OR规范"
+  unmute-confirm: "取消屏蔽用户？"
+  unblock-confirm: "取消拉黑此用户？"
   save: "保存"
 common/views/components/password-settings.vue:
   reset: "更改密码"
@@ -1074,6 +1162,7 @@ desktop/views/components/ui.header.account.vue:
   groups: "群组"
   follow-requests: "关注申请"
   admin: "管理"
+  room: "房间"
 desktop/views/components/ui.header.nav.vue:
   game: "游戏"
 desktop/views/components/ui.header.notifications.vue:
@@ -1096,26 +1185,29 @@ desktop/views/components/window.vue:
   popout: "弹出"
   close: "关闭"
 admin/views/index.vue:
-  dashboard: "Dashboard"
-  instance: "例"
-  emoji: "Emoji"
+  dashboard: "仪表盘"
+  instance: "实例"
+  emoji: "自定义Emoji"
   moderators: "版主"
   users: "用户"
-  federation: "联合"
+  federation: "联邦"
   announcements: "公告"
   abuse: "举报垃圾信息"
   queue: "作业队列"
-  logs: "登录"
+  logs: "日志"
   db: "数据库"
   back-to-misskey: "返回 Misskey"
 admin/views/db.vue:
   tables: "表格"
+  vacuum: "VACUUM"
+  vacuum-info: "清理数据库。 保持数据完整并减少磁盘使用量。 此操作通常会自动定期执行。"
+  vacuum-exclamation: "运行VACUUM之后，数据库上的负载可能会持续一段时间，并且可能不响应用户操作。"
 admin/views/dashboard.vue:
   dashboard: "Dashboard"
   accounts: "账户"
   notes: "帖子"
   drive: "网盘"
-  instances: "例子"
+  instances: "实例"
   this-instance: "此实例"
   federated: "联合"
 admin/views/queue.vue:
@@ -1136,7 +1228,7 @@ admin/views/queue.vue:
   result-is-truncated: "结果已省略"
   other-queues: "其他队列"
 admin/views/logs.vue:
-  logs: "登录"
+  logs: "日志"
   domain: "域"
   level: "级别"
   levels:
@@ -1154,7 +1246,7 @@ admin/views/abuse.vue:
   details: "详情"
   remove-report: "删除"
 admin/views/instance.vue:
-  instance: "例子"
+  instance: "实例"
   instance-name: "实例名称"
   instance-description: "实例介绍"
   host: "主机名"
@@ -1187,7 +1279,7 @@ admin/views/instance.vue:
   object-storage-s3-info-here: "这里"
   object-storage-gcs-info: "将Google Cloud Storage用作对象存储时，请将“终端”设置为storage.googleapis.com，并将“区域”留空。"
   cache-remote-files: "远程文件缓存"
-  cache-remote-files-desc: "如果没有此参数，则所有远程文件都将直接链接到其主机服务器。 这将是保存服务器存储的有效解决方案，但是对于设置禁用直接链接的用户而言，远程文件不可见，因为不会生成缩略图，从而增加流量。 建议启用此参数集。"
+  proxy-remote-files: "代理远程文件"
   local-drive-capacity-mb: "每个用户的网盘空间"
   remote-drive-capacity-mb: "每个远程用户的网盘容量"
   mb: "以兆字节(Mbps)为单位"
@@ -1324,6 +1416,8 @@ admin/views/users.vue:
   remote-user-updated: "远程用户信息已更新"
   delete-all-files: "删除所有文件"
   delete-all-files-confirm: "删除所有文件吗？"
+  username: "用户名"
+  host: "主机名"
   users:
     title: "用户"
     sort:
@@ -1335,6 +1429,7 @@ admin/views/users.vue:
     state:
       title: "状态"
       all: "全部"
+      available: "可用"
       admin: "管理员"
       moderator: "版主"
       adminOrModerator: "管理员+版主"
@@ -1354,11 +1449,18 @@ admin/views/moderators.vue:
     added: "已注册版主。"
     remove: "取消"
     removed: "取消注册版主"
+  logs:
+    title: "日志"
+    moderator: "版主"
+    type: "操作"
+    at: "日期和时间"
+    info: "信息"
 admin/views/emoji.vue:
   add-emoji:
     title: "添加emoji"
     name: "Emoji 名称"
     name-desc: "你可以使用字符a~z 0~9 _"
+    category: "类别"
     aliases: "别名"
     aliases-desc: "您可以添加多个，以空格分隔。"
     url: "emoji 地址"
@@ -1403,7 +1505,7 @@ admin/views/federation.vue:
   block: "拉黑"
   marked-as-closed: "标记为已关闭"
   lookup: "查询"
-  instances: "联合"
+  instances: "联邦"
   instance-not-registered: "实例未注册"
   sort: "排序"
   sorts:
@@ -1523,7 +1625,7 @@ desktop/views/widgets/trends.vue:
 desktop/views/widgets/users.vue:
   title: "推荐用户"
   refresh: "更多"
-  no-one: "不是！"
+  no-one: "没有任何推荐用户！"
 mobile/views/components/drive.vue:
   used: "已使用"
   folder-count: "文件夹"
@@ -1642,6 +1744,8 @@ mobile/views/pages/search.vue:
   not-found: "没有找到有关于“{q}”的帖子"
 mobile/views/pages/selectdrive.vue:
   select-file: "选择文件"
+mobile/views/pages/notifications.vue:
+  notifications: "通知"
 mobile/views/pages/settings.vue:
   signed-in-as: "以{}登录"
 mobile/views/pages/user.vue:
@@ -1700,6 +1804,7 @@ deck/deck.user-column.vue:
   activity: "活动"
   timeline: "时间线"
   pinned-notes: "置顶帖"
+  pinned-page: "已置顶的页面"
 docs:
   edit-this-page-on-github: "发现错误或想要为文档做出贡献？"
   edit-this-page-on-github-link: "在GitHub上编辑这个页面。"
@@ -1731,9 +1836,14 @@ pages:
   read-page: "查看源"
   page-created: "页面已创建"
   page-updated: "页面已更新"
+  name-already-exists: "该页面URL已存在"
+  title-invalid-name: "无效的页面URL"
+  text-invalid-name: "请确认该项不为空"
   are-you-sure-delete: "是否删除此页面？"
   page-deleted: "该页面已被删除。"
   edit-this-page: "编辑此页面"
+  pin-this-page: "置顶"
+  unpin-this-page: "取消置顶"
   view-source: "查看源代码"
   view-page: "查看页面"
   like: "赞"
@@ -1752,6 +1862,7 @@ pages:
   url: "页面URL"
   summary: "页面摘要"
   align-center: "居中"
+  hide-title-when-pinned: "置顶时隐藏标题"
   font: "字体"
   fontSerif: "衬线字体"
   fontSansSerif: "无衬线字体"
@@ -1772,10 +1883,10 @@ pages:
     section: "章节"
     image: "图片"
     button: "按钮"
-    if: "如果"
+    if: "判断"
     _if:
       variable: "变量"
-    post: "投稿形式"
+    post: "投稿窗口"
     _post:
       text: "内容"
     textInput: "文本输入"
@@ -1805,12 +1916,25 @@ pages:
       inc: "增加值"
     _button:
       text: "标题"
+      colored: "彩色"
       action: "按下按钮时的行为"
       _action:
         dialog: "显示对话框"
         _dialog:
           content: "内容"
         resetRandom: "随机值重置"
+        pushEvent: "发送事件"
+        _pushEvent:
+          event: "事件名称"
+          message: "按下时显示的消息"
+          variable: "发送的变量"
+          no-variable: "空"
+    radioButton: "选择项"
+    _radioButton:
+      name: "变量名"
+      title: "标题"
+      values: "使用换行区分的选择项"
+      default: "默认值"
   script:
     categories:
       flow: "控制"
@@ -1868,6 +1992,9 @@ pages:
       _mod:
         arg1: "A"
         arg2: "B"
+      round: "四舍五入"
+      _round:
+        arg1: "数值"
       eq: "A和B相等"
       _eq:
         arg1: "A"
@@ -1983,3 +2110,64 @@ pages:
     enviromentVariables: "环境变量"
     pageVariables: "页面元素"
     argVariables: "输入槽函数"
+room:
+  add-furniture: "放置家具"
+  translate: "移动"
+  rotate: "旋转"
+  exit: "返回"
+  remove: "移除"
+  save: "保存"
+  saved: "已保存"
+  clear: "清理"
+  clear-confirm: "是否清除所有家具？"
+  leave-confirm: "有尚未保存的修改。是否离开？"
+  chooseImage: "选择图片"
+  room-type: "房间类型"
+  carpet-color: "地板颜色"
+  rooms:
+    default: "默认"
+    washitsu: "和式房间"
+  furnitures:
+    milk: "牛奶纸箱"
+    bed: "床"
+    low-table: "矮桌"
+    desk: "书桌"
+    chair: "椅子"
+    chair2: "椅子2"
+    fan: "换气扇"
+    pc: "电脑"
+    plant: "观叶植物"
+    plant2: "观叶植物2"
+    eraser: "橡皮擦"
+    pencil: "铅笔"
+    pudding: "布丁"
+    cardboard-box: "纸板箱"
+    cardboard-box2: "纸板箱2"
+    cardboard-box3: "纸板箱3"
+    book: "书"
+    book2: "书2"
+    piano: "钢琴"
+    facial-tissue: "纸巾盒"
+    server: "服务器"
+    moon: "月球"
+    corkboard: "软木板"
+    mousepad: "鼠标垫"
+    monitor: "显示器"
+    keyboard: "键盘"
+    carpet-stripe: "地毯(条纹)"
+    mat: "垫子"
+    color-box: "收纳柜"
+    wall-clock: "挂钟"
+    photoframe: "相框"
+    cube: "立方体"
+    tv: "电视"
+    pinguin: "企鹅君"
+    rubik-cube: "魔方"
+    poster-h: "海报(横向)"
+    poster-v: "海报(纵向)"
+    sofa: "沙发"
+    spiral: "螺旋楼梯"
+    bin: "垃圾箱"
+    cup-noodle: "杯面"
+    holo-display: "全息显示器"
+    energy-drink: "能量饮料"

locales/zh-TW.yml

@@ -7,8 +7,6 @@ common:
     rich-contents: "發佈"
     reaction: "回應"
     drive: "雲端硬碟"
-  adblock:
-    detected: "請禁用廣告封鎖器"
   close: "關閉"
   enter-password: "請輸入密碼"
   2fa: "雙重身份驗證"
@@ -88,3 +86,6 @@ admin/views/charts.vue:
   drive: "雲端硬碟"
 pages:
   like: "贊"
+room:
+  furnitures:
+    moon: "月"

migration/1562422242907-PasswordLessLogin.ts

@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class PasswordLessLogin1562422242907 implements MigrationInterface {
+
+	public async up(queryRunner: QueryRunner): Promise<any> {
+		await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "usePasswordLessLogin" boolean DEFAULT false NOT NULL`);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<any> {
+		await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "usePasswordLessLogin"`);
+	}
+
+}

migration/1562444565093-PinnedPage.ts

@@ -0,0 +1,17 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class PinnedPage1562444565093 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "pinnedPageId" character varying(32)`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "UQ_6dc44f1ceb65b1e72bacef2ca27" UNIQUE ("pinnedPageId")`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "FK_6dc44f1ceb65b1e72bacef2ca27" FOREIGN KEY ("pinnedPageId") REFERENCES "page"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "FK_6dc44f1ceb65b1e72bacef2ca27"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "UQ_6dc44f1ceb65b1e72bacef2ca27"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "pinnedPageId"`);
+    }
+
+}

migration/1562448332510-PageTitleHideOption.ts

@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class PageTitleHideOption1562448332510 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "page" ADD "hideTitleWhenPinned" boolean NOT NULL DEFAULT false`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "hideTitleWhenPinned"`);
+    }
+
+}

migration/1562869971568-ModerationLog.ts

@@ -0,0 +1,17 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class ModerationLog1562869971568 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "moderation_log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "type" character varying(128) NOT NULL, "info" jsonb NOT NULL, CONSTRAINT "PK_d0adca6ecfd068db83e4526cc26" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_a08ad074601d204e0f69da9a95" ON "moderation_log" ("userId") `);
+        await queryRunner.query(`ALTER TABLE "moderation_log" ADD CONSTRAINT "FK_a08ad074601d204e0f69da9a954" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "moderation_log" DROP CONSTRAINT "FK_a08ad074601d204e0f69da9a954"`);
+        await queryRunner.query(`DROP INDEX "IDX_a08ad074601d204e0f69da9a95"`);
+        await queryRunner.query(`DROP TABLE "moderation_log"`);
+    }
+
+}

migration/1563757595828-UsedUsername.ts

@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class UsedUsername1563757595828 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "used_username" ("username" character varying(128) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, CONSTRAINT "PK_78fd79d2d24c6ac2f4cc9a31a5d" PRIMARY KEY ("username"))`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`DROP TABLE "used_username"`);
+    }
+
+}

migration/1565634203341-room.ts

@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class room1565634203341 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "room" jsonb NOT NULL DEFAULT '{}'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "room"`);
+    }
+
+}

migration/1571220798684-CustomEmojiCategory.ts

@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class CustomEmojiCategory1571220798684 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "emoji" ADD "category" character varying(128)`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "category"`, undefined);
+    }
+
+}

migration/1572760203493-nodeinfo.ts

@@ -0,0 +1,29 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class nodeinfo1572760203493 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "system"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "softwareName" character varying(64) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "softwareVersion" character varying(64) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "openRegistrations" boolean DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "name" character varying(256) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "description" character varying(4096) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "maintainerName" character varying(128) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "maintainerEmail" character varying(256) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "infoUpdatedAt" TIMESTAMP WITH TIME ZONE`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "infoUpdatedAt"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "maintainerEmail"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "maintainerName"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "description"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "name"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "openRegistrations"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "softwareVersion"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "softwareName"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "system" character varying(64)`, undefined);
+    }
+
+}

migration/1576269851876-TalkFederationId.ts

@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class TalkFederationId1576269851876 implements MigrationInterface {
+    name = 'TalkFederationId1576269851876'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "messaging_message" ADD "uri" character varying(512)`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "messaging_message" DROP COLUMN "uri"`, undefined);
+    }
+
+}

migration/1576869585998-ProxyRemoteFiles.ts

@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class ProxyRemoteFiles1576869585998 implements MigrationInterface {
+    name = 'ProxyRemoteFiles1576869585998'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "proxyRemoteFiles" boolean NOT NULL DEFAULT false`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "proxyRemoteFiles"`, undefined);
+    }
+
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.24.2",
+	"version": "11.37.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -26,243 +26,239 @@
 		"format": "gulp format"
 	},
 	"resolutions": {
-		"gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1",
-		"video-thumbnail-generator/lodash": "^4.17.11"
+		"https-proxy-agent": "^3.0.0",
+		"lodash": "^4.17.13"
 	},
 	"dependencies": {
-		"@elastic/elasticsearch": "7.1.0",
-		"@fortawesome/fontawesome-svg-core": "1.2.19",
-		"@fortawesome/free-brands-svg-icons": "5.9.0",
-		"@fortawesome/free-regular-svg-icons": "5.9.0",
-		"@fortawesome/free-solid-svg-icons": "5.9.0",
-		"@fortawesome/vue-fontawesome": "0.1.6",
+		"@elastic/elasticsearch": "7.5.0",
+		"@fortawesome/fontawesome-svg-core": "1.2.26",
+		"@fortawesome/free-brands-svg-icons": "5.12.0",
+		"@fortawesome/free-regular-svg-icons": "5.12.0",
+		"@fortawesome/free-solid-svg-icons": "5.12.0",
+		"@fortawesome/vue-fontawesome": "0.1.9",
 		"@koa/cors": "3.0.0",
-		"@typescript-eslint/parser": "1.11.0",
+		"@koa/multer": "2.0.2",
+		"@koa/router": "8.0.5",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.5.15",
-		"@types/cbor": "2.0.0",
-		"@types/dateformat": "3.0.0",
-		"@types/deep-equal": "1.0.1",
+		"@types/bull": "3.10.6",
+		"@types/cbor": "5.0.0",
+		"@types/dateformat": "3.0.1",
 		"@types/double-ended-queue": "2.1.1",
 		"@types/gulp": "4.0.6",
 		"@types/gulp-mocha": "0.0.32",
 		"@types/gulp-rename": "0.0.33",
 		"@types/gulp-replace": "0.0.31",
-		"@types/gulp-uglify": "3.0.6",
-		"@types/gulp-util": "3.0.34",
-		"@types/is-root": "2.1.2",
 		"@types/is-url": "1.2.28",
 		"@types/js-yaml": "3.12.1",
 		"@types/jsdom": "12.2.4",
-		"@types/katex": "0.10.1",
-		"@types/koa": "2.0.49",
-		"@types/koa-bodyparser": "5.0.2",
+		"@types/katex": "0.11.0",
+		"@types/koa": "2.11.0",
+		"@types/koa-bodyparser": "4.3.0",
 		"@types/koa-compress": "2.0.9",
 		"@types/koa-cors": "0.0.0",
 		"@types/koa-favicon": "2.0.19",
 		"@types/koa-logger": "3.1.1",
 		"@types/koa-mount": "4.0.0",
-		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.42",
 		"@types/koa-send": "4.1.2",
-		"@types/koa-views": "2.0.3",
-		"@types/koa__cors": "2.2.3",
-		"@types/lolex": "3.1.1",
-		"@types/minio": "7.0.2",
+		"@types/koa-views": "2.0.4",
+		"@types/koa__cors": "3.0.0",
+		"@types/koa__multer": "2.0.1",
+		"@types/koa__router": "8.0.2",
+		"@types/lolex": "5.1.0",
 		"@types/mocha": "5.2.7",
-		"@types/node": "12.0.10",
-		"@types/nodemailer": "6.2.0",
+		"@types/node": "13.1.4",
+		"@types/nodemailer": "6.4.0",
 		"@types/nprogress": "0.2.0",
 		"@types/oauth": "0.9.1",
-		"@types/parse5": "5.0.0",
+		"@types/parse5": "5.0.2",
 		"@types/parsimmon": "1.10.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
-		"@types/qrcode": "1.3.3",
+		"@types/qrcode": "1.3.4",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.13",
+		"@types/redis": "2.8.14",
 		"@types/rename": "1.0.1",
-		"@types/request": "2.48.1",
-		"@types/request-promise-native": "1.0.16",
+		"@types/request": "2.48.4",
+		"@types/request-promise-native": "1.0.17",
 		"@types/request-stats": "3.0.0",
-		"@types/rimraf": "2.0.2",
+		"@types/rimraf": "2.0.3",
 		"@types/seedrandom": "2.4.28",
-		"@types/sharp": "0.22.2",
+		"@types/sharp": "0.23.1",
 		"@types/showdown": "1.9.3",
-		"@types/speakeasy": "2.0.4",
-		"@types/systeminformation": "3.23.1",
+		"@types/speakeasy": "2.0.5",
+		"@types/systeminformation": "3.54.1",
 		"@types/tinycolor2": "1.4.2",
 		"@types/tmp": "0.1.0",
-		"@types/uuid": "3.4.5",
+		"@types/uuid": "3.4.6",
 		"@types/web-push": "3.3.0",
-		"@types/webpack": "4.4.34",
+		"@types/webpack": "4.41.1",
 		"@types/webpack-stream": "3.2.10",
-		"@types/websocket": "0.0.40",
-		"@types/ws": "6.0.1",
-		"animejs": "3.0.1",
-		"apexcharts": "3.8.1",
+		"@types/websocket": "1.0.0",
+		"@types/ws": "6.0.4",
+		"@typescript-eslint/parser": "2.15.0",
+		"agentkeepalive": "4.1.0",
+		"animejs": "3.1.0",
+		"apexcharts": "3.12.0",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
+		"aws-sdk": "2.598.0",
 		"bcryptjs": "2.4.3",
-		"bootstrap": "4.3.1",
-		"bootstrap-vue": "2.0.0-rc.13",
-		"bull": "3.10.0",
-		"cafy": "15.1.1",
-		"cbor": "4.1.5",
+		"bootstrap": "4.4.1",
+		"bootstrap-vue": "2.1.0",
+		"bull": "3.12.1",
+		"cafy": "15.2.1",
+		"cbor": "5.0.1",
 		"chai": "4.2.0",
-		"chalk": "2.4.2",
-		"cli-highlight": "2.1.1",
-		"commander": "2.20.0",
+		"chalk": "3.0.0",
+		"cli-highlight": "2.1.4",
+		"commander": "4.1.0",
 		"content-disposition": "0.5.3",
 		"crc-32": "1.2.0",
-		"css-loader": "3.0.0",
+		"css-loader": "3.4.1",
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
-		"deep-equal": "1.0.1",
-		"diskusage": "1.1.2",
+		"diskusage": "1.1.3",
 		"double-ended-queue": "2.1.0-0",
-		"emojilib": "2.4.0",
-		"eslint": "6.0.1",
-		"eslint-plugin-vue": "5.2.3",
+		"eslint": "6.8.0",
+		"eslint-plugin-vue": "6.1.2",
 		"eventemitter3": "4.0.0",
-		"feed": "3.0.0",
-		"file-type": "12.0.0",
-		"fuckadblock": "3.2.1",
+		"feed": "4.1.0",
+		"file-type": "13.0.1",
+		"fluent-ffmpeg": "2.1.2",
 		"gulp": "4.0.2",
-		"gulp-cssnano": "2.1.3",
-		"gulp-imagemin": "6.0.0",
-		"gulp-mocha": "6.0.0",
-		"gulp-rename": "1.4.0",
+		"gulp-clean-css": "4.2.0",
+		"gulp-mocha": "7.0.2",
+		"gulp-rename": "2.0.0",
 		"gulp-replace": "1.0.0",
 		"gulp-sourcemaps": "2.6.5",
 		"gulp-stylus": "2.7.0",
+		"gulp-terser": "1.2.0",
 		"gulp-tslint": "8.1.4",
 		"gulp-typescript": "5.0.1",
-		"gulp-uglify": "3.0.2",
-		"gulp-util": "3.0.8",
 		"hard-source-webpack-plugin": "0.13.1",
 		"html-minifier": "4.0.0",
-		"http-signature": "1.2.0",
-		"insert-text-at-cursor": "0.2.0",
+		"http-signature": "1.3.1",
+		"https-proxy-agent": "4.0.0",
+		"insert-text-at-cursor": "0.3.0",
 		"is-root": "2.1.0",
 		"is-svg": "4.2.0",
 		"js-yaml": "3.13.1",
-		"jsdom": "15.1.1",
-		"json5": "2.1.0",
+		"jsdom": "15.2.1",
+		"json5": "2.1.1",
 		"json5-loader": "3.0.0",
 		"jsrsasign": "8.0.12",
-		"katex": "0.10.2",
-		"koa": "2.7.0",
+		"katex": "0.11.1",
+		"koa": "2.11.0",
 		"koa-bodyparser": "4.2.1",
 		"koa-compress": "3.0.0",
 		"koa-favicon": "2.0.1",
 		"koa-json-body": "5.3.0",
-		"koa-logger": "3.2.0",
+		"koa-logger": "3.2.1",
 		"koa-mount": "4.0.0",
-		"koa-multer": "1.0.2",
-		"koa-router": "7.4.0",
 		"koa-send": "5.0.0",
 		"koa-slow": "2.1.0",
-		"koa-views": "6.2.0",
+		"koa-views": "6.2.1",
 		"langmap": "0.0.16",
 		"loader-utils": "1.2.3",
-		"lolex": "4.1.0",
+		"lolex": "5.1.2",
 		"lookup-dns-cache": "2.1.0",
-		"minio": "7.0.10",
-		"mocha": "6.1.4",
+		"mocha": "7.0.0",
 		"moji": "0.5.1",
-		"moment": "2.24.0",
 		"ms": "2.1.2",
-		"nested-property": "1.0.1",
+		"multer": "1.4.2",
+		"nested-property": "1.0.2",
 		"node-fetch": "2.6.0",
-		"nodemailer": "6.2.1",
+		"nodemailer": "6.4.2",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"os-utils": "0.0.14",
-		"parse5": "5.1.0",
-		"parsimmon": "1.12.0",
-		"pg": "7.11.0",
+		"parse5": "5.1.1",
+		"parsimmon": "1.13.0",
+		"pg": "7.17.0",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
-		"prismjs": "1.16.0",
+		"prismjs": "1.18.0",
 		"progress-bar-webpack-plugin": "1.12.1",
-		"promise-any": "0.2.0",
 		"promise-limit": "2.7.0",
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.4",
 		"punycode": "2.1.1",
 		"pureimage": "0.1.6",
-		"qrcode": "1.3.3",
+		"qrcode": "1.4.4",
 		"random-seed": "0.3.0",
 		"randomcolor": "0.5.4",
-		"ratelimiter": "3.3.0",
+		"ratelimiter": "3.4.0",
 		"recaptcha-promise": "0.1.3",
-		"reconnecting-websocket": "4.1.10",
+		"reconnecting-websocket": "4.2.0",
 		"redis": "2.8.0",
+		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
 		"request": "2.88.0",
-		"request-promise-native": "1.0.7",
+		"request-promise-native": "1.0.8",
 		"request-stats": "3.0.0",
 		"require-all": "3.0.0",
-		"rimraf": "2.6.3",
+		"rimraf": "3.0.0",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"seedrandom": "3.0.1",
-		"sharp": "0.22.1",
-		"showdown": "1.9.0",
+		"seedrandom": "3.0.5",
+		"sharp": "0.23.4",
+		"showdown": "1.9.1",
 		"showdown-highlightjs-extension": "0.1.2",
 		"speakeasy": "2.0.0",
 		"stringz": "2.0.0",
-		"style-loader": "0.23.1",
-		"stylus": "0.54.5",
+		"style-loader": "1.1.2",
+		"stylus": "0.54.7",
 		"stylus-loader": "3.0.2",
-		"summaly": "2.3.0",
-		"systeminformation": "4.13.1",
+		"summaly": "2.3.1",
+		"syslog-pro": "1.0.0",
+		"systeminformation": "4.17.3",
 		"syuilo-password-strength": "0.0.1",
-		"terser-webpack-plugin": "1.3.0",
+		"terser-webpack-plugin": "2.3.1",
 		"textarea-caret": "3.1.0",
+		"three": "0.112.1",
 		"tinycolor2": "1.4.1",
 		"tmp": "0.1.0",
-		"ts-loader": "5.3.3",
-		"ts-node": "7.0.1",
-		"tslint": "5.18.0",
+		"ts-loader": "6.2.1",
+		"ts-node": "8.5.4",
+		"tslint": "5.20.1",
 		"tslint-sonarts": "1.9.0",
-		"typeorm": "0.2.18",
-		"typescript": "3.5.2",
-		"uglify-es": "3.3.9",
+		"typeorm": "0.2.22",
+		"typescript": "3.7.4",
 		"ulid": "2.3.0",
-		"url-loader": "2.0.1",
-		"uuid": "3.3.2",
+		"url-loader": "3.0.0",
+		"uuid": "3.3.3",
 		"v-animate-css": "0.0.3",
 		"v-debounce": "0.1.2",
-		"video-thumbnail-generator": "1.1.3",
-		"vue": "2.6.10",
+		"vue": "2.6.11",
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.6.0",
-		"vue-cropperjs": "4.0.0",
-		"vue-i18n": "8.11.2",
+		"vue-cropperjs": "4.0.1",
+		"vue-i18n": "8.15.3",
 		"vue-js-modal": "1.3.31",
-		"vue-json-pretty": "1.6.0",
-		"vue-loader": "15.7.0",
+		"vue-json-pretty": "1.6.3",
+		"vue-loader": "15.8.3",
 		"vue-marquee-text-component": "1.1.1",
 		"vue-prism-component": "1.1.1",
-		"vue-router": "3.0.6",
+		"vue-router": "3.1.3",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.16",
-		"vue-template-compiler": "2.6.10",
-		"vuedraggable": "2.23.0",
+		"vue-svg-inline-loader": "1.4.4",
+		"vue-template-compiler": "2.6.11",
+		"vuedraggable": "2.23.2",
 		"vuewordcloud": "18.7.11",
-		"vuex": "3.1.1",
-		"vuex-persistedstate": "2.5.4",
-		"web-push": "3.3.5",
-		"webpack": "4.35.2",
-		"webpack-cli": "3.3.5",
-		"websocket": "1.0.28",
-		"ws": "7.0.1",
+		"vuex": "3.1.2",
+		"vuex-persistedstate": "2.7.0",
+		"web-push": "3.4.3",
+		"webpack": "4.41.5",
+		"webpack-cli": "3.3.10",
+		"websocket": "1.0.31",
+		"ws": "7.2.1",
 		"xev": "2.0.1"
+	},
+	"devDependencies": {
+		"@types/fluent-ffmpeg": "2.1.12"
 	}
 }

src/@types/lookup-dns-cache.d.ts

@@ -1,17 +1,9 @@
 declare module 'lookup-dns-cache' {
-	type IPv4 = 4;
+	import { LookupOneOptions, LookupAllOptions, LookupOptions, LookupAddress } from 'dns';
 
-	type IPv6 = 6;
-
-	type Family = IPv4 | IPv6 | undefined;
-
-	interface IRunOptions {
-		family?: Family;
-		all?: boolean;
-	}
-
-	type RunCallback = (error: Error | null, address?: string | string[], family?: Family) => void;
-
-	export function lookup(hostname: string, options: IRunOptions | Family, callback: RunCallback): {} | undefined;
-	export function lookup(hostname: string, callback: RunCallback): {} | undefined;
+	function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
+	function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
+	function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException | null, addresses: LookupAddress[]) => void): void;
+	function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException | null, address: string | LookupAddress[], family: number) => void): void;
+	function lookup(hostname: string, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
 }

src/@types/promise-any.d.ts

@@ -1,7 +0,0 @@
-declare module 'promise-any' {
-	function promiseAny<T>(iterable: Iterable<T | PromiseLike<T>>): Promise<T>;
-
-	namespace promiseAny {} // Hack
-
-	export = promiseAny;
-}

src/argv.ts

@@ -1,8 +1,8 @@
 import * as program from 'commander';
-import * as pkg from '../package.json';
+import config from './config';
 
 program
-	.version(pkg.version)
+	.version(config.version)
 	.option('--no-daemons', 'Disable daemon processes (for debbuging)')
 	.option('--disable-clustering', 'Disable clustering')
 	.option('--only-server', 'Run server only (without job queue processing)')

src/boot/index.ts

@@ -1,5 +1,5 @@
 import * as cluster from 'cluster';
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import Xev from 'xev';
 
 import Logger from '../services/logger';

src/boot/master.ts

@@ -1,6 +1,6 @@
 import * as os from 'os';
 import * as cluster from 'cluster';
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 import * as portscanner from 'portscanner';
 import * as isRoot from 'is-root';
 
@@ -8,10 +8,10 @@ import Logger from '../services/logger';
 import loadConfig from '../config/load';
 import { Config } from '../config/types';
 import { lessThan } from '../prelude/array';
-import * as pkg from '../../package.json';
 import { program } from '../argv';
 import { showMachineInfo } from '../misc/show-machine-info';
 import { initDb } from '../db/postgre';
+import * as meta from '../meta.json';
 
 const logger = new Logger('core', 'cyan');
 const bootLogger = logger.createSubLogger('boot', 'magenta', false);
@@ -19,7 +19,7 @@ const bootLogger = logger.createSubLogger('boot', 'magenta', false);
 function greet() {
 	if (!program.quiet) {
 		//#region Misskey logo
-		const v = `v${pkg.version}`;
+		const v = `v${meta.version}`;
 		console.log('  _____ _         _           ');
 		console.log(' |     |_|___ ___| |_ ___ _ _ ');
 		console.log(' | | | | |_ -|_ -| \'_| -_| | |');
@@ -35,18 +35,18 @@ function greet() {
 	}
 
 	bootLogger.info('Welcome to Misskey!');
-	bootLogger.info(`Misskey v${pkg.version}`, null, true);
+	bootLogger.info(`Misskey v${meta.version}`, null, true);
 }
 
 /**
  * Init master process
  */
 export async function masterMain() {
-	greet();
-
 	let config!: Config;
 
 	try {
+		greet();
+
 		// initialize app
 		config = await init();
 
@@ -159,7 +159,7 @@ async function init(): Promise<Config> {
 	return config;
 }
 
-async function spawnWorkers(limit: number = Infinity) {
+async function spawnWorkers(limit: number = 1) {
 	const workers = Math.min(limit, os.cpus().length);
 	bootLogger.info(`Starting ${workers} worker${workers === 1 ? '' : 's'}...`);
 	await Promise.all([...Array(workers)].map(spawnWorker));

src/client/app/admin/script.ts

@@ -19,7 +19,8 @@ init(launch => {
 		mode: 'history',
 		base: '/admin/',
 		routes: [
-			{ path: '/', component: Index },
+			{ path: '/:page', component: Index },
+			{ path: '/', redirect: '/dashboard' },
 			{ path: '*', component: NotFound }
 		]
 	});

src/client/app/admin/views/dashboard.vue

@@ -115,7 +115,6 @@ export default Vue.extend({
 			connection: null,
 			meta: null,
 			instances: [],
-			clock: null,
 			faDatabase
 		};
 	},
@@ -124,7 +123,6 @@ export default Vue.extend({
 		this.connection = this.$root.stream.useSharedConnection('serverStats');
 
 		this.updateStats();
-		this.clock = setInterval(this.updateStats, 3000);
 
 		this.$root.getMeta().then(meta => {
 			this.meta = meta;
@@ -145,7 +143,6 @@ export default Vue.extend({
 
 	beforeDestroy() {
 		this.connection.dispose();
-		clearInterval(this.clock);
 	},
 
 	methods: {

src/client/app/admin/views/emoji.vue

@@ -8,6 +8,9 @@
 					<span>{{ $t('add-emoji.name') }}</span>
 					<template #desc>{{ $t('add-emoji.name-desc') }}</template>
 				</ui-input>
+				<ui-input v-model="category" :datalist="categoryList">
+					<span>{{ $t('add-emoji.category') }}</span>
+				</ui-input>
 				<ui-input v-model="aliases">
 					<span>{{ $t('add-emoji.aliases') }}</span>
 					<template #desc>{{ $t('add-emoji.aliases-desc') }}</template>
@@ -24,7 +27,7 @@
 
 	<ui-card>
 		<template #title><fa :icon="faGrin"/> {{ $t('emojis.title') }}</template>
-		<section v-for="emoji in emojis" class="oryfrbft">
+		<section v-for="emoji in emojis" :key="emoji.name" class="oryfrbft">
 			<div>
 				<img :src="emoji.url" :alt="emoji.name" style="width: 64px;"/>
 			</div>
@@ -33,6 +36,9 @@
 					<ui-input v-model="emoji.name">
 						<span>{{ $t('add-emoji.name') }}</span>
 					</ui-input>
+					<ui-input v-model="emoji.category" :datalist="categoryList">
+						<span>{{ $t('add-emoji.category') }}</span>
+					</ui-input>
 					<ui-input v-model="emoji.aliases">
 						<span>{{ $t('add-emoji.aliases') }}</span>
 					</ui-input>
@@ -55,12 +61,14 @@
 import Vue from 'vue';
 import i18n from '../../i18n';
 import { faGrin } from '@fortawesome/free-regular-svg-icons';
+import { unique } from '../../../../prelude/array';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/emoji.vue'),
 	data() {
 		return {
 			name: '',
+			category: '',
 			url: '',
 			aliases: '',
 			emojis: [],
@@ -72,10 +80,17 @@ export default Vue.extend({
 		this.fetchEmojis();
 	},
 
+	computed: {
+		categoryList() {
+			return unique(this.emojis.map((x: any) => x.category || '').filter((x: string) => x !== ''));
+		}
+	},
+
 	methods: {
 		add() {
 			this.$root.api('admin/emoji/add', {
 				name: this.name,
+				category: this.category,
 				url: this.url,
 				aliases: this.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
@@ -94,7 +109,6 @@ export default Vue.extend({
 
 		fetchEmojis() {
 			this.$root.api('admin/emoji/list').then(emojis => {
-				emojis.reverse();
 				for (const e of emojis) {
 					e.aliases = (e.aliases || []).join(' ');
 				}
@@ -106,6 +120,7 @@ export default Vue.extend({
 			this.$root.api('admin/emoji/update', {
 				id: emoji.id,
 				name: emoji.name,
+				category: emoji.category,
 				url: emoji.url,
 				aliases: emoji.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {

src/client/app/admin/views/federation.vue

@@ -509,7 +509,7 @@ export default Vue.extend({
 
 		saveBlockedHosts() {
 			this.$root.api('admin/update-meta', {
-				blockedHosts: this.blockedHosts.split('\n')
+				blockedHosts: this.blockedHosts ? this.blockedHosts.split('\n') : []
 			}).then(() => {
 				this.$root.dialog({
 					type: 'success',

src/client/app/admin/views/index.vue

@@ -18,18 +18,18 @@
 			<p class="name"><mk-user-name :user="$store.state.i"/></p>
 		</div>
 		<ul>
-			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</li>
-			<li @click="nav('instance')" :class="{ active: page == 'instance' }"><fa icon="cog" fixed-width/>{{ $t('instance') }}</li>
-			<li @click="nav('queue')" :class="{ active: page == 'queue' }"><fa :icon="faTasks" fixed-width/>{{ $t('queue') }}</li>
-			<li @click="nav('logs')" :class="{ active: page == 'logs' }"><fa :icon="faStream" fixed-width/>{{ $t('logs') }}</li>
-			<li @click="nav('db')" :class="{ active: page == 'db' }"><fa :icon="faDatabase" fixed-width/>{{ $t('db') }}</li>
-			<li @click="nav('moderators')" :class="{ active: page == 'moderators' }"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</li>
-			<li @click="nav('users')" :class="{ active: page == 'users' }"><fa icon="users" fixed-width/>{{ $t('users') }}</li>
-			<li @click="nav('drive')" :class="{ active: page == 'drive' }"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</li>
-			<li @click="nav('federation')" :class="{ active: page == 'federation' }"><fa :icon="faGlobe" fixed-width/>{{ $t('federation') }}</li>
-			<li @click="nav('emoji')" :class="{ active: page == 'emoji' }"><fa :icon="faGrin" fixed-width/>{{ $t('emoji') }}</li>
-			<li @click="nav('announcements')" :class="{ active: page == 'announcements' }"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</li>
-			<li @click="nav('abuse')" :class="{ active: page == 'abuse' }"><fa :icon="faExclamationCircle" fixed-width/>{{ $t('abuse') }}</li>
+			<li><router-link to="/dashboard" active-class="active"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</router-link></li>
+			<li><router-link to="/instance" active-class="active"><fa icon="cog" fixed-width/>{{ $t('instance') }}</router-link></li>
+			<li><router-link to="/queue" active-class="active"><fa :icon="faTasks" fixed-width/>{{ $t('queue') }}</router-link></li>
+			<li><router-link to="/logs" active-class="active"><fa :icon="faStream" fixed-width/>{{ $t('logs') }}</router-link></li>
+			<li><router-link to="/db" active-class="active"><fa :icon="faDatabase" fixed-width/>{{ $t('db') }}</router-link></li>
+			<li><router-link to="/moderators" active-class="active"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</router-link></li>
+			<li><router-link to="/users" active-class="active"><fa icon="users" fixed-width/>{{ $t('users') }}</router-link></li>
+			<li><router-link to="/drive" active-class="active"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</router-link></li>
+			<li><router-link to="/federation" active-class="active"><fa :icon="faGlobe" fixed-width/>{{ $t('federation') }}</router-link></li>
+			<li><router-link to="/emoji" active-class="active"><fa :icon="faGrin" fixed-width/>{{ $t('emoji') }}</router-link></li>
+			<li><router-link to="/announcements" active-class="active"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</router-link></li>
+			<li><router-link to="/abuse" active-class="active"><fa :icon="faExclamationCircle" fixed-width/>{{ $t('abuse') }}</router-link></li>
 		</ul>
 		<div class="back-to-misskey">
 			<a href="/"><fa :icon="faArrowLeft"/> {{ $t('back-to-misskey') }}</a>
@@ -102,7 +102,6 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			page: 'dashboard',
 			version,
 			isMobile,
 			navOpend: !isMobile,
@@ -116,9 +115,9 @@ export default Vue.extend({
 			faDatabase,
 		};
 	},
-	methods: {
-		nav(page: string) {
-			this.page = page;
+	computed: {
+		page() {
+			return this.$route.params.page;
 		}
 	}
 });
@@ -240,11 +239,10 @@ export default Vue.extend({
 			list-style none
 			font-size 15px
 
-			> li
+			> li > a
 				display block
 				padding 10px 16px
 				margin 0
-				cursor pointer
 				user-select none
 				color #eee
 				transition margin-left 0.2s ease

src/client/app/admin/views/instance.vue

@@ -81,6 +81,7 @@
 		</section>
 		<section>
 			<ui-switch v-model="cacheRemoteFiles">{{ $t('cache-remote-files') }}<template #desc>{{ $t('cache-remote-files-desc') }}</template></ui-switch>
+			<ui-switch v-model="proxyRemoteFiles">{{ $t('proxy-remote-files') }}<template #desc>{{ $t('proxy-remote-files-desc') }}</template></ui-switch>
 		</section>
 		<section class="fit-top fit-bottom">
 			<ui-input v-model="localDriveCapacityMb" type="number">{{ $t('local-drive-capacity-mb') }}<template #suffix>MB</template><template #desc>{{ $t('mb') }}</template></ui-input>
@@ -275,6 +276,7 @@ export default Vue.extend({
 			description: null,
 			languages: null,
 			cacheRemoteFiles: false,
+			proxyRemoteFiles: false,
 			localDriveCapacityMb: null,
 			remoteDriveCapacityMb: null,
 			maxNoteTextLength: null,
@@ -339,6 +341,7 @@ export default Vue.extend({
 			this.description = meta.description;
 			this.languages = meta.langs.join(' ');
 			this.cacheRemoteFiles = meta.cacheRemoteFiles;
+			this.proxyRemoteFiles = meta.proxyRemoteFiles;
 			this.localDriveCapacityMb = meta.driveCapacityPerLocalUserMb;
 			this.remoteDriveCapacityMb = meta.driveCapacityPerRemoteUserMb;
 			this.maxNoteTextLength = meta.maxNoteTextLength;
@@ -461,8 +464,9 @@ export default Vue.extend({
 				iconUrl: this.iconUrl,
 				name: this.name,
 				description: this.description,
-				langs: this.languages.split(' '),
+				langs: this.languages ? this.languages.split(' ') : [],
 				cacheRemoteFiles: this.cacheRemoteFiles,
+				proxyRemoteFiles: this.proxyRemoteFiles,
 				localDriveCapacityMb: parseInt(this.localDriveCapacityMb, 10),
 				remoteDriveCapacityMb: parseInt(this.remoteDriveCapacityMb, 10),
 				maxNoteTextLength: parseInt(this.maxNoteTextLength, 10),
@@ -490,8 +494,8 @@ export default Vue.extend({
 				enableServiceWorker: this.enableServiceWorker,
 				swPublicKey: this.swPublicKey,
 				swPrivateKey: this.swPrivateKey,
-				pinnedUsers: this.pinnedUsers.split('\n'),
-				hiddenTags: this.hiddenTags.split('\n'),
+				pinnedUsers: this.pinnedUsers ? this.pinnedUsers.split('\n') : [],
+				hiddenTags: this.hiddenTags ? this.hiddenTags.split('\n') : [],
 				useObjectStorage: this.useObjectStorage,
 				objectStorageBaseUrl: this.objectStorageBaseUrl ? this.objectStorageBaseUrl : null,
 				objectStorageBucket: this.objectStorageBucket ? this.objectStorageBucket : null,

src/client/app/admin/views/moderators.vue

@@ -12,6 +12,31 @@
 			</ui-horizon-group>
 		</section>
 	</ui-card>
+
+	<ui-card>
+		<template #title>{{ $t('logs.title') }}</template>
+		<section class="fit-top">
+			<sequential-entrance animation="entranceFromTop" delay="25">
+				<div v-for="log in logs" :key="log.id" class="">
+					<ui-horizon-group inputs>
+						<ui-input :value="log.user | acct" type="text" readonly>
+							<span>{{ $t('logs.moderator') }}</span>
+						</ui-input>
+						<ui-input :value="log.type" type="text" readonly>
+							<span>{{ $t('logs.type') }}</span>
+						</ui-input>
+						<ui-input :value="log.createdAt | date" type="text" readonly>
+							<span>{{ $t('logs.at') }}</span>
+						</ui-input>
+					</ui-horizon-group>
+					<ui-textarea :value="JSON.stringify(log.info, null, 4)" readonly>
+						<span>{{ $t('logs.info') }}</span>
+					</ui-textarea>
+				</div>
+			</sequential-entrance>
+			<ui-button v-if="existMoreLogs" @click="fetchLogs">{{ $t('@.load-more') }}</ui-button>
+		</section>
+	</ui-card>
 </div>
 </template>
 
@@ -26,10 +51,17 @@ export default Vue.extend({
 	data() {
 		return {
 			username: '',
-			changing: false
+			changing: false,
+			logs: [],
+			untilLogId: null,
+			existMoreLogs: false
 		};
 	},
 
+	created() {
+		this.fetchLogs();
+	},
+
 	methods: {
 		async add() {
 			this.changing = true;
@@ -74,6 +106,22 @@ export default Vue.extend({
 
 			this.changing = false;
 		},
+
+		fetchLogs() {
+			this.$root.api('admin/show-moderation-logs', {
+				untilId: this.untilId,
+				limit: 10 + 1
+			}).then(logs => {
+				if (logs.length == 10 + 1) {
+					logs.pop();
+					this.existMoreLogs = true;
+				} else {
+					this.existMoreLogs = false;
+				}
+				this.logs = this.logs.concat(logs);
+				this.untilLogId = this.logs[this.logs.length - 1].id;
+			});
+		},
 	}
 });
 </script>

src/client/app/admin/views/queue.vue

@@ -48,14 +48,15 @@
 				</ui-select>
 			</ui-horizon-group>
 			<sequential-entrance animation="entranceFromTop" delay="25">
-				<div class="xvvuvgsv" v-for="job in jobs">
+				<div class="xvvuvgsv" v-for="job in jobs" :key="job.id">
 					<b>{{ job.id }}</b>
 					<template v-if="domain === 'deliver'">
 						<span>{{ job.data.to }}</span>
 					</template>
 					<template v-if="domain === 'inbox'">
-						<span>{{ job.activity.id }}</span>
+						<span>{{ job.data.activity.id }}</span>
 					</template>
+					<span>{{ `(${job.attempts}/${job.maxAttempts}, ${Math.floor((jobsFetched - job.timestamp) / 1000 / 60)}min)` }}</span>
 				</div>
 			</sequential-entrance>
 			<ui-info v-if="jobs.length == jobsLimit">{{ $t('result-is-truncated', { n: jobsLimit }) }}</ui-info>
@@ -84,6 +85,7 @@ export default Vue.extend({
 			chartLimit: 200,
 			jobs: [],
 			jobsLimit: 50,
+			jobsFetched: Date.now(),
 			domain: 'deliver',
 			state: 'delayed',
 			faTasks, faPaperPlane, faInbox, faChartBar, faDatabase, faCloud
@@ -140,6 +142,7 @@ export default Vue.extend({
 				state: this.state,
 				limit: this.jobsLimit
 			}).then(jobs => {
+				this.jobsFetched = Date.now(),
 				this.jobs = jobs;
 			});
 		},
@@ -149,7 +152,8 @@ export default Vue.extend({
 
 <style lang="stylus" scoped>
 .xvvuvgsv
-	> b
-		margin-right 16px
+	margin-left -6px
+	> b, span
+		margin 0 6px
 
 </style>

src/client/app/admin/views/users.user.vue

@@ -5,7 +5,7 @@
 			<mk-avatar class="avatar" :user="user" :disable-link="true"/>
 		</a>
 	</div>
-	<div>
+	<div @click="click(user.id)">
 		<header>
 			<b><mk-user-name :user="user"/></b>
 			<span class="username">@{{ user | acct }}</span>
@@ -32,7 +32,7 @@ import { faSnowflake } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('admin/views/users.vue'),
-	props: ['user'],
+	props: ['user', 'click'],
 	data() {
 		return {
 			faSnowflake, faMicrophoneSlash
@@ -44,7 +44,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .kofvwchc
 	display flex
-	padding 16px 0
+	padding 16px
 	border-top solid 1px var(--faceDivider)
 
 	> div:first-child
@@ -55,6 +55,7 @@ export default Vue.extend({
 
 	> div:last-child
 		flex 1
+		cursor pointer
 		padding-left 16px
 
 		@media (max-width 500px)
@@ -80,4 +81,15 @@ export default Vue.extend({
 			> .is-suspended
 				margin 0 0 0 .5em
 				color #4dabf7
+
+	&:hover
+		color var(--primaryForeground)
+		background var(--primary)
+		text-decoration none
+		border-radius 3px
+
+	&:active
+		color var(--primaryForeground)
+		background var(--primaryDarken10)
+		border-radius 3px
 </style>

src/client/app/admin/views/users.vue

@@ -8,7 +8,7 @@
 			</ui-input>
 			<ui-button @click="showUser"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>
 
-			<div class="user" v-if="user">
+			<div ref="user" class="user" v-if="user" :key="user.id">
 				<x-user :user="user"/>
 				<div class="actions">
 					<ui-button v-if="user.host != null" @click="updateRemoteUser"><fa :icon="faSync"/> {{ $t('update-remote-user') }}</ui-button>
@@ -42,6 +42,7 @@
 				<ui-select v-model="state">
 					<template #label>{{ $t('users.state.title') }}</template>
 					<option value="all">{{ $t('users.state.all') }}</option>
+					<option value="available">{{ $t('users.state.available') }}</option>
 					<option value="admin">{{ $t('users.state.admin') }}</option>
 					<option value="moderator">{{ $t('users.state.moderator') }}</option>
 					<option value="silenced">{{ $t('users.state.silenced') }}</option>
@@ -54,8 +55,16 @@
 					<option value="remote">{{ $t('users.origin.remote') }}</option>
 				</ui-select>
 			</ui-horizon-group>
+			<ui-horizon-group searchboxes>
+				<ui-input v-model="searchUsername" type="text" spellcheck="false" @input="fetchUsers(true)">
+					<span>{{ $t('username') }}</span>
+				</ui-input>
+				<ui-input v-model="searchHost" type="text" spellcheck="false" @input="fetchUsers(true)" :disabled="origin === 'local'">
+					<span>{{ $t('host') }}</span>
+				</ui-input>
+			</ui-horizon-group>
 			<sequential-entrance animation="entranceFromTop" delay="25">
-				<x-user v-for="user in users" :user='user' :key="user.id"/>
+				<x-user v-for="user in users" :key="user.id" :user='user' :click="showUserOnClick"/>
 			</sequential-entrance>
 			<ui-button v-if="existMore" @click="fetchUsers">{{ $t('@.load-more') }}</ui-button>
 		</section>
@@ -85,6 +94,8 @@ export default Vue.extend({
 			sort: '+createdAt',
 			state: 'all',
 			origin: 'local',
+			searchUsername: '',
+			searchHost: '',
 			limit: 10,
 			offset: 0,
 			users: [],
@@ -107,6 +118,7 @@ export default Vue.extend({
 		},
 
 		origin() {
+			if (this.origin === 'local') this.searchHost = '';
 			this.users = [];
 			this.offset = 0;
 			this.fetchUsers();
@@ -157,6 +169,15 @@ export default Vue.extend({
 			this.target = '';
 		},
 
+		async showUserOnClick(userId: string) {
+			this.$root.api('admin/show-user', { userId: userId }).then(info => {
+				this.user = info;
+				this.$nextTick(() => {
+					this.$refs.user.scrollIntoView();
+				});
+			});
+		},
+
 		/** 処理対象ユーザーの情報を更新する */
 		async refreshUser() {
 			this.$root.api('admin/show-user', { userId: this.user.id }).then(info => {
@@ -308,13 +329,16 @@ export default Vue.extend({
 			return !confirm.canceled;
 		},
 
-		fetchUsers() {
+		fetchUsers(truncate?: boolean) {
+			if (truncate) this.offset = 0;
 			this.$root.api('admin/show-users', {
 				state: this.state,
 				origin: this.origin,
 				sort: this.sort,
 				offset: this.offset,
-				limit: this.limit + 1
+				limit: this.limit + 1,
+				username: this.searchUsername,
+				hostname: this.searchHost
 			}).then(users => {
 				if (users.length == this.limit + 1) {
 					users.pop();
@@ -322,7 +346,7 @@ export default Vue.extend({
 				} else {
 					this.existMore = false;
 				}
-				this.users = this.users.concat(users);
+				this.users = truncate ? users : this.users.concat(users);
 				this.offset += this.limit;
 			});
 		}

src/client/app/boot.js

@@ -72,34 +72,39 @@
 	//#region Fetch locale data
 	const cachedLocale = localStorage.getItem('locale');
 	const localeKey = localStorage.getItem('localeKey');
+	let localeData = null;
 
 	if (cachedLocale == null || localeKey != `${ver}.${lang}`) {
 		const locale = await fetch(`/assets/locales/${lang}.json?ver=${ver}`)
 			.then(response => response.json());
+		localeData = locale;
 
 		localStorage.setItem('locale', JSON.stringify(locale));
 		localStorage.setItem('localeKey', `${ver}.${lang}`);
+	} else {
+		localeData = JSON.parse(cachedLocale);
 	}
 	//#endregion
 
 	// Detect the user agent
 	const ua = navigator.userAgent.toLowerCase();
-	const isMobile = /mobile|iphone|ipad|android/.test(ua);
+	let isMobile = /mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576;
+	if (settings && settings.device.appTypeForce) {
+		if (settings.device.appTypeForce === 'mobile') {
+			isMobile = true;
+		} else if (settings.device.appTypeForce === 'desktop') {
+			isMobile = false;
+		}
+	}
 
 	// Get the <head> element
 	const head = document.getElementsByTagName('head')[0];
 
 	// If mobile, insert the viewport meta tag
 	if (isMobile) {
-		const meta = document.createElement('meta');
-		meta.setAttribute('name', 'viewport');
-		meta.setAttribute('content',
-			'width=device-width,' +
-			'initial-scale=1,' +
-			'minimum-scale=1,' +
-			'maximum-scale=1,' +
-			'user-scalable=no');
-		head.appendChild(meta);
+		const viewport = document.getElementsByName("viewport").item(0);
+		viewport.content = `${viewport.content},minimum-scale=1,maximum-scale=1,user-scalable=no`;
+		head.appendChild(viewport);
 	}
 
 	// Switch desktop or mobile version
@@ -111,9 +116,9 @@
 	// Note: 'async' make it possible to load the script asyncly.
 	//       'defer' make it possible to run the script when the dom loaded.
 	const script = document.createElement('script');
-	script.setAttribute('src', `/assets/${app}.${ver}.js`);
-	script.setAttribute('async', 'true');
-	script.setAttribute('defer', 'true');
+	script.src = `/assets/${app}.${ver}.js`;
+	script.async = true;
+	script.defer = true;
 	head.appendChild(script);
 
 	// 3秒経ってもスクリプトがロードされない場合はバージョンが古くて
@@ -136,10 +141,10 @@
 			localStorage.setItem('v', meta.version);
 
 			alert(
-				'Misskeyの新しいバージョンがあります。ページを再度読み込みします。' +
-				'\n\n' +
-				'New version of Misskey available. The page will be reloaded.');
-
+				localeData.common._settings["update-available"] +
+				'\n' +
+				localeData.common._settings["update-available-desc"]
+			);
 			refresh();
 		}
 	}, 3000);

src/client/app/common/scripts/collect-page-vars.ts

@@ -32,6 +32,12 @@ export function collectPageVars(content) {
 					type: 'number',
 					value: 0
 				});
+			} else if (x.type === 'radioButton') {
+				pageVars.push({
+					name: x.name,
+					type: 'string',
+					value: x.default || ''
+				});
 			} else if (x.children) {
 				collect(x.children);
 			}

src/client/app/common/scripts/fuck-ad-block.ts

@@ -1,18 +0,0 @@
-declare const fuckAdBlock: any;
-
-export default ($root: any) => {
-	require('fuckadblock');
-
-	function adBlockDetected() {
-		$root.dialog({
-			title: $root.$t('@.adblock.detected'),
-			text: $root.$t('@.adblock.warning')
-		});
-	}
-
-	if (fuckAdBlock === undefined) {
-		adBlockDetected();
-	} else {
-		fuckAdBlock.onDetected(adBlockDetected);
-	}
-};

src/client/app/common/scripts/get-face.ts

@@ -4,7 +4,8 @@ const faces = [
 	'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!',
 	'✌️(´･_･`)✌️',
 	'(｡>﹏<｡)',
-	'(Δ・x・Δ)'
+	'(Δ・x・Δ)',
+	'(ｺ｀・ﾍ・´ｹ)'
 ];
 
 export default () => faces[Math.floor(Math.random() * faces.length)];

src/client/app/common/scripts/note-mixin.ts

@@ -3,6 +3,8 @@ import { sum, unique } from '../../../../prelude/array';
 import shouldMuteNote from './should-mute-note';
 import MkNoteMenu from '../views/components/note-menu.vue';
 import MkReactionPicker from '../views/components/reaction-picker.vue';
+import pleaseLogin from './please-login';
+import i18n from '../../i18n';
 
 function focus(el, fn) {
 	const target = fn(el);
@@ -20,10 +22,13 @@ type Opts = {
 };
 
 export default (opts: Opts = {}) => ({
+	i18n: i18n(),
+
 	data() {
 		return {
 			showContent: false,
-			hideThisNote: false
+			hideThisNote: false,
+			openingMenu: false
 		};
 	},
 
@@ -38,7 +43,7 @@ export default (opts: Opts = {}) => ({
 				'ctrl+q': this.renoteDirectly,
 				'up|k|shift+tab': this.focusBefore,
 				'down|j|tab': this.focusAfter,
-				'esc': this.blur,
+				//'esc': this.blur,
 				'm|o': () => this.menu(true),
 				's': this.toggleShowContent,
 				'1': () => this.reactDirectly('like'),
@@ -108,6 +113,7 @@ export default (opts: Opts = {}) => ({
 
 	methods: {
 		reply(viaKeyboard = false) {
+			pleaseLogin(this.$root);
 			this.$root.$post({
 				reply: this.appearNote,
 				animation: !viaKeyboard,
@@ -118,6 +124,7 @@ export default (opts: Opts = {}) => ({
 		},
 
 		renote(viaKeyboard = false) {
+			pleaseLogin(this.$root);
 			this.$root.$post({
 				renote: this.appearNote,
 				animation: !viaKeyboard,
@@ -134,13 +141,22 @@ export default (opts: Opts = {}) => ({
 		},
 
 		react(viaKeyboard = false) {
+			pleaseLogin(this.$root);
 			this.blur();
-			this.$root.new(MkReactionPicker, {
+			const w = this.$root.new(MkReactionPicker, {
 				source: this.$refs.reactButton,
-				note: this.appearNote,
 				showFocus: viaKeyboard,
 				animation: !viaKeyboard
-			}).$once('closed', this.focus);
+			});
+			w.$once('chosen', reaction => {
+				this.$root.api('notes/reactions/create', {
+					noteId: this.appearNote.id,
+					reaction: reaction
+				}).then(() => {
+					w.close();
+				});
+			});
+			w.$once('closed', this.focus);
 		},
 
 		reactDirectly(reaction) {
@@ -159,6 +175,7 @@ export default (opts: Opts = {}) => ({
 		},
 
 		favorite() {
+			pleaseLogin(this.$root);
 			this.$root.api('notes/favorites/create', {
 				noteId: this.appearNote.id
 			}).then(() => {
@@ -170,17 +187,33 @@ export default (opts: Opts = {}) => ({
 		},
 
 		del() {
-			this.$root.api('notes/delete', {
-				noteId: this.appearNote.id
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('@.delete-confirm'),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) return;
+
+				this.$root.api('notes/delete', {
+					noteId: this.appearNote.id
+				});
 			});
 		},
 
 		menu(viaKeyboard = false) {
-			this.$root.new(MkNoteMenu, {
+			if (this.openingMenu) return;
+			this.openingMenu = true;
+			const w = this.$root.new(MkNoteMenu, {
 				source: this.$refs.menuButton,
 				note: this.appearNote,
 				animation: !viaKeyboard
-			}).$once('closed', this.focus);
+			}).$once('closed', () => {
+				this.openingMenu = false;
+				this.focus();
+			});
+			this.$once('hook:beforeDestroy', () => {
+				w.destroyDom();
+			});
 		},
 
 		toggleShowContent() {

src/client/app/common/scripts/paging.ts

@@ -44,13 +44,21 @@ export default (opts) => ({
 				return window.scrollY <= 8;
 			};
 
-			window.addEventListener('scroll', this.onWindowScroll, { passive: true });
+			window.addEventListener('scroll', this.onScroll, { passive: true });
+		} else if (opts.isContainer) {
+			this.isScrollTop = () => {
+				return this.$el.scrollTop <= 8;
+			};
+
+			this.$el.addEventListener('scroll', this.onScroll, { passive: true });
 		}
 	},
 
 	beforeDestroy() {
 		if (opts.captureWindowScroll) {
-			window.removeEventListener('scroll', this.onWindowScroll);
+			window.removeEventListener('scroll', this.onScroll);
+		} else if (opts.isContainer) {
+			this.$el.removeEventListener('scroll', this.onScroll);
 		}
 	},
 
@@ -67,6 +75,7 @@ export default (opts) => ({
 
 		async init() {
 			this.fetching = true;
+			if (opts.beforeInit) opts.beforeInit(this);
 			let params = typeof this.pagination.params === 'function' ? this.pagination.params(true) : this.pagination.params;
 			if (params && params.then) params = await params;
 			await this.$root.api(this.pagination.endpoint, {
@@ -151,7 +160,7 @@ export default (opts) => ({
 			this.queue = [];
 		},
 
-		onWindowScroll() {
+		onScroll() {
 			if (this.isScrollTop()) {
 				this.onTop();
 			}
@@ -162,8 +171,10 @@ export default (opts) => ({
 				// http://d.hatena.ne.jp/favril/20091105/1257403319
 				if (this.$el.offsetHeight == 0) return;
 
-				const current = window.scrollY + window.innerHeight;
-				if (current > document.body.offsetHeight - 8) this.onBottom();
+				const bottomPosition = opts.isContainer ? this.$el.scrollHeight : document.body.offsetHeight;
+
+				const currentBottomPosition = opts.isContainer ? this.$el.scrollTop + this.$el.clientHeight : window.scrollY + window.innerHeight;
+				if (currentBottomPosition > (bottomPosition - 8)) this.onBottom();
 			}
 		},
 

src/client/app/common/scripts/please-login.ts

@@ -0,0 +1,10 @@
+export default ($root: any) => {
+	if ($root.$store.getters.isSignedIn) return;
+
+	$root.dialog({
+		title: $root.$t('@.signin-required'),
+		text: null
+	});
+
+	throw new Error('signin required');
+};

src/client/app/common/scripts/post-form.ts

@@ -8,6 +8,7 @@ import { host, url } from '../../config';
 import i18n from '../../i18n';
 import { erase, unique } from '../../../../prelude/array';
 import extractMentions from '../../../../misc/extract-mentions';
+import { formatTimeString } from '../../../../misc/format-time-string';
 
 export default (opts) => ({
 	i18n: i18n(),
@@ -34,6 +35,10 @@ export default (opts) => ({
 			type: String,
 			required: false
 		},
+		initialNote: {
+			type: Object,
+			required: false
+		},
 		instant: {
 			type: Boolean,
 			required: false,
@@ -148,15 +153,26 @@ export default (opts) => ({
 		// デフォルト公開範囲
 		this.applyVisibility(this.$store.state.settings.rememberNoteVisibility ? (this.$store.state.device.visibility || this.$store.state.settings.defaultNoteVisibility) : this.$store.state.settings.defaultNoteVisibility);
 
+		if (this.reply && this.reply.localOnly) {
+			this.localOnly = true;
+		}
+
 		// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
 		if (this.reply && ['home', 'followers', 'specified'].includes(this.reply.visibility)) {
 			this.visibility = this.reply.visibility;
-		}
+			if (this.reply.visibility === 'specified') {
+				this.$root.api('users/show', {
+					userIds: this.reply.visibleUserIds.filter(uid => uid !== this.$store.state.i.id && uid !== this.reply.userId)
+				}).then(users => {
+					this.visibleUsers.push(...users);
+				});
 
-		if (this.reply) {
-			this.$root.api('users/show', { userId: this.reply.userId }).then(user => {
-				this.visibleUsers.push(user);
-			});
+				if (this.reply.userId !== this.$store.state.i.id) {
+					this.$root.api('users/show', { userId: this.reply.userId }).then(user => {
+						this.visibleUsers.push(user);
+					});
+				}
+			}
 		}
 
 		// keep cw when reply
@@ -188,6 +204,29 @@ export default (opts) => ({
 				}
 			}
 
+			// 削除して編集
+			if (this.initialNote) {
+				const init = this.initialNote;
+				this.text = init.text ? init.text : '';
+				this.files = init.files;
+				this.cw = init.cw;
+				this.useCw = init.cw != null;
+				if (init.poll) {
+					this.poll = true;
+					this.$nextTick(() => {
+						(this.$refs.poll as any).set({
+							choices: init.poll.choices.map(c => c.text),
+							multiple: init.poll.multiple
+						});
+					});
+				}
+				// hack 位置情報投稿が動くようになったら適用する
+				this.geo = null;
+				this.visibility = init.visibility;
+				this.localOnly = init.localOnly;
+				this.quoteId = init.renote ? init.renote.id : null;
+			}
+
 			this.$nextTick(() => this.watch());
 		});
 	},
@@ -237,8 +276,8 @@ export default (opts) => ({
 			for (const x of Array.from((this.$refs.file as any).files)) this.upload(x);
 		},
 
-		upload(file) {
-			(this.$refs.uploader as any).upload(file);
+		upload(file: File, name?: string) {
+			(this.$refs.uploader as any).upload(file, this.$store.state.settings.uploadFolder, name);
 		},
 
 		onChangeUploadings(uploads) {
@@ -284,11 +323,14 @@ export default (opts) => ({
 		setVisibility() {
 			const w = this.$root.new(MkVisibilityChooser, {
 				source: this.$refs.visibilityButton,
-				currentVisibility: this.visibility
+				currentVisibility: this.localOnly ? `local-${this.visibility}` : this.visibility
 			});
 			w.$once('chosen', v => {
 				this.applyVisibility(v);
 			});
+			this.$once('hook:beforeDestroy', () => {
+				w.close();
+			});
 		},
 
 		applyVisibility(v: string) {
@@ -320,6 +362,7 @@ export default (opts) => ({
 			this.text = '';
 			this.files = [];
 			this.poll = false;
+			this.quoteId = null;
 			this.$emit('change-attached-files', this.files);
 		},
 
@@ -327,16 +370,29 @@ export default (opts) => ({
 			if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey) && this.canPost) this.post();
 		},
 
-		async onPaste(e) {
-			for (const item of Array.from(e.clipboardData.items)) {
+		async onPaste(e: ClipboardEvent) {
+			for (const { item, i } of Array.from(e.clipboardData.items).map((item, i) => ({item, i}))) {
 				if (item.kind == 'file') {
-					this.upload(item.getAsFile());
+					const file = item.getAsFile();
+					const lio = file.name.lastIndexOf('.');
+					const ext = lio >= 0 ? file.name.slice(lio) : '';
+					const formatted = `${formatTimeString(new Date(file.lastModified), this.$store.state.settings.pastedFileName).replace(/{{number}}/g, `${i + 1}`)}${ext}`;
+					const name = this.$store.state.settings.pasteDialog
+						? await this.$root.dialog({
+								title: this.$t('@.post-form.enter-file-name'),
+								input: {
+									default: formatted
+								},
+								allowEmpty: false
+							}).then(({ canceled, result }) => canceled ? false : result)
+						: formatted;
+					if (name) this.upload(file, name);
 				}
 			}
 
 			const paste = e.clipboardData.getData('text');
 
-			if (paste.startsWith(url + '/notes/')) {
+			if (!this.renote && !this.quoteId && paste.startsWith(url + '/notes/')) {
 				e.preventDefault();
 
 				this.$root.dialog({
@@ -404,6 +460,9 @@ export default (opts) => ({
 			vm.$once('chosen', emoji => {
 				insertTextAtCursor(this.$refs.text, emoji);
 			});
+			this.$once('hook:beforeDestroy', () => {
+				vm.close();
+			});
 		},
 
 		saveDraft() {

src/client/app/common/scripts/room/furniture.ts

@@ -0,0 +1,21 @@
+export type RoomInfo = {
+	roomType: string;
+	carpetColor: string;
+	furnitures: Furniture[];
+};
+
+export type Furniture = {
+	id: string; // 同じ家具が複数ある場合にそれぞれを識別するためのIDであり、家具IDではない
+	type: string; // こっちが家具ID(chairとか)
+	position: {
+		x: number;
+		y: number;
+		z: number;
+	};
+	rotation: {
+		x: number;
+		y: number;
+		z: number;
+	};
+	props?: Record<string, any>;
+};

src/client/app/common/scripts/room/furnitures.json5

@@ -0,0 +1,397 @@
+// 家具メタデータ
+
+// 家具にはユーザーが設定できるプロパティを設定可能です:
+//
+// props: {
+//   <propname>: <proptype>
+// }
+//
+// proptype一覧:
+// * image ... 画像選択ダイアログを出し、その画像のURLが格納されます
+// * color ... 色選択コントロールを出し、選択された色が格納されます
+
+// 家具にカスタムテクスチャを適用できるようにするには、textureプロパティに以下の追加の情報を含めます:
+// 便宜上そのUVのどの部分にカスタムテクスチャを貼り合わせるかのエリアをテクスチャエリアと呼びます。
+// UVは1024*1024だと仮定します。
+//
+// <key>: {
+//   prop: <プロパティ名>,
+//   uv: {
+//     x: <テクスチャエリアX座標>,
+//     y: <テクスチャエリアY座標>,
+//     width: <テクスチャエリアの幅>,
+//     height: <テクスチャエリアの高さ>,
+//   },
+// }
+//
+// <key>には、カスタムテクスチャを適用したいメッシュ名を指定します
+// <プロパティ名>には、カスタムテクスチャとして使用する画像を格納するプロパティ(前述)名を指定します
+
+// 家具にカスタムカラーを適用できるようにするには、colorプロパティに以下の追加の情報を含めます:
+//
+// <key>: <プロパティ名>
+//
+// <key>には、カスタムカラーを適用したいマテリアル名を指定します
+// <プロパティ名>には、カスタムカラーとして使用する色を格納するプロパティ(前述)名を指定します
+
+[
+	{
+		id: "milk",
+		place: "floor"
+	},
+	{
+		id: "bed",
+		place: "floor"
+	},
+	{
+		id: "low-table",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Table: 'color'
+		}
+	},
+	{
+		id: "desk",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Board: 'color'
+		}
+	},
+	{
+		id: "chair",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Chair: 'color'
+		}
+	},
+	{
+		id: "chair2",
+		place: "floor",
+		props: {
+			color1: 'color',
+			color2: 'color'
+		},
+		color: {
+			Cushion: 'color1',
+			Leg: 'color2'
+		}
+	},
+	{
+		id: "fan",
+		place: "wall"
+	},
+	{
+		id: "pc",
+		place: "floor"
+	},
+	{
+		id: "plant",
+		place: "floor"
+	},
+	{
+		id: "plant2",
+		place: "floor"
+	},
+	{
+		id: "eraser",
+		place: "floor"
+	},
+	{
+		id: "pencil",
+		place: "floor"
+	},
+	{
+		id: "pudding",
+		place: "floor"
+	},
+	{
+		id: "cardboard-box",
+		place: "floor"
+	},
+	{
+		id: "cardboard-box2",
+		place: "floor"
+	},
+	{
+		id: "cardboard-box3",
+		place: "floor"
+	},
+	{
+		id: "book",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Cover: 'color'
+		}
+	},
+	{
+		id: "book2",
+		place: "floor"
+	},
+	{
+		id: "piano",
+		place: "floor"
+	},
+	{
+		id: "facial-tissue",
+		place: "floor"
+	},
+	{
+		id: "server",
+		place: "floor"
+	},
+	{
+		id: "moon",
+		place: "floor"
+	},
+	{
+		id: "corkboard",
+		place: "wall"
+	},
+	{
+		id: "mousepad",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Pad: 'color'
+		}
+	},
+	{
+		id: "monitor",
+		place: "floor",
+		props: {
+			screen: 'image'
+		},
+		texture: {
+			Screen: {
+				prop: 'screen',
+				uv: {
+					x: 0,
+					y: 434,
+					width: 1024,
+					height: 588,
+				},
+			},
+		},
+	},
+	{
+		id: "tv",
+		place: "floor",
+		props: {
+			screen: 'image'
+		},
+		texture: {
+			Screen: {
+				prop: 'screen',
+				uv: {
+					x: 0,
+					y: 434,
+					width: 1024,
+					height: 588,
+				},
+			},
+		},
+	},
+	{
+		id: "keyboard",
+		place: "floor"
+	},
+	{
+		id: "carpet-stripe",
+		place: "floor",
+		props: {
+			color1: 'color',
+			color2: 'color'
+		},
+		color: {
+			CarpetAreaA: 'color1',
+			CarpetAreaB: 'color2'
+		},
+	},
+	{
+		id: "mat",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Mat: 'color'
+		}
+	},
+	{
+		id: "color-box",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			main: 'color'
+		}
+	},
+	{
+		id: "wall-clock",
+		place: "wall"
+	},
+	{
+		id: "cube",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Cube: 'color'
+		}
+	},
+	{
+		id: "photoframe",
+		place: "wall",
+		props: {
+			photo: 'image',
+			color: 'color'
+		},
+		texture: {
+			Photo: {
+				prop: 'photo',
+				uv: {
+					x: 0,
+					y: 342,
+					width: 1024,
+					height: 683,
+				},
+			},
+		},
+		color: {
+			Frame: 'color'
+		}
+	},
+	{
+		id: "pinguin",
+		place: "floor",
+		props: {
+			body: 'color',
+			belly: 'color'
+		},
+		color: {
+			Body: 'body',
+			Belly: 'belly',
+		}
+	},
+	{
+		id: "rubik-cube",
+		place: "floor",
+	},
+	{
+		id: "poster-h",
+		place: "wall",
+		props: {
+			picture: 'image'
+		},
+		texture: {
+			Poster: {
+				prop: 'picture',
+				uv: {
+					x: 0,
+					y: 277,
+					width: 1024,
+					height: 745,
+				},
+			},
+		},
+	},
+	{
+		id: "poster-v",
+		place: "wall",
+		props: {
+			picture: 'image'
+		},
+		texture: {
+			Poster: {
+				prop: 'picture',
+				uv: {
+					x: 0,
+					y: 0,
+					width: 745,
+					height: 1024,
+				},
+			},
+		},
+	},
+	{
+		id: "sofa",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Sofa: 'color'
+		}
+	},
+	{
+		id: "spiral",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Step: 'color'
+		}
+	},
+	{
+		id: "bin",
+		place: "floor",
+		props: {
+			color: 'color'
+		},
+		color: {
+			Bin: 'color'
+		}
+	},
+	{
+		id: "cup-noodle",
+		place: "floor"
+	},
+	{
+		id: "holo-display",
+		place: "floor",
+		props: {
+			image: 'image'
+		},
+		texture: {
+			Image_Front: {
+				prop: 'image',
+				uv: {
+					x: 0,
+					y: 0,
+					width: 1024,
+					height: 1024,
+				},
+			},
+			Image_Back: {
+				prop: 'image',
+				uv: {
+					x: 0,
+					y: 0,
+					width: 1024,
+					height: 1024,
+				},
+			},
+		},
+	},
+	{
+		id: 'energy-drink',
+		place: "floor",
+	}
+]

src/client/app/common/scripts/room/room.ts

@@ -0,0 +1,776 @@
+import autobind from 'autobind-decorator';
+import { v4 as uuid } from 'uuid';
+import * as THREE from 'three';
+import { GLTFLoader, GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
+import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js';
+import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass.js';
+import { ShaderPass } from 'three/examples/jsm/postprocessing/ShaderPass.js';
+import { BloomPass } from 'three/examples/jsm/postprocessing/BloomPass.js';
+import { FXAAShader } from 'three/examples/jsm/shaders/FXAAShader.js';
+import { TransformControls } from 'three/examples/jsm/controls/TransformControls.js';
+import { Furniture, RoomInfo } from './furniture';
+import { query as urlQuery } from '../../../../../prelude/url';
+const furnitureDefs = require('./furnitures.json5');
+
+THREE.ImageUtils.crossOrigin = '';
+
+type Options = {
+	graphicsQuality: Room['graphicsQuality'];
+	onChangeSelect: Room['onChangeSelect'];
+	useOrthographicCamera: boolean;
+};
+
+/**
+ * MisskeyRoom Core Engine
+ */
+export class Room {
+	private clock: THREE.Clock;
+	private scene: THREE.Scene;
+	private renderer: THREE.WebGLRenderer;
+	private camera: THREE.PerspectiveCamera | THREE.OrthographicCamera;
+	private controls: OrbitControls;
+	private composer: EffectComposer;
+	private mixers: THREE.AnimationMixer[] = [];
+	private furnitureControl: TransformControls;
+	private roomInfo: RoomInfo;
+	private graphicsQuality: 'cheep' | 'low' | 'medium' | 'high' | 'ultra';
+	private roomObj: THREE.Object3D;
+	private objects: THREE.Object3D[] = [];
+	private selectedObject: THREE.Object3D = null;
+	private onChangeSelect: Function;
+	private isTransformMode = false;
+	private renderFrameRequestId: number;
+
+	private get canvas(): HTMLCanvasElement {
+		return this.renderer.domElement;
+	}
+
+	private get furnitures(): Furniture[] {
+		return this.roomInfo.furnitures;
+	}
+
+	private set furnitures(furnitures: Furniture[]) {
+		this.roomInfo.furnitures = furnitures;
+	}
+
+	private get enableShadow() {
+		return this.graphicsQuality != 'cheep';
+	}
+
+	private get usePostFXs() {
+		return this.graphicsQuality !== 'cheep' && this.graphicsQuality !== 'low';
+	}
+
+	private get shadowQuality() {
+		return (
+			this.graphicsQuality === 'ultra' ? 16384 :
+			this.graphicsQuality === 'high' ? 8192 :
+			this.graphicsQuality === 'medium' ? 4096 :
+			this.graphicsQuality === 'low' ? 1024 :
+			0); // cheep
+	}
+
+	constructor(user, isMyRoom, roomInfo: RoomInfo, container, options: Options) {
+		this.roomInfo = roomInfo;
+		this.graphicsQuality = options.graphicsQuality;
+		this.onChangeSelect = options.onChangeSelect;
+
+		this.clock = new THREE.Clock(true);
+
+		//#region Init a scene
+		this.scene = new THREE.Scene();
+
+		const width = window.innerWidth;
+		const height = window.innerHeight;
+
+		//#region Init a renderer
+		this.renderer = new THREE.WebGLRenderer({
+			antialias: false,
+			stencil: false,
+			alpha: false,
+			powerPreference:
+				this.graphicsQuality === 'ultra' ? 'high-performance' :
+				this.graphicsQuality === 'high' ? 'high-performance' :
+				this.graphicsQuality === 'medium' ? 'default' :
+				this.graphicsQuality === 'low' ? 'low-power' :
+				'low-power' // cheep
+		});
+
+		this.renderer.setPixelRatio(window.devicePixelRatio);
+		this.renderer.setSize(width, height);
+		this.renderer.autoClear = false;
+		this.renderer.setClearColor(new THREE.Color(0x051f2d));
+		this.renderer.shadowMap.enabled = this.enableShadow;
+		this.renderer.shadowMap.type =
+			this.graphicsQuality === 'ultra' ? THREE.PCFSoftShadowMap :
+			this.graphicsQuality === 'high' ? THREE.PCFSoftShadowMap :
+			this.graphicsQuality === 'medium' ? THREE.PCFShadowMap :
+			this.graphicsQuality === 'low' ? THREE.BasicShadowMap :
+			THREE.BasicShadowMap; // cheep
+
+		container.appendChild(this.canvas);
+		//#endregion
+
+		//#region Init a camera
+		this.camera = options.useOrthographicCamera
+			? new THREE.OrthographicCamera(
+				width / - 2, width / 2, height / 2, height / - 2, -10, 10)
+			: new THREE.PerspectiveCamera(45, width / height);
+
+		if (options.useOrthographicCamera) {
+			this.camera.position.x = 2;
+			this.camera.position.y = 2;
+			this.camera.position.z = 2;
+			this.camera.zoom = 100;
+			this.camera.updateProjectionMatrix();
+		} else {
+			this.camera.position.x = 5;
+			this.camera.position.y = 2;
+			this.camera.position.z = 5;
+		}
+
+		this.scene.add(this.camera);
+		//#endregion
+
+		//#region AmbientLight
+		const ambientLight = new THREE.AmbientLight(0xffffff, 1);
+		this.scene.add(ambientLight);
+		//#endregion
+
+		if (this.graphicsQuality !== 'cheep') {
+			//#region Room light
+			const roomLight = new THREE.SpotLight(0xffffff, 0.1);
+
+			roomLight.position.set(0, 8, 0);
+			roomLight.castShadow = this.enableShadow;
+			roomLight.shadow.bias = -0.0001;
+			roomLight.shadow.mapSize.width = this.shadowQuality;
+			roomLight.shadow.mapSize.height = this.shadowQuality;
+			roomLight.shadow.camera.near = 0.1;
+			roomLight.shadow.camera.far = 9;
+			roomLight.shadow.camera.fov = 45;
+
+			this.scene.add(roomLight);
+			//#endregion
+		}
+
+		//#region Out light
+		const outLight1 = new THREE.SpotLight(0xffffff, 0.4);
+		outLight1.position.set(9, 3, -2);
+		outLight1.castShadow = this.enableShadow;
+		outLight1.shadow.bias = -0.001; // アクネ、アーチファクト対策 その代わりピーターパンが発生する可能性がある
+		outLight1.shadow.mapSize.width = this.shadowQuality;
+		outLight1.shadow.mapSize.height = this.shadowQuality;
+		outLight1.shadow.camera.near = 6;
+		outLight1.shadow.camera.far = 15;
+		outLight1.shadow.camera.fov = 45;
+		this.scene.add(outLight1);
+
+		const outLight2 = new THREE.SpotLight(0xffffff, 0.2);
+		outLight2.position.set(-2, 3, 9);
+		outLight2.castShadow = false;
+		outLight2.shadow.bias = -0.001; // アクネ、アーチファクト対策 その代わりピーターパンが発生する可能性がある
+		outLight2.shadow.camera.near = 6;
+		outLight2.shadow.camera.far = 15;
+		outLight2.shadow.camera.fov = 45;
+		this.scene.add(outLight2);
+		//#endregion
+
+		//#region Init a controller
+		this.controls = new OrbitControls(this.camera, this.canvas);
+
+		this.controls.target.set(0, 1, 0);
+		this.controls.enableZoom = true;
+		this.controls.enablePan = isMyRoom;
+		this.controls.minPolarAngle = 0;
+		this.controls.maxPolarAngle = Math.PI / 2;
+		this.controls.minAzimuthAngle = 0;
+		this.controls.maxAzimuthAngle = Math.PI / 2;
+		this.controls.enableDamping = true;
+		this.controls.dampingFactor = 0.2;
+		this.controls.mouseButtons.LEFT = 1;
+		this.controls.mouseButtons.MIDDLE = 2;
+		this.controls.mouseButtons.RIGHT = 0;
+		//#endregion
+
+		//#region POST FXs
+		if (!this.usePostFXs) {
+			this.composer = null;
+		} else {
+			const renderTarget = new THREE.WebGLRenderTarget(width, height, {
+				minFilter: THREE.LinearFilter,
+				magFilter: THREE.LinearFilter,
+				format: THREE.RGBFormat,
+				stencilBuffer: false,
+			});
+
+			const fxaa = new ShaderPass(FXAAShader);
+			fxaa.uniforms['resolution'].value = new THREE.Vector2(1 / width, 1 / height);
+			fxaa.renderToScreen = true;
+
+			this.composer = new EffectComposer(this.renderer, renderTarget);
+			this.composer.addPass(new RenderPass(this.scene, this.camera));
+			if (this.graphicsQuality === 'ultra') {
+				this.composer.addPass(new BloomPass(0.25, 30, 128.0, 512));
+			}
+			this.composer.addPass(fxaa);
+		}
+		//#endregion
+		//#endregion
+
+		//#region Label
+		//#region Avatar
+		const avatarUrl = `/proxy/?${urlQuery({ url: user.avatarUrl })}`;
+
+		const textureLoader = new THREE.TextureLoader();
+		textureLoader.crossOrigin = 'anonymous';
+
+		const iconTexture = textureLoader.load(avatarUrl);
+		iconTexture.wrapS = THREE.RepeatWrapping;
+		iconTexture.wrapT = THREE.RepeatWrapping;
+		iconTexture.anisotropy = 16;
+
+		const avatarMaterial = new THREE.MeshBasicMaterial({
+			map: iconTexture,
+			side: THREE.DoubleSide,
+			alphaTest: 0.5
+		});
+
+		const iconGeometry = new THREE.PlaneGeometry(1, 1);
+
+		const avatarObject = new THREE.Mesh(iconGeometry, avatarMaterial);
+		avatarObject.position.set(-3, 2.5, 2);
+		avatarObject.rotation.y = Math.PI / 2;
+		avatarObject.castShadow = false;
+
+		this.scene.add(avatarObject);
+		//#endregion
+
+		//#region Username
+		const name = user.username;
+
+		new THREE.FontLoader().load('/assets/fonts/helvetiker_regular.typeface.json', font => {
+			const nameGeometry = new THREE.TextGeometry(name, {
+				size: 0.5,
+				height: 0,
+				curveSegments: 8,
+				font: font,
+				bevelThickness: 0,
+				bevelSize: 0,
+				bevelEnabled: false
+			});
+
+			const nameMaterial = new THREE.MeshLambertMaterial({
+				color: 0xffffff
+			});
+
+			const nameObject = new THREE.Mesh(nameGeometry, nameMaterial);
+			nameObject.position.set(-3, 2.25, 1.25);
+			nameObject.rotation.y = Math.PI / 2;
+			nameObject.castShadow = false;
+
+			this.scene.add(nameObject);
+		});
+		//#endregion
+		//#endregion
+
+		//#region Interaction
+		if (isMyRoom) {
+			this.furnitureControl = new TransformControls(this.camera, this.canvas);
+			this.scene.add(this.furnitureControl);
+
+			// Hover highlight
+			this.canvas.onmousemove = this.onmousemove;
+
+			// Click
+			this.canvas.onmousedown = this.onmousedown;
+		}
+		//#endregion
+
+		//#region Init room
+		this.loadRoom();
+		//#endregion
+
+		//#region Load furnitures
+		for (const furniture of this.furnitures) {
+			this.loadFurniture(furniture).then(obj => {
+				this.scene.add(obj.scene);
+				this.objects.push(obj.scene);
+			});
+		}
+		//#endregion
+
+		// Start render
+		if (this.usePostFXs) {
+			this.renderWithPostFXs();
+		} else {
+			this.renderWithoutPostFXs();
+		}
+	}
+
+	@autobind
+	private renderWithoutPostFXs() {
+		this.renderFrameRequestId =
+			window.requestAnimationFrame(this.renderWithoutPostFXs);
+
+		// Update animations
+		const clock = this.clock.getDelta();
+		for (const mixer of this.mixers) {
+			mixer.update(clock);
+		}
+
+		this.controls.update();
+		this.renderer.render(this.scene, this.camera);
+	}
+
+	@autobind
+	private renderWithPostFXs() {
+		this.renderFrameRequestId =
+			window.requestAnimationFrame(this.renderWithPostFXs);
+
+		// Update animations
+		const clock = this.clock.getDelta();
+		for (const mixer of this.mixers) {
+			mixer.update(clock);
+		}
+
+		this.controls.update();
+		this.renderer.clear();
+		this.composer.render();
+	}
+
+	@autobind
+	private loadRoom() {
+		const type = this.roomInfo.roomType;
+		new GLTFLoader().load(`/assets/room/rooms/${type}/${type}.glb`, gltf => {
+			gltf.scene.traverse(child => {
+				if (!(child instanceof THREE.Mesh)) return;
+
+				child.receiveShadow = this.enableShadow;
+
+				child.material = new THREE.MeshLambertMaterial({
+					color: (child.material as THREE.MeshStandardMaterial).color,
+					map: (child.material as THREE.MeshStandardMaterial).map,
+					name: (child.material as THREE.MeshStandardMaterial).name,
+				});
+
+				// 異方性フィルタリング
+				if ((child.material as THREE.MeshLambertMaterial).map && this.graphicsQuality !== 'cheep') {
+					(child.material as THREE.MeshLambertMaterial).map.minFilter = THREE.LinearMipMapLinearFilter;
+					(child.material as THREE.MeshLambertMaterial).map.magFilter = THREE.LinearMipMapLinearFilter;
+					(child.material as THREE.MeshLambertMaterial).map.anisotropy = 8;
+				}
+			});
+
+			gltf.scene.position.set(0, 0, 0);
+
+			this.scene.add(gltf.scene);
+			this.roomObj = gltf.scene;
+			if (this.roomInfo.roomType === 'default') {
+				this.applyCarpetColor();
+			}
+		});
+	}
+
+	@autobind
+	private loadFurniture(furniture: Furniture) {
+		const def = furnitureDefs.find(d => d.id === furniture.type);
+		return new Promise<GLTF>((res, rej) => {
+			const loader = new GLTFLoader();
+			loader.load(`/assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => {
+				const model = gltf.scene;
+
+				// Load animation
+				if (gltf.animations.length > 0) {
+					const mixer = new THREE.AnimationMixer(model);
+					this.mixers.push(mixer);
+					for (const clip of gltf.animations) {
+						mixer.clipAction(clip).play();
+					}
+				}
+
+				model.name = furniture.id;
+				model.position.x = furniture.position.x;
+				model.position.y = furniture.position.y;
+				model.position.z = furniture.position.z;
+				model.rotation.x = furniture.rotation.x;
+				model.rotation.y = furniture.rotation.y;
+				model.rotation.z = furniture.rotation.z;
+
+				model.traverse(child => {
+					if (!(child instanceof THREE.Mesh)) return;
+					child.castShadow = this.enableShadow;
+					child.receiveShadow = this.enableShadow;
+					(child.material as THREE.MeshStandardMaterial).metalness = 0;
+
+					// 異方性フィルタリング
+					if ((child.material as THREE.MeshStandardMaterial).map && this.graphicsQuality !== 'cheep') {
+						(child.material as THREE.MeshStandardMaterial).map.minFilter = THREE.LinearMipMapLinearFilter;
+						(child.material as THREE.MeshStandardMaterial).map.magFilter = THREE.LinearMipMapLinearFilter;
+						(child.material as THREE.MeshStandardMaterial).map.anisotropy = 8;
+					}
+				});
+
+				if (def.color) { // カスタムカラー
+					this.applyCustomColor(model);
+				}
+
+				if (def.texture) { // カスタムテクスチャ
+					this.applyCustomTexture(model);
+				}
+
+				res(gltf);
+			}, null, rej);
+		});
+	}
+
+	@autobind
+	private applyCarpetColor() {
+		this.roomObj.traverse(child => {
+			if (!(child instanceof THREE.Mesh)) return;
+			if (child.material &&
+				(child.material as THREE.MeshStandardMaterial).name &&
+				(child.material as THREE.MeshStandardMaterial).name === 'Carpet'
+			) {
+				const colorHex = parseInt(this.roomInfo.carpetColor.substr(1), 16);
+				(child.material as THREE.MeshStandardMaterial).color.setHex(colorHex);
+			}
+		});
+	}
+
+	@autobind
+	private applyCustomColor(model: THREE.Object3D) {
+		const furniture = this.furnitures.find(furniture => furniture.id === model.name);
+		const def = furnitureDefs.find(d => d.id === furniture.type);
+		if (def.color == null) return;
+		model.traverse(child => {
+			if (!(child instanceof THREE.Mesh)) return;
+			for (const t of Object.keys(def.color)) {
+				if (!child.material ||
+					!(child.material as THREE.MeshStandardMaterial).name ||
+					(child.material as THREE.MeshStandardMaterial).name !== t
+				) continue;
+
+				const prop = def.color[t];
+				const val = furniture.props ? furniture.props[prop] : undefined;
+
+				if (val == null) continue;
+
+				const colorHex = parseInt(val.substr(1), 16);
+				(child.material as THREE.MeshStandardMaterial).color.setHex(colorHex);
+			}
+		});
+	}
+
+	@autobind
+	private applyCustomTexture(model: THREE.Object3D) {
+		const furniture = this.furnitures.find(furniture => furniture.id === model.name);
+		const def = furnitureDefs.find(d => d.id === furniture.type);
+		if (def.texture == null) return;
+
+		model.traverse(child => {
+			if (!(child instanceof THREE.Mesh)) return;
+			for (const t of Object.keys(def.texture)) {
+				if (child.name !== t) continue;
+
+				const prop = def.texture[t].prop;
+				const val = furniture.props ? furniture.props[prop] : undefined;
+
+				if (val == null) continue;
+
+				const canvas = document.createElement('canvas');
+				canvas.height = 1024;
+				canvas.width = 1024;
+
+				child.material = new THREE.MeshLambertMaterial({
+					emissive: 0x111111,
+					side: THREE.DoubleSide,
+					alphaTest: 0.5,
+				});
+
+				const img = new Image();
+				img.crossOrigin = 'anonymous';
+				img.onload = () => {
+					const uvInfo = def.texture[t].uv;
+
+					const ctx = canvas.getContext('2d');
+					ctx.drawImage(img,
+						0, 0, img.width, img.height,
+						uvInfo.x, uvInfo.y, uvInfo.width, uvInfo.height);
+
+					const texture = new THREE.Texture(canvas);
+					texture.wrapS = THREE.RepeatWrapping;
+					texture.wrapT = THREE.RepeatWrapping;
+					texture.anisotropy = 16;
+					texture.flipY = false;
+
+					(child.material as THREE.MeshLambertMaterial).map = texture;
+					(child.material as THREE.MeshLambertMaterial).needsUpdate = true;
+					(child.material as THREE.MeshLambertMaterial).map.needsUpdate = true;
+				};
+				img.src = val;
+			}
+		});
+	}
+
+	@autobind
+	private onmousemove(ev: MouseEvent) {
+		if (this.isTransformMode) return;
+
+		const rect = (ev.target as HTMLElement).getBoundingClientRect();
+		const x = (((ev.clientX * window.devicePixelRatio) - rect.left) / this.canvas.width) * 2 - 1;
+		const y = -(((ev.clientY * window.devicePixelRatio) - rect.top) / this.canvas.height) * 2 + 1;
+		const pos = new THREE.Vector2(x, y);
+
+		this.camera.updateMatrixWorld();
+
+		const raycaster = new THREE.Raycaster();
+		raycaster.setFromCamera(pos, this.camera);
+
+		const intersects = raycaster.intersectObjects(this.objects, true);
+
+		for (const object of this.objects) {
+			if (this.isSelectedObject(object)) continue;
+			object.traverse(child => {
+				if (child instanceof THREE.Mesh) {
+					(child.material as THREE.MeshStandardMaterial).emissive.setHex(0x000000);
+				}
+			});
+		}
+
+		if (intersects.length > 0) {
+			const intersected = this.getRoot(intersects[0].object);
+			if (this.isSelectedObject(intersected)) return;
+			intersected.traverse(child => {
+				if (child instanceof THREE.Mesh) {
+					(child.material as THREE.MeshStandardMaterial).emissive.setHex(0x191919);
+				}
+			});
+		}
+	}
+
+	@autobind
+	private onmousedown(ev: MouseEvent) {
+		if (this.isTransformMode) return;
+		if (ev.target !== this.canvas || ev.button !== 0) return;
+
+		const rect = (ev.target as HTMLElement).getBoundingClientRect();
+		const x = (((ev.clientX * window.devicePixelRatio) - rect.left) / this.canvas.width) * 2 - 1;
+		const y = -(((ev.clientY * window.devicePixelRatio) - rect.top) / this.canvas.height) * 2 + 1;
+		const pos = new THREE.Vector2(x, y);
+
+		this.camera.updateMatrixWorld();
+
+		const raycaster = new THREE.Raycaster();
+		raycaster.setFromCamera(pos, this.camera);
+
+		const intersects = raycaster.intersectObjects(this.objects, true);
+
+		for (const object of this.objects) {
+			object.traverse(child => {
+				if (child instanceof THREE.Mesh) {
+					(child.material as THREE.MeshStandardMaterial).emissive.setHex(0x000000);
+				}
+			});
+		}
+
+		if (intersects.length > 0) {
+			const selectedObj = this.getRoot(intersects[0].object);
+			this.selectFurniture(selectedObj);
+		} else {
+			this.selectedObject = null;
+			this.onChangeSelect(null);
+		}
+	}
+
+	@autobind
+	private getRoot(obj: THREE.Object3D): THREE.Object3D {
+		let found = false;
+		let x = obj.parent;
+		while (!found) {
+			if (x.parent.parent == null) {
+				found = true;
+			} else {
+				x = x.parent;
+			}
+		}
+		return x;
+	}
+
+	@autobind
+	private isSelectedObject(obj: THREE.Object3D): boolean {
+		if (this.selectedObject == null) {
+			return false;
+		} else {
+			return obj.name === this.selectedObject.name;
+		}
+	}
+
+	@autobind
+	private selectFurniture(obj: THREE.Object3D) {
+		this.selectedObject = obj;
+		this.onChangeSelect(obj);
+		obj.traverse(child => {
+			if (child instanceof THREE.Mesh) {
+				(child.material as THREE.MeshStandardMaterial).emissive.setHex(0xff0000);
+			}
+		});
+	}
+
+	/**
+	 * 家具の移動/回転モードにします
+	 * @param type 移動か回転か
+	 */
+	@autobind
+	public enterTransformMode(type: 'translate' | 'rotate') {
+		this.isTransformMode = true;
+		this.furnitureControl.setMode(type);
+		this.furnitureControl.attach(this.selectedObject);
+	}
+
+	/**
+	 * 家具の移動/回転モードを終了します
+	 */
+	@autobind
+	public exitTransformMode() {
+		this.isTransformMode = false;
+		this.furnitureControl.detach();
+	}
+
+	/**
+	 * 家具プロパティを更新します
+	 * @param key プロパティ名
+	 * @param value 値
+	 */
+	@autobind
+	public updateProp(key: string, value: any) {
+		const furniture = this.furnitures.find(furniture => furniture.id === this.selectedObject.name);
+		if (furniture.props == null) furniture.props = {};
+		furniture.props[key] = value;
+		this.applyCustomColor(this.selectedObject);
+		this.applyCustomTexture(this.selectedObject);
+	}
+
+	/**
+	 * 部屋に家具を追加します
+	 * @param type 家具の種類
+	 */
+	@autobind
+	public addFurniture(type: string) {
+		const furniture = {
+			id: uuid(),
+			type: type,
+			position: {
+				x: 0,
+				y: 0,
+				z: 0,
+			},
+			rotation: {
+				x: 0,
+				y: 0,
+				z: 0,
+			},
+		};
+
+		this.furnitures.push(furniture);
+
+		this.loadFurniture(furniture).then(obj => {
+			this.scene.add(obj.scene);
+			this.objects.push(obj.scene);
+		});
+	}
+
+	/**
+	 * 現在選択されている家具を部屋から削除します
+	 */
+	@autobind
+	public removeFurniture() {
+		this.exitTransformMode();
+		const obj = this.selectedObject;
+		this.scene.remove(obj);
+		this.objects = this.objects.filter(object => object.name !== obj.name);
+		this.furnitures = this.furnitures.filter(furniture => furniture.id !== obj.name);
+		this.selectedObject = null;
+		this.onChangeSelect(null);
+	}
+
+	/**
+	 * 全ての家具を部屋から削除します
+	 */
+	@autobind
+	public removeAllFurnitures() {
+		this.exitTransformMode();
+		for (const obj of this.objects) {
+			this.scene.remove(obj);
+		}
+		this.objects = [];
+		this.furnitures = [];
+		this.selectedObject = null;
+		this.onChangeSelect(null);
+	}
+
+	/**
+	 * 部屋の床の色を変更します
+	 * @param color 色
+	 */
+	@autobind
+	public updateCarpetColor(color: string) {
+		this.roomInfo.carpetColor = color;
+		this.applyCarpetColor();
+	}
+
+	/**
+	 * 部屋の種類を変更します
+	 * @param type 種類
+	 */
+	@autobind
+	public changeRoomType(type: string) {
+		this.roomInfo.roomType = type;
+		this.scene.remove(this.roomObj);
+		this.loadRoom();
+	}
+
+	/**
+	 * 部屋データを取得します
+	 */
+	@autobind
+	public getRoomInfo() {
+		for (const obj of this.objects) {
+			const furniture = this.furnitures.find(f => f.id === obj.name);
+			furniture.position.x = obj.position.x;
+			furniture.position.y = obj.position.y;
+			furniture.position.z = obj.position.z;
+			furniture.rotation.x = obj.rotation.x;
+			furniture.rotation.y = obj.rotation.y;
+			furniture.rotation.z = obj.rotation.z;
+		}
+
+		return this.roomInfo;
+	}
+
+	/**
+	 * 選択されている家具を取得します
+	 */
+	@autobind
+	public getSelectedObject() {
+		return this.selectedObject;
+	}
+
+	@autobind
+	public findFurnitureById(id: string) {
+		return this.furnitures.find(furniture => furniture.id === id);
+	}
+
+	/**
+	 * レンダリングを終了します
+	 */
+	@autobind
+	public destroy() {
+		// Stop render loop
+		window.cancelAnimationFrame(this.renderFrameRequestId);
+
+		this.controls.dispose();
+		this.scene.dispose();
+	}
+}

src/client/app/common/views/components/autocomplete.vue

@@ -28,9 +28,9 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import * as emojilib from 'emojilib';
+import { emojilist } from '../../../../../misc/emojilist';
 import contains from '../../../common/scripts/contains';
-import { twemojiBase } from '../../../../../misc/twemoji-base';
+import { twemojiSvgBase } from '../../../../../misc/twemoji-base';
 import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url';
 
 type EmojiDef = {
@@ -41,9 +41,7 @@ type EmojiDef = {
 	isCustomEmoji?: boolean;
 };
 
-const lib = Object.entries(emojilib.lib).filter((x: any) => {
-	return x[1].category != 'flags';
-});
+const lib = emojilist.filter(x => x.category !== 'flags');
 
 const char2file = (char: string) => {
 	let codes = Array.from(char).map(x => x.codePointAt(0).toString(16));
@@ -52,21 +50,21 @@ const char2file = (char: string) => {
 	return codes.join('-');
 };
 
-const emjdb: EmojiDef[] = lib.map((x: any) => ({
-	emoji: x[1].char,
-	name: x[0],
+const emjdb: EmojiDef[] = lib.map(x => ({
+	emoji: x.char,
+	name: x.name,
 	aliasOf: null,
-	url: `${twemojiBase}/2/svg/${char2file(x[1].char)}.svg`
+	url: `${twemojiSvgBase}/${char2file(x.char)}.svg`
 }));
 
-for (const x of lib as any) {
-	if (x[1].keywords) {
-		for (const k of x[1].keywords) {
+for (const x of lib) {
+	if (x.keywords) {
+		for (const k of x.keywords) {
 			emjdb.push({
-				emoji: x[1].char,
+				emoji: x.char,
 				name: k,
-				aliasOf: x[0],
-				url: `${twemojiBase}/2/svg/${char2file(x[1].char)}.svg`
+				aliasOf: x.name,
+				url: `${twemojiSvgBase}/${char2file(x.char)}.svg`
 			});
 		}
 	}
@@ -85,7 +83,7 @@ export default Vue.extend({
 			hashtags: [],
 			emojis: [],
 			select: -1,
-			emojilib,
+			emojilist,
 			emojiDb: [] as EmojiDef[]
 		}
 	},

src/client/app/common/views/components/code-core.vue

@@ -1,16 +1,16 @@
 <template>
-<prism :inline="inline" :language="lang || 'js'">{{ code }}</prism>
+<x-prism :inline="inline" :language="prismLang">{{ code }}</x-prism>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
 import 'prismjs';
 import 'prismjs/themes/prism-okaidia.css';
-import Prism from 'vue-prism-component';
+import XPrism from 'vue-prism-component';
 
 export default Vue.extend({
 	components: {
-		Prism
+		XPrism
 	},
 	props: {
 		code: {
@@ -25,6 +25,12 @@ export default Vue.extend({
 			type: Boolean,
 			required: false
 		}
+	},
+
+	computed: {
+		prismLang() {
+			return Prism.languages[this.lang] ? this.lang : 'js';
+		}
 	}
 });
 </script>

src/client/app/common/views/components/connect-failed.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="mk-connect-failed">
-	<img src="https://raw.githubusercontent.com/syuilo/misskey/develop/src/client/assets/error.jpg" alt=""/>
+	<img src="/assets/error.jpg" onerror="this.src='https://raw.githubusercontent.com/syuilo/misskey/develop/src/client/assets/error.jpg';" alt=""/>
 	<h1>{{ $t('title') }}</h1>
 	<p class="text">
 		<span>{{ this.$t('description').substr(0, this.$t('description').indexOf('{')) }}</span>

src/client/app/common/views/components/dialog.vue

@@ -1,6 +1,12 @@
 <template>
-<div class="felqjxyj" :class="{ splash }">
-	<div class="bg" ref="bg" @click="onBgClick"></div>
+<ui-modal
+	ref="modal"
+	class="modal"
+	:class="{ splash }"
+	:close-anime-duration="300"
+	:close-on-bg-click="false"
+	@bg-click="onBgClick"
+	@before-close="onBeforeClose">
 	<div class="main" ref="main" :class="{ round: $store.state.device.roundedCorners }">
 		<template v-if="type == 'signin'">
 			<mk-signin/>
@@ -38,7 +44,7 @@
 			</ui-horizon-group>
 		</template>
 	</div>
-</div>
+</ui-modal>
 </template>
 
 <script lang="ts">
@@ -98,7 +104,7 @@ export default Vue.extend({
 		return {
 			inputValue: this.input && this.input.default ? this.input.default : null,
 			userInputValue: null,
-			selectedValue: this.select ? this.select.items ? this.select.items[0].value : this.select.groupedItems[0].items[0].value : null,
+			selectedValue: this.select ? this.select.default ? this.select.default : this.select.items ? this.select.items[0].value : this.select.groupedItems[0].items[0].value : null,
 			canOk: true,
 			faTimesCircle, faQuestionCircle
 		};
@@ -120,14 +126,6 @@ export default Vue.extend({
 		if (this.user) this.canOk = false;
 
 		this.$nextTick(() => {
-			(this.$refs.bg as any).style.pointerEvents = 'auto';
-			anime({
-				targets: this.$refs.bg,
-				opacity: 1,
-				duration: 100,
-				easing: 'linear'
-			});
-
 			anime({
 				targets: this.$refs.main,
 				opacity: 1,
@@ -170,33 +168,27 @@ export default Vue.extend({
 			this.close();
 		},
 
+		onBgClick() {
+			if (this.cancelableByBgClick) this.cancel();
+		}
+
 		close() {
+			this.$refs.modal.close();
+		},
+
+		onBeforeClose() {
 			this.$el.style.pointerEvents = 'none';
-			(this.$refs.bg as any).style.pointerEvents = 'none';
 			(this.$refs.main as any).style.pointerEvents = 'none';
 
-			anime({
-				targets: this.$refs.bg,
-				opacity: 0,
-				duration: 300,
-				easing: 'linear'
-			});
 			anime({
 				targets: this.$refs.main,
 				opacity: 0,
 				scale: 0.8,
 				duration: 300,
 				easing: 'cubicBezier(0, 0.5, 0.5, 1)',
-				complete: () => this.destroyDom()
 			});
 		},
 
-		onBgClick() {
-			if (this.cancelableByBgClick) {
-				this.cancel();
-			}
-		},
-
 		onInputKeydown(e) {
 			if (e.which == 13) { // Enter
 				e.preventDefault();
@@ -209,80 +201,63 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-.felqjxyj
+.modal
 	display flex
 	align-items center
 	justify-content center
-	position fixed
-	z-index 30000
-	top 0
-	left 0
-	width 100%
-	height 100%
 
 	&.splash
 		> .main
 			min-width 0
 			width initial
 
-	> .bg
-		display block
-		position fixed
-		top 0
-		left 0
-		width 100%
-		height 100%
-		background rgba(#000, 0.7)
-		opacity 0
-		pointer-events none
+.main
+	display block
+	position fixed
+	margin auto
+	padding 32px
+	min-width 320px
+	max-width 480px
+	width calc(100% - 32px)
+	text-align center
+	background var(--face)
+	color var(--faceText)
+	opacity 0
 
-	> .main
-		display block
-		position fixed
-		margin auto
-		padding 32px
-		min-width 320px
-		max-width 480px
-		width calc(100% - 32px)
-		text-align center
-		background var(--face)
-		color var(--faceText)
-		opacity 0
+	&.round
+		border-radius 8px
 
-		&.round
-			border-radius 8px
+	> .icon
+		font-size 32px
 
-		> .icon
-			font-size 32px
+		&.success
+			color #85da5a
 
-			&.success
-				color #85da5a
+		&.error
+			color #ec4137
 
-			&.error
-				color #ec4137
+		&.warning
+			color #ecb637
 
-			&.warning
-				color #ecb637
+		> *
+			display block
+			margin 0 auto
 
-			> *
-				display block
-				margin 0 auto
-
-			& + header
-				margin-top 16px
-
-		> header
-			margin 0 0 8px 0
-			font-weight bold
-			font-size 20px
-
-			& + .body
-				margin-top 8px
-
-		> .body
-			margin 16px 0 0 0
-
-		> .buttons
+		& + header
 			margin-top 16px
 
+	> header
+		margin 0 0 8px 0
+		font-weight bold
+		font-size 20px
+
+		& + .body
+			margin-top 8px
+
+	> .body
+		margin 16px 0 0 0
+
+	> .buttons
+		margin-top 16px
+
 </style>

src/client/app/common/views/components/drive-file-thumbnail.vue

@@ -57,7 +57,8 @@ export default Vue.extend({
 		},
 		fit: {
 			type: String,
-			required: true
+			required: false,
+			default: 'cover'
 		},
 		detail: {
 			type: Boolean,

src/client/app/common/views/components/emoji-picker.vue

@@ -5,29 +5,52 @@
 			:title="category.text"
 			@click="go(category)"
 			:class="{ active: category.isActive }"
+			:key="category.text"
 		>
 			<fa :icon="category.icon" fixed-width/>
 		</button>
 	</header>
 	<div class="emojis">
-		<header><fa :icon="categories.find(x => x.isActive).icon" fixed-width/> {{ categories.find(x => x.isActive).text }}</header>
-		<div v-if="categories.find(x => x.isActive).name">
-			<button v-for="emoji in Object.entries(lib).filter(([k, v]) => v.category === categories.find(x => x.isActive).name)"
-				:title="emoji[0]"
-				@click="chosen(emoji[1].char)"
-				:key="emoji[0]"
-			>
-				<mk-emoji :emoji="emoji[1].char"/>
-			</button>
-		</div>
-		<div v-else>
-			<button v-for="emoji in customEmojis"
-				:title="emoji.name"
-				@click="chosen(`:${emoji.name}:`)"
-			>
-				<img :src="emoji.url" :alt="emoji.name"/>
-			</button>
-		</div>
+		<template v-if="categories[0].isActive">
+			<header class="category"><fa :icon="faHistory" fixed-width/> {{ $t('recent-emoji') }}</header>
+			<div class="list">
+				<button v-for="(emoji, i) in ($store.state.device.recentEmojis || [])"
+					:title="emoji.name"
+					@click="chosen(emoji)"
+					:key="i"
+				>
+					<mk-emoji v-if="emoji.char != null" :emoji="emoji.char"/>
+					<img v-else :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
+				</button>
+			</div>
+		</template>
+
+		<header class="category"><fa :icon="categories.find(x => x.isActive).icon" fixed-width/> {{ categories.find(x => x.isActive).text }}</header>
+		<template v-if="categories.find(x => x.isActive).name">
+			<div class="list">
+				<button v-for="emoji in emojilist.filter(e => e.category === categories.find(x => x.isActive).name)"
+					:title="emoji.name"
+					@click="chosen(emoji)"
+					:key="emoji.name"
+				>
+					<mk-emoji :emoji="emoji.char"/>
+				</button>
+			</div>
+		</template>
+		<template v-else>
+			<div v-for="(key, i) in Object.keys(customEmojis)" :key="i">
+				<header class="sub">{{ key || $t('no-category') }}</header>
+				<div class="list">
+					<button v-for="emoji in customEmojis[key]"
+						:title="emoji.name"
+						@click="chosen(emoji)"
+						:key="emoji.name"
+					>
+						<img :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/>
+					</button>
+				</div>
+			</div>
+		</template>
 	</div>
 </div>
 </template>
@@ -35,17 +58,21 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { lib } from 'emojilib';
-import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice } from '@fortawesome/free-solid-svg-icons';
+import { emojilist } from '../../../../../misc/emojilist';
+import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url';
+import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faHistory } from '@fortawesome/free-solid-svg-icons';
 import { faHeart, faFlag } from '@fortawesome/free-regular-svg-icons';
+import { groupByX } from '../../../../../prelude/array';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/emoji-picker.vue'),
 
 	data() {
 		return {
-			lib,
-			customEmojis: [],
+			emojilist,
+			getStaticImageUrl,
+			customEmojis: {},
+			faGlobe, faHistory,
 			categories: [{
 				text: this.$t('custom-emoji'),
 				icon: faAsterisk,
@@ -95,18 +122,43 @@ export default Vue.extend({
 	},
 
 	created() {
-		this.customEmojis = (this.$root.getMetaSync() || { emojis: [] }).emojis || [];
+		let local = (this.$root.getMetaSync() || { emojis: [] }).emojis || [];
+		local = groupByX(local, (x: any) => x.category || '');
+		this.customEmojis = local;
+
+		if (this.$store.state.device.activeEmojiCategoryName) {
+			this.goCategory(this.$store.state.device.activeEmojiCategoryName);
+		}
 	},
 
 	methods: {
-		go(category) {
+		go(category: any) {
+			this.goCategory(category.name);
+		},
+
+		goCategory(name: string) {
+			let matched = false;
 			for (const c of this.categories) {
-				c.isActive = c.name === category.name;
+				c.isActive = c.name === name;
+				if (c.isActive) {
+					matched = true;
+					this.$store.commit('device/set', { key: 'activeEmojiCategoryName', value: c.name });
+				}
+			}
+			if (!matched) {
+				this.categories[0].isActive = true;
 			}
 		},
 
-		chosen(emoji) {
-			this.$emit('chosen', emoji);
+		chosen(emoji: any) {
+			const getKey = (emoji: any) => emoji.char || `:${emoji.name}:`;
+
+			let recents = this.$store.state.device.recentEmojis || [];
+			recents = recents.filter((e: any) => getKey(e) !== getKey(emoji));
+			recents.unshift(emoji)
+			this.$store.commit('device/set', { key: 'recentEmojis', value: recents.splice(0, 16) });
+
+			this.$emit('chosen', getKey(emoji));
 		}
 	}
 });
@@ -140,7 +192,7 @@ export default Vue.extend({
 		overflow-y auto
 		overflow-x hidden
 
-		> header
+		> header.category
 			position sticky
 			top 0
 			left 0
@@ -150,7 +202,12 @@ export default Vue.extend({
 			color var(--text)
 			font-size 12px
 
-		> div
+		>>> header.sub
+			padding 4px 8px
+			color var(--text)
+			font-size 12px
+
+		>>> div.list
 			display grid
 			grid-template-columns 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr
 			gap 4px
@@ -178,6 +235,7 @@ export default Vue.extend({
 					left 0
 					width 100%
 					height 100%
+					object-fit contain
 					font-size 28px
 					transition transform 0.2s ease
 					pointer-events none

src/client/app/common/views/components/emoji.vue

@@ -7,10 +7,8 @@
 
 <script lang="ts">
 import Vue from 'vue';
-// スクリプトサイズがデカい
-//import { lib } from 'emojilib';
 import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url';
-import { twemojiBase } from '../../../../../misc/twemoji-base';
+import { twemojiSvgBase } from '../../../../../misc/twemoji-base';
 
 export default Vue.extend({
 	props: {
@@ -92,7 +90,7 @@ export default Vue.extend({
 			if (!codes.includes('200d')) codes = codes.filter(x => x != 'fe0f');
 			codes = codes.filter(x => x && x.length);
 
-			this.url = `${twemojiBase}/2/svg/${codes.join('-')}.svg`;
+			this.url = `${twemojiSvgBase}/${codes.join('-')}.svg`;
 		}
 	},
 });

src/client/app/common/views/components/frac.vue

@@ -0,0 +1,49 @@
+<template>
+<span class="mk-frac"><span>{{ pad }}</span><span>{{ value }} / {{ total }}</span></span>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+
+export default Vue.extend({
+	i18n: i18n(),
+	props: {
+		value: {
+			type: Number,
+			required: true,
+		},
+		total: {
+			type: Number,
+			required: true,
+		},
+	},
+	computed: {
+		pad(this: {
+			value: number;
+			total: number;
+			length(value: number): number;
+		}) {
+			return '0'.repeat(this.length(this.total) - this.length(this.value));
+		},
+	},
+	methods: {
+		length(value: number) {
+			const string = value.toString();
+
+			return string.includes('e') ? -~string.substr(string.indexOf('e')) : string.length;
+		},
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+.mk-frac
+	-webkit-font-feature-settings 'tnum'
+	-moz-font-feature-settings 'tnum'
+	font-feature-settings 'tnum'
+	font-variant-numeric tabular-nums
+
+	> :first-child
+		visibility hidden
+</style>

src/client/app/common/views/components/games/reversi/reversi.game.vue

@@ -5,17 +5,17 @@
 
 	<div style="overflow: hidden; line-height: 28px;">
 		<p class="turn" v-if="!iAmPlayer && !game.isEnded">
-			<mfm :key="'turn:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
+			<mfm :key="'turn:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) })" :plain="true" :custom-emojis="turnUser.emojis"/>
 			<mk-ellipsis/>
 		</p>
 		<p class="turn" v-if="logPos != logs.length">
-			<mfm :key="'past-turn-of:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
+			<mfm :key="'past-turn-of:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) })" :plain="true" :custom-emojis="turnUser.emojis"/>
 		</p>
 		<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">{{ $t('@.reversi.opponent-turn') }}<mk-ellipsis/></p>
 		<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">{{ $t('@.reversi.my-turn') }}</p>
 		<p class="result" v-if="game.isEnded && logPos == logs.length">
 			<template v-if="game.winner">
-				<mfm :key="'won'" :text="$t('@.reversi.won', { name: $options.filters.userName(game.winner) })" :should-break="false" :plain-text="true" :custom-emojis="game.winner.emojis"/>
+				<mfm :key="'won'" :text="$t('@.reversi.won', { name: $options.filters.userName(game.winner) })" :plain="true" :custom-emojis="game.winner.emojis"/>
 				<span v-if="game.surrendered != null"> ({{ $t('surrendered') }})</span>
 			</template>
 			<template v-else>{{ $t('@.reversi.drawn') }}</template>

src/client/app/common/views/components/google.vue

@@ -41,7 +41,6 @@ export default Vue.extend({
 		padding 10px
 		width 100%
 		height 40px
-		font-family sans-serif
 		font-size 16px
 		color var(--googleSearchFg)
 		background var(--googleSearchBg)

src/client/app/common/views/components/image-viewer.vue

@@ -1,70 +1,41 @@
 <template>
-<div class="dkjvrdxtkvqrwmhfickhndpmnncsgacq">
-	<div class="bg" @click="close"></div>
-	<img :src="image.url" :alt="image.name" :title="image.name" @click="close"/>
-</div>
+<ui-modal ref="modal" v-hotkey.global="keymap">
+	<img :src="image.url" :alt="image.name" :title="image.name" @click="close" />
+</ui-modal>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
-import anime from 'animejs';
 
 export default Vue.extend({
 	props: ['image'],
-	mounted() {
-		anime({
-			targets: this.$el,
-			opacity: 1,
-			duration: 100,
-			easing: 'linear'
-		});
+	computed: {
+		keymap(): any {
+			return {
+				'esc': this.close,
+			};
+		}
 	},
 	methods: {
 		close() {
-			anime({
-				targets: this.$el,
-				opacity: 0,
-				duration: 100,
-				easing: 'linear',
-				complete: () => this.destroyDom()
-			});
+			(this.$refs.modal as any).close();
 		}
 	}
 });
 </script>
 
 <style lang="stylus" scoped>
-.dkjvrdxtkvqrwmhfickhndpmnncsgacq
-	display block
+img
 	position fixed
-	z-index 2048
+	z-index 2
 	top 0
+	right 0
+	bottom 0
 	left 0
-	width 100%
-	height 100%
-	opacity 0
-
-	> .bg
-		display block
-		position fixed
-		z-index 1
-		top 0
-		left 0
-		width 100%
-		height 100%
-		background rgba(#000, 0.7)
-
-	> img
-		position fixed
-		z-index 2
-		top 0
-		right 0
-		bottom 0
-		left 0
-		max-width 100%
-		max-height 100%
-		margin auto
-		cursor zoom-out
-		image-orientation from-image
+	max-width 100%
+	max-height 100%
+	margin auto
+	cursor zoom-out
+	image-orientation from-image
 
 </style>

src/client/app/common/views/components/index.ts

@@ -33,6 +33,7 @@ import fileTypeIcon from './file-type-icon.vue';
 import emoji from './emoji.vue';
 import welcomeTimeline from './welcome-timeline.vue';
 import userList from './user-list.vue';
+import frac from './frac.vue';
 import uiInput from './ui/input.vue';
 import uiButton from './ui/button.vue';
 import uiHorizonGroup from './ui/horizon-group.vue';
@@ -46,6 +47,7 @@ import uiInfo from './ui/info.vue';
 import uiMargin from './ui/margin.vue';
 import uiHr from './ui/hr.vue';
 import uiPagination from './ui/pagination.vue';
+import uiModal from './ui/modal.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';
 
@@ -82,6 +84,7 @@ Vue.component('mk-file-type-icon', fileTypeIcon);
 Vue.component('mk-emoji', emoji);
 Vue.component('mk-welcome-timeline', welcomeTimeline);
 Vue.component('mk-user-list', userList);
+Vue.component('mk-frac', frac);
 Vue.component('ui-input', uiInput);
 Vue.component('ui-button', uiButton);
 Vue.component('ui-horizon-group', uiHorizonGroup);
@@ -95,5 +98,6 @@ Vue.component('ui-info', uiInfo);
 Vue.component('ui-margin', uiMargin);
 Vue.component('ui-hr', uiHr);
 Vue.component('ui-pagination', uiPagination);
+Vue.component('ui-modal', uiModal);
 Vue.component('form-button', formButton);
 Vue.component('form-radio', formRadio);

src/client/app/common/views/components/media-image.vue

@@ -59,9 +59,12 @@ export default Vue.extend({
 	},
 	methods: {
 		onClick() {
-			this.$root.new(ImageViewer, {
+			const viewer = this.$root.new(ImageViewer, {
 				image: this.image
 			});
+			this.$once('hook:beforeDestroy', () => {
+				viewer.close();
+			});
 		}
 	}
 });

src/client/app/common/views/components/media-list.vue

@@ -35,13 +35,14 @@ export default Vue.extend({
 	mounted() {
 		//#region for Safari bug
 		if (this.$refs.grid) {
-			this.$refs.grid.style.height = this.$refs.grid.clientHeight ? `${this.$refs.grid.clientHeight}px` : '128px';
+			this.$refs.grid.style.height = this.$refs.grid.clientHeight ? `${this.$refs.grid.clientHeight}px`
+				: this.$store.state.device.inDeckMode ? '128px' : this.$root.isMobile ? '173px' : '287px';
 		}
 		//#endregion
 	},
 	methods: {
 		previewable(file) {
-			return file.type.startsWith('video') || file.type.startsWith('image');
+			return (file.type.startsWith('video') || file.type.startsWith('image')) && file.thumbnailUrl;
 		}
 	}
 });

src/client/app/common/views/components/mention.vue

@@ -1,11 +1,17 @@
 <template>
-<router-link class="ldlomzub" :to="`/${ canonical }`" v-user-preview="canonical">
+<router-link class="ldlomzub" :to="url" v-user-preview="canonical" v-if="url.startsWith('/')">
 	<span class="me" v-if="isMe">{{ $t('@.you') }}</span>
 	<span class="main">
 		<span class="username">@{{ username }}</span>
 		<span class="host" :class="{ fade: $store.state.settings.contrastedAcct }" v-if="(host != localHost) || $store.state.settings.showFullAcct">@{{ toUnicode(host) }}</span>
 	</span>
 </router-link>
+<a class="ldlomzub" :href="url" target="_blank" rel="noopener" v-else>
+	<span class="main">
+		<span class="username">@{{ username }}</span>
+		<span class="host" :class="{ fade: $store.state.settings.contrastedAcct }">@{{ toUnicode(host) }}</span>
+	</span>
+</a>
 </template>
 
 <script lang="ts">
@@ -32,6 +38,15 @@ export default Vue.extend({
 		};
 	},
 	computed: {
+		url(): string {
+			switch (this.host) {
+				case 'twitter.com':
+				case 'github.com':
+					return `https://${this.host}/${this.username}`;
+				default:
+					return `/${this.canonical}`;
+			}
+		},
 		canonical(): string {
 			return this.host === localHost ? `@${this.username}` : `@${this.username}@${toUnicode(this.host)}`;
 		},

src/client/app/common/views/components/messaging-room.form.vue

@@ -30,6 +30,7 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import * as autosize from 'autosize';
+import { formatTimeString } from '../../../../../misc/format-time-string';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/messaging-room.form.vue'),
@@ -84,13 +85,26 @@ export default Vue.extend({
 		}
 	},
 	methods: {
-		onPaste(e) {
+		async onPaste(e: ClipboardEvent) {
 			const data = e.clipboardData;
 			const items = data.items;
 
 			if (items.length == 1) {
 				if (items[0].kind == 'file') {
-					this.upload(items[0].getAsFile());
+					const file = items[0].getAsFile();
+					const lio = file.name.lastIndexOf('.');
+					const ext = lio >= 0 ? file.name.slice(lio) : '';
+					const formatted = `${formatTimeString(new Date(file.lastModified), this.$store.state.settings.pastedFileName).replace(/{{number}}/g, '1')}${ext}`;
+					const name = this.$store.state.settings.pasteDialog
+						? await this.$root.dialog({
+							title: this.$t('@.post-form.enter-file-name'),
+							input: {
+								default: formatted
+							},
+							allowEmpty: false
+						}).then(({ canceled, result }) => canceled ? false : result)
+						: formatted;
+					if (name) this.upload(file, name);
 				}
 			} else {
 				if (items[0].kind == 'file') {
@@ -157,8 +171,8 @@ export default Vue.extend({
 			this.upload((this.$refs.file as any).files[0]);
 		},
 
-		upload(file) {
-			(this.$refs.uploader as any).upload(file);
+		upload(file: File, name?: string) {
+			(this.$refs.uploader as any).upload(file, this.$store.state.settings.uploadFolder, name);
 		},
 
 		onUploaded(file) {

src/client/app/common/views/components/messaging-room.message.vue

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

src/client/app/common/views/components/messaging.vue

@@ -138,7 +138,7 @@ export default Vue.extend({
 			}
 			this.$root.api('users/search', {
 				query: this.q,
-				localOnly: true,
+				localOnly: false,
 				limit: 10,
 				detail: false
 			}).then(users => {

src/client/app/common/views/components/mfm.ts

@@ -22,11 +22,11 @@ export default Vue.component('misskey-flavored-markdown', {
 			type: String,
 			required: true
 		},
-		shouldBreak: {
+		plain: {
 			type: Boolean,
-			default: true
+			default: false
 		},
-		plainText: {
+		nowrap: {
 			type: Boolean,
 			default: false
 		},
@@ -50,7 +50,7 @@ export default Vue.component('misskey-flavored-markdown', {
 	render(createElement) {
 		if (this.text == null || this.text == '') return;
 
-		const ast = (this.plainText ? parsePlain : parse)(this.text);
+		const ast = (this.plain ? parsePlain : parse)(this.text);
 
 		let bigCount = 0;
 		let motionCount = 0;
@@ -60,7 +60,7 @@ export default Vue.component('misskey-flavored-markdown', {
 				case 'text': {
 					const text = token.node.props.text.replace(/(\r\n|\n|\r)/g, '\n');
 
-					if (this.shouldBreak) {
+					if (!this.plain) {
 						const x = text.split('\n')
 							.map(t => t == '' ? [createElement('br')] : [createElement('span', t), createElement('br')]);
 						x[x.length - 1].pop();
@@ -270,7 +270,7 @@ export default Vue.component('misskey-flavored-markdown', {
 						},
 						props: {
 							customEmojis: this.customEmojis || customEmojis,
-							normal: this.plainText
+							normal: this.plain
 						}
 					})];
 				}

src/client/app/common/views/components/misskey-flavored-markdown.vue

@@ -1,5 +1,5 @@
 <template>
-<mfm-core v-bind="$attrs" class="havbbuyv" :class="{ plain: $attrs['plain-text'] }" v-once/>
+<mfm-core v-bind="$attrs" class="havbbuyv" :class="{ nowrap: $attrs['nowrap'] }" v-once/>
 </template>
 
 <script lang="ts">
@@ -17,8 +17,9 @@ export default Vue.extend({
 .havbbuyv
 	white-space pre-wrap
 
-	&.plain
+	&.nowrap
 		white-space pre
+		word-wrap normal // https://codeday.me/jp/qa/20190424/690106.html
 
 	>>> .title
 		display block
@@ -30,6 +31,7 @@ export default Vue.extend({
 		border-radius 4px
 
 	>>> .quote
+		display block
 		margin 8px
 		padding 6px 0 6px 12px
 		color var(--mfmQuote)

src/client/app/common/views/components/note-menu.vue

@@ -22,66 +22,95 @@ export default Vue.extend({
 	},
 	computed: {
 		items(): any[] {
-			return [{
-				icon: 'at',
-				text: this.$t('mention'),
-				action: this.mention
-			}, null, {
-				icon: 'info-circle',
-				text: this.$t('detail'),
-				action: this.detail
-			}, {
-				icon: faCopy,
-				text: this.$t('copy-content'),
-				action: this.copyContent
-			}, {
-				icon: 'link',
-				text: this.$t('copy-link'),
-				action: this.copyLink
-			}, this.note.uri ? {
-				icon: 'external-link-square-alt',
-				text: this.$t('remote'),
-				action: () => {
-					window.open(this.note.uri, '_blank');
-				}
-			} : undefined,
-			null,
-			this.isFavorited ? {
-				icon: 'star',
-				text: this.$t('unfavorite'),
-				action: () => this.toggleFavorite(false)
-			} : {
-				icon: 'star',
-				text: this.$t('favorite'),
-				action: () => this.toggleFavorite(true)
-			},
-			this.note.userId != this.$store.state.i.id ? this.isWatching ? {
-				icon: faEyeSlash,
-				text: this.$t('unwatch'),
-				action: () => this.toggleWatch(false)
-			} : {
-				icon: faEye,
-				text: this.$t('watch'),
-				action: () => this.toggleWatch(true)
-			} : undefined,
-			this.note.userId == this.$store.state.i.id ? (this.$store.state.i.pinnedNoteIds || []).includes(this.note.id) ? {
-				icon: 'thumbtack',
-				text: this.$t('unpin'),
-				action: () => this.togglePin(false)
-			} : {
-				icon: 'thumbtack',
-				text: this.$t('pin'),
-				action: () => this.togglePin(true)
-			} : undefined,
-			...(this.note.userId == this.$store.state.i.id || this.$store.state.i.isAdmin || this.$store.state.i.isModerator ? [
-				null, {
-					icon: ['far', 'trash-alt'],
-					text: this.$t('delete'),
-					action: this.del
-				}]
-				: []
-			)]
-			.filter(x => x !== undefined)
+			if (this.$store.getters.isSignedIn) {
+				return [{
+					icon: 'at',
+					text: this.$t('mention'),
+					action: this.mention
+				}, null, {
+					icon: 'info-circle',
+					text: this.$t('detail'),
+					action: this.detail
+				}, {
+					icon: faCopy,
+					text: this.$t('copy-content'),
+					action: this.copyContent
+				}, {
+					icon: 'link',
+					text: this.$t('copy-link'),
+					action: this.copyLink
+				}, this.note.uri ? {
+					icon: 'external-link-square-alt',
+					text: this.$t('remote'),
+					action: () => {
+						window.open(this.note.uri, '_blank');
+					}
+				} : undefined,
+				null,
+				this.isFavorited ? {
+					icon: 'star',
+					text: this.$t('unfavorite'),
+					action: () => this.toggleFavorite(false)
+				} : {
+					icon: 'star',
+					text: this.$t('favorite'),
+					action: () => this.toggleFavorite(true)
+				},
+				this.note.userId != this.$store.state.i.id ? this.isWatching ? {
+					icon: faEyeSlash,
+					text: this.$t('unwatch'),
+					action: () => this.toggleWatch(false)
+				} : {
+					icon: faEye,
+					text: this.$t('watch'),
+					action: () => this.toggleWatch(true)
+				} : undefined,
+				this.note.userId == this.$store.state.i.id ? (this.$store.state.i.pinnedNoteIds || []).includes(this.note.id) ? {
+					icon: 'thumbtack',
+					text: this.$t('unpin'),
+					action: () => this.togglePin(false)
+				} : {
+					icon: 'thumbtack',
+					text: this.$t('pin'),
+					action: () => this.togglePin(true)
+				} : undefined,
+				...(this.note.userId == this.$store.state.i.id || this.$store.state.i.isAdmin || this.$store.state.i.isModerator ? [
+					null,
+					this.note.userId == this.$store.state.i.id ? {
+						icon: 'undo-alt',
+						text: this.$t('delete-and-edit'),
+						action: this.deleteAndEdit
+					} : undefined,
+					{
+						icon: ['far', 'trash-alt'],
+						text: this.$t('delete'),
+						action: this.del
+					}]
+					: []
+				)]
+				.filter(x => x !== undefined);
+			} else {
+				return [{
+					icon: 'info-circle',
+					text: this.$t('detail'),
+					action: this.detail
+				}, {
+					icon: faCopy,
+					text: this.$t('copy-content'),
+					action: this.copyContent
+				}, {
+					icon: 'link',
+					text: this.$t('copy-link'),
+					action: this.copyLink
+				}, this.note.uri ? {
+					icon: 'external-link-square-alt',
+					text: this.$t('remote'),
+					action: () => {
+						window.open(this.note.uri, '_blank');
+					}
+				} : undefined]
+				.filter(x => x !== undefined);
+			}
 		}
 	},
 
@@ -154,6 +183,25 @@ export default Vue.extend({
 			});
 		},
 
+		deleteAndEdit() {
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('delete-and-edit-confirm'),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) return;
+				this.$root.api('notes/delete', {
+					noteId: this.note.id
+				}).then(() => {
+					this.destroyDom();
+				});
+				this.$post({
+					initialNote: this.note,
+					reply: this.note.reply,
+				});
+			});
+		},
+
 		toggleFavorite(favorite: boolean) {
 			this.$root.api(favorite ? 'notes/favorites/create' : 'notes/favorites/delete', {
 				noteId: this.note.id
@@ -179,6 +227,7 @@ export default Vue.extend({
 		},
 
 		closed() {
+			this.$emit('closed');
 			this.$nextTick(() => {
 				this.destroyDom();
 			});

src/client/app/common/views/components/page/page.block.vue

@@ -16,10 +16,11 @@ import XIf from './page.if.vue';
 import XTextarea from './page.textarea.vue';
 import XPost from './page.post.vue';
 import XCounter from './page.counter.vue';
+import XRadioButton from './page.radio-button.vue';
 
 export default Vue.extend({
 	components: {
-		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter
+		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter, XRadioButton
 	},
 
 	props: {

src/client/app/common/views/components/page/page.button.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-	<ui-button class="kudkigyw" @click="click()">{{ script.interpolate(value.text) }}</ui-button>
+	<ui-button class="kudkigyw" @click="click()" :primary="value.primary">{{ script.interpolate(value.text) }}</ui-button>
 </div>
 </template>
 
@@ -27,6 +27,19 @@ export default Vue.extend({
 			} else if (this.value.action === 'resetRandom') {
 				this.script.aiScript.updateRandomSeed(Math.random());
 				this.script.eval();
+			} else if (this.value.action === 'pushEvent') {
+				this.$root.api('page-push', {
+					pageId: this.script.page.id,
+					event: this.value.event,
+					...(this.value.var ? {
+						var: this.script.vars[this.value.var]
+					} : {})
+				});
+
+				this.$root.dialog({
+					type: 'success',
+					text: this.script.interpolate(this.value.message)
+				});
 			}
 		}
 	}
@@ -36,7 +49,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .kudkigyw
 	display inline-block
-	min-width 300px
+	min-width 200px
 	max-width 450px
 	margin 8px 0
 </style>