Merge branch 'misskey-dev:develop' into notification-read-api

.circleci/config.yml

@@ -1,49 +0,0 @@
-version: 2.1
-
-executors:
-  docker:
-    working_directory: /tmp/workspace
-    docker:
-      - image: docker:latest
-
-jobs:
-  docker:
-    parameters:
-      with_deploy:
-        type: boolean
-        default: false
-    executor: docker
-    steps:
-      - checkout
-      - setup_remote_docker:
-          version: 19.03.13
-      - run:
-          name: Build
-          command: |
-            docker build -t misskey/misskey .
-      - when:
-          condition: <<parameters.with_deploy>>
-          steps:
-            - run:
-                name: Deploy
-                command: |
-                  if [ "$DOCKERHUB_USERNAME$DOCKERHUB_PASSWORD" ]
-                   then
-                    apk update && apk add jq
-                    docker tag misskey/misskey misskey/misskey:$(cat package.json | jq -r .version)
-                    docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-                    docker push -a misskey/misskey
-                   else
-                    echo -e '\033[0;33mAborted deploying to Docker Hub\033[0;39m'
-                  fi
-
-workflows:
-  version: 2
-  docker:
-    jobs:
-      - docker:
-          name: auto-build
-          with_deploy: true
-          filters:
-            branches:
-              only: master

.config/example.yml

@@ -157,3 +157,10 @@ id: 'aid'
 
 # Sign to ActivityPub GET request (default: false)
 #signToActivityPubGet: true
+
+#allowedPrivateNetworks: [
+#  '127.0.0.1/32'
+#]
+
+# Upload or download file size limits (bytes)
+#maxFileSize: 262144000

.dockerignore

@@ -1,8 +1,8 @@
 .autogen
-.git
 .github
 .travis
 .vscode
+.config
 Dockerfile
 build/
 built/
@@ -12,3 +12,4 @@ elasticsearch/
 node_modules/
 redis/
 files/
+misskey-assets/

.github/CODEOWNERS

@@ -1,38 +0,0 @@
-# PATH                                          OWNERS
-/.autogen/                                      @acid-chicken
-/.circleci/                                     @syuilo @acid-chicken
-/.config/                                       @syuilo @AyaMorisawa @mei23 @acid-chicken @rinsuki
-# /.config/mongo_initdb_example.js              @khws4v1
-/.github/                                       @syuilo @AyaMorisawa @acid-chicken
-/.vscode/                                       @acid-chicken
-/assets/                                        @syuilo # @tamaina
-/docs/                                          @syuilo
-/docs/*.en.md                                   @AyaMorisawa # @skid9000
-# /docs/*.fr.md                                 @BoFFire
-# /docs/docker.*.md                             @khws4v1
-/locales/                                       @syuilo
-/src/                                           @syuilo @AyaMorisawa @mei23 @acid-chicken @rinsuki
-# /src/crypto_key.cc                            @akihikodaki
-# /src/crypto_key.d.ts                          @akihikodaki
-/.dockerignore                                  @syuilo # @khws4v1
-/.editorconfig                                  @syuilo @AyaMorisawa
-/.eslintrc                                      @syuilo
-/.gitattributes                                 @syuilo
-/.gitignore                                     @syuilo
-/.npmrc                                         @syuilo
-/.vsls.json                                     @AyaMorisawa
-/CHANGELOG.md                                   @syuilo
-/CODE_OF_CONDUCT.md                             @syuilo
-/CONTRIBUTING.md                                @syuilo
-/Dockerfile                                     @syuilo @AyaMorisawa @acid-chicken # @khws4v1
-/LICENSE                                        @syuilo
-/README.md                                      @syuilo @AyaMorisawa @acid-chicken # @nikhiljha
-# /binding.gyp                                  @akihikodaki
-/crowdin.yml                                    @syuilo
-# /docker-compose.yml                           @khws4v1
-/gulpfile.ts                                    @syuilo @AyaMorisawa
-/jsconfig.json                                  @syuilo @AyaMorisawa
-/package.json                                   @syuilo @AyaMorisawa
-/tsconfig.json                                  @syuilo @AyaMorisawa
-/tslint.json                                    @syuilo @AyaMorisawa
-/webpack.config.ts                              @syuilo @AyaMorisawa

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,30 +1,10 @@
 <!-- ℹ お読みください
-PRありがとうございます！ PRを作成する前に、以下をご確認ください:
+PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください:
-- 可能であればタイトルに、以下で示すようなPRの種類が分かるキーワードをプリフィクスしてください。
+https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
-  - fix / refactor / feat / enhance / perf / chore
-  - また、PRの粒度が適切であることを確認してください。ひとつのPRに複数の種類の変更や関心を含めることは避けてください。
-- このPRによって解決されるIssueがある場合は、そのIssueへの参照を本文内に含めてください。
-- CHANGELOG.mdに変更点を追記してください。リファクタリングなど、利用者に影響を与えない変更についてはこの限りではありません。
-- この変更により新たに作成、もしくは更新すべきドキュメントがないか確認してください。
-- 機能追加やバグ修正をした場合は、可能であればテストケースを追加してください。
-- テスト、Lintが通っていることを予め確認してください。
-  - `npm run test`、`npm run lint`でぞれぞれ実施可能です
-- UIに変更がある場合はスクリーンショットを本文内に添付してください。
-ご協力ありがとうございます🤗
 -->
 <!-- ℹ README
-Thank you for your PR! Before creating a PR, please check the following:
+Thank you for your PR! Before creating a PR, please check the contribution guide:
-- If possible, prefix the title with a keyword that identifies the type of this PR, as shown below.
+https://github.com/misskey-dev/misskey/blob/develop/docs/CONTRIBUTING.en.md
-  - fix / refactor / feat / enhance / perf / chore
-  - Also, make sure that the granularity of this PR is appropriate. Please do not include more than one type of change or interest in a single PR.
-- If there is an Issue which will be resolved by this PR, please include a reference to the Issue in the text.
-- Please add the summary of the changes to CHANGELOG.md. However, this is not necessary for changes that do not affect the users, such as refactoring.
-- Check if there are any documents that need to be created or updated due to this change.
-- If you have added a feature or fixed a bug, please add a test case if possible.
-- Please make sure that tests and Lint are passed in advance.
-  - You can run it with `npm run test` and `npm run lint`.
-- If this PR includes UI changes, please attach a screenshot in the text.
-Thanks for your cooperation 🤗
 -->
 
 # What

.github/workflows/docker-develop.yml

@@ -0,0 +1,33 @@
+name: Publish Docker image (develop)
+
+on:
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: misskey/misskey
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and Push to Docker Hub
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: misskey/misskey:develop
+          labels: develop

.github/workflows/docker.yml

@@ -0,0 +1,32 @@
+name: Publish Docker image
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: misskey/misskey
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and Push to Docker Hub
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/lint.yml

@@ -0,0 +1,21 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
+    - run: yarn install
+    - run: yarn lint

.github/workflows/nodejs.yml

@@ -1,55 +0,0 @@
-name: Node.js CI
-on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
-
-jobs:
-  build_and_test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x, 16.x]
-
-    services:
-      postgres:
-        image: postgres:10-alpine
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_DB: test-misskey
-          POSTGRES_HOST_AUTH_METHOD: trust
-      redis:
-        image: redis:alpine
-        ports:
-          - 6379:6379
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - name: Install dependencies
-      run: yarn install
-    - name: Check yarn.lock
-      run: git diff --exit-code yarn.lock
-    - name: Copy Configure
-      run: cp .circleci/misskey/*.yml .config
-    - name: Build
-      run: yarn build
-    - name: Test
-      run: yarn test
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
-      with:
-        node-version: 12.x
-    - run: yarn install
-    - run: yarn lint

.github/workflows/test.yml

@@ -0,0 +1,87 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+
+jobs:
+  mocha:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.x]
+
+    services:
+      postgres:
+        image: postgres:12.2-alpine
+        ports:
+          - 54312:5432
+        env:
+          POSTGRES_DB: test-misskey
+          POSTGRES_HOST_AUTH_METHOD: trust
+      redis:
+        image: redis:4.0-alpine
+        ports:
+          - 56312:6379
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install dependencies
+      run: yarn install
+    - name: Check yarn.lock
+      run: git diff --exit-code yarn.lock
+    - name: Copy Configure
+      run: cp test/test.yml .config
+    - name: Build
+      run: yarn build
+    - name: Test
+      run: yarn mocha
+
+  e2e:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.x]
+
+    services:
+      postgres:
+        image: postgres:12.2-alpine
+        ports:
+          - 54312:5432
+        env:
+          POSTGRES_DB: test-misskey
+          POSTGRES_HOST_AUTH_METHOD: trust
+      redis:
+        image: redis:4.0-alpine
+        ports:
+          - 56312:6379
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install dependencies
+      run: yarn install
+    - name: Check yarn.lock
+      run: git diff --exit-code yarn.lock
+    - name: Copy Configure
+      run: cp test/test.yml .config
+    - name: Build
+      run: yarn build
+    - name: Test
+      run: yarn e2e

.gitignore

@@ -9,6 +9,10 @@
 /node_modules
 report.*.json
 
+# Cypress
+cypress/screenshots
+cypress/videos
+
 # config
 /.config/*
 !/.config/example.yml

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "misskey-assets"]
+	path = misskey-assets
+	url = https://github.com/misskey-dev/assets.git

.vscode/extensions.json

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

CHANGELOG.md

@@ -10,11 +10,200 @@
 ## 12.x.x (unreleased)
 
 ### Improvements
+- フォロー/フォロワーを非公開にできるように
+- インスタンスプロフィールレンダリング ready
+- 通知のリアクションアイコンをホバーで拡大できるように
+- メールアドレスのバリデーションを強化
+
+### Bugfixes
+- クライアント: 長いメニューが画面からはみ出す問題を修正
+- クライアント: コントロールパネルのジョブキューに個々のジョブが表示されないのを修正
+- クライアント: fix missing i18n string
+- fix html conversion issue with code blocks
+
+## 12.95.0 (2021/10/31)
+
+### Improvements
+- スレッドミュート機能
+
+### Bugfixes
+- リレー向けのActivityが一部実装で除外されてしまうことがあるのを修正
+- 削除したノートやユーザーがリモートから参照されると復活することがあるのを修正
+- クライアント: ページ編集時のドロップダウンメニューなどが動作しない問題を修正
+- クライアント: コントロールパネルのカスタム絵文字タブが切り替わらないように見える問題を修正
+- API: ユーザー情報の hasUnreadChannel が常に false になっている問題を修正
+
+## 12.94.1 (2021/10/25)
+
+### Improvements
+
+### Bugfixes
+- クライアント: ユーザーページのナビゲーションが失敗する問題を修正
+
+## 12.94.0 (2021/10/25)
+
+### Improvements
+- クライアント: 画像ビューアを強化
+- クライアント: メンションにユーザーのアバターを表示するように
+- クライアント: デザインの調整
+- クライアント: twemojiをセルフホスティングするように
+
+### Bugfixes
+- クライアント: CWで画像が隠されたとき、画像の高さがおかしいことになる問題を修正
+
+### NOTE
+- このバージョンから、iOS 15未満のサポートがされなくなります。対象のバージョンをお使いの方は、iOSのバージョンアップを行ってください。
+
+## 12.93.2 (2021/10/23)
+
+### Bugfixes
+- クライアント: ウィジェットを追加できない問題を修正
+
+## 12.93.1 (2021/10/23)
+
+### Bugfixes
+- クライアント: 通知上でローカルのリアクションが表示されないのを修正
+
+## 12.93.0 (2021/10/23)
+
+### Improvements
+- クライアント: コントロールパネルのパフォーマンスを改善
+- クライアント: 自分のリアクション一覧を見れるように
+	- 設定により、リアクション一覧を全員に公開することも可能
+- クライアント: ユーザー検索の精度を強化
+- クライアント: 新しいライトテーマを追加
+- クライアント: 新しいダークテーマを追加
+- API: ユーザーのリアクション一覧を取得する users/reactions を追加
+- API: users/search および users/search-by-username-and-host を強化
+- ミュート及びブロックのインポートを行えるように
+- クライアント: /share のクエリでリプライやファイル等の情報を渡せるように
+- チャートのsyncを毎日0時に自動で行うように
+
+### Bugfixes
+- クライアント: テーマの管理が行えない問題を修正
+- API: アプリケーション通知が取得できない問題を修正
+- クライアント: リモートノートで意図せずローカルカスタム絵文字が使われてしまうことがあるのを修正
+- ActivityPub: not reacted な Undo.Like がinboxに滞留するのを修正
+
+### Changes
+- 連合の考慮に問題があることなどが分かったため、モデレーターをブロックできない仕様を廃止しました
+- データベースにログを保存しないようになりました
+	- ログを永続化したい場合はsyslogを利用してください
+
+## 12.92.0 (2021/10/16)
+
+### Improvements
+- アカウント登録にメールアドレスの設定を必須にするオプション
+- クライアント: 全体的なUIのブラッシュアップ
+- クライアント: MFM関数構文のサジェストを実装
+- クライアント: ノート本文を投稿フォーム内でプレビューできるように
+- クライアント: 未読の通知のみ表示する機能
+- クライアント: 通知ページで通知の種類によるフィルタ
+- クライアント: アニメーションを減らす設定の適用範囲を拡充
+- クライアント: 新しいダークテーマを追加
+- クライアント: テーマコンパイラに hue と saturate 関数を追加
+- ActivityPub: HTML -> MFMの変換を強化
+- API: グループから抜ける users/groups/leave エンドポイントを実装
+- API: i/notifications に unreadOnly オプションを追加
+- API: ap系のエンドポイントをログイン必須化+レートリミット追加
+- MFM: Add tag syntaxes of bold <b></b> and strikethrough <s></s>
+
+### Bugfixes
+- Fix createDeleteAccountJob
+- admin inbox queue does not show individual jobs
+- クライアント: ヘッダーのタブが折り返される問題を修正
+- クライアント: ヘッダーにタブが表示されている状態でタイトルをクリックしたときにタブ選択が表示されるのを修正
+- クライアント: ユーザーページのタブが機能していない問題を修正
+- クライアント: ピン留めユーザーの設定項目がない問題を修正
+- クライアント: Deck UIにおいて、重ねたカラムの片方を畳んだ状態で右に出すと表示が壊れる問題を修正
+- API: 管理者およびモデレーターをブロックできてしまう問題を修正
+- MFM: Mentions in the link label are parsed as text
+- MFM: Add a property to the URL node indicating whether it was enclosed in <>
+- MFM: Disallows < and > in hashtags
+
+### Changes
+- 保守性やユーザビリティの観点から、Misskeyのコマンドラインオプションが削除されました。
+	- 必要であれば、代わりに環境変数で設定することができます
+- MFM: パフォーマンス、保守性、構文誤認識抑制の観点から、旧関数構文のサポートが削除されました。
+	- 旧構文(`[foo bar]`)を使用せず、現行の構文(`$[foo bar]`)を使用してください。
+
+## 12.91.0 (2021/09/22)
+
+### Improvements
+- ActivityPub: リモートユーザーのDeleteアクティビティに対応
+- ActivityPub: add resolver check for blocked instance
+- ActivityPub: deliverキューのメモリ使用量を削減
+- API: 管理者用アカウント削除APIを実装(/admin/accounts/delete)
+	- リモートユーザーの削除も可能に
+- アカウントが凍結された場合に、凍結された旨を表示してからログアウトするように
+- 凍結されたアカウントにログインしようとしたときに、凍結されている旨を表示するように
+- リスト、アンテナタイムラインを個別ページとして分割
+- UIの改善
+- MFMにsparklesエフェクトを追加
+- 非ログイン自は更新ダイアログを出さないように
+- クライアント起動時、アップデートが利用可能な場合エラー表示およびダイアログ表示しないように
+
+### Bugfixes
+- アカウントデータのエクスポート/インポート処理ができない問題を修正
+- アンテナの既読が付かない問題を修正
+- popupで設定ページを表示すると、アカウントの削除ページにアクセスすることができない問題を修正
+- "問題が発生しました"ウィンドウを開くと☓ボタンがなくて閉じれない問題を修正
+
+## 12.90.1 (2021/09/05)
+
+### Bugfixes
+- Dockerfileを修正
+- ノート翻訳時に公開範囲が考慮されていない問題を修正
+
+## 12.90.0 (2021/09/04)
+
+### Improvements
+- 藍モード、および藍ウィジェット
+	- クライアントに藍ちゃんを召喚することができるようになりました。
+- URLからのアップロード, APの添付ファイル, 外部ファイルのプロキシ等では、Privateアドレス等へのリクエストは拒否されるようになりました。
+	- developmentで動作している場合は、この制限は適用されません。
+	- Proxy使用時には、この制限は適用されません。
+		Proxy使用時に同等の制限を行いたい場合は、Proxy側で設定を行う必要があります。
+	- `default.yml`にて`allowedPrivateNetworks`にCIDRを追加することにより、宛先ネットワークを指定してこの制限から除外することが出来ます。
+- アップロード, ダウンロード出来るファイルサイズにハードリミットが適用されるようになりました。(約250MB)
+	- `default.yml`にて`maxFileSize`を変更することにより、制限値を変更することが出来ます。
+
+### Bugfixes
+- 管理者が最初にサインアップするページでログインされないのを修正
+- CWを維持する設定を復活
+- クライアントの表示を修正
+
+## 12.89.2 (2021/08/24)
+
+### Bugfixes
+- カスタムCSSを有効にしているとエラーになる問題を修正
+
+## 12.89.1 (2021/08/24)
+
+### Improvements
+- クライアントのデザインの調整
+
+### Bugfixes
+- 翻訳でDeepLのProアカウントに対応していない問題を修正
+- インスタンス設定でDeepLのAuth Keyが空で表示される問題を修正
+- セキュリティの向上
+
+## 12.89.0 (2021/08/21)
+
+### Improvements
+- アカウント削除の安定性を向上
+- 絵文字オートコンプリートの挙動を改修
+- localStorageのaccountsはindexedDBで保持するように
+- ActivityPub: ジョブキューの試行タイミングを調整 (#7635)
+- API: sw/unregisterを追加
+- ワードミュートのドキュメントを追加
+- クライアントのデザインの調整
 - 依存関係の更新
 - API: notifications/readは配列でも受け付けるように
 
 ### Bugfixes
 - チャンネルを作成しているとアカウントを削除できないのを修正
+- ノートの「削除して編集」をするとアンケートの選択肢が[object Object]になる問題を修正
 
 ## 12.88.0 (2021/08/17)
 

CONTRIBUTING.md

@@ -1,22 +1,43 @@
 # Contribution guide
-:v: Thanks for your contributions :v:
+We're glad you're interested in contributing Misskey! In this document you will find the information you need to contribute to the project.
 
-## When you contribute...
+**ℹ️ Important:** This project uses Japanese as its major language, **but you do not need to translate and write the Issues/PRs in Japanese.**
-- 任意のIssueについて、せっかく実装してくださっても、実装方法や設計の認識が揃ってないとマージできない/しないことになりかねないので、初めにそのIssue上で着手することを宣言し、必要に応じて他メンバーと実装方法や設計のすり合わせを行ってください。宣言することは作業が他の人と被るのを防止する効果もあります。
+Also, you might receive comments on your Issue/PR in Japanese, but you do not need to reply to them in Japanese as well.\
-  - 設計に迷った時はプロジェクトリーダーの判断を仰いでください。
+The accuracy of translation into Japanese is not high, so it will be easier for us to understand if you write it in the original language.
-- 時間や優先度の都合上、提出してくださったPRが長期間放置されることもありますがご理解ください。
+It will also allow the reader to use the translation tool of their preference if necessary.
-  - 温度感高めで見てほしいものは責付いてください。
 
 ## Issues
-Feature suggestions and bug reports are filed in https://github.com/misskey-dev/misskey/issues .
+Before creating an issue, please check the following:
+- To avoid duplication, please search for similar issues before creating a new issue.
+- Do not use Issues to ask questions or troubleshooting.
+	- Issues should only be used to feature requests, suggestions, and bug tracking.
+	- Please ask questions or troubleshooting in the [Misskey Forum](https://forum.misskey.io/) or [Discord](https://discord.gg/Wp8gVStHW3).
 
-* Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one.
+## Before implementation
-* If you have multiple independent issues, please submit them separately.
+When you want to add a feature or fix a bug, **first have the design and policy reviewed in an Issue** (if it is not there, please make one). Without this step, there is a high possibility that the PR will not be merged even if it is implemented.
 
-## Branches
+Also, when you start implementation, assign yourself to the Issue (if you cannot do it yourself, ask another member to assign you). By expressing your intention to work the Issue, you can prevent conflicts in the work.
-* **master** branch is tracking the latest release and used for production purposes.
+
-* **develop** branch is where we work for the next release.
+## Well-known branches
-* **l10n_develop** branch is reserved for localization management.
+- **`master`** branch is tracking the latest release and used for production purposes.
+- **`develop`** branch is where we work for the next release.
+	- When you create a PR, basically target it to this branch.
+- **`l10n_develop`** branch is reserved for localization management.
+
+## Creating a PR
+Thank you for your PR! Before creating a PR, please check the following:
+- If possible, prefix the title with a keyword that identifies the type of this PR, as shown below.
+  - `fix` / `refactor` / `feat` / `enhance` / `perf` / `chore` etc
+  - Also, make sure that the granularity of this PR is appropriate. Please do not include more than one type of change or interest in a single PR.
+- If there is an Issue which will be resolved by this PR, please include a reference to the Issue in the text.
+- Please add the summary of the changes to [`CHANGELOG.md`](/CHANGELOG.md). However, this is not necessary for changes that do not affect the users, such as refactoring.
+- Check if there are any documents that need to be created or updated due to this change.
+- If you have added a feature or fixed a bug, please add a test case if possible.
+- Please make sure that tests and Lint are passed in advance.
+  - You can run it with `npm run test` and `npm run lint`. [See more info](#testing)
+- If this PR includes UI changes, please attach a screenshot in the text.
+
+Thanks for your cooperation 🤗
 
 ## Localization (l10n)
 Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
@@ -28,18 +49,33 @@ If your language is not listed in Crowdin, please open an issue.
 
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
-## Documentation
+## Testing
-* Documents for instance admins are located in [`/docs`](/docs).
+- Test codes are located in [`/test`](/test).
-* Documents for end users are located in [`/src/docs`](/src/docs).
 
-## Test
+### Run test
-* Test codes are located in [`/test`](/test).
+Create a config file.
+```
+cp test/test.yml .config/
+```
+Prepare DB/Redis for testing.
+```
+docker-compose -f test/docker-compose.yml up
+```
+Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.yml`. 
 
-### Run specify test
+Run all test.
+```
+npm run test
+```
+
+#### Run specify test
 ```
 npx cross-env TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT="./test/tsconfig.json" npx mocha test/foo.ts --require ts-node/register
 ```
 
+### e2e tests
+TODO
+
 ## Continuous integration
 Misskey uses GitHub Actions for executing automated tests.
 Configuration files are located in [`/.github/workflows`](/.github/workflows).
@@ -55,116 +91,11 @@ Configuration files are located in [`/.github/workflows`](/.github/workflows).
 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
+## Notes
 ### How to resolve conflictions occurred at yarn.lock?
 
 Just execute `yarn` to fix it.
 
-## Glossary
-### AP
-Stands for _**A**ctivity**P**ub_.
-
-### MFM
-Stands for _**M**isskey **F**lavored **M**arkdown_.
-
-### Mk
-Stands for _**M**iss**k**ey_.
-
-### SW
-Stands for _**S**ervice**W**orker_.
-
-### Nyaize
-Convert な(na) to にゃ(nya)
-
-#### Denyaize
-Revert Nyaize
-
-## 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)
-	bar;
-else
-	baz;
-```
-
-Good:
-``` ts
-if (foo) {
-	bar;
-} else {
-	baz;
-}
-```
-
-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;
-```
-
-Make sure that the condition and the body statement are on the same line.
-
-### 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
-export default function(foo: string): string {
-```
-
-Good:
-``` ts
-export function something(foo: string): string {
-```
-
-## Directory structure
-```
-src ... Source code
-	@types ... Type definitions
-	prelude ... Independence utils for coding JavaScript without side effects
-	misc ... Independence utils for Misskey without side effects
-	service ... Common functions with side effects
-	queue ... Job queues and Jobs
-	server ... Web Server
-	client ... Client
-	mfm ... MFM
-
-test ... Test code
-
-```
-
-## Notes
 ### placeholder
 SQLをクエリビルダで組み立てる際、使用するプレースホルダは重複してはならない
 例えば
@@ -236,6 +167,9 @@ const users = userIds.length > 0 ? await Users.find({
 SQLでは配列のインデックスは**1始まり**。
 `[a, b, c]`の `a`にアクセスしたいなら`[0]`ではなく`[1]`と書く
 
+### null IN
+nullが含まれる可能性のあるカラムにINするときは、そのままだとおかしくなるのでORなどでnullのハンドリングをしよう。
+
 ### `undefined`にご用心
 MongoDBの時とは違い、findOneでレコードを取得する時に対象レコードが存在しない場合 **`undefined`** が返ってくるので注意。
 MongoDBは`null`で返してきてたので、その感覚で`if (x === null)`とか書くとバグる。代わりに`if (x == null)`と書いてください
@@ -250,6 +184,13 @@ npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
 ### コネクションには`markRaw`せよ
 **Vueのコンポーネントのdataオプションとして**misskey.jsのコネクションを設定するとき、必ず`markRaw`でラップしてください。インスタンスが不必要にリアクティブ化されることで、misskey.js内の処理で不具合が発生するとともに、パフォーマンス上の問題にも繋がる。なお、Composition APIを使う場合はこの限りではない(リアクティブ化はマニュアルなため)。
 
+### JSONのimportに気を付けよう
+TypeScriptでjsonをimportすると、tscでコンパイルするときにそのjsonファイルも一緒にdistディレクトリに吐き出されてしまう。この挙動により、意図せずファイルの書き換えが発生することがあるので、jsonをimportするときは書き換えられても良いものかどうか確認すること。書き換えされて欲しくない場合は、importで読み込むのではなく、`fs.readFileSync`などの関数を使って読み込むようにすればよい。
+
+### コンポーネントのスタイル定義でmarginを持たせない
+コンポーネント自身がmarginを設定するのは問題の元となることはよく知られている
+marginはそのコンポーネントを使う側が設定する
+
 ## その他
 ### HTMLのクラス名で follow という単語は使わない
 広告ブロッカーで誤ってブロックされる

Dockerfile

@@ -4,26 +4,17 @@ ENV NODE_ENV=production
 
 WORKDIR /misskey
 
+ENV BUILD_DEPS autoconf automake file g++ gcc libc-dev libtool make nasm pkgconfig python3 zlib-dev git
+
 FROM base AS builder
 
-RUN apk add --no-cache \
-    autoconf \
-    automake \
-    file \
-    g++ \
-    gcc \
-    libc-dev \
-    libtool \
-    make \
-    nasm \
-    pkgconfig \
-    python3 \
-    zlib-dev
-
-COPY package.json yarn.lock .yarnrc ./
-RUN yarn install
 COPY . ./
-RUN yarn build
+
+RUN apk add --no-cache $BUILD_DEPS && \
+    git submodule update --init && \
+    yarn install && \
+    yarn build && \
+    rm -rf .git
 
 FROM base AS runner
 
@@ -38,3 +29,4 @@ COPY --from=builder /misskey/built ./built
 COPY . ./
 
 CMD ["npm", "run", "migrateandstart"]
+

README.md

@@ -4,7 +4,6 @@
 
 <div align="center">
 
-[![CircleCI](https://img.shields.io/circleci/project/github/misskey-dev/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/misskey-dev/misskey)
 [![Dependencies](https://img.shields.io/david/misskey-dev/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/misskey-dev/misskey)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge&logo=github)](http://makeapullrequest.com)
 [![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
@@ -65,7 +64,7 @@ Organize and store your files! Want to post a picture you have already uploaded?
 
 :package: Create your own instance
 ----------------------------------------------------------------
-Please see the [Setup and Installation Guide](./docs/setup.en.md).
+Please see the [Setup and Installation Guide](https://misskey-hub.net/docs/install/install.html).
 
 :wrench: Contribution
 ----------------------------------------------------------------
@@ -104,6 +103,12 @@ Related projects
 - [misskey.js](https://github.com/misskey-dev/misskey.js) - Misskey SDK for JavaScript
 - [mfm.js](https://github.com/misskey-dev/mfm.js) - MFM parser
 
+Sponsors
+----------------------------------------------------------------
+<div align="center">
+	<a class="rss3" title="RSS3" href="https://rss3.io/" target="_blank" style="display: inline-block;"><img src="https://rss3.io/assets/images/Logo.svg" alt="RSS3" style="display: inline-block; height: 60px;"></a>
+</div>
+
 :heart: Backers
 ----------------------------------------------------------------
 <!-- PATREON_START -->

crowdin.yml

@@ -2,6 +2,3 @@ files:
   - source: /locales/ja-JP.yml
     translation: /locales/%locale%.yml
     update_option: update_as_unapproved
-  - source: /src/docs/ja-JP/**/*.md
-    translation: /src/docs/%locale%/**/%original_file_name%
-    update_option: update_as_unapproved

cypress.json

@@ -1,3 +1,3 @@
 {
-	"baseUrl": "http://localhost"
+	"baseUrl": "http://localhost:61812"
 }

cypress/integration/basic.js

@@ -1,10 +1,14 @@
-describe('Basic', () => {
+describe('Before setup instance', () => {
-	before(() => {
+	beforeEach(() => {
-		cy.request('POST', '/api/reset-db');
+		cy.request('POST', '/api/reset-db').as('reset');
+		cy.get('@reset').its('status').should('equal', 204);
+		cy.reload(true);
 	});
 
-	beforeEach(() => {
+	afterEach(() => {
-		cy.reload(true);
+		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
+		// waitを入れることでそれを防止できる
+		cy.wait(1000);
 	});
 
   it('successfully loads', () => {
@@ -14,56 +18,173 @@ describe('Basic', () => {
 	it('setup instance', () => {
     cy.visit('/');
 
+		cy.intercept('POST', '/api/admin/accounts/create').as('signup');
+	
 		cy.get('[data-cy-admin-username] input').type('admin');
-
 		cy.get('[data-cy-admin-password] input').type('admin1234');
-
 		cy.get('[data-cy-admin-ok]').click();
+
+		// なぜか動かない
+		//cy.wait('@signup').should('have.property', 'response.statusCode');
+		cy.wait('@signup');
+  });
+});
+
+describe('After setup instance', () => {
+	beforeEach(() => {
+		cy.request('POST', '/api/reset-db').as('reset');
+		cy.get('@reset').its('status').should('equal', 204);
+		cy.reload(true);
+
+		// インスタンス初期セットアップ
+		cy.request('POST', '/api/admin/accounts/create', {
+			username: 'admin',
+			password: 'pass',
+		}).its('body').as('admin');
+
+		cy.get('@admin');
+	});
+
+	afterEach(() => {
+		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
+		// waitを入れることでそれを防止できる
+		cy.wait(1000);
+	});
+
+  it('successfully loads', () => {
+    cy.visit('/');
   });
 
 	it('signup', () => {
-    cy.visit('/');
+		cy.visit('/');
+
+		cy.intercept('POST', '/api/signup').as('signup');
 
 		cy.get('[data-cy-signup]').click();
-
 		cy.get('[data-cy-signup-username] input').type('alice');
-
 		cy.get('[data-cy-signup-password] input').type('alice1234');
-	
 		cy.get('[data-cy-signup-password-retype] input').type('alice1234');
-
 		cy.get('[data-cy-signup-submit]').click();
+
+		cy.wait('@signup');
+  });
+});
+
+describe('After user signup', () => {
+	beforeEach(() => {
+		cy.request('POST', '/api/reset-db').as('reset');
+		cy.get('@reset').its('status').should('equal', 204);
+		cy.reload(true);
+
+		// インスタンス初期セットアップ
+		cy.request('POST', '/api/admin/accounts/create', {
+			username: 'admin',
+			password: 'pass',
+		}).its('body').as('admin');
+
+		cy.get('@admin').then(() => {
+			// ユーザー作成
+			cy.request('POST', '/api/signup', {
+				username: 'alice',
+				password: 'alice1234',
+			}).its('body').as('alice');
+		});
+
+		cy.get('@alice');
+	});
+
+	afterEach(() => {
+		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
+		// waitを入れることでそれを防止できる
+		cy.wait(1000);
+	});
+
+  it('successfully loads', () => {
+    cy.visit('/');
   });
 
 	it('signin', () => {
-    cy.visit('/');
+		cy.visit('/');
+
+		cy.intercept('POST', '/api/signin').as('signin');
 
 		cy.get('[data-cy-signin]').click();
-
 		cy.get('[data-cy-signin-username] input').type('alice');
-
 		// Enterキーでサインインできるかの確認も兼ねる
 		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
+
+		cy.wait('@signin');
+  });
+
+	it('suspend', function() {
+		cy.request('POST', '/api/admin/suspend-user', {
+			i: this.admin.token,
+			userId: this.alice.id,
+		});
+
+		cy.visit('/');
+
+		cy.get('[data-cy-signin]').click();
+		cy.get('[data-cy-signin-username] input').type('alice');
+		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
+
+		// TODO: cypressにブラウザの言語指定できる機能が実装され次第英語のみテストするようにする
+		cy.contains(/アカウントが凍結されています|This account has been suspended due to/gi);
+	});
+});
+
+describe('After user singed in', () => {
+	beforeEach(() => {
+		cy.request('POST', '/api/reset-db').as('reset');
+		cy.get('@reset').its('status').should('equal', 204);
+		cy.reload(true);
+
+		// インスタンス初期セットアップ
+		cy.request('POST', '/api/admin/accounts/create', {
+			username: 'admin',
+			password: 'pass',
+		}).its('body').as('admin');
+
+		cy.get('@admin').then(() => {
+			// ユーザー作成
+			cy.request('POST', '/api/signup', {
+				username: 'alice',
+				password: 'alice1234',
+			}).its('body').as('alice');
+		});
+
+		cy.get('@alice').then(() => {
+			cy.visit('/');
+
+			cy.intercept('POST', '/api/signin').as('signin');
+
+			cy.get('[data-cy-signin]').click();
+			cy.get('[data-cy-signin-username] input').type('alice');
+			cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
+
+			cy.wait('@signin').as('signedIn');
+		});
+
+		cy.get('@signedIn');
+	});
+
+	afterEach(() => {
+		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
+		// waitを入れることでそれを防止できる
+		cy.wait(1000);
+	});
+
+  it('successfully loads', () => {
+    cy.visit('/');
   });
 
 	it('note', () => {
     cy.visit('/');
 
-		//#region TODO: この辺はUI操作ではなくAPI操作でログインする
-		cy.get('[data-cy-signin]').click();
-
-		cy.get('[data-cy-signin-username] input').type('alice');
-
-		// Enterキーでサインインできるかの確認も兼ねる
-		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
-		//#endregion
-
 		cy.get('[data-cy-open-post-form]').click();
-
 		cy.get('[data-cy-post-form-text]').type('Hello, Misskey!');
-
 		cy.get('[data-cy-open-post-form-submit]').click();
 
-		// TODO: 投稿した文字列が画面内にあるか(=タイムラインに流れてきたか)のテスト
+		cy.contains('Hello, Misskey!');
   });
 });

docker-compose.yml

@@ -15,6 +15,7 @@ services:
       - external_network
     volumes:
       - ./files:/misskey/files
+      - ./.config:/misskey/.config:ro
 
   redis:
     restart: always

docs/README.md

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

docs/docker.en.md

@@ -1,96 +0,0 @@
-Docker Guide
-================================================================
-
-This guide describes how to install and setup Misskey with Docker.
-
-- [Japanese version also available - 日本語版もあります](./docker.ja.md)
-- [Simplified Chinese version also available - 简体中文版同样可用](./docker.zh.md)
-
-----------------------------------------------------------------
-
-*1.* Download Misskey
-----------------------------------------------------------------
-1. Clone Misskey repository's master branch.
-
-	`git clone -b master git://github.com/misskey-dev/misskey.git`
-
-2. Move to misskey directory.
-
-	`cd misskey`
-
-3. Checkout to the [latest release](https://github.com/misskey-dev/misskey/releases/latest) tag.
-
-	`git checkout master`
-
-*2.* Configure Misskey
-----------------------------------------------------------------
-
-Create configuration files with following:
-
-```bash
-cd .config
-cp example.yml default.yml
-cp docker_example.env docker.env
-```
-
-### `default.yml`
-
-Edit this file the same as non-Docker environment.  
-However hostname of Postgresql, Redis and Elasticsearch are not `localhost`, they are set in `docker-compose.yml`.  
-The following is default hostname:
-
-| Service       | Hostname |
-|---------------|----------|
-| Postgresql    | `db`     |
-| Redis         | `redis`  |
-| Elasticsearch | `es`     |
-
-### `docker.env`
-
-Configure Postgresql in this file.  
-The minimum required settings are:
-
-| name                | Description   |
-|---------------------|---------------|
-| `POSTGRES_PASSWORD` | Password      |
-| `POSTGRES_USER`     | Username      |
-| `POSTGRES_DB`       | Database name |
-
-*3.* Configure Docker
-----------------------------------------------------------------
-Edit `docker-compose.yml`.
-
-*4.* Build Misskey
-----------------------------------------------------------------
-Build misskey with the following:
-
-`docker-compose build`
-
-*5.* Init DB
-----------------------------------------------------------------
-``` shell
-docker-compose run --rm web yarn run init
-```
-
-*6.* That is it.
-----------------------------------------------------------------
-Well done! Now you have an environment to run Misskey.
-
-### Launch normally
-Just `docker-compose up -d`. GLHF!
-
-### How to update your Misskey server to the latest version
-1. `git stash`
-2. `git checkout master`
-3. `git pull`
-4. `git stash pop`
-5. `docker-compose build`
-6. Check [ChangeLog](../CHANGELOG.md) for migration information
-7. `docker-compose stop && docker-compose up -d`
-
-### How to execute [cli commands](manage.en.md):
-`docker-compose run --rm web node built/tools/mark-admin @example`
-
-----------------------------------------------------------------
-
-If you have any questions or trouble, feel free to contact us!

docs/docker.fr.md

@@ -1,90 +0,0 @@
-Guide Docker
-================================================================
-
-Ce guide explique comment installer et configurer Misskey avec Docker.
-
-- [Version japonaise également disponible - Japanese version also available - 日本語版もあります](./docker.ja.md)  
-- [Version anglaise également disponible - English version also available - 英語版もあります](./docker.en.md)
-- [Version Chinois simplifié également disponible - Simplified Chinese version also available - 简体中文版同样可用](./docker.zh.md)
-
-----------------------------------------------------------------
-
-*1.* Télécharger Misskey
-----------------------------------------------------------------
-1. Clone le dépôt de Misskey sur la branche master.
-
-	`git clone -b master git://github.com/misskey-dev/misskey.git`
-
-2. Naviguez dans le dossier du dépôt.
-
-	`cd misskey`
-
-3. Checkout sur le tag de la [dernière version](https://github.com/misskey-dev/misskey/releases/latest).
-
-	`git checkout master`
-
-*2.* Configuration de Misskey
-----------------------------------------------------------------
-1. `cp .config/example.yml .config/default.yml` Copiez le fichier `.config/example.yml` et renommez-le `default.yml`.
-2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` Copie le fichier `.config/mongo_initdb_example.js` et le renomme en `mongo_initdb.js`.
-3. Editez `default.yml` et `mongo_initdb.js`.
-
-*3.* Configurer Docker
-----------------------------------------------------------------
-Editez `docker-compose.yml`.
-
-*4.* Contruire Misskey
-----------------------------------------------------------------
-Contruire l'image Docker avec:
-
-`docker-compose build`
-
-*5.* C'est tout !
-----------------------------------------------------------------
-Parfait, Vous avez un environnement prêt pour démarrer Misskey.
-
-### Lancer normalement
-Utilisez la commande `docker-compose up -d`. GLHF!
-
-### How to update your Misskey server to the latest version
-1. `git stash`
-2. `git checkout master`
-3. `git pull`
-4. `git stash pop`
-5. `docker-compose build`
-6. Consultez le [ChangeLog](../CHANGELOG.md) pour avoir les éventuelles informations de migration
-7. `docker-compose stop && docker-compose up -d`
-
-### Comment exécuter des [commandes](manage.fr.md)
-`docker-compose run --rm web node built/tools/mark-admin @example`
-
-### Configuration d'ElasticSearch (pour la fonction de recherche)
-*1.* Préparation de l'environnement
-----------------------------------------------------------------
-1. Permet de créer le dossier d'accueil de la base ElasticSearch aves les bons droits
-
-	`mkdir elasticsearch && chown 1000:1000 elasticsearch`
-
-2. Augmente la valeur max du paramètre map_count du système (valeur minimum pour pouvoir lancer ES)
-
-	`sysctl -w vm.max_map_count=262144`
-
-*2.* Après lancement du docker-compose, initialisation de la base ElasticSearch
-----------------------------------------------------------------
-1. Connexion dans le conteneur web
-
-	`docker-compose -it web /bin/sh`
-
-2. Ajout du paquet curl
-
-	`apk add curl`
-
-3. Création de la base ES
-
-	`curl -X PUT "es:9200/misskey" -H 'Content-Type: application/json' -d'{ "settings" : { "index" : { } }}'`
-
-4. `exit`
-
-----------------------------------------------------------------
-
-Si vous avez des questions ou des problèmes, n'hésitez pas à nous contacter !

docs/docker.ja.md

@@ -1,97 +0,0 @@
-Dockerを使ったMisskey構築方法
-================================================================
-
-このガイドはDockerを使ったMisskeyセットアップ方法について解説します。
-
-- [英語版もあります - English version also available](./docker.en.md)
-- [简体中文版同样可用 - Simplified Chinese version also available](./docker.zh.md)
-
-----------------------------------------------------------------
-
-*1.* Misskeyのダウンロード
-----------------------------------------------------------------
-1. masterブランチからMisskeyレポジトリをクローン
-
-	`git clone -b master git://github.com/misskey-dev/misskey.git`
-
-2. misskeyディレクトリに移動
-
-	`cd misskey`
-
-3. [最新のリリース](https://github.com/misskey-dev/misskey/releases/latest)を確認
-
-	`git checkout master`
-
-*2.* 設定ファイルの作成と編集
-----------------------------------------------------------------
-
-下記コマンドで設定ファイルを作成してください。
-
-```bash
-cd .config
-cp example.yml default.yml
-cp docker_example.env docker.env
-```
-
-### `default.yml`の編集
-
-非Docker環境と同じ様に編集してください。  
-ただし、Postgresql、RedisとElasticsearchのホストは`localhost`ではなく、`docker-compose.yml`で設定されたサービス名になっています。  
-標準設定では次の通りです。
-
-| サービス       | ホスト名 |
-|---------------|---------|
-| Postgresql    |`db`     |
-| Redis         |`redis`  |
-| Elasticsearch |`es`     |
-
-### `docker.env`の編集
-
-このファイルはPostgresqlの設定を記述します。  
-最低限記述する必要がある設定は次の通りです。
-
-| 設定                 | 内容         |
-|---------------------|--------------|
-| `POSTGRES_PASSWORD` | パスワード    |
-| `POSTGRES_USER`     | ユーザー名    |
-| `POSTGRES_DB`       | データベース名 |
-
-*3.* Dockerの設定
-----------------------------------------------------------------
-`docker-compose.yml`を編集してください。
-
-*4.* Misskeyのビルド
-----------------------------------------------------------------
-次のコマンドでMisskeyをビルドしてください:
-
-`docker-compose build`
-
-*5.* データベースを初期化
-----------------------------------------------------------------
-``` shell
-docker-compose run --rm web yarn run init
-```
-
-*6.* 以上です！
-----------------------------------------------------------------
-お疲れ様でした。これでMisskeyを動かす準備は整いました。
-
-### 通常起動
-`docker-compose up -d`するだけです。GLHF!
-
-### Misskeyを最新バージョンにアップデートする方法:
-1. `git stash`
-2. `git checkout master`
-3. `git pull`
-4. `git stash pop`
-5. `docker-compose build`
-6. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する
-7. `docker-compose stop && docker-compose up -d`
-
-### cliコマンドを実行する方法:
-
-`docker-compose run --rm web node built/tools/mark-admin @example`
-
-----------------------------------------------------------------
-
-なにかお困りのことがありましたらお気軽にご連絡ください。

docs/docker.zh.md

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

docs/examples/misskey.nginx

@@ -1,71 +0,0 @@
-# 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-enabled/
-#    or copy to /etc/nginx/conf.d/
-
-# For WebSocket
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    ''      close;
-}
-
-proxy_cache_path /tmp/nginx_cache levels=1:2 keys_zone=cache1:16m max_size=1g inactive=720m use_temp_path=off;
-
-server {
-    listen 80;
-    listen [::]:80;
-    server_name example.tld;
-
-    # For SSL domain validation
-    root /var/www/html;
-    location /.well-known/acme-challenge/ { allow all; }
-    location /.well-known/pki-validation/ { allow all; }
-    location / { return 301 https://$server_name$request_uri; }
-}
-
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-    server_name example.tld;
-    ssl_session_cache shared:ssl_session_cache:10m;
-
-    # To use Let's Encrypt certificate
-    ssl_certificate     /etc/letsencrypt/live/example.tld/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/example.tld/privkey.pem;
-
-    # To use Debian/Ubuntu's self-signed certificate (For testing or before issuing a certificate)
-    #ssl_certificate     /etc/ssl/certs/ssl-cert-snakeoil.pem;
-    #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
-
-    # SSL protocol settings
-    ssl_protocols TLSv1.2;
-    ssl_ciphers ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:AES128-SHA;
-    ssl_prefer_server_ciphers on;
-
-    # Change to your upload limit
-    client_max_body_size 80m;
-
-    # Proxy to Node
-    location / {
-        proxy_pass http://127.0.0.1:3000;
-        proxy_set_header Host $host;
-        proxy_http_version 1.1;
-        proxy_redirect off;
-
-        # If it's behind another reverse proxy or CDN, remove the following.
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto https;
-
-        # For WebSocket
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-
-        # Cache settings
-        proxy_cache cache1;
-        proxy_cache_lock on;
-        proxy_cache_use_stale updating;
-        add_header X-Cache $upstream_cache_status;
-    }
-}

docs/manage.en.md

@@ -1,14 +0,0 @@
-# Management guide
-
-## Check the status of the job queue
-coming soon
-
-## Mark as 'admin' user
-``` shell
-node built/tools/mark-admin (Username)
-```
-
-e.g.
-``` shell
-node built/tools/mark-admin @syuilo
-```

docs/manage.fr.md

@@ -1,14 +0,0 @@
-# Guide d'administration
-
-## Vérifier le status de la file d'attente des taches
-coming soon
-
-## Marquer un utilisateur en tant que 'admin'
-``` shell
-node built/tools/mark-admin (nom d'utilisateur)
-```
-
-Exemple :
-``` shell
-node built/tools/mark-admin @syuilo
-```

docs/manage.ja.md

@@ -1,14 +0,0 @@
-# 運営ガイド
-
-## ジョブキューの状態を調べる
-coming soon
-
-## 管理者ユーザーを設定する
-``` shell
-node built/tools/mark-admin (ユーザー名)
-```
-
-例:
-``` shell
-node built/tools/mark-admin @syuilo
-```

docs/manage.zh.md

@@ -1,14 +0,0 @@
-# 运营指南
-
-## 检查任务队列的状态
-即将到来……
-
-## 设置用户为管理员
-``` shell
-node built/tools/mark-admin (用户名)
-```
-
-样例
-``` shell
-node built/tools/mark-admin @syuilo
-```

docs/setup.en.md

@@ -1,146 +0,0 @@
-Misskey Setup and Installation Guide
-================================================================
-
-We thank you for your interest in setting up your Misskey server!
-This guide describes how to install and setup Misskey.
-
-- [Japanese version also available - 日本語版もあります](./setup.ja.md)
-- [Simplified Chinese version also available - 简体中文版同样可用](./setup.zh.md)
-
-----------------------------------------------------------------
-
-*1.* Create Misskey user
-----------------------------------------------------------------
-Running misskey as root is not a good idea so we create a user for that.
-In debian for exemple :
-
-```
-adduser --disabled-password --disabled-login misskey
-```
-
-*2.* Install dependencies
-----------------------------------------------------------------
-Please install and setup these softwares:
-
-#### Dependencies :package:
-* **[Node.js](https://nodejs.org/en/)** (12.x, 14.x)
-* **[PostgreSQL](https://www.postgresql.org/)** (>= 10)
-* **[Redis](https://redis.io/)**
-
-##### Optional
-* [Yarn](https://yarnpkg.com/) *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/)
-
-*3.* Install Misskey
-----------------------------------------------------------------
-1. Connect to misskey user.
-
-	`su - misskey`
-
-2. Clone the misskey repo from master branch.
-
-	`git clone -b master git://github.com/misskey-dev/misskey.git`
-
-3. Navigate to misskey directory
-
-	`cd misskey`
-
-4. Checkout to the [latest release](https://github.com/misskey-dev/misskey/releases/latest)
-
-	`git checkout master`
-
-5. Install misskey dependencies.
-
-	`yarn`
-
-*4.* Configure Misskey
-----------------------------------------------------------------
-1. Copy the `.config/example.yml` and rename it to `default.yml`.
-
-	`cp .config/example.yml .config/default.yml`
-
-2. Edit `default.yml`
-
-*5.* Build Misskey
-----------------------------------------------------------------
-
-Build misskey with the following:
-
-`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. `npx node-gyp configure`
-2. `npx node-gyp build`
-3. `NODE_ENV=production yarn build`
-
-*6.* Init DB
-----------------------------------------------------------------
-``` shell
-yarn run init
-```
-
-*7.* That is it.
-----------------------------------------------------------------
-Well done! Now, you have an environment that run to Misskey.
-
-### Launch normally
-Just `NODE_ENV=production npm start`. GLHF!
-
-### Launch with systemd
-
-1. Create a systemd service here
-
-	`/etc/systemd/system/misskey.service`
-
-2. Edit it, and paste this and save:
-
-	```
-	[Unit]
-	Description=Misskey daemon
-
-	[Service]
-	Type=simple
-	User=misskey
-	ExecStart=/usr/bin/npm start
-	WorkingDirectory=/home/misskey/misskey
-	Environment="NODE_ENV=production"
-	TimeoutSec=60
-	StandardOutput=syslog
-	StandardError=syslog
-	SyslogIdentifier=misskey
-	Restart=always
-
-	[Install]
-	WantedBy=multi-user.target
-	```
-
-3. Reload systemd and enable the misskey service.
-
-	`systemctl daemon-reload ; systemctl enable misskey`
-
-4. Start the misskey service.
-
-	`systemctl start misskey`
-
-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. `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

@@ -1,135 +0,0 @@
-Guide d'installation et de configuration de Misskey
-================================================================
-
-Nous vous remerçions de l'intrêt que vous manifestez pour l'installation de votre propre instance Misskey !
-Ce guide décrit les étapes à suivre afin d'installer et de configurer une instance Misskey.
-
-- [La version en japonnais est également disponible sur - 日本語版もあります](./setup.ja.md)
-- [Version anglaise également disponible - English version also available - 英語版もあります](./setup.en.md)
-- [Version Chinois simplifié également disponible - Simplified Chinese version also available - 简体中文版同样可用](./setup.zh.md)
-
-----------------------------------------------------------------
-
-*1.* Création de l'utilisateur Misskey
-----------------------------------------------------------------
-Executer misskey en tant que super-utilisateur étant une mauvaise idée, nous allons créer un utilisateur dédié.
-Sous Debian, par exemple :
-
-```
-adduser --disabled-password --disabled-login misskey
-```
-
-*2.* Installation des dépendances
-----------------------------------------------------------------
-Installez les paquets suivants :
-
-#### Dépendences :package:
-* **[Node.js](https://nodejs.org/en/)** (12.x, 14.x)
-* **[PostgreSQL](https://www.postgresql.org/)** (>= 10)
-* **[Redis](https://redis.io/)**
-
-##### Optionnels
-* [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
-----------------------------------------------------------------
-1. Basculez vers l'utilisateur misskey.
-
-	`su - misskey`
-
-2. Clonez la branche master du dépôt misskey.
-
-	`git clone -b master git://github.com/misskey-dev/misskey.git`
-
-3. Accédez au dossier misskey.
-
-	`cd misskey`
-
-4. Checkout sur le tag de la [version la plus récente](https://github.com/misskey-dev/misskey/releases/latest)
-
-	`git checkout master`
- 
-5. Installez les dépendances de misskey.
-
-	`yarn install`
-
-*4.* Création du fichier de configuration
-----------------------------------------------------------------
-1. Copiez le fichier `.config/example.yml` et renommez-le`default.yml`.
-
-	`cp .config/example.yml .config/default.yml`
-
-2. Editez le fichier `default.yml`
-
-*5.* Construction de Misskey
-----------------------------------------------------------------
-
-Construisez Misskey comme ceci :
-
-`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. `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 yarn start`. Bonne chance et amusez-vous bien !
-
-### Démarrage avec systemd
-
-1. Créez un service systemd sur
-
-	`/etc/systemd/system/misskey.service`
-
-2. Editez-le puis copiez et coller ceci dans le fichier :
-
-	```
-	[Unit]
-	Description=Misskey daemon
-
-	[Service]
-	Type=simple
-	User=misskey
-	ExecStart=/usr/bin/npm start
-	WorkingDirectory=/home/misskey/misskey
-	Environment="NODE_ENV=production"
-	TimeoutSec=60
-	StandardOutput=syslog
-	StandardError=syslog
-	SyslogIdentifier=misskey
-	Restart=always
-
-	[Install]
-	WantedBy=multi-user.target
-	```
-
-3. Redémarre systemd et active le service misskey.
-
-	`systemctl daemon-reload ; systemctl enable misskey`
-
-4. Démarre le service misskey.
-
-	`systemctl start misskey`
-
-Vous pouvez vérifier si le service a démarré en utilisant la commande `systemctl status misskey`.
-
-### Méthode de mise à jour vers la plus récente version de Misskey
-1. `git checkout master`
-2. `git pull`
-3. `yarn install`
-4. `NODE_ENV=production yarn build`
-5. `yarn migrate`
-
-----------------------------------------------------------------
-
-Si vous rencontrez des difficultés ou avez d'autres questions, n'hésitez pas à nous contacter !

docs/setup.ja.md

@@ -1,144 +0,0 @@
-Misskey構築の手引き
-================================================================
-
-Misskeyサーバーの構築にご関心をお寄せいただきありがとうございます！
-このガイドではMisskeyのインストール・セットアップ方法について解説します。
-
-- [英語版もあります - English version also available](./setup.en.md)
-- [简体中文版同样可用 - Simplified Chinese version also available](./setup.zh.md)
-
-----------------------------------------------------------------
-
-*1.* Misskeyユーザーの作成
-----------------------------------------------------------------
-Misskeyはrootユーザーで実行しない方がよいため、代わりにユーザーを作成します。
-Debianの例:
-
-```
-adduser --disabled-password --disabled-login misskey
-```
-
-*2.* 依存関係をインストールする
-----------------------------------------------------------------
-これらのソフトウェアをインストール・設定してください:
-
-#### 依存関係 :package:
-* **[Node.js](https://nodejs.org/en/)** (12.x, 14.x)
-* **[PostgreSQL](https://www.postgresql.org/)** (10以上)
-* **[Redis](https://redis.io/)**
-
-##### オプション
-* [Yarn](https://yarnpkg.com/)
-	* セキュリティの観点から推奨されます。 yarn をインストールしない方針の場合は、文章中の `yarn` を適宜 `npx yarn` と読み替えてください。
-* [Elasticsearch](https://www.elastic.co/)
-	* 検索機能を有効にするためにはインストールが必要です。
-* [FFmpeg](https://www.ffmpeg.org/)
-
-*3.* Misskeyのインストール
-----------------------------------------------------------------
-1. misskeyユーザーを使用
-
-	`su - misskey`
-
-2. masterブランチからMisskeyレポジトリをクローン
-
-	`git clone -b master git://github.com/misskey-dev/misskey.git`
-
-3. misskeyディレクトリに移動
-
-	`cd misskey`
-
-4. [最新のリリース](https://github.com/misskey-dev/misskey/releases/latest)を確認
-
-	`git checkout master`
-
-5. Misskeyの依存パッケージをインストール
-
-	`yarn install`
-
-*4.* 設定ファイルを作成する
-----------------------------------------------------------------
-1. `.config/example.yml`をコピーし名前を`default.yml`にする。
-
-	`cp .config/example.yml .config/default.yml`
-
-2. `default.yml` を編集する。
-
-*5.* Misskeyのビルド
-----------------------------------------------------------------
-
-次のコマンドでMisskeyをビルドしてください:
-
-`NODE_ENV=production yarn build`
-
-Debianをお使いであれば、`build-essential`パッケージをインストールする必要があります。
-
-何らかのモジュールでエラーが発生する場合はnode-gypを使ってください:
-1. `npx node-gyp configure`
-2. `npx node-gyp build`
-3. `NODE_ENV=production yarn build`
-
-*6.* データベースを初期化
-----------------------------------------------------------------
-``` shell
-yarn run init
-```
-
-*7.* 以上です！
-----------------------------------------------------------------
-お疲れ様でした。これでMisskeyを動かす準備は整いました。
-
-### 通常起動
-`NODE_ENV=production yarn start`するだけです。GLHF!
-
-### systemdを用いた起動
-1. systemdサービスのファイルを作成
-
-	`/etc/systemd/system/misskey.service`
-
-2. エディタで開き、以下のコードを貼り付けて保存:
-
-	```
-	[Unit]
-	Description=Misskey daemon
-
-	[Service]
-	Type=simple
-	User=misskey
-	ExecStart=/usr/bin/npm start
-	WorkingDirectory=/home/misskey/misskey
-	Environment="NODE_ENV=production"
-	TimeoutSec=60
-	StandardOutput=syslog
-	StandardError=syslog
-	SyslogIdentifier=misskey
-	Restart=always
-
-	[Install]
-	WantedBy=multi-user.target
-	```
-
-	CentOSで1024以下のポートを使用してMisskeyを使用する場合は`ExecStart=/usr/bin/sudo /usr/bin/npm start`に変更する必要があります。
-
-3. systemdを再読み込みしmisskeyサービスを有効化
-
-	`systemctl daemon-reload; systemctl enable misskey`
-
-4. misskeyサービスの起動
-
-	`systemctl start misskey`
-
-`systemctl status misskey`と入力すると、サービスの状態を調べることができます。
-
-### Misskeyを最新バージョンにアップデートする方法:
-1. `git checkout master`
-2. `git pull`
-3. `yarn install`
-4. `NODE_ENV=production yarn build`
-5. `yarn migrate`
-
-なにか問題が発生した場合は、`yarn clean`または`yarn cleanall`すると直る場合があります。
-
-----------------------------------------------------------------
-
-なにかお困りのことがありましたらお気軽にご連絡ください。

docs/setup.zh.md

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

locales/ar-SA.yml

@@ -1,16 +1,19 @@
 ---
 _lang_: "العربية"
+headlineMisskey: "شبكة مرتبطة بالملاحظات"
 introMisskey: "اهلا بك! ميسكي هو منصة تدوين مصغر لا مركزية ومفتوحة المصدر.\nيمكنك مشاركة \"ملاحظات\" عن ما يجري حولك، وإخبار الجميع عن نفسك 📡\nتسمح لك \"الانفعالات\" بتعبير عن شعورك حول ملاحظات الآخرين 👍\nاكتشف عالمًا جديدًا 🚀"
 monthAndDay: "{day}/{month}"
 search: "البحث"
 notifications: "الإشعارات"
 username: "اسم المستخدم"
 password: "الكلمة السرية"
+forgotPassword: "نسيتَ كلمة السر"
 fetchingAsApObject: "جارٍ جلبه مِن الفديفرس…"
 ok: " حسناً"
 gotIt: "فهِمت"
 cancel: " إلغاء"
 enterUsername: "أدخِل إسم مسخدم"
+renotedBy: "أعاد {user} نشر ملاحظة"
 noNotes: "لم يتم العثور على أية ملاحظات"
 noNotifications: "ليس هناك أية اشعارات"
 instance: "مثيل الخادم"
@@ -25,7 +28,7 @@ login: "لِج"
 loggingIn: "جارٍ تسجيل الدخول"
 logout: "الخروج"
 signup: "أنشئ حسابًا"
-uploading: "عملية الإرسال جارية"
+uploading: "يرفع..."
 save: "حفظ"
 users: "المستخدمون"
 addUser: "اضافة مستخدم"
@@ -36,7 +39,7 @@ favorited: "تمت الإضافة إلى المفضلة."
 alreadyFavorited: "تمت إضافته بالفعل إلى المفضلة."
 cantFavorite: "تعذرت الإضافة إلى المفضلة."
 pin: "دبّسها على الصفحة الشخصية"
-unpin: "ألغ تثبيتها من ملفك الشخصي"
+unpin: "ألغ تدبيسها من ملفك الشخصي"
 copyContent: "انسخ المحتوى"
 copyLink: "انسخ الرابط"
 delete: "حذف"
@@ -62,12 +65,14 @@ files: "الملفات"
 download: "تنزيل"
 driveFileDeleteConfirm: "أمتأكد من حذف ملف {name}؟ كل الملاحظات المُرفق بها هذا الملف ستحذف."
 unfollowConfirm: "أمتأكد من إلغاء متابعة {name}؟"
+exportRequested: "قد تستغرق عملية التصدير بعض الوقت. بمجرد الانتهاء ستتم إضافة الملف الناتج إلى قرص التخزين."
+importRequested: "يستغرق الاستيراد بعض الوقت"
 lists: "القوائم"
 noLists: "ليس لديك أية قائمة"
 note: "ملاحظة"
 notes: "الملاحظات"
 following: "المتابَعون"
-followers: "المتابِعين"
+followers: "المتابِعون"
 followsYou: "يتابعك"
 createList: "إنشاء قائمة"
 manageLists: "إدارة القوائم"
@@ -75,9 +80,12 @@ error: "خطأ"
 somethingHappened: "حدث خطأ"
 retry: "حاول مجددًا"
 pageLoadError: "فشل تحميل الصفحة"
+pageLoadErrorDescription: "عادة ما يكون السبب خطأ في الشبكة أو التخزين المؤقت للمتصفح. امسح التخزين المؤقت ثم أعد المحاولة لاحقًا."
+serverIsDead: "الخادم لا يستجيب، حاول بعد قليل"
+youShouldUpgradeClient: "حدّث الصفحة لعرضها."
 enterListName: "اسم القائمة"
 privacy: "الخصوصية"
-makeFollowManuallyApprove: "القبول يدويا طلبات الإشتراك"
+makeFollowManuallyApprove: "قبول طلبات الإشتراك يدويا"
 defaultNoteVisibility: "مدى الرؤية الافتراضي"
 follow: "تابِع"
 followRequest: "طلب اشتراك"
@@ -85,7 +93,11 @@ followRequests: "طلبات الإشتراك"
 unfollow: "إلغاء الاشتراك"
 followRequestPending: "طلبات الإشتراك المعلّقة"
 enterEmoji: "أدخل إيموجي"
+renote: "أعد النشر"
 unrenote: "إلغاء مشاركة الملاحظة"
+renoted: "أُعيد نشره"
+cantRenote: "لا يمكن إعادة نشر الملاحظة"
+cantReRenote: "لا يمكنك إعادة نشر ملاحظة معاد نشرها"
 quote: "اقتبس"
 pinnedNote: "ملاحظة مدبسة"
 pinned: "دبّسها على الصفحة الشخصية"
@@ -94,8 +106,12 @@ clickToShow: "اضغط للعرض"
 sensitive: "محتوى حساس"
 add: "إضافة"
 reaction: "تفاعل"
+reactionSettingDescription: "اختر التفاعلات المفضلة التي تريد تثبيتها في منتقي التفاعلات."
+reactionSettingDescription2: "اسحب لإعادة التنظيم ، انقر للحذف ، استخدم \"+\" للإضافة."
 rememberNoteVisibility: "تذكر إعدادت مدى رؤية الملاحظات"
 attachCancel: "أزل المرفق"
+markAsSensitive: "علّمه كمحتوى حساس"
+unmarkAsSensitive: "ألغ تعيينه كمحتوى حساس"
 enterFileName: "ادخل اسم الملف"
 mute: "اكتم"
 unmute: "إلغاء الكتم"
@@ -105,18 +121,33 @@ suspend: "علِق"
 unsuspend: "ألغ التعليق"
 blockConfirm: "أمتأكد من حجب هذا الحساب؟"
 unblockConfirm: "أمتأكد من إلغاء حجب هذا الحساب؟"
+suspendConfirm: "أمتأكد من تعليق الحساب؟"
+unsuspendConfirm: "أمتأكد من إلغاء تعليق؟"
 selectList: "اختر قائمة"
+selectAntenna: "اختر هوائيًا"
+selectWidget: "اختر ودجة"
+editWidgets: "عدّل الودجات"
 editWidgetsExit: "تم"
 customEmojis: "إيموجي مخصص"
+emoji: "الوجوه التعبيرية"
+emojis: "الوجوه التعبيرية"
+emojiName: "اسم الوجه التعبيري"
+emojiUrl: "رابط الوجه التعبيري"
 addEmoji: "إضافة إيموجي"
+settingGuide: "الإعدادات المستحسنة"
 cacheRemoteFiles: "خزن مؤقتا الملفات البعيدة"
+flagAsBot: "علّمه كحساب آلي"
+flagAsBotDescription: "فعّل هذا الخيار إذا كان هذا الحساب يُدار عبر برمجية. إذا فُعل فسيكون بمثابة علامة للمطورين الآخرين لتجنب سلاسل لا متناعية من التفاعل بين حسابات الآلية وضبط أنظمة ميسكي للتعامل مع هذا الحساب كروبوت."
+flagAsCat: "علّم هذا الحساب كحساب قط"
+flagAsCatDescription: "فعّل هذا الخيار لوضع علامة على الحساب لتوضيح أنه حساب قط."
 autoAcceptFollowed: "اقبل طلبات المتابعة تلقائيا من الحسابات المتابَعة"
+addAccount: "أضف حساباً"
 loginFailed: "فشل الولوج"
 showOnRemote: "رؤيته على مثيل الخادم البُعدي"
 general: "الرئيسية"
-wallpaper: "خلفية الشاشة"
+wallpaper: "الخلفية"
-setWallpaper: "استخدم خلفية الشاشة"
+setWallpaper: "عيّن خلفية"
-removeWallpaper: "إزالة خلفية الشاشة"
+removeWallpaper: "أزل الخلفية"
 searchWith: "البحث: {q}"
 youHaveNoLists: "لا تمتلك أية قائمة"
 followConfirm: "أتريد متابعة {name}؟"
@@ -127,8 +158,10 @@ recipient: "المرسَل إليه·ها"
 annotation: "التعليقات"
 federation: "الفديرالية"
 instances: "مثيل الخادم"
+registeredAt: "مسجل في"
 latestRequestSentAt: "آخر طلب أرسِل في"
 latestRequestReceivedAt: "آخر طلب تُلقي في"
+latestStatus: "الحالات الأخيرة"
 storageUsage: "مساحة التخزين المستخدمة"
 charts: "المنحنيات البيانية"
 perHour: "في الساعة"
@@ -148,6 +181,11 @@ disk: "قرص التخزين"
 instanceInfo: "معلومات مثيل الخادم"
 statistics: "الإحصائيات"
 clearQueue: "تفريغ قائمة الإنتظار"
+clearQueueConfirmTitle: "أتريد مسح الطابور؟"
+clearCachedFiles: "امسح التخزين المؤقت"
+clearCachedFilesConfirm: "أتريد حذف التخزين المؤقت للملفات البعيدة؟"
+blockedInstances: "المثلاء المحجوبون"
+blockedInstancesDescription: "قائمة بالمثلاء التي تريد حظرها بحيث كل نطاق في سطر لوحده. بعد إدراجهم لن يتمكنوا من التفاعل مع هذا المثيل."
 muteAndBlock: "تم كتمها / تم حجبها"
 mutedUsers: "الحسابات التي تم كتمها"
 blockedUsers: "الحسابات التي تم حظرها"
@@ -174,26 +212,26 @@ usernameOrUserId: "اسم المستخدم أو معرّفه"
 noSuchUser: "لم يُعثَر على المستخدم"
 lookup: "البحث"
 announcements: "الإعلانات"
-imageUrl: "عنوان URL للصورة"
+imageUrl: "رابط الصورة"
 remove: "حذف"
 removed: "تم حذفه بنجاح"
 removeAreYouSure: "متأكد من أنك تريد حذف {x}؟"
 deleteAreYouSure: "متأكد من أنك تريد حذف {x}؟"
 resetAreYouSure: "هل تريد إعادة التعيين؟"
 saved: "تم حفظه"
-messaging: "الدردشة"
+messaging: "المحادثة"
-upload: "تحميل"
+upload: "ارفع"
 fromDrive: "من المخزن"
-fromUrl: "من عنوان URL"
+fromUrl: "عبر رابط"
-uploadFromUrl: "التحميل عبر URL"
+uploadFromUrl: "ارفع عبر رابط"
-uploadFromUrlDescription: "رابط الملف المراد تحميله "
+uploadFromUrlDescription: "رابط الملف المراد رفعه"
 uploadFromUrlRequested: "الرفع مطلوب"
 uploadFromUrlMayTakeTime: "سيستغرق بعض الوقت لاتمام الرفع "
 explore: "استكشاف"
 games: "ألعاب Misskey"
 messageRead: "مقروءة"
 noMoreHistory: "لا يوجد المزيد من التاريخ"
-startMessaging: "ابدأ الدردشة"
+startMessaging: "ابدأ محادثة"
 nUsersRead: "تمت القراءة من {n}"
 agreeTo: "اوافق على {0}"
 tos: "شروط الخدمة"
@@ -231,7 +269,7 @@ unableToDelete: "لا يمكن حذفه"
 inputNewFileName: "ادخل الإسم الجديد للملف"
 inputNewFolderName: "ادخل الإسم الجديد للمجلد"
 hasChildFilesOrFolders: "الان الملف غير فارغ. لا يمكن حذفه"
-copyUrl: "انسخ عنوان URL"
+copyUrl: "انسخ الرابط"
 rename: "إعادة التسمية"
 avatar: "الصورة الرمزية"
 banner: "الصورة الرأسية"
@@ -250,7 +288,7 @@ instanceName: "اسم مثيل الخادم"
 instanceDescription: "وصف مثيل الخادم"
 maintainerName: "المدير"
 maintainerEmail: "عنوان بريد المدير الإلكتروني"
-tosUrl: "عنوان URL لشروط الخدمة"
+tosUrl: "رابط صفحة شروط الخدمة"
 thisYear: "هذا العام"
 thisMonth: "هذا الشهر"
 today: "اليوم"
@@ -265,7 +303,17 @@ disablingTimelinesInfo: "سيتمكن المسؤولون ومن تعديل دا
 registration: "إنشاء حساب"
 enableRegistration: "تفعيل إنشاء الحسابات الجديدة"
 invite: "دعوة"
+driveCapacityPerLocalAccount: "حصة التخزين لكل مستخدم محلي"
+driveCapacityPerRemoteAccount: "حصة التخزين لكل مستخدم بعيد"
+inMb: "بالميغابايت"
+iconUrl: "رابط الأيقونة"
+bannerUrl: "رابط صورة اللافتة"
+backgroundImageUrl: "رابط صورة الخلفية"
 basicInfo: "المعلومات الأساسية "
+pinnedUsers: "المستخدمون المدبسون"
+pinnedUsersDescription: "قائمة المستخدمين المدبسين في لسان \"استكشف\" ، اجعل كل اسم مستخدم في سطر لوحده."
+pinnedPages: "الصفحات المدبسة"
+pinnedPagesDescription: "أدخل مسار الصفحات التي تريد تدبيسها في أعلى هذا الموقع، اجعل كل مسار في سطر لوحده."
 pinnedNotes: "ملاحظة مدبسة"
 hcaptchaSiteKey: "مفتاح الموقع"
 hcaptchaSecretKey: "المفتاح السري"
@@ -278,12 +326,21 @@ manageAntennas: "إدارة الهوائيات"
 name: "الإسم"
 antennaSource: "مصدر الهوائي"
 antennaKeywords: "الكلمات المفتاحية للإستقبال"
+notifyAntenna: "نبهني بصول ملاحظات جديدة"
+withFileAntenna: "ملاحظات تحوي ملفات فقط"
+caseSensitive: "حساسية حالة الأحرف"
 withReplies: "بالردود"
 notesAndReplies: "الملاحظات والردود"
-withFiles: "بالمرفقات"
+withFiles: "ذات مرفقات"
 silence: "اكتم"
+silenceConfirm: "أمتأكد من كتم هذا المستخدم؟"
 unsilence: "إلغاء الكتم"
+unsilenceConfirm: "أمتأكد من إلغاء كتم هذا المستخدم؟"
 popularUsers: "المستخدمون الشائعون"
+recentlyUpdatedUsers: "أصحاب النشاطات الأخيرة"
+recentlyRegisteredUsers: "المستخدمون المنضمون حديثًا"
+recentlyDiscoveredUsers: "المستخدمون المكتشفون حديثًا"
+exploreUsersCount: "يوجد {count} مستخدم(ا)"
 exploreFediverse: "استكشف الفديفرس"
 popularTags: "الوسوم الرائجة"
 userList: "القوائم"
@@ -296,27 +353,35 @@ moderator: "مشرِف"
 nUsersMentioned: "{n} مستخدمين تمت الإشارة إليهم"
 securityKey: "مفتاح الأمان"
 securityKeyName: "اسم المفتاح"
+registerSecurityKey: "سجل مفتاح أمان"
 lastUsed: "آخر استخدام"
 unregister: "إلغاء التسجيل"
 passwordLessLogin: "لِج مِن دون كلمة سرية"
 resetPassword: "أعد تعيين كلمتك السرية"
 newPasswordIs: "كلمتك السرية الجديدة هي {password}"
+reduceUiAnimation: "قلص تأثيرات الواجهة"
 share: "شارِك"
 notFound: "غير موجود"
+notFoundDescription: "تعذر العثور على صفحة يقود إليها هذا الرابط."
+uploadFolder: "المجلد الافتراضي للرفع"
 cacheClear: "مسح ذاكرة التخزين المؤقت"
 markAsReadAllNotifications: "وضع جميع الإشعارات كأنها مقروءة"
+markAsReadAllUnreadNotes: "علّم جميع الملاحظات كمقروءة"
+markAsReadAllTalkMessages: "علّم جميع الرسائل كمقروءة"
 help: "المساعدة"
 inputMessageHere: "اكتب رسالتك هنا"
 close: "اغلق"
 group: "الفريق"
 groups: "الفِرَق"
 createGroup: "انشئ فريقًا"
+ownedGroups: "مجموعات المالك"
+joinedGroups: "المجموعات المنضم إليها"
 invites: "دعوة"
 groupName: "اسم الفريق"
 members: "الأعضاء"
 transfer: "نقل"
-messagingWithUser: "الدردشة مع مستخدم آخر"
+messagingWithUser: "تحدث مع مستخدم"
-messagingWithGroup: "دردشة جماعية"
+messagingWithGroup: "محادثة جماعية"
 title: "العنوان"
 text: "النص"
 enable: "تشغيل"
@@ -324,13 +389,18 @@ next: "التالية"
 retype: "أعد الكتابة"
 noteOf: "ملاحظات {user}"
 inviteToGroup: "دعوة إلى فريق"
+maxNoteTextLength: "حد عدد المحارف لكل ملاحظة"
+quoteAttached: "اِقتُبسَ"
 noMessagesYet: "ليس هناك رسائل بعد"
 newMessageExists: "لقد تلقيت رسالة جديدة"
+onlyOneFileCanBeAttached: "يمكنك إرفاق ملف واحد بالرسالة"
+signinRequired: "رجاءً لِج"
 invitations: "دعوة"
 invitationCode: "رمز الدعوة"
 checking: "التحقق جارٍ"
 available: "متوفر"
 unavailable: "غير متوفر"
+usernameInvalidFormat: "يمكنك استخدام A-z، a-z، 0-9، _"
 tooShort: "قصير جدًا"
 tooLong: "طويل جدًا"
 weakPassword: "الكلمة السرية ضعيفة"
@@ -339,11 +409,15 @@ strongPassword: "الكلمة السرية قوية"
 passwordMatched: "التطابق صحيح!"
 passwordNotMatched: "غير متطابقتان"
 signinWith: "الولوج عبر {x}"
+signinFailed: "فشل الولوج، خطأ في اسم المستخدم أو كلمة المرور."
 or: "أو"
+language: "اللغة"
 uiLanguage: "لغة واجهة المستخدم"
+groupInvited: "دُعيت إلى مجموعة"
 aboutX: "عن {x}"
 useOsNativeEmojis: "استخدم الإيموجيات الخاصة بنظام التشغيل"
 youHaveNoGroups: "لا تمتلك أية فِرَق"
+joinOrCreateGroup: "احصل على دعوة لمجموعة أو أنشئ واحدة."
 noHistory: "السجل فارغ"
 signinHistory: "تاريخ تسجيل الدخول"
 doing: "انتظر لحظة"
@@ -351,8 +425,10 @@ category: "الفئات"
 tags: "الوسوم"
 docSource: "مصدر هذا المستند"
 createAccount: "أنشئ حسابًا"
+existingAccount: "الحسابات الموجودة"
 regenerate: "أعِد التوليد"
 fontSize: "حجم الخط"
+noFollowRequests: "ليس لديك طلبات متابعة معلقة"
 openImageInNewTab: "إفتح الصورة بصفحة جديدة"
 dashboard: "لوحة التحكم"
 local: "المحلي"
@@ -361,30 +437,49 @@ total: "المجموع"
 weekOverWeekChanges: "أسبوعيا"
 dayOverDayChanges: "يوميا"
 appearance: "المظهر"
+clientSettings: "إعدادات العميل"
 accountSettings: "إعدادات الحساب"
 promotion: "ترقية"
 promote: "روِّج"
 numberOfDays: "عدد الأيام"
 hideThisNote: "إخفاء هذه الملاحظة"
+objectStorageBaseUrl: "الرابط الأساسي"
+objectStoragePrefix: "البادئة"
+objectStorageEndpoint: "نقطة النهاية"
+objectStorageRegion: "المنطقة"
+objectStorageUseSSL: "استخدم SSL"
+objectStorageUseProxy: "اتصل عبر وكيل"
+serverLogs: "سجلات الخادم"
 deleteAll: "حذف الكل"
+showFixedPostForm: "أظهر نموذج الكتابة في أعلى الصفحة"
+newNoteRecived: "هناك ملاحظات جديدة"
 sounds: "الرنات"
 listen: "استمع"
 none: "لا شيء"
+showInPage: "اعرض في الصفحة"
 volume: "مستوى الصوت"
 details: "التفاصيل"
 chooseEmoji: "اختر إيموجي"
+unableToProcess: "يتعذر إكمال العملية"
 recentUsed: "المستخدمة مؤخرا"
 install: "التثبيت"
 uninstall: "إلغاء التثبيت"
 installedApps: "التطبيقات المُخوّلة"
+nothing: "لا يوجد شيء هنا"
 lastUsedDate: "آخر استخدام"
 state: "الحالة"
 sort: "ترتيب حسب"
+ascendingOrder: "تصاعدي"
+descendingOrder: "تنازلي"
 output: "الخارجة"
 updateRemoteUser: "تحديث المعلومات عن المستخدم البعيد"
 deleteAllFiles: "حذف كافة الملفات"
+deleteAllFilesConfirm: "أتريد حذف كل الملفات؟"
+removeAllFollowing: "ألغ متابعة كل المتابَعين"
 userSuspended: "تم تعليق هذا المستخدم."
 userSilenced: "تم إسكات هذا المستخدم."
+yourAccountSuspendedTitle: "هذا الحساب معلق"
+menu: "القائمة"
 addItem: "إضافة عنصر"
 rooms: "الغرفة"
 relays: "المُرَحلات"
@@ -392,9 +487,15 @@ addRelay: "إضافة مُرحّل"
 addedRelays: "المرحلات التي تم إضافتها"
 deletedNote: "ملاحظة محذوفة"
 invisibleNote: "ملاحظة مخفية"
+enableInfiniteScroll: "فعّل التمرير المتواصل"
+visibility: "الظهور"
 poll: "استطلاع رأي"
 useCw: "إخفاء المحتوى"
+enablePlayer: "افتح مشغل الفيديو"
+disablePlayer: "أغلق مشغل الفيديو"
 themeEditor: "مصمم القوالب"
+description: "الوصف"
+leaveConfirm: "لديك تغييرات غير محفوظة. أتريد المتابعة دون حفظها؟"
 manage: "إدارة "
 plugins: "الإضافات"
 width: "العرض"
@@ -402,12 +503,14 @@ height: "الإرتفاع"
 large: "كبير"
 medium: "متوسط"
 small: "صغير"
+generateAccessToken: "ولّد رمز الوصول"
 permission: "أذونات"
 enableAll: "تشغيل الكل"
 disableAll: "تعطيل الكل"
 tokenRequested: "منح حق الوصول إلى الحساب"
 notificationType: "أنواع الإشعارات"
 edit: "التعديل"
+emailServer: "خادم البريد الإلكتروني"
 email: "البريد الإلكتروني "
 emailAddress: "عنوان البريد الالكتروني"
 smtpHost: "المضيف"
@@ -418,32 +521,183 @@ makeActive: "تفعيل"
 display: "المظهر"
 copy: "نسخ"
 metrics: "المقاييس"
+channel: "القنوات"
+create: "أنشئ"
+notificationSetting: "إعدادات التنبيهات"
+notificationSettingDesc: "اختر نوع التنبيهات المراد عرضها"
+other: "منوعات"
+regenerateLoginToken: "أعد توليد الرمز"
+fileIdOrUrl: "معرف الملف أو رابط"
+chatOpenBehavior: "سلوك نفاذة المحادثة عند فتحها"
+behavior: "السلوك"
+sample: "مثال"
+abuseReports: "البلاغات"
+reportAbuse: "البلاغات"
+reportAbuseOf: "أبلغ عن {name}"
+fillAbuseReportDescription: "أكتب بالتفصيل سبب البلاغ، إذا كنت تبلغ عن ملاحظة أرفق رابط لها."
+abuseReported: "أُرسل البلاغ، شكرًا لك"
+send: "أرسل"
+abuseMarkAsResolved: "علّم البلاغ كمحلول"
+openInNewTab: "افتح في لسان جديد"
+defaultNavigationBehaviour: "سلوك الملاحة الافتراضي"
+waitingFor: "في انتظار {x}"
+random: "عشوائي"
+system: "النظام"
+switchUi: "بدّل واجهة المستخدم"
+createNew: "أنشِئ جديد"
+optional: "اختياري"
 public: "للعامة"
+i18nInfo: "يترجم متطوعون ميسكي إلى عدة لغات، يمكنك المساعدة عبر {link}"
+manageAccessTokens: "إدارة رموز الوصول"
+accountInfo: "معلومات الحساب"
+notesCount: "عدد الملاحظات"
+repliesCount: "عدد الردود المرسلة"
+renotesCount: "عدد الملاحظات المعاد نشرها (المرسلة)"
+repliedCount: "عدد الردود المستلمة"
+renotedCount: "عدد الملاحظات المعاد نشرها (المستلمة)"
+followingCount: "عدد الحسابات المتابَعة"
+followersCount: "عدد المتابِعين"
+sentReactionsCount: "عدد الانفعالات المرسلة"
+receivedReactionsCount: "عدد الانفعالات المستلمة"
+pollVotesCount: "عدد الاستطلاعات المرسلة"
+pollVotedCount: "عدد الاستطلاعات المستلمة"
+yes: "نعم"
+no: "لا"
+driveFilesCount: "عدد الملفات في قرص التخزين"
+useSystemFont: "استخدم الخط الافتراضية للنظام"
+experimentalFeatures: "ميّزات اختبارية"
+developer: "المطور"
+clearCache: "امسح التخزين المؤقت"
 currentVersion: "الإصدار الحالي"
 latestVersion: "آخر نسخة مستقرة"
 usageAmount: "الإستخدام"
 capacity: "السعة"
 inUse: "مستخدم"
+useReactionPickerForContextMenu: "افتح منتقي التفاعلات عند التقر بالزر الأيمن"
+typingUsers: "{users} يكتب(ون)..."
+jumpToSpecifiedDate: "انتقل إلى التاريخ المحدد"
+showingPastTimeline: "أنت تستعرض حاليًا خيطًا زمنيًا قديمًا"
+markAllAsRead: "علّم الكل كمقروء"
+goBack: "رجوع"
+unlikeConfirm: "أتريد إلغاء إعجابك؟"
+fullView: "ملء الشاشة"
+quitFullView: "اخرج من وضع ملء للشاشة"
+addDescription: "أضف وصفًا"
 info: "عن"
+userInfo: "معلومات المستخدم"
+unknown: "مجهول"
+onlineStatus: "الحالة"
+hideOnlineStatus: "اخف الحالة"
+online: "متصل"
+active: "نشط"
+offline: "غير متصل"
+notRecommended: "غير مستحسن"
+botProtection: "الحماية من الحسابات الآلية"
+instanceBlocking: "المثيلات المحجوبة"
+selectAccount: "اختر حسابًا"
+enabled: "مفعّل"
+disabled: "معطّل"
+quickAction: "الإجراءات السّريعة"
 user: "المستخدمون"
 administration: "إدارة "
+accounts: "الحسابات"
+switch: "بدّل"
+noBotProtectionWarning: "لم تضبط الحماية من الحسابات الآلية"
+configure: "اضبط"
 postToGallery: "انشر في المعرض"
 gallery: "المعرض"
+recentPosts: "المشاركات الحديثة"
+shareWithNote: "شاركه في ملاحظة"
+ads: "الإعلانات"
 expiration: "ينتهي استطلاع الرأي في"
+priority: "الأولوية"
+high: "عالية"
 middle: "متوسط"
+low: "منخفضة"
+emailNotConfiguredWarning: "لم تعيّن بريدًا إلكترونيًا"
+ratio: "النسبة"
+previewNoteText: "اعرض معاينة"
+customCss: "CSS مخصصة"
 global: "الشامل"
+squareAvatars: "اعرض شكل الصور الرمزية كمربعات"
+sent: "أرسل"
+received: "اُستلم"
+searchResult: "نتائج البحث"
+hashtags: "الوسوم"
+learnMore: "راجع المزيد"
+misskeyUpdated: "حُدث ميسكي!"
+whatIsNew: "اعرض التغييرات"
+translate: "ترجم"
+translatedFrom: "تُرجم من {x}"
+accountDeletionInProgress: "حذف الحساب جارٍ"
+usernameInfo: "الاسم الذي يميزك عن بافي مستخدمي هذا الخادم، يمكنك استخدام الحروف اللاتينية (a~z, A~Z) والأرقام (0~9) والشرطة السفلية (_). لا يمكنك تغييره بعد تسجيله."
+lastCommunication: "آخر تواصل"
+itsOn: "مفعّل"
+itsOff: "معطّل"
+emailRequiredForSignup: "عنوان البريد الإلكتروني إلزامي للتسجيل"
+filter: "رشّح"
+controlPanel: "لوحة التحكم"
+manageAccounts: "إدارة الحسابات"
+makeReactionsPublic: "اجعل سجل التفاعلات علنيًا"
+makeReactionsPublicDescription: "هذا سيجعل قائمة تفاعلاتك مرئية للعلن."
+classic: "تقليدي"
 _docs:
   admin: "إدارة "
+_gallery:
+  unlike: "أزل الإعجاب"
 _email:
   _follow:
     title: "يتابعك"
+_registry:
+  keys: "المفاتيح"
+  domain: "النّطاق"
+  createKey: "أنشئ مفتاحًا"
+_aboutMisskey:
+  about: "ميسكي هو برمجية مفتوحة المصدر يطورها syuilo منذ 2014."
+  contributors: "المساهم الرئيسي"
+  allContributors: "كل المساهمين"
+  source: "الشفرة المصدرية"
+  translation: "ترجم ميسكي"
+  donate: "تبرع لميسكي"
+  morePatrons: "نحن نقدر الدعم الذي قدمه العديد من الأشخاص الذين لم نذكرهم. شكرًا لكم 🥰"
+  patrons: "الداعمون"
+_nsfw:
+  force: "اخف كل الوسائط"
 _mfm:
   mention: "أشر الى"
+  hashtag: "الوسوم"
+  url: "الرابط"
+  urlDescription: "يمكن عرض الروابط"
+  link: "رابط"
+  bold: "عريض"
+  small: "صغير"
   quote: "اقتبس"
   emoji: "إيموجي مخصص"
   search: "البحث"
 _reversi:
+  gameSettings: "إعدادات اللعبة"
+  chooseBoard: "اختر اللوح"
+  blackOrWhite: "أسود/أبيض"
+  blackIs: "{name} سيلعب بالأسود"
+  botSettings: "خيارات الحسابات الآلية"
+  waitingBoth: "استعد"
+  ready: "جاهز"
+  cancelReady: "ألغ الجهوزية"
+  opponentTurn: "دور الخصم"
+  myTurn: "دورك"
+  turnOf: "دور {name}"
+  pastTurnOf: "دور {name}"
+  surrender: "استسلم"
+  drawn: "تعادل"
+  won: "فاز {name}"
+  black: "أسود"
+  white: "أبيض"
   total: "المجموع"
+  turnCount: "الدور {count}"
+  myGames: "جولاتي"
+  allGames: "كل الجولات"
+  ended: "انتهت"
+  playing: "يُلعب الآن"
 _channel:
   featured: "المتداوَلة"
 _menuDisplay:
@@ -453,17 +707,21 @@ _theme:
   install: "تنصيب قالب"
   manage: "إدارة القوالب"
   code: "شيفرة القالب"
+  description: "الوصف"
   installed: "تم تنصيب {name}"
   make: "إنشاء قالب"
   alpha: "الشفافية"
   keys:
+    link: "رابط"
+    hashtag: "وسم"
     mention: "أشر الى"
-    messageBg: "خلفية الدردشة"
+    renote: "أعد النشر"
+    messageBg: "خلفية المحادثة"
 _sfx:
   note: "الملاحظات"
   noteMy: "ملاحظتي"
   notification: "الإشعارات"
-  chat: "الدردشة"
+  chat: "المحادثة"
 _ago:
   unknown: "مجهول"
   future: "المستقبَل"
@@ -483,11 +741,35 @@ _time:
 _tutorial:
   title: "كيف تستخدم Misskey"
   step1_1: "مرحبًا!"
+  step1_2: "تدعى هذه الصفحة 'الخيط الزمني' وهي تحوي ملاحظات الأشخاص الذي تتابعهم مرتبة حسب تاريخ نشرها."
+  step1_3: "خيطك الزمني فارغ حاليًا بما أنك لا تتابع أي شخص ولم تنشر أي ملاحظة."
+  step2_1: "لننهي إعداد ملفك الشخصي قبل كتابة ملاحظة أو متابعة أشخاص."
+  step3_1: "هل أنهيت إعداد حسابك؟"
+  step3_2: "إذا تاليًا للنشر ملاحظة. أنقر على أيقونة القلم في أعلى الشاشة"
+  step5_3: "لمتابعة مستخدمين ادخل ملفهم الشخصي بالنقر على صورتهم الشخصية ثم اضغط زر 'تابع'."
 _2fa:
   registerKey: "تسجيل مفتاح أمان جديد"
 _permissions:
+  "read:account": "اعرض معلومات حسابك"
   "write:account": "تعديل معلومات حسابك"
+  "read:blocks": "اعرض قائمة المستخدمين المحجوبين"
+  "write:blocks": "عدّل قائمة المستخدمين المحجوبين"
+  "read:drive": "تصفح قرص التخزين"
+  "write:drive": "احذف أو عدّل محتويات قرص التخزين"
+  "read:favorites": "اعرض المفضلة"
+  "write:favorites": "عدّل المفضلة"
   "read:notifications": "اظهر الإشعارات"
+  "read:reactions": "اعرض تفاعلاتك"
+  "write:reactions": "عدّل تفاعلاتك"
+  "write:votes": "صوّت"
+  "read:pages": "اعرض صفحاتك"
+  "write:pages": "عدّل أو احذف صفحاتك"
+  "read:user-groups": "اعرض مجموعات المستخدمين"
+  "write:user-groups": "عدّل أو احذف مجموعات المستخدمين"
+  "read:gallery": "اعرض المعرض"
+  "write:gallery": "عدّل المعرض"
+_auth:
+  shareAccess: "أتريد التفويض لـ \"{name}\" بالوصول لحسابك؟"
 _weekday:
   sunday: "الأحد"
   monday: "الإثنين"
@@ -538,39 +820,74 @@ _poll:
 _visibility:
   public: "للعامة"
   home: "الرئيسي"
-  followers: "المتابِعين"
+  followers: "المتابِعون"
   specified: "مباشرة"
   localOnly: "المحلي فقط"
 _postForm:
   replyPlaceholder: "رد على هذه الملاحظة…"
   quotePlaceholder: "اقتبس هذه الملاحظة…"
+  channelPlaceholder: "انشر في قناة..."
+  _placeholders:
+    c: "ما الذي تفكر فيه؟"
+    d: "ما الذي تريد قوله؟"
+    e: "أكتب..."
 _profile:
   name: "الإسم"
   username: "اسم المستخدم"
+  description: "السيرة"
   youCanIncludeHashtags: "يمكنك أيضًا إضافة وسوم إلى نبذتك التعريفية."
+  metadata: "معلومات إضافية"
+  metadataEdit: "عدّل المعلومات الإضافية"
+  metadataDescription: "يُمكنك عرض 4 حقول معلومات في ملفك الشخصي"
+  metadataLabel: "التسمية"
+  metadataContent: "المحتوى"
+  changeAvatar: "غيّر الصورة الرمزية"
+  changeBanner: "غيّر اللافتة"
 _exportOrImport:
   allNotes: "كل الملاحظات"
   followingList: "المتابَعون"
-  muteList: "اكتم"
+  muteList: "المستخدمون المكتومون"
-  blockingList: "احجب"
+  blockingList: "المستخدمون المحجوبون"
   userLists: "القوائم"
 _charts:
   usersTotal: "مجموع عدد المستخدمين والمستخدمات"
   activeUsers: "المستخدمون النشطون"
+  notesTotal: "إجمالي الملاحظات"
 _timelines:
   home: "الرئيسي"
   local: "المحلي"
   social: "الاجتماعي"
   global: "الشامل"
 _rooms:
+  leaveConfirm: "لديك تغييرات غير محفوظة. أتريد المتابعة دون حفظها؟"
+  chooseImage: "اختر صورة"
+  roomType: "نوع الغرفة"
   _roomType:
     default: "افتراضي"
+    washitsu: "الأسلوب الياباني"
   _furnitures:
+    milk: "علبة حليب"
+    bed: "سرير"
+    low-table: "طاولة قصيرة"
+    desk: "مكتب"
+    chair: "كرسي"
+    chair2: "كرسي 2"
+    pc: "حاسوب"
     monitor: "شاشة التحكم"
     banknote: "أوراق نقدية"
 _pages:
+  viewPage: "اعرض صفحاتك"
+  like: "أعجبني"
+  unlike: "أزل الإعجاب"
+  my: "صفحاتي"
   blocks:
     image: "الصور"
+    _post:
+      text: "المحتوى"
+    _button:
+      _action:
+        _dialog:
+          content: "المحتوى"
   script:
     categories:
       list: "القوائم"
@@ -599,9 +916,11 @@ _notification:
   youGotMessagingMessageFromUser: "لقد تلقيت رسالة مِن {name}"
   youGotMessagingMessageFromGroup: "لقد أرسِلَت رسالة إلى الفريق {name}"
   youWereFollowed: "يتابعك"
+  youWereInvitedToGroup: "دُعيت إلى مجموعة"
   _types:
     follow: "المتابَعون"
     mention: "أشر الى"
+    renote: "أعد النشر"
     quote: "اقتبس"
     reaction: "تفاعل"
 _deck:

locales/de-DE.yml

@@ -81,6 +81,8 @@ somethingHappened: "Ein Fehler ist aufgetreten"
 retry: "Wiederholen"
 pageLoadError: "Laden der Seite fehlgeschlagen."
 pageLoadErrorDescription: "Dieser Fehler wird meist durch Netzwerkfehler oder den Browser-Cache verursacht. Bitte leere den Cache oder versuche es nach einiger Zeit erneut."
+serverIsDead: "Dieser Server antwortet nicht. Bitte warte einen Moment und versuche es dann erneut."
+youShouldUpgradeClient: "Bitte aktualisiere diese Seite, um eine neuere Version deines Clients zu verwenden."
 enterListName: "Name der Liste eingeben"
 privacy: "Privatsphäre"
 makeFollowManuallyApprove: "Follow-Anfragen benötigen Bestätigung"
@@ -529,6 +531,8 @@ removeAllFollowing: "Allen gefolgten Benutzern entfolgen"
 removeAllFollowingDescription: "Dies entfolgt allen Benutzerkonten von {host}. Bitte führe dies durch, falls diese Instanz z.B. nicht mehr existiert."
 userSuspended: "Dieser Benutzer wurde gesperrt."
 userSilenced: "Dieser Benutzer wurde instanzweit stummgeschaltet."
+yourAccountSuspendedTitle: "Dieses Benutzerkonto ist gesperrt"
+yourAccountSuspendedDescription: "Dieses Benutzerkonto wurde gesperrt, da es gegen die Nutzungsbedingungen dieses Servers verstoßen hat. Trete mit dem Betreiber in Kontakt, falls du weitere Details erfahren möchtest. Bitte erstelle kein neues Benutzerkonto."
 menu: "Menü"
 divider: "Trenner"
 addItem: "Element hinzufügen"
@@ -543,7 +547,7 @@ invisibleNote: "Private Notiz"
 enableInfiniteScroll: "Automatisch mehr Notizen laden"
 visibility: "Sichtbarkeit"
 poll: "Umfrage"
-useCw: "Inhalt verbergen"
+useCw: "Inhaltswarnung verwenden"
 enablePlayer: "Video-Player öffnen"
 disablePlayer: "Video-Player schließen"
 expandTweet: "Tweet ausklappen"
@@ -748,7 +752,7 @@ switch: "Wechseln"
 noMaintainerInformationWarning: "Betreiberinformationen sind nicht konfiguriert."
 noBotProtectionWarning: "Bot-Schutz ist nicht konfiguriert."
 configure: "Konfigurieren"
-postToGallery: "Beitrag zu Galerie hinzufügen"
+postToGallery: "Neuen Galerie-Beitrag erstellen"
 gallery: "Galerie"
 recentPosts: "Neue Beiträge"
 popularPosts: "Beliebte Beiträge"
@@ -762,6 +766,7 @@ middle: "Mittel"
 low: "Niedrig"
 emailNotConfiguredWarning: "Keine Email-Adresse hinterlegt"
 ratio: "Verhältnis"
+previewNoteText: "Vorschau anzeigen"
 customCss: "Benutzerdefiniertes CSS"
 customCssWarn: "Verwende diese Einstellung nur, wenn du weißt, was sie tut. Ungültige Eingaben können dazu führen, dass der Client nicht mehr normal funktioniert."
 global: "Global"
@@ -777,6 +782,36 @@ misskeyUpdated: "Misskey wurde aktualisiert!"
 whatIsNew: "Änderungen anzeigen"
 translate: "Übersetzen"
 translatedFrom: "Aus {x} übersetzt"
+accountDeletionInProgress: "Löschung des Benutzerkontos momentan in Bearbeitung"
+usernameInfo: "Ein Name, durch den dein Benutzerkonto auf diesem Server identifiziert werden kann. Du kannst das Alphabet (a~z, A~Z), Ziffern (0~9) oder Unterstriche (_) verwenden. Benutzernamen können später nicht geändert werden."
+aiChanMode: "Ai Modus"
+keepCw: "Inhaltswarnungen beibehalten"
+pubSub: "Pub/Sub Benutzerkonten"
+lastCommunication: "Letzte Kommunikation"
+resolved: "Gelöst"
+unresolved: "Ungelöst"
+itsOn: "Eingeschaltet"
+itsOff: "Ausgeschaltet"
+emailRequiredForSignup: "Angaben einer Email-Adresse als benötigt markieren"
+unread: "Ungelesen"
+filter: "Filter"
+manageAccounts: "Benutzerkonten verwalten"
+makeReactionsPublic: "Reaktionsverlauf veröffentlichen"
+makeReactionsPublicDescription: "Jeder wird die Liste deiner gesendeten Reaktionen einsehen können."
+classic: "Classic"
+muteThread: "Thread stummschalten"
+unmuteThread: "Threadstummschaltung aufheben"
+_signup:
+  almostThere: "Fast geschafft"
+  emailAddressInfo: "Bitte gib deine Email-Adresse ein."
+  emailSent: "An deine Email-Adresse ({email}) wurde soeben eine Bestätigungsmail geschickt. Bitte klicke auf den enthaltenen Link, um die Erstellung deines Benutzerkontos abzuschließen."
+_accountDelete:
+  accountDelete: "Benutzerkonto löschen"
+  mayTakeTime: "Da die Löschung eines Benutzerkontos ein aufwendiger Prozess ist, kann dessen Dauer davon abhängen, wie viel Inhalt in diesem erstellt wurde oder wie viele Dateien hochgeladen wurden."
+  sendEmail: "Sobald die Löschung abgeschlossen ist, wird an die mit ihm verknüpfte Email-Adresse eine Benachrichtigung versendet."
+  requestAccountDelete: "Löschung des Benutzerkontos anfordern"
+  started: "Löschung wurde eingeleitet."
+  inProgress: "Löschung in Bearbeitung"
 _docs:
   continueReading: "Mehr lesen"
   features: "Funktionen"
@@ -859,19 +894,19 @@ _mfm:
   flip: "Spiegelung"
   flipDescription: "Inhalt horizontal oder vertikal gespiegelt anzeigen."
   jelly: "Animation (Dehnen)"
-  jellyDescription: "Verleiht eine sich dehnende Animation."
+  jellyDescription: "Verleiht dem Inhalt eine sich dehnende Animation."
   tada: "Animation (Tada)"
   tadaDescription: "Verleiht eine Animation mit \"Tada!\"-Gefühl"
   jump: "Animation (Sprung)"
-  jumpDescription: "Verleiht eine springende Animation."
+  jumpDescription: "Verleiht dem Inhalt eine springende Animation."
   bounce: "Animation (Federn)"
-  bounceDescription: "Verleiht eine federnde Animation."
+  bounceDescription: "Verleiht dem Inhalt eine federnde Animation."
   shake: "Animation (Zittern)"
-  shakeDescription: "Verleiht eine zitternde Animation."
+  shakeDescription: "Verleiht dem Inhalt eine zitternde Animation."
   twitch: "Animation (Zucken)"
-  twitchDescription: "Verleiht eine sehr stark zuckende Animation."
+  twitchDescription: "Verleiht dem Inhalt eine sehr stark zuckende Animation."
   spin: "Animation (Rotieren)"
-  spinDescription: "Verleiht eine rotierende Animation."
+  spinDescription: "Verleiht dem Inhalt eine rotierende Animation."
   x2: "Groß"
   x2Description: "Inhalte größer anzeigen."
   x3: "Sehr groß"
@@ -884,6 +919,8 @@ _mfm:
   fontDescription: "Setzt die Schriftart des Inhaltes fest."
   rainbow: "Regenbogen"
   rainbowDescription: "Lässt den Inhalt in Regenbogenfarben erscheinen."
+  sparkle: "Glitzer"
+  sparkleDescription: "Verleiht Inhalt einen glitzernden Partikeleffekt."
 _reversi:
   reversi: "Reversi"
   gameSettings: "Spieleinstellungen"
@@ -1007,9 +1044,9 @@ _theme:
     infoFg: "Text von Informationen"
     infoWarnBg: "Hintergrund von Warnungen"
     infoWarnFg: "Text von Warnungen"
-    cwBg: "Hintergrund von verborgenen Inhalten"
+    cwBg: "Hintergrund des Inhaltswarnungsknopfs"
-    cwFg: "Text von verborgenen Inhalten"
+    cwFg: "Text des Inhaltswarnungsknopfs"
-    cwHoverBg: "Hintergrund von verborgenen Inhalten (Mouseover)"
+    cwHoverBg: "Hintergrund des Inhaltswarnungsknopfs (Mouseover)"
     toastBg: "Hintergrund von Benachrichtigungen"
     toastFg: "Text von Benachrichtigungen"
     buttonBg: "Hintergrund von Schaltflächen"
@@ -1110,6 +1147,10 @@ _permissions:
   "write:user-groups": "Benutzergruppen bearbeiten oder löschen"
   "read:channels": "Kanäle lesen"
   "write:channels": "Kanäle bedienen"
+  "read:gallery": "Beiträge deiner Galerie lesen"
+  "write:gallery": "Deine Galerie bearbeiten"
+  "read:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge lesen"
+  "write:gallery-likes": "Liste deiner mit \"Gefällt mir\" markierten Galerie-Beiträge bearbeiten"
 _auth:
   shareAccess: "Möchtest du \"{name}\" authorisieren, auf dieses Benuzerkonto zugreifen zu können?"
   shareAccessAsk: "Bist du dir sicher, dass du diese Anwendung authorisieren möchtest, auf dein Benutzerkonto zugreifen zu können?"
@@ -1150,8 +1191,9 @@ _widgets:
   jobQueue: "Job-Warteschlange"
   serverMetric: "Servermetriken"
   aiscript: "AiScript-Konsole"
+  aichan: "Ai"
 _cw:
-  hide: "Verbergen"
+  hide: "Inhalt verbergen"
   show: "Inhalt anzeigen"
   chars: "{count} Zeichen"
   files: "{count} Datei(en)"

locales/en-US.yml

@@ -1,7 +1,7 @@
 ---
 _lang_: "English"
 headlineMisskey: "A network connected by notes"
-introMisskey: "Welcome! Misskey is an open source, decentralized microblogging service.\nCreate \"notes\" to share what is happening now, or to share it with everyone around you. 📡\nWith \"reactions\", you can also quickly express your feelings about everyone's notes. 👍\nLet's explore a new world! 🚀"
+introMisskey: "Welcome! Misskey is an open source, decentralized microblogging service.\nCreate \"notes\" to share your thoughts with everyone around you. 📡\nWith \"reactions\", you can also quickly express your feelings about everyone's notes. 👍\nLet's explore a new world! 🚀"
 monthAndDay: "{month}/{day}"
 search: "Search"
 notifications: "Notifications"
@@ -81,6 +81,8 @@ somethingHappened: "An error occurred"
 retry: "Retry"
 pageLoadError: "Failed to load page."
 pageLoadErrorDescription: "This is normally caused by network errors or the browser's cache. Try clearing the cache and then try again after waiting a little while."
+serverIsDead: "This server is not responding. Please wait for a while and try again."
+youShouldUpgradeClient: "To view this page, please refresh to update your client."
 enterListName: "Enter a list name"
 privacy: "Privacy"
 makeFollowManuallyApprove: "Follow requests require approval"
@@ -92,7 +94,7 @@ unfollow: "Unfollow"
 followRequestPending: "Pending follow request"
 enterEmoji: "Enter an emoji"
 renote: "Renote"
-unrenote: "Take back Renote"
+unrenote: "Take back renote"
 renoted: "Renoted."
 cantRenote: "This post can't be renoted."
 cantReRenote: "A renote can't be renoted."
@@ -136,7 +138,7 @@ settingGuide: "Recommended settings"
 cacheRemoteFiles: "Cache remote files"
 cacheRemoteFilesDescription: "When this setting is disabled, remote files are loaded directly from the remote instance. Disabling this will decrease storage usage, but increase traffic, as thumbnails will not be generated."
 flagAsBot: "Mark this account as as bot"
-flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as flag for other developers to prevent endless interaction chains with other bots and adjust Misskey's internal systems to treat this account as a bot."
+flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Misskey's internal systems to treat this account as a bot."
 flagAsCat: "Mark this account as a cat"
 flagAsCatDescription: "Enable this option to mark this account as a cat."
 autoAcceptFollowed: "Automatically approve follow requests from users you're following"
@@ -199,7 +201,7 @@ done: "Done"
 processing: "Processing..."
 preview: "Preview"
 default: "Default"
-noCustomEmojis: "There are no emojis"
+noCustomEmojis: "There are no emoji"
 noJobs: "There are no jobs"
 federating: "Federating"
 blocked: "Blocked"
@@ -213,7 +215,7 @@ instanceFollowers: "Followers of instance"
 instanceUsers: "Users of this instance"
 changePassword: "Change password"
 security: "Security"
-retypedNotMatch: "The inputs does not match."
+retypedNotMatch: "The inputs do not match."
 currentPassword: "Current password"
 newPassword: "New password"
 newPasswordRetype: "Retype new password"
@@ -429,7 +431,7 @@ invitationCode: "Invitation code"
 checking: "Checking..."
 available: "Available"
 unavailable: "Not available"
-usernameInvalidFormat: "You can use upper- and lowercase letters, numbers as well as underscores."
+usernameInvalidFormat: "You can use upper- and lowercase letters, numbers, and underscores."
 tooShort: "Too short"
 tooLong: "Too long"
 weakPassword: "Weak password"
@@ -445,7 +447,7 @@ language: "Language"
 uiLanguage: "User interface language"
 groupInvited: "You've been invited to a group"
 aboutX: "About {x}"
-useOsNativeEmojis: "Use OS native Emojis"
+useOsNativeEmojis: "Use OS native Emoji"
 youHaveNoGroups: "You have no groups"
 joinOrCreateGroup: "Get invited to a group or create your own."
 noHistory: "No history available"
@@ -482,7 +484,7 @@ objectStorageBaseUrlDesc: "URL used as reference. Specify the URL of your CDN or
 objectStorageBucket: "Bucket"
 objectStorageBucketDesc: "Please specify the bucket name used at your provider."
 objectStoragePrefix: "Prefix"
-objectStoragePrefixDesc: "Files will stored under directories with this prefix."
+objectStoragePrefixDesc: "Files will be stored under directories with this prefix."
 objectStorageEndpoint: "Endpoint"
 objectStorageEndpointDesc: "Leave this empty if you are using AWS S3, otherwise specify the endpoint as '<host>' or '<host>:<port>', depending on the service you are using."
 objectStorageRegion: "Region"
@@ -529,6 +531,8 @@ removeAllFollowing: "Unfollow all followed users"
 removeAllFollowingDescription: "Executing this unfollows all accounts from {host}. Please run this if the instance e.g. no longer exists."
 userSuspended: "This user has been suspended."
 userSilenced: "This user has been silenced."
+yourAccountSuspendedTitle: "This account is suspended"
+yourAccountSuspendedDescription: "This account has been suspended due to breaking the server's terms of services or similar. Contact the administrator if you would like to know a more detailed reason. Please do not create a new account."
 menu: "Menu"
 divider: "Divider"
 addItem: "Add Item"
@@ -606,7 +610,7 @@ useGlobalSettingDesc: "If turned on, your account's notification settings will b
 other: "Other"
 regenerateLoginToken: "Regenerate login token"
 regenerateLoginTokenDescription: "Regenerate the token used internally during login. Normally this action is not necessary. If regenerated, all devices will be logged out."
-setMultipleBySeparatingWithSpace: "You can set multiple by separating them with spaces."
+setMultipleBySeparatingWithSpace: "Separate multiple entries with spaces."
 fileIdOrUrl: "File-ID or URL"
 chatOpenBehavior: "Behavior of the chat window when opened"
 behavior: "Behavior"
@@ -649,7 +653,7 @@ pollVotesCount: "Number of sent poll votes"
 pollVotedCount: "Number of received poll votes"
 yes: "Yes"
 no: "No"
-driveFilesCount: "Number of drive files"
+driveFilesCount: "Number of Drive files"
 driveUsage: "Drive space usage"
 noCrawle: "Reject crawler indexing"
 noCrawleDescription: "Ask search engines to not index your profile page, notes, Pages, etc."
@@ -657,7 +661,7 @@ lockedAccountInfo: "Unless you set your note visiblity to \"Followers only\", yo
 alwaysMarkSensitive: "Mark as NSFW by default"
 loadRawImages: "Load original images instead of showing thumbnails"
 disableShowingAnimatedImages: "Don't play animated images"
-verificationEmailSent: "A verification email has been sent. Please access the included link to complete verification."
+verificationEmailSent: "A verification email has been sent. Please follow the included link to complete verification."
 notSet: "Not set"
 emailVerified: "Email has been verified"
 noteFavoritesCount: "Number of favorite notes"
@@ -688,7 +692,7 @@ sendErrorReportsDescription: "When turned on, detailed error information will be
 myTheme: "My theme"
 backgroundColor: "Background color"
 accentColor: "Accent color"
-textColor: "Textfarbe"
+textColor: "Text color"
 saveAs: "Save as..."
 advanced: "Advanced"
 value: "Value"
@@ -724,7 +728,7 @@ fullView: "Full view"
 quitFullView: "Exit full view"
 addDescription: "Add description"
 userPagePinTip: "You can display notes here by selecting \"Pin to profile\" from the menu of individual notes."
-notSpecifiedMentionWarning: "This note contains mentions of users not included as recipient"
+notSpecifiedMentionWarning: "This note contains mentions of users not included as recipients"
 info: "About"
 userInfo: "User information"
 unknown: "Unknown"
@@ -748,7 +752,7 @@ switch: "Switch"
 noMaintainerInformationWarning: "Maintainer information is not configured."
 noBotProtectionWarning: "Bot protection is not configured."
 configure: "Configure"
-postToGallery: "Post to Gallery"
+postToGallery: "Create new gallery post"
 gallery: "Gallery"
 recentPosts: "Recent posts"
 popularPosts: "Popular posts"
@@ -762,6 +766,7 @@ middle: "Medium"
 low: "Low"
 emailNotConfiguredWarning: "Email address not set."
 ratio: "Ratio"
+previewNoteText: "Show preview"
 customCss: "Custom CSS"
 customCssWarn: "This setting should only be used if you know what it does. Entering improper values may cause the client to stop functioning normally."
 global: "Global"
@@ -777,6 +782,37 @@ misskeyUpdated: "Misskey has been updated!"
 whatIsNew: "Show changes"
 translate: "Translate"
 translatedFrom: "Translated from {x}"
+accountDeletionInProgress: "Account deletion is currently in progress"
+usernameInfo: "A name that identifies your account from others on this server.  You can use the alphabet (a~z, A~Z), digits (0~9) or underscores (_). Usernames cannot be changed later."
+aiChanMode: "Ai Mode"
+keepCw: "Keep Content Warnings"
+pubSub: "Pub/Sub Accounts"
+lastCommunication: "Last communication"
+resolved: "Resolved"
+unresolved: "Unresolved"
+itsOn: "Enabled"
+itsOff: "Disabled"
+emailRequiredForSignup: "Require email address for sign-up"
+unread: "Unread"
+filter: "Filter"
+controlPanel: "Control Panel"
+manageAccounts: "Manage Accounts"
+makeReactionsPublic: "Set reaction history to public"
+makeReactionsPublicDescription: "This will make the list of all your past reactions publicly visible."
+classic: "Classic"
+muteThread: "Mute thread"
+unmuteThread: "Unmute thread"
+_signup:
+  almostThere: "Almost there"
+  emailAddressInfo: "Please enter your email address."
+  emailSent: "A confirmation email has been sent to your email address ({email}). Please click the included link to complete account creation."
+_accountDelete:
+  accountDelete: "Delete Account"
+  mayTakeTime: "As account deletion is a resource-heavy process, it may take some time to complete depending on how much content you have created and how many files you have uploaded."
+  sendEmail: "Once account deletion has been completed, an email will be sent to the email address registered to this account."
+  requestAccountDelete: "Request account deletion"
+  started: "Deletion has been started."
+  inProgress: "Deletion is currently in progress"
 _docs:
   continueReading: "Read more"
   features: "Features"
@@ -795,7 +831,7 @@ _gallery:
   my: "My Gallery"
   liked: "Liked Posts"
   like: "Like"
-  unlike: "Undo like"
+  unlike: "Remove like"
 _email:
   _follow:
     title: "You've got a new follower"
@@ -835,11 +871,11 @@ _mfm:
   url: "URL"
   urlDescription: "URLs can be displayed."
   link: "Link"
-  linkDescription: "Specific parts of text can be displayed as an URL."
+  linkDescription: "Specific parts of text can be displayed as a URL."
   bold: "Bold"
   boldDescription: "Highlights letters by making them thicker."
   small: "Small"
-  smallDescription: "Displays contents small and thin."
+  smallDescription: "Displays content small and thin."
   center: "Center"
   centerDescription: "Displays content centered."
   inlineCode: "Code (In-line)"
@@ -851,7 +887,7 @@ _mfm:
   blockMath: "Math (Block)"
   blockMathDescription: "Display multi-line Math formulas (KaTeX) in a block"
   quote: "Quote"
-  quoteDescription: "Displays content as quote."
+  quoteDescription: "Displays content as a quote."
   emoji: "Custom Emoji"
   emojiDescription: "By surrounding a custom emoji name with colons, custom emoji can be displayed."
   search: "Search"
@@ -881,9 +917,11 @@ _mfm:
   blur: "Blur"
   blurDescription: "Content can be blurred via this effect. It will be displayed clearly when hovered over."
   font: "Font"
-  fontDescription: "Sets the font to display contents in."
+  fontDescription: "Sets the font to display content in."
   rainbow: "Rainbow"
   rainbowDescription: "Makes the content appear in rainbow colors."
+  sparkle: "Sparkle"
+  sparkleDescription: "Gives content a sparkling particle effect."
 _reversi:
   reversi: "Reversi"
   gameSettings: "Game settings"
@@ -943,8 +981,8 @@ _menuDisplay:
 _wordMute:
   muteWords: "Muted words"
   muteWordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
-  muteWordsDescription2: "Surround keywords by slashes to use regular expressions."
+  muteWordsDescription2: "Surround keywords with slashes to use regular expressions."
-  softDescription: "Hides notes fulfilling the set conditions from the timeline."
+  softDescription: "Hide notes that fulfil the set conditions from the timeline."
   hardDescription: "Prevents notes fulfilling the set conditions from being added to the timeline. In addition, these notes will not be added to the timeline even if the conditions are changed."
   soft: "Soft"
   hard: "Hard"
@@ -1002,7 +1040,7 @@ _theme:
     divider: "Divider"
     scrollbarHandle: "Scrollbar handle"
     scrollbarHandleHover: "Scrollbar handle (Hover)"
-    dateLabelFg: "Text of date labels"
+    dateLabelFg: "Date label text"
     infoBg: "Information background"
     infoFg: "Information text"
     infoWarnBg: "Warning background"
@@ -1075,19 +1113,19 @@ _tutorial:
 _2fa:
   alreadyRegistered: "You have already registered a 2-factor authentication device."
   registerDevice: "Register a new device"
-  registerKey: "Register a new Security Key"
+  registerKey: "Register a security key"
   step1: "First, install an authentication app (such as {a} or {b}) on your device."
   step2: "Then, scan the QR code displayed on this screen."
   step3: "Enter the token provided by your app to finish setup."
-  step4: "From now, any future login attempts will ask for such a login token."
+  step4: "From now on, any future login attempts will ask for such a login token."
-  securityKeyInfo: "Besides fingerprint or PIN authentication, you can also setup authentication via hardware security keys that support FIDO2 to further secure your login process."
+  securityKeyInfo: "Besides fingerprint or PIN authentication, you can also setup authentication via hardware security keys that support FIDO2 to further secure your account."
 _permissions:
   "read:account": "View your account information"
   "write:account": "Edit your account information"
-  "read:blocks": "View the list of people you blocked"
+  "read:blocks": "View your list of blocked users"
   "write:blocks": "Edit your list of blocked users"
-  "read:drive": "Access your drive files and folders"
+  "read:drive": "Access your Drive files and folders"
-  "write:drive": "Edit or delete your drive files and folders"
+  "write:drive": "Edit or delete your Drive files and folders"
   "read:favorites": "View your list of favorites"
   "write:favorites": "Edit your list of favorites"
   "read:following": "View information on who you follow"
@@ -1110,6 +1148,10 @@ _permissions:
   "write:user-groups": "Edit or delete your user groups"
   "read:channels": "Read your channels"
   "write:channels": "Modify your channels"
+  "read:gallery": "View your gallery"
+  "write:gallery": "Edit your gallery"
+  "read:gallery-likes": "View list of liked gallery posts"
+  "write:gallery-likes": "Edit list of liked gallery posts"
 _auth:
   shareAccess: "Would you like to authorize \"{name}\" to access this account?"
   shareAccessAsk: "Are you sure you want to authorize this application to access your account?"
@@ -1150,6 +1192,7 @@ _widgets:
   jobQueue: "Job Queue"
   serverMetric: "Server metrics"
   aiscript: "AiScript console"
+  aichan: "Ai"
 _cw:
   hide: "Hide"
   show: "Show content"
@@ -1311,23 +1354,23 @@ _rooms:
     doll-ai: "Ai doll"
     banknote: "Pile of money"
 _pages:
-  newPage: "Create a page"
+  newPage: "Create a new Page"
-  editPage: "Edit this page"
+  editPage: "Edit this Page"
   readPage: "Source view activated"
   created: "Page successfully created"
   updated: "Page successfully edited"
   deleted: "Page successfully deleted"
   pageSetting: "Page settings"
-  nameAlreadyExists: "The specified page URL already exists"
+  nameAlreadyExists: "The specified Page URL already exists"
-  invalidNameTitle: "The specified page URL is invalid"
+  invalidNameTitle: "The specified Page URL is invalid"
-  invalidNameText: "Make sure the page title is not empty"
+  invalidNameText: "Make sure the Page title is not empty"
-  editThisPage: "Edit this page"
+  editThisPage: "Edit this Page"
   viewSource: "View source"
-  viewPage: "View your pages"
+  viewPage: "View your Pages"
   like: "Like"
-  unlike: "Undo like"
+  unlike: "Remove like"
-  my: "My pages"
+  my: "My Pages"
-  liked: "Liked pages"
+  liked: "Liked Pages"
   featured: "Featured"
   inspector: "Inspector"
   contents: "Contents"
@@ -1337,10 +1380,10 @@ _pages:
   url: "Page URL"
   summary: "Page summary"
   alignCenter: "Center elements"
-  hideTitleWhenPinned: "Hide page title when pinned to profile"
+  hideTitleWhenPinned: "Hide Page title when pinned to profile"
   font: "Font"
   fontSerif: "Serif"
-  fontSansSerif: "Sans serif"
+  fontSansSerif: "Sans Serif"
   eyeCatchingImageSet: "Set thumbnail"
   eyeCatchingImageRemove: "Delete thumbnail"
   chooseBlock: "Add a block"
@@ -1555,7 +1598,7 @@ _pages:
       seedRandomPick: "Randomly choose from list (with seed)"
       _seedRandomPick:
         arg1: "Seed"
-        arg2: "Liste"
+        arg2: "List"
       DRPWPM: "Randomly choose from weighted list (Changes once a day for each user)"
       _DRPWPM:
         arg1: "Text list"
@@ -1635,8 +1678,8 @@ _deck:
   columnMargin: "Margin between columns"
   columnHeaderHeight: "Column header height"
   addColumn: "Add column"
-  swapLeft: "Swap to left"
+  swapLeft: "Swap left"
-  swapRight: "Swap to right"
+  swapRight: "Swap right"
   swapUp: "Swap with above"
   swapDown: "Swap with below"
   stackLeft: "Stack on left column"

locales/eo-UY.yml

@@ -1,101 +1,107 @@
 ---
 _lang_: "Esperanto"
-headlineMisskey: "Reto ligata per notoj"
+headlineMisskey: "Jen la reto konektata de notoj"
-introMisskey: "Bonvenon! Misskey estas malfermitkoda malcentraliza mikrobloga servo.\nKreu \"noto\"n por diskonigi tion ke nun okazas, aŭ por dissendu pri vi📡\nPer la funkcio \"reago\" vi ankaŭ povas rapide esprimi vian senton pri ĉies noto👍\nVolu esplori nova mondo🚀"
+introMisskey: "Bonvenon! Misskey estas malfermitkoda malcentraliza etbloga servo.\nKreu \"noto\"n por paroli vian penson al iuj ĉirkaŭ vi. 📡\nLa funkcion \"reago\" ebligas esprimi rapide vian senton pri ies noto en Fediverso. 👍\nBonvole esploru novan mondon. 🚀"
-monthAndDay: "{day}-a/{month}"
+monthAndDay: "{{day}}/{{month}}"
 search: "Serĉi"
 notifications: "Sciigoj"
 username: "Uzantnomo"
 password: "Pasvorto"
 forgotPassword: "Ĉu vi forgesis pasvorton?"
-fetchingAsApObject: "Informpetado de Fediverso..."
+fetchingAsApObject: "Informpetado de kunfederaĵo…"
 ok: "Akcepteble"
 gotIt: "Mi komprenas"
 cancel: "Nuligi"
 enterUsername: "Entajpu uzantnomon"
-renotedBy: "Renoto farita de {user}"
+renotedBy: "Noto plusendita de {user}"
 noNotes: "Neniu noto!"
 noNotifications: "Vi ne havas sciigojn."
-instance: "Ekzemplo"
+instance: "Nodo"
 settings: "Agordoj"
 basicSettings: "Ĝeneralaj agordoj"
 otherSettings: "Aliaj agordoj"
-openInWindow: "Malfermi en nova fenestro"
+openInWindow: "Malfermi en fenestro"
 profile: "Profilo"
 timeline: "Templinio"
-noAccountDescription: "Tiu uzanto ankoraŭ ne skribis biografieton"
+noAccountDescription: "Neniu priskribo"
 login: "Ensaluti"
-loggingIn: "Ensalutado..."
+loggingIn: "Ensalutado…"
 logout: "Elsaluti"
-signup: "Krei konton"
+signup: "Registriĝi"
-uploading: "Alŝutado..."
+uploading: "Alŝutado…"
 save: "Konservi"
-users: "Uzanto"
+users: "Uzantoj"
 addUser: "Aldoni uzanton"
 favorite: "Preferi"
-favorites: "Preferataj"
+favorites: "Preferaĵoj"
 unfavorite: "Malpreferi"
-favorited: "Aldonita al preferatoj"
+favorited: "Aldonita al via listo de preferaĵoj."
-alreadyFavorited: "Jame aldonita al preferatoj"
+alreadyFavorited: "Ĝi jam estis aldonita al via listo de preferaĵoj."
-cantFavorite: "Ne aldonita al preferatoj"
+cantFavorite: "Ne aldonita al via listo de preferaĵoj."
-pin: "Alpingli sur la profilo"
+pin: "Alpingli"
 unpin: "Depingli"
 copyContent: "Kopii enhavon"
 copyLink: "Kopii ligilon"
 delete: "Forviŝi"
-deleteAndEdit: "Forigi kaj redakti"
+deleteAndEdit: "Redakti foriginte"
-deleteAndEditConfirm: "Ĉu vi certas, ke vi volas forigi kaj redakti la noton? Ankaŭ ĉiuj reagoj, renotoj, kaj respondoj al ĝi foriĝos."
+deleteAndEditConfirm: "Ĉu vi certas, ke vi volas forigi kaj redakti la noton? Tio forviŝos reagojn, plusendojn, kaj respondojn ĉiujn de ĝi."
-addToList: "Aldoni al la listo"
+addToList: "Aldoni al listo"
 sendMessage: "Sendi mesaĝon"
 copyUsername: "Kopii uzantnomon"
 searchUser: "Serĉi uzanton"
 reply: "Respondi"
 loadMore: "Vidu pli"
 showMore: "Vidi pli"
-youGotNewFollower: "sksekvis vin"
+youGotNewFollower: "eksekvis vin"
 receiveFollowRequest: "Peto de sekvado estas ricevita"
 followRequestAccepted: "La peto de sekvado akceptita"
 mention: "Mencioj"
 mentions: "Al vi"
-directNotes: "Rektaj notoj"
+directNotes: "Rekte senditaj"
 importAndExport: "Importi/eksporti"
 import: "Importi"
 export: "Eksporti"
 files: "Dosieroj"
 download: "Elŝuti"
-driveFileDeleteConfirm: "Ĉu vi certas, ke vi volas forviŝi la dosieron \"{name}\"? Ankaŭ notoj kiu enhavas ĝin forviŝiĝos."
+driveFileDeleteConfirm: "Ĉu vi certas, ke vi volas forviŝi la dosieron \"{name}\"? Pro tio forviŝiĝos ankaŭ la notoj kiuj enhavas ĝin."
-unfollowConfirm: "Ĉu vi certas, ke vi volas ne plu sekvi {name}'(o)n?"
+unfollowConfirm: "Ĉu vi certas, ke vi volas ĉesi sekvi {name}'(o)n?"
 lists: "Listoj"
 noLists: "Neniu listo"
-note: "Elsendi noto"
+note: "Sendi"
 notes: "Notoj"
 following: "Sekvatoj"
 followers: "Sekvantoj"
 followsYou: "Sekvas vin"
-createList: "Kreii liston"
+createList: "Krei liston"
+manageLists: "Administri liston"
 error: "Eraro"
-somethingHappened: "Problemo okazis."
+somethingHappened: "Problemo okazis"
-retry: "Reprovi"
+retry: "Provi denove"
 enterListName: "Entajpu nomon de la listo"
 privacy: "Privateco"
+defaultNoteVisibility: "Implicitaĵo de videbleco"
 follow: "Sekvi"
 followRequest: "Peti de sekvado"
 followRequests: "Petoj de sekvado"
-unfollow: "Malsekvi"
+unfollow: "Ne plu sekvi"
 enterEmoji: "Entajpu emoĵion"
-renote: "Fari renoton"
+renote: "Plusendi la noton"
-unrenote: "Malfari renoton"
+unrenote: "Malfari plusendadon"
-renoted: "Renoton fariĝis."
+renoted: "Sukcese plusendita"
-cantRenote: "Tiu noto ne estas renototebla."
+cantRenote: "Oni ne povas plusendi la noton."
-cantReRenote: "Oni ne povas fari renoton kiu enhavas renoto."
+cantReRenote: "Plusendo de noto ne estas plusendebla."
 quote: "Citi"
-pinnedNote: "Pinglita noto"
+pinnedNote: "Alpinglita noto"
-pinned: "Alpingli sur la profilo"
+pinned: "Alpingli"
 you: "Vi"
 clickToShow: "Klaku por malkaŝu"
 sensitive: "Enhavo ne estas deca por laborejo (NSFW)"
 add: "Aldoni"
 reaction: "Reagoj"
+rememberNoteVisibility: "Rememoru videblecon de la noto laste sendita "
+attachCancel: "Deigi aldonaĵon"
+markAsSensitive: "Troviĝi NSFW"
+unmarkAsSensitive: "Ne troviĝi NSFW"
 enterFileName: "Entajpu nomon de dosiero"
 mute: "Silentigi"
 unmute: "Malsilentigi"
@@ -118,12 +124,12 @@ emojis: "Emoĵio"
 emojiName: "Nomo de emoĵio"
 emojiUrl: "URL de la emoĵio"
 addEmoji: "Aldoni emoĵion"
-settingGuide: "Rekomendaj agordoj"
+settingGuide: "Agordaj rekomendoj"
-cacheRemoteFiles: "Havi staplon por transaj dosieroj"
+cacheRemoteFiles: "Stapli transajn dosierojn"
-flagAsBot: "Tiu uzanto estas roboto"
+flagAsBot: "Agordo por robota uzanto"
-flagAsCat: "Tiu uzanto estas kato"
+flagAsCat: "Agordo de katiĝa uzanto"
 addAccount: "Aldoni konton"
-showOnRemote: "Vidi sur la fora ekzemplo"
+showOnRemote: "Vidi ĉe la surloka nodo"
 general: "Ĝenerala"
 wallpaper: "Ekranfonoj"
 setWallpaper: "Apliki ekranfonon"
@@ -131,40 +137,55 @@ removeWallpaper: "Forviŝi ekranfonon. "
 searchWith: "Serĉi: {q}"
 youHaveNoLists: "Vi ne havas listojn."
 followConfirm: "Ĉu vi certas ke vi volas sekvi {name}'(o)n?"
+host: "Gastigo"
 selectUser: "Elekti uzanton"
+recipient: "Ricevonto"
 annotation: "Komentarioj"
 federation: "Kunfederaĵo"
-instances: "Ekzemplo"
+instances: "Nodoj"
+latestRequestSentAt: "Lastatempa sendo"
+latestRequestReceivedAt: "Lastatempa ricevo"
+latestStatus: "Laŭstato"
 perHour: "Po horo"
 perDay: "Po tago"
-blockThisInstance: "Bloki tiu ekzemplo"
+blockThisInstance: "Bloki la nodon"
+operations: "Agoj"
+software: "Programaro"
 version: "Versio"
+metadata: "Metadatumoj"
 withNFiles: "{n} dosiero(j)"
+monitor: "Monitoro"
+network: "Reto"
 disk: "Diskilo"
-instanceInfo: "Informo pri la ekzemplo"
+instanceInfo: "Informoj pri la nodo"
+statistics: "Statistikoj"
 clearCachedFiles: "Malplenigi la staplon"
 clearCachedFilesConfirm: "Ĉu vi certas, ke vi volas forviŝi ĉiujn transajn dosierojn en la staplo?"
-blockedInstances: "Blokataj ekzemploj"
+blockedInstances: "Blokitaj nodoj"
-muteAndBlock: "Silentigatoj kaj blokatoj"
+muteAndBlock: "Silentigitoj kaj blokitoj"
-mutedUsers: "Silentigataj uzantoj"
+mutedUsers: "Silentigitaj uzantoj"
-blockedUsers: "Blokataj uzantoj"
+blockedUsers: "Blokitaj uzantoj"
 noUsers: "Sen uzantoj"
 editProfile: "Redakti profilon"
 noteDeleteConfirm: "Ĉu vi certas ke vi volas forviŝi la noton?"
-pinLimitExceeded: "Vi ne plu povas alpingli noton."
+pinLimitExceeded: "Vi povas alpingli ne pli noton."
-processing: "Traktado..."
+done: "Fini"
+processing: "Prilaborado…"
+preview: "Antaŭmontro"
 noCustomEmojis: "Neniu emoĵio"
-federating: "Kunfederado"
+federating: "Nun kunfederanta"
-blocked: "Blokata"
+blocked: "Blokita"
+suspended: "Suspendita"
 all: "Ĉiuj"
-subscribing: "Abonita"
+subscribing: "Abonata"
-publishing: "Dissendado"
+publishing: "Al kiu dissendas"
 notResponding: "Alvokato ne disponeblas"
-instanceFollowing: "Sekvatoj el la ekzemplo"
+instanceFollowing: "Sekvatoj en la nodo"
-instanceFollowers: "Sekvantoj el la ekzemplo"
+instanceFollowers: "Sekvantoj el la nodo"
-instanceUsers: "Uzantoj de la ekzemplo"
+instanceUsers: "Uzantoj de tiu ĉi nodo"
 changePassword: "Ŝanĝi pasvorton"
 security: "Sekureco"
+retypedNotMatch: "Enigitoj ne estas konformaj."
 currentPassword: "Aktuala pasvorto"
 newPassword: "Nova pasvorto"
 newPasswordRetype: "Reentajpu la novan pasvorton"
@@ -186,20 +207,20 @@ upload: "Alŝuti"
 fromDrive: "De la disko"
 fromUrl: "De URL"
 uploadFromUrl: "Alŝuti de URL"
-uploadFromUrlDescription: "URL de la dosiero kiun vi volas alŝuti"
+uploadFromUrlDescription: "URL de dosiero kiun vi volas alŝuti"
 explore: "Esplori"
-games: "Ludoj sur Misskey"
+games: "Miskiaj Ludoj"
 messageRead: "Legita"
 startMessaging: "Komenci babiladon"
 nUsersRead: "Legita de {n} homoj"
 tos: "Kondiĉoj de uzado"
 start: "Komenciĝi"
-home: "Hejmo"
+home: "Hejma"
-remoteUserCaution: "Ĉi tiu Infomoj estas ne tute ekzakta pro distanca uzanto."
+remoteUserCaution: "Ĉi tiuj infomoj ne estas tute ekzaktaj pro transa uzanto."
 activity: "Aktiveco"
 images: "Bildoj"
 birthday: "Naskiĝdato"
-registeredDate: "Registriĝdato"
+registeredDate: "Dato de registriĝo"
 location: "Loko"
 theme: "Koloraro"
 light: "Luma"
@@ -232,21 +253,25 @@ watch: "Observi"
 unwatch: "Malobservi"
 accept: "Permesi"
 normal: "Normala"
-instanceName: "Nomo de la ekzemplo"
+instanceName: "Nomo de la nodo"
+instanceDescription: "Priskribo de la nodo "
 maintainerName: "Nomo de la administranto"
 maintainerEmail: "Retpoŝto de la administranto"
 tosUrl: "URL de kondiĉoj de uzado"
 thisYear: "Ĉi-jare"
 thisMonth: "Ĉi-monate"
 today: "Hodiaŭ"
-dayX: "{day}-a"
+dayX: "{day}a"
-monthX: "{month}"
+monthX: "La {month}a monato"
 yearX: "La jaro {year}"
 pages: "Paĝoj"
 connectService: "Konekti"
 disconnectService: "Farkonektiĝi"
+enableLocalTimeline: "Ebligi lokan templinion"
 enableGlobalTimeline: "Ebligi mallokan templinion"
 registration: "Registri"
+enableRegistration: "Ebligi novan uzanton registriĝon"
+invite: "Inviti"
 driveCapacityPerLocalAccount: "Volumo de disko po unu loka uzanto"
 driveCapacityPerRemoteAccount: "Volumo de disko po unu transa uzanto"
 iconUrl: "URL de la ikono (retpaĝsimbolo, ktp)"
@@ -255,63 +280,91 @@ backgroundImageUrl: "URL de fona bildo"
 basicInfo: "Baza informo"
 pinnedUsers: "Alpinglita uzanto"
 pinnedPages: "Alpinglitaj paĝoj"
-pinnedNotes: "Pinglita noto"
+pinnedNotes: "Alpinglita noto"
+hcaptchaSiteKey: "Reteja ŝlosilo"
+hcaptchaSecretKey: "Sekreta ŝlosilo"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "Ebligi reCAPTCHA'on"
+recaptchaSiteKey: "Reteja ŝlosilo"
+recaptchaSecretKey: "Sekreta ŝlosilo"
 antennas: "Antenoj"
+manageAntennas: "Administri antenojn"
 name: "Nomo"
+notifyAntenna: "Oni sciigos novajn notojn"
 withFileAntenna: "Nur kun aldonaĵo"
 withReplies: "Inkluzive respondoj"
+connectedTo: "Sekva konto estas konektita"
 notesAndReplies: "Kun respondoj"
 withFiles: "Kun aldonaĵo"
 silence: "Mutigi"
 silenceConfirm: "Ĉu vi certas ke vi volas mutigi la uzanton?"
 unsilence: "Malmutigi"
 unsilenceConfirm: "Ĉu vi certas ke vi volas malmutigi la uzanton?"
-recentlyUpdatedUsers: "Uzantoj kiu lastatempe faris noton"
+popularUsers: "Popularaj uzantoj"
-recentlyRegisteredUsers: "Nove aniĝintaj uzantoj"
+recentlyUpdatedUsers: "Uzantoj kiuj lastatempe sendis noton"
+recentlyRegisteredUsers: "Novaliĝintaj uzantoj"
+recentlyDiscoveredUsers: "Lastatempe trovitaj uzantoj"
+exploreUsersCount: "Tio estas {count} uzantoj"
+exploreFediverse: "Esplori la Fediverson"
 popularTags: "Popularaj kradvortoj"
 userList: "Listoj"
 about: "Informoj"
 aboutMisskey: "Pri Misskey"
 administrator: "Administranto"
-moderator: "Moderigisto"
+twoStepAuthentication: "Dua-faktora aŭtentiko"
+moderator: "Kontrolisto"
+nUsersMentioned: "{n} uzanto(j) menciis"
 securityKey: "Sekureca ŝlosilo"
 securityKeyName: "Nomo de la ŝlosilo"
 lastUsed: "Plej malnove uzita"
+unregister: "Malregistriĝi"
 passwordLessLogin: "Ensaluti sen pasvorto"
 resetPassword: "Restarigi pasvorton"
 newPasswordIs: "La nova pasvorto estas {password}."
 share: "Diskonigi"
 notFound: "Ne trovita"
 cacheClear: "Malplenigi staplon"
+markAsReadAllNotifications: "Marki ĉiujn sciigojn kiel legito"
 help: "Manlibro de uzado"
 inputMessageHere: "Entajpu masaĝo tie ĉi"
 close: "Fermi"
 group: "Grupo"
 groups: "Grupoj"
 createGroup: "Krei grupon"
+invites: "Inviti"
 groupName: "Grupa nomo"
 members: "Membroj"
-messagingWithUser: "Mesaĝado kun uzanto"
+messagingWithUser: "Babili private"
-messagingWithGroup: "Mesaĝado kun grupo"
+messagingWithGroup: "Babili grupe"
 title: "Titolo"
 text: "Teksto"
 enable: "Ebligi"
 next: "Sekve"
+retype: "Retajpu"
 noteOf: "Noto de {user}"
-noMessagesYet: "Neniu mesaĝo"
+quoteAttached: "Kun citaĵo"
+quoteQuestion: "Ĉu vi aldonas citaĵon?"
+noMessagesYet: "Ankoraŭ neniu mesaĝo"
 newMessageExists: "Vi ricevis novan mesaĝon."
-onlyOneFileCanBeAttached: "Vi povas aldoni nur unu dosieron po unu mesaĝo."
+onlyOneFileCanBeAttached: "Oni povas aldoni nur unu dosieron po mesaĝo."
-invitationCode: "Kodo de invito"
+signinRequired: "Bonvolu ensaluti"
+invitations: "Inviti"
+invitationCode: "Invita kodo"
+unavailable: "Ne disponebla"
+passwordMatched: "Konforma"
+passwordNotMatched: "Nekonforma"
 or: "Aŭ"
 language: "Lingvo"
-uiLanguage: "Lingvo de la fasado"
+uiLanguage: "Lingvo de fasado"
 aboutX: "Pri {x}"
 useOsNativeEmojis: "Oni uzas la emoĵioj de la denaska sistemo"
 youHaveNoGroups: "Neniuj grupoj"
+doing: "Traktado..."
 category: "Kategorio"
 tags: "Etikedoj"
 createAccount: "Krei konton"
 existingAccount: "Ekzista konto"
+regenerate: "Regeneri"
 fontSize: "Tipara grando"
 noFollowRequests: "Vi ne havas peto de sekvado"
 openImageInNewTab: "Fermi la bildon en nova tablo"
@@ -319,79 +372,124 @@ dashboard: "Stirpanelo"
 local: "Loka"
 remote: "Transa"
 total: "Entute"
+appearance: "Eksteraĵo"
 clientSettings: "Agordoj de kliento"
-accountSettings: "Agordoj de Konto"
+accountSettings: "Agordoj de konto"
 numberOfDays: "Nombro de tagoj"
-hideThisNote: "Kaŝi tiun noton"
+hideThisNote: "Kaŝi la noton"
 objectStorageBaseUrl: "Baza URL"
 objectStorageRegion: "Regiono"
 objectStorageUseSSL: "Oni uzas SSL"
 serverLogs: "Servila protokolo"
 deleteAll: "Forviŝi ĉiujn"
+newNoteRecived: "Jen estas novaj notoj"
 sounds: "Sonoj"
 listen: "Aŭdi"
 none: "Neniu"
 showInPage: "Vidi en paĝo"
+popout: "Superigi"
+volume: "Laŭteco"
+masterVolume: "Baza laŭteco"
+chooseEmoji: "Elekti emoĵion"
+recentUsed: "Lastatempaj uzitaj"
+install: "Instali"
+uninstall: "Malinstali"
+installedApps: "Instalita programo"
+nothing: "Neniu"
+installedDate: "Dato de instalado"
+lastUsedDate: "Lastfoje uzita je"
+state: "Stato"
+sort: "Ordigado"
+output: "Elmeto"
+script: "Skripto"
+disablePagesScript: "Malebligi AiScripto en la paĝoj"
 deleteAllFiles: "Forviŝi ĉiujn dosierojn"
-deleteAllFilesConfirm: "Ĉu vi certas, ke vi volas forviŝi ĉiujn viajn dosierojn?"
+deleteAllFilesConfirm: "Ĉu vi certas, ke vi volas forviŝi ĉiujn dosierojn?"
-userSilenced: "Tiu uzanto estas mutigata."
+userSuspended: "Ĉi tiu uzanto estas flostigita."
+userSilenced: "Ĉi tiu uzanto estas mutigita."
 menu: "Menuo"
+addItem: "Aldoni novaĵon"
+rooms: "Ĉambro"
 deletedNote: "Forviŝita noto"
 invisibleNote: "Malpublika noto"
+visibility: "Videbleco"
 poll: "Balotujo"
 useCw: "Kaŝi enhavo"
+enablePlayer: "Vidi videon"
+disablePlayer: "Fermi videon"
+expandTweet: "Disvolvi pepon"
 themeEditor: "Redaktilo de koloraroj"
+description: "Priskribo"
+describeFile: "Priskribi la bildon"
+enterFileDescription: "Priskribu"
 author: "Aŭtoro"
+manage: "Administro"
 plugins: "Kromaĵoj"
 deck: "Kartaro"
+width: "Larĝeco"
+height: "Alteco"
 medium: "Meza"
 small: "Malgranda"
 edit: "Redakti"
 emailServer: "Retpoŝta servilo"
 email: "Retpoŝto"
 emailAddress: "Retpoŝta adreso"
-smtpConfig: "Agordoj de la servilo SMTP"
+smtpConfig: "Agordoj de SMTP servilo"
+smtpHost: "Gastigo"
+smtpPort: "Pordo"
 smtpUser: "Uzantnomo"
 smtpPass: "Pasvorto"
-wordMute: "Silentigo de vortoj"
+wordMute: "Silentigi specifajn vortojn"
 userSaysSomething: "{name} parolis ion"
+makeActive: "Aktivigi"
 display: "Vidi"
 copy: "Kopii"
+overview: "Resumo"
 database: "Datumbazo"
 channel: "Kanalo"
 create: "Krei"
 notificationSetting: "Agordoj de sciigoj"
 useGlobalSetting: "Oni uzas malloka agordo"
 fileIdOrUrl: "Dosiera identigilo aŭ URL"
-abuseReports: "Signali"
+sample: "Ekzemplo"
-reportAbuse: "Signali"
+abuseReports: "Signaloj"
-reportAbuseOf: "Signali {name}'(o)n"
+reportAbuse: "Signalo"
+reportAbuseOf: "Signali kontraŭ {name}'(o)"
 send: "Sendi"
 openInNewTab: "Malfermi en nova langeto"
-editTheseSettingsMayBreakAccount: "Redakti tiujn agordojn estas eble damaĝi konton."
+editTheseSettingsMayBreakAccount: "Redakti ĉi tiujn agordojn povas damaĝi vian konton."
+instanceTicker: "Informoj pri la nodo kiu dissendas la noton"
+random: "Hazarde"
+system: "Sistemo"
+desktop: "Labortablo"
+createNew: "Krei novan"
+optional: "Opciaj"
 public: "Publika"
 i18nInfo: "Misskey estas tradukata en diversaj lingvoj far volontuloj. Oni povas kontribui por la tradukado ĉe {link}."
 accountInfo: "Kontaj Informoj"
-notesCount: "Numero de notoj"
+notesCount: "La nombro de notoj"
-repliesCount: "Numero de respondoj senditaj"
+repliesCount: "La nombro de respondoj senditaj"
-renotesCount: "Numero de renotoj kiun vi sendis"
+renotesCount: "La nombro de notoj kiujn la uzanto plusendis"
-repliedCount: "Numero de respondoj ricevitaj"
+repliedCount: "La nombro de respondoj ricevitaj"
-renotedCount: "Numero de renotoj kiun vi ricevis"
+renotedCount: "La nombro de uzantulaj notoj plusenditaj"
-followingCount: "Numero de sekvatoj"
+followingCount: "La nombro de sekvatoj"
-followersCount: "Numero de sekvantoj"
+followersCount: "La nombro de sekvantoj"
-sentReactionsCount: "Numero de sentitaj reagoj"
+sentReactionsCount: "La nombro de la reagoj senditaj"
-receivedReactionsCount: "Numero de ricevitaj reagoj"
+receivedReactionsCount: "La nombro de la reagoj ricevitaj"
 yes: "Jes"
 no: "Ne"
-driveFilesCount: "Numero de dosieroj sur la disko"
+driveFilesCount: "La nombro de la dosieroj ĉe la disko"
 notSet: "Ne elektita"
-noteFavoritesCount: "Numero de la preferataj notoj"
+emailVerified: "Via retpoŝto estis kontrolita."
+noteFavoritesCount: "La nombro de notoj preferataj"
+pageLikesCount: "La nombro de paĝoj kiun la uzanto preferas"
+pageLikedCount: "La nombro de uzantoj, kiuj preferas paĝon de ĉi tiu uzanto"
 contact: "Kontakto"
 makeExplorable: "Videbligi konton sur la paĝo \"Esplori\""
 duplicate: "Duobligi"
 left: "Maldekstra"
 center: "Centra"
-showTitlebar: "Montri titola stango"
+showTitlebar: "Videbligi titolan stangon"
 clearCache: "Malplenigi staplon"
 onlineUsersCount: "{n} uzanto(j) estas surlinea"
 nUsers: "{n} uzanto(j)"
@@ -412,18 +510,25 @@ newVersionOfClientAvailable: "Nova versio de via kliento estas disponebla."
 inUse: "Uzata"
 editCode: "Redakti kodon"
 emailNotification: "Sciigoj per retpoŝto"
-publish: "Publikigi"
 inChannelSearch: "Serĉi en kanalo"
-useReactionPickerForContextMenu: "Oni malfermas reago-elektilon per dekstro-kliki"
+useReactionPickerForContextMenu: "Malfermi reago-elektilon per dekstro-klaki"
-typingUsers: "{users} estas entajpanta(j)..."
+typingUsers: "{users} nun entajpas…"
+clear: "Vakigi"
+goBack: "Reiri antaŭ"
+addDescription: "Priskribi"
 info: "Informoj"
+userInfo: "Informoj de uzanto"
 unknown: "Nekonata"
 online: "Surkonektita"
 offline: "Forkonektita"
-instanceBlocking: "Blokado de ekzemplo"
+instanceBlocking: "Bloki specifajn nodojn"
 selectAccount: "Elekti konton"
-user: "Uzanto"
+user: "Uzantoj"
+administration: "Administro"
 accounts: "Kontoj"
+shareWithNote: "Kundividi en noto"
+ads: "Reklamaĵo"
+memo: "Memorigilo"
 high: "Alta"
 middle: "Meza"
 low: "Malalta"
@@ -433,12 +538,18 @@ sent: "Sendi"
 received: "Ricevita"
 searchResult: "Serĉorezultoj"
 hashtags: "Kradvorto"
+troubleshooting: "Problemsolvi"
 learnMore: "Lernu pli"
 translate: "Traduki"
 translatedFrom: "Tradukita el {x}"
+controlPanel: "Ŝaltpodio"
+classic: "Klasika"
 _docs:
   continueReading: "Legi plu"
   features: "Funkcioj"
+  admin: "Administro"
+_ad:
+  back: "Nuligi"
 _gallery:
   liked: "Ŝatitaj notoj"
   like: "Ŝati"
@@ -447,6 +558,9 @@ _email:
     title: "Vi estas eksekvita"
   _receiveFollowRequest:
     title: "Vi ricevis peton de sekvado"
+_plugin:
+  install: "Instali kromaĵon"
+  manage: "Administri kromaĵojn"
 _registry:
   key: "Ŝlosilo"
   keys: "Ŝlosiloj"
@@ -455,11 +569,12 @@ _registry:
 _aboutMisskey:
   about: "Misskey estas malfermitkoda programo evoluigata de syuilo ekde la 2014."
   contributors: "Precipaj kontribuantoj"
-  allContributors: "Ĉiuj kontribuintoj"
+  allContributors: "Ĉiuj kontribuantoj"
   source: "Fontkodo"
   translation: "Traduki Misskey'on"
   patrons: "Mecenatoj"
 _mfm:
+  dummy: "Misskey evoluigas la mondon de Fediverso"
   mention: "Mencioj"
   hashtag: "Kradvorto"
   url: "URL"
@@ -478,6 +593,7 @@ _mfm:
   x2: "Granda"
   x3: "Grandega"
   x4: "Pli grandega"
+  font: "Presliteraro"
 _reversi:
   total: "Entute"
 _instanceTicker:
@@ -487,25 +603,37 @@ _instanceTicker:
 _channel:
   create: "Krei kanalon"
   edit: "Redakti kanalon"
+  setBanner: "Apliki standardan bildon"
+  removeBanner: "Forviŝi la standardan bildon"
+  owned: "Posedaĵo"
   following: "Sekvante"
   usersCount: "{n} partoprenanto(j)"
 _menuDisplay:
+  top: "Supro"
   hide: "Kaŝi"
 _wordMute:
-  muteWords: "Kaŝigitaj vortoj"
+  muteWords: "Silentigitaj vortoj"
-  mutedNotes: "Silentigataj notoj"
+  soft: "En kliento"
+  hard: "En servilo"
+  mutedNotes: "Silentigitaj notoj"
 _theme:
-  code: "Kodo de koloraro"
+  manage: "Administri kolorarojn"
+  code: "Kolorara kodo"
+  description: "Priskribo"
+  color: "Koloro"
   darken: "Malbrileco"
   lighten: "Brileco"
   keys:
     bg: "Fono"
     navBg: "Fono de flanka stango"
+    link: "Ligilo"
     hashtag: "Kradvorto"
     mention: "Mencioj"
-    renote: "Fari renoton"
+    mentionMe: "Mencio al vi"
+    renote: "Noto plusendita"
     buttonBg: "Fono de butono"
     driveFolderBg: "Fono de dosierujo de la disko"
+    messageBg: "Fono de retbabilejo"
 _sfx:
   note: "Nova noto"
   noteMy: "Mia noto"
@@ -517,7 +645,7 @@ _sfx:
 _ago:
   future: "Futuro"
   justNow: "Ĵus"
-  secondsAgo: "Antaŭ {n} sekundoj"
+  secondsAgo: "Antaŭ {n} sekundo(j)"
   minutesAgo: "Antaŭ {n} minutoj"
   hoursAgo: "Antaŭ {n} horo(j)"
   daysAgo: "Antaŭ {n} tagoj"
@@ -534,35 +662,41 @@ _tutorial:
   step1_1: "Bonvenon."
   step7_2: "Se vi volas scii pli pri Misskey, rigardu la fakon {help}."
   step7_3: "Do, bonvolu amuziĝi Misskey'on🚀"
+_2fa:
+  registerKey: "Nove registri ŝlosilon"
 _permissions:
-  "read:blocks": "Vidi la liston de uzantoj kiun vi blokas"
+  "read:account": "Legado de la informoj pri via konto"
-  "write:blocks": "Redakti vian liston de blokataj uzantoj"
+  "write:account": "Redatado de la informoj de via konto"
-  "read:drive": "Operacio por legi la informon de dosiero en via disko de Misskey"
+  "read:blocks": "Vidi vian liston de uzantoj blokitaj"
+  "write:blocks": "Redakti vian liston de blokitoj"
+  "read:drive": "Legi vian diskon"
   "write:drive": "Ĉia operacio por skribi, forviŝi, aŭ alimaniere ŝanĝi la informon de dosiero en via disko de Misskey"
-  "read:favorites": "Vidi vian liston de preferatoj"
+  "read:favorites": "Vidi vian liston de preferaĵoj"
-  "read:following": "Vidi tiun kiun vi sekvas"
+  "write:favorites": "Redakti vian liston de preferaĵoj"
+  "read:following": "Vidi la infomaciojn pri tio, kion vi sekvas"
   "write:following": "Sekvi aŭ malsekvi alian uzanton"
   "read:messaging": "Vidi vian retbabiladon"
-  "read:mutes": "Vidi vian liston de silentigoj"
+  "write:messaging": "Retbabilejo"
-  "write:mutes": "Redakti vian liston de silentigoj"
+  "read:mutes": "Vidi vian liston de silentigitoj"
+  "write:mutes": "Redakti vian liston de silentigitoj"
   "write:notes": "Krei / Forviŝi noton"
   "read:notifications": "Vidi sciigojn"
+  "write:notifications": "Manipulado por viaj sciigoj"
   "read:reactions": "Vidi reagojn"
   "write:reactions": "Redakti viajn reagojn"
-  "read:pages": "Vidi via paĝojn"
   "read:page-likes": "Vidi ŝatojn de paĝo"
   "read:channels": "Vidi kanalojn"
 _antennaSources:
   all: "Ĉiuj notoj"
-  homeTimeline: "Notoj far uzantoj, kiujn vi sekvas"
+  homeTimeline: "Notoj far uzantoj kiujn vi sekvas"
 _weekday:
-  sunday: "dimanĉo"
+  sunday: "Dimanĉo"
-  monday: "lundo"
+  monday: "Lundo"
-  tuesday: "mardo"
+  tuesday: "Mardo"
-  wednesday: "merkredo"
+  wednesday: "Merkredo"
-  thursday: "ĵaŭdo"
+  thursday: "Ĵaŭdo"
-  friday: "vendredo"
+  friday: "Vendredo"
-  saturday: "sabato"
+  saturday: "Sabato"
 _widgets:
   notifications: "Sciigoj"
   timeline: "Templinio"
@@ -572,6 +706,7 @@ _widgets:
   slideshow: "Bildoprezento"
   button: "Butono"
   onlineUsers: "Surkonektita uzanto"
+  aichan: "Ai"
 _cw:
   show: "Vidu pli"
   files: "{count} dosiero(j)"
@@ -584,34 +719,42 @@ _poll:
   vote: "Baloti"
   closed: "Oni jam balotis ĝin"
 _visibility:
-  publicDescription: "Via noto aperiĝos sur la konfederacia templinio"
+  public: "Publika"
-  home: "Hejmo"
+  publicDescription: "Via noto estos videbla de ĉiuj uzantoj"
-  homeDescription: "Elsendi nur sur la hejmtemplinio"
+  home: "Hejma"
-  followers: "Sekvantoj"
+  homeDescription: "Dissendi nur sur hejma templinio"
-  followersDescription: "Nur al sekvantoj al mi"
+  followers: "Nur al sekvantoj"
+  followersDescription: "Publiki nur al viaj sekvantoj"
+  specified: "Rekte"
+  specifiedDescription: "Montri nur al specifaj uzantoj"
   localOnly: "Nur loka"
   localOnlyDescription: "Ne montri al transaj uzantoj"
 _postForm:
-  replyPlaceholder: "Respondi al tiu noto..."
+  replyPlaceholder: "Respondi la noton…"
-  quotePlaceholder: "Citado tiun noton..."
+  quotePlaceholder: "Citi la noton…"
-  channelPlaceholder: "Sendi sur la kanalo"
+  channelPlaceholder: "Mencii en kanalo…"
 _profile:
   name: "Nomo"
   username: "Uzantnomo"
+  description: "Sinprezento"
+  metadata: "Kromaj informoj"
   metadataEdit: "Redakti kromaj informoj"
   changeAvatar: "Ŝanĝi profilbildon"
   changeBanner: "Ŝanĝi standardon"
 _exportOrImport:
   allNotes: "Ĉiuj notoj"
-  followingList: "Sekvataj"
+  followingList: "Sekvataj uzantoj"
   muteList: "Silentigoj"
-  blockingList: "Blokado"
+  blockingList: "Blokitoj"
   userLists: "Listoj"
 _charts:
-  federationInstancesTotal: "Tuta numero de kunfederantaj ekzemploj"
+  federationInstancesTotal: "La totala nombro de nodoj kunfederantaj"
-  filesTotal: "Tuta numero de dosieroj"
+  usersTotal: "La totala nombro de la uzantoj"
+  activeUsers: "La nombro de la uzantoj aktivaj"
+  notesTotal: "La totala nombro de notoj"
+  filesTotal: "La totala nombro de la dosieroj"
 _timelines:
-  home: "Hejmo"
+  home: "Hejma"
   local: "Loka"
   social: "Sociala"
   global: "Malloka"
@@ -619,24 +762,48 @@ _rooms:
   translate: "Movi"
   chooseImage: "Elekti bildon"
   _furnitures:
+    bed: "Lito"
+    low-table: "Malaltotablo"
+    desk: "Skribotablo"
+    chair: "Seĝo"
+    chair2: "Seĝo 2"
+    pc: "Komputilo"
+    eraser: "Skrapileto"
+    pencil: "Krajono"
+    pudding: "Flaŭno"
+    book: "Libro"
+    book2: "Libro 2"
+    piano: "Piano"
+    facial-tissue: "Tualetpaperejo"
     server: "Servilo"
-    moon: "La luno"
+    moon: "Luno"
+    monitor: "Monitoro"
+    keyboard: "Klavaro"
+    doll-ai: "Pupa Ai"
 _pages:
+  newPage: "Krei novan paĝon"
   editPage: "Redakti paĝon"
-  deleted: "La paĝo estas forigita."
+  deleted: "Oni forviŝis la paĝon."
   editThisPage: "Redakti la paĝon"
-  viewPage: "Vidi via paĝojn"
+  viewPage: "Vidi viajn paĝojn"
   my: "Miaj paĝoj"
   featured: "Ravaĵoj"
-  content: "Blokado de paĝo"
+  contents: "Enhavo"
+  content: "Paĝo en bloko"
   url: "URL de paĝo"
   alignCenter: "Centrigi"
   chooseBlock: "Aldoni blokon"
+  contentBlocks: "Enhavo"
   blocks:
+    text: "Teksto"
+    textarea: "Areo de teksto"
     image: "Bildo"
     button: "Butono"
     _post:
       canvasId: "Kanvasa identigilo"
+    textInput: "Enmeto el teksto"
+    textareaInput: "Enmeto el teksto en multaj linioj"
+    numberInput: "Nombra enmeto"
     _numberInput:
       text: "Titolo"
     _canvas:
@@ -652,8 +819,20 @@ _pages:
           event: "Nomo de la evento"
   script:
     categories:
+      text: "Manipulo de teksto"
       list: "Listoj"
     blocks:
+      text: "Teksto"
+      multiLineText: "Teksto (multaj linioj)"
+      textList: "List de teksto"
+      _strLen:
+        arg1: "Teksto"
+      _strPick:
+        arg1: "Teksto"
+      _strReplace:
+        arg1: "Teksto"
+      _strReverse:
+        arg1: "Teksto"
       _join:
         arg1: "Listoj"
       _randomPick:
@@ -662,30 +841,49 @@ _pages:
         arg1: "Listoj"
       _seedRandomPick:
         arg2: "Listoj"
+      _DRPWPM:
+        arg1: "List de teksto"
       pick: "Elekti de la listo"
       _pick:
         arg1: "Listoj"
       _listLen:
         arg1: "Listoj"
+      _stringToNumber:
+        arg1: "Teksto"
+      _splitStrByLine:
+        arg1: "Teksto"
+      _fn:
+        slots: "Juntoj"
+        arg1: "Elmeto"
+    thereIsEmptySlot: "La junto {slot} estas malplena!"
     types:
+      string: "Teksto"
       array: "Listoj"
       stringArray: "List de teksto"
+    emptySlot: "Malplena junto"
+    argVariables: "Eniga junto"
 _notification:
   fileUploaded: "La dosiero sukcese alŝutiĝis."
+  youGotMention: "{name} mencis"
+  youGotReply: "{name} respondis"
+  youGotQuote: "{name} citis"
+  youRenoted: "{name} plusendis"
   youGotPoll: "{name} balotis"
   youGotMessagingMessageFromUser: "{name} sentis mesaĝon al vi."
   youGotMessagingMessageFromGroup: "Retbabilan mesaĝon oni sendis al la grupo {name}"
-  youWereFollowed: "sksekvis vin"
+  youWereFollowed: "eksekvis vin"
   youReceivedFollowRequest: "Vi ricevis peton de sekvado"
-  yourFollowRequestAccepted: "Via peto por eksekvu estas akceptita."
+  yourFollowRequestAccepted: "Via peto de sekvado estis akceptita."
   _types:
-    follow: "Sekvatoj"
+    all: "Ĉio"
+    follow: "Nova sekvatoj"
     mention: "Mencioj"
-    renote: "Fari renoton"
+    reply: "Respondoj"
+    renote: "Notoj plusenditaj"
     quote: "Citi"
     reaction: "Reagoj"
     receiveFollowRequest: "Ricevita peton de sekvado"
-    followRequestAccepted: "Peto por eksekvu akceptita"
+    followRequestAccepted: "Akceptita peto por sekvado"
 _deck:
   profile: "Agordaro"
   _columns:
@@ -694,3 +892,4 @@ _deck:
     antenna: "Antenoj"
     list: "Listoj"
     mentions: "Al vi"
+    direct: "Rekte"

locales/es-ES.yml

@@ -7,6 +7,7 @@ search: "Buscar"
 notifications: "Notificaciones"
 username: "Nombre de usuario"
 password: "Contraseña"
+forgotPassword: "Olvidé mi Contraseña"
 fetchingAsApObject: "Buscando en el fediverso"
 ok: "OK"
 gotIt: "Entendido"
@@ -279,6 +280,7 @@ emptyDrive: "El drive está vacío"
 emptyFolder: "La carpeta está vacía"
 unableToDelete: "No se puede borrar"
 inputNewFileName: "Ingrese un nuevo nombre de archivo"
+inputNewDescription: "Ingrese nueva descripción"
 inputNewFolderName: "Ingrese un nuevo nombre de la carpeta"
 circularReferenceFolder: "La carpeta de destino es una sub-carpeta de la carpeta que quieres mover."
 hasChildFilesOrFolders: "No se puede borrar esta carpeta. No está vacía."
@@ -310,6 +312,8 @@ monthX: "Mes {month}"
 yearX: "Año {year}"
 pages: "Páginas"
 integration: "Integración"
+connectService: "Conectar"
+disconnectService: "Desconectar"
 enableLocalTimeline: "Habilitar linea de tiempo local"
 enableGlobalTimeline: "Habilitar linea de tiempo global"
 disablingTimelinesInfo: "Aunque se desactiven estas lineas de tiempo, por conveniencia el administrador y los moderadores pueden seguir usándolos"
@@ -323,6 +327,7 @@ driveCapacityPerRemoteAccount: "Capacidad del drive por usuario remoto"
 inMb: "En megabytes"
 iconUrl: "URL de la imagen del avatar"
 bannerUrl: "URL de la imagen del banner"
+backgroundImageUrl: "URL de la imagen de fondo"
 basicInfo: "Información básica"
 pinnedUsers: "Usuarios fijados"
 pinnedUsersDescription: "Describir los usuarios que quiere fijar en la página \"Descubrir\" separados por una linea nueva"
@@ -524,6 +529,9 @@ removeAllFollowing: "Retener todos los siguientes"
 removeAllFollowingDescription: "Cancelar todos los siguientes del servidor {host}. Ejecutar en caso de que esta instancia haya dejado de existir"
 userSuspended: "Este usuario ha sido suspendido."
 userSilenced: "Este usuario ha sido silenciado."
+yourAccountSuspendedTitle: "Esta cuenta ha sido suspendida"
+yourAccountSuspendedDescription: "Esta cuenta ha sido suspendida debido a violaciones de los términos de servicio del servidor y otras razones. Para más información, póngase en contacto con el administrador. Por favor, no cree una nueva cuenta."
+menu: "Menú"
 divider: "Divisor"
 addItem: "Agregar elemento"
 rooms: "Cuartos"
@@ -543,6 +551,8 @@ disablePlayer: "Cerrar reproductor"
 expandTweet: "Expandir tweet"
 themeEditor: "Editor de temas"
 description: "Descripción"
+describeFile: "Añade una descripción"
+enterFileDescription: "Introducir un título"
 author: "Autor"
 leaveConfirm: "Hay modificaciones sin guardar. ¿Desea descartarlas?"
 manage: "Administrar"
@@ -645,29 +655,90 @@ driveFilesCount: "Cantidad de archivos en el drive"
 driveUsage: "Uso del drive"
 noCrawle: "Rechazar indexación del crawler"
 noCrawleDescription: "Pedir a los motores de búsqueda que no indexen tu perfil, notas, páginas, etc."
+lockedAccountInfo: "A menos que configures la visibilidad de tus notas como \"Sólo seguidores\", tus notas serán visibles para cualquiera, incluso si requieres que los seguidores sean aprobados manualmente."
 alwaysMarkSensitive: "Marcar los medios de comunicación como contenido sensible por defecto"
+loadRawImages: "Cargar las imágenes originales en lugar de mostrar las miniaturas"
+disableShowingAnimatedImages: "No reproducir imágenes animadas"
 verificationEmailSent: "Se le ha enviado un correo electrónico de confirmación. Por favor, acceda al enlace proporcionado en el correo electrónico para completar la configuración."
 notSet: "Sin especificar"
 emailVerified: "Su dirección de correo electrónico ha sido verificada."
 noteFavoritesCount: "Número de notas favoritas"
 pageLikesCount: "Número de favoritos en la página"
 pageLikedCount: "Número de favoritos de su página"
+reversiCount: "Numero de partidas Reversi"
 contact: "Contacto"
+useSystemFont: "Utilizar la tipografía por defecto del sistema"
 clips: "Clip"
+experimentalFeatures: "Características experimentales"
+developer: "Desarrolladores"
+makeExplorable: "Hacer visible la cuenta en \"Explorar\""
+makeExplorableDescription: "Si desactiva esta opción, su cuenta no aparecerá en la sección \"Explorar\"."
+showGapBetweenNotesInTimeline: "Mostrar un intervalo entre notas en la línea de tiempo"
+duplicate: "Duplicar"
+left: "Izquierda"
+center: "Centrar"
+wide: "Ancho"
+narrow: "Estrecho"
+reloadToApplySetting: "Esta configuración sólo se aplicará después de recargar la página. ¿Recargar ahora?"
+showTitlebar: "Mostrar la barra de título"
 clearCache: "Limpiar caché"
+onlineUsersCount: "{n} usuarios en línea"
+nUsers: "{n} Usuarios"
+nNotes: "{n} Notas"
+sendErrorReports: "Envíar informe de errores"
+sendErrorReportsDescription: "Si habilita esta opción, ayudará a mejorar la calidad de Misskey compartiendo información detallada sobre los errores cuando se produzca un problema.\nEsto incluye información como la versión de su sistema operativo, el tipo de navegador que utiliza, su historial de actividad, etc."
+myTheme: "Mi Tema"
 backgroundColor: "Fondo"
 accentColor: "Acento"
 textColor: "Texto"
+saveAs: "Guardar como…"
+advanced: "Avanzado"
 value: "Valores"
+createdAt: "Fecha de creación"
+updatedAt: "Actualizado"
+saveConfirm: "¿Guardar cambios?"
+deleteConfirm: "¿Desea eliminarlo?"
+invalidValue: "Este no es un valor válido."
+registry: "Registro"
+closeAccount: "Cerrar cuenta"
+currentVersion: "Versión actual"
+latestVersion: "Última versión"
+youAreRunningUpToDateClient: "Está utilizando la versión más reciente de su cliente."
+newVersionOfClientAvailable: "Hay una versión más nueva de su cliente disponible."
+usageAmount: "Uso"
+capacity: "Capacidad"
+inUse: "Usado"
+editCode: "Editar código"
 goBack: "Deseleccionar"
 info: "Información"
 user: "Usuarios"
 administration: "Administrar"
 expiration: "Termina el"
 middle: "Mediano"
+customCssWarn: "Este ajuste sólo debe utilizarse si se sabe lo que hace. Introducir valores inadecuados puede hacer que el cliente deje de funcionar con normalidad."
 global: "Global"
+squareAvatars: "Mostrar iconos cuadrados"
 sent: "Enviar"
+received: "Recibido"
+searchResult: "Resultados de búsqueda"
 hashtags: "Hashtag"
+troubleshooting: "Solución de problemas"
+useBlurEffect: "Utilizar efecto de desenfoque en la interfaz de usuario"
+learnMore: "Ver más"
+misskeyUpdated: "¡Misskey ha sido actualizado!"
+whatIsNew: "Mostrar cambios"
+translate: "Traducir"
+translatedFrom: "Traducido de {x}"
+accountDeletionInProgress: "La eliminación de la cuenta está en curso"
+usernameInfo: "Un nombre que identifique su cuenta de otras en este servidor.  Puede utilizar el alfabeto (a~z, A~Z), dígitos (0~9) o guiones bajos (_). Los nombres de usuario no se pueden cambiar posteriormente."
+aiChanMode: "Modo Ai"
+keepCw: "Mantener la advertencia de contenido"
+pubSub: "Cuentas Pub/Sub"
+lastCommunication: "Última comunicación"
+resolved: "Resuelto"
+unresolved: "Sin resolver"
+_accountDelete:
+  accountDelete: "Eliminar Cuenta"
 _docs:
   admin: "Administrar"
 _ad:

locales/fr-FR.yml

@@ -81,6 +81,8 @@ somethingHappened: "Une erreur est survenue"
 retry: "Réessayer"
 pageLoadError: "Le chargement de la page a échoué"
 pageLoadErrorDescription: "Cela est généralement causé par le cache du navigateur ou par un problème réseau. Veuillez vider votre cache ou attendre un peu et réessayer."
+serverIsDead: "Le serveur ne répond pas. Patientez quelques instants puis essayez à nouveau."
+youShouldUpgradeClient: "Si la page ne s'affiche pas correctement, rechargez-la pour mettre votre client à jour."
 enterListName: "Nom de la liste"
 privacy: "Confidentialité"
 makeFollowManuallyApprove: "Accepter manuellement les demandes d’abonnement"
@@ -136,7 +138,7 @@ settingGuide: "Configuration proposée"
 cacheRemoteFiles: "Mise en cache des fichiers distants"
 cacheRemoteFilesDescription: "Lorsque cette option est désactivée, les fichiers distants sont chargés directement depuis l’instance distante. La désactiver diminuera certes l’utilisation de l’espace de stockage local mais augmentera le trafic réseau puisque les miniatures ne seront plus générées."
 flagAsBot: "Ce compte est un robot"
-flagAsBotDescription: "Si ce compte est géré de manière automatisée , définissez cette option. Si elle est activée, elle agira comme un marqueur pour les autres développeurs afin d'éviter des chaînes d'interaction sans fin avec d'autres robots et d'ajuster les systèmes internes de Misskey pour traiter ce compte comme un robot."
+flagAsBotDescription: "Si ce compte est géré de manière automatisée, choisissez cette option. Si elle est activée, elle agira comme un marqueur pour les autres développeurs afin d'éviter des chaînes d'interaction sans fin avec d'autres robots et d'ajuster les systèmes internes de Misskey pour traiter ce compte comme un robot."
 flagAsCat: "Ce compte est un chat"
 flagAsCatDescription: "Activer l'option \" Je suis un chat \" pour ce compte."
 autoAcceptFollowed: "Accepter automatiquement les demandes d’abonnement venant d’utilisateur·rice·s que vous suivez"
@@ -363,7 +365,7 @@ withFiles: "Avec fichiers joints"
 silence: "Mettre en sourdine"
 silenceConfirm: "Êtes-vous sûr·e de vouloir mettre l’utilisateur·rice en sourdine ?"
 unsilence: "Annuler la sourdine"
-unsilenceConfirm: "Êtes-vous sûr·e de vouloir annuler la mise en sourdine de cette utilisateur·rice ?"
+unsilenceConfirm: "Êtes-vous sûr·e de vouloir annuler la mise en sourdine de cet·te utilisateur·rice ?"
 popularUsers: "Utilisateur·rice·s populaires"
 recentlyUpdatedUsers: "Utilisateur·rice·s actif·ve·s récemment"
 recentlyRegisteredUsers: "Utilisateur·rice·s récemment inscrit·e·s"
@@ -377,7 +379,7 @@ aboutMisskey: "À propos de Misskey"
 administrator: "Administrateur"
 token: "Jeton"
 twoStepAuthentication: "Authentification à deux facteurs"
-moderator: "Modérateurs"
+moderator: "Modérateur·rice·s"
 nUsersMentioned: "{n} utilisateur·rice·s mentionné·e·s"
 securityKey: "Clé de sécurité"
 securityKeyName: "Nom de la clé"
@@ -429,7 +431,7 @@ invitationCode: "Code d’invitation"
 checking: "Vérification en cours..."
 available: "Disponible"
 unavailable: "Non disponible"
-usernameInvalidFormat: "Le nom d'utilisateur peut contenir uniquement des lettres, des chiffres et des _"
+usernameInvalidFormat: "Le nom d'utilisateur peut contenir uniquement des lettres (minuscules et/ou majuscules), des chiffres et des _"
 tooShort: "Trop court"
 tooLong: "Trop long"
 weakPassword: "Mot de passe faible"
@@ -495,7 +497,7 @@ objectStorageSetPublicRead: "Régler sur « public » lors de l'envoi"
 serverLogs: "Journal du serveur"
 deleteAll: "Supprimer tout"
 showFixedPostForm: "Afficher le formulaire de publication en haut du fil d'actualité"
-newNoteRecived: "Vous avez reçu une nouvelle note"
+newNoteRecived: "Voir les nouvelles notes"
 sounds: "Sons"
 listen: "Écouter"
 none: "Rien"
@@ -529,6 +531,8 @@ removeAllFollowing: "Retenir tous les abonnements"
 removeAllFollowingDescription: "Se désabonner de tous les comptes de {host}. Veuillez lancer cette action uniquement si l’instance n’existe plus."
 userSuspended: "Cet·te utilisateur·rice a été suspendu·e."
 userSilenced: "Cette utilisateur·trice a été mis·e en sourdine."
+yourAccountSuspendedTitle: "Ce compte est suspendu"
+yourAccountSuspendedDescription: "Ce compte est suspendu car vous avez enfreint les conditions d'utilisation de l'instance, ou pour un motif similaire. Si vous souhaitez connaître en détail les raisons de cette suspension, renseignez-vous auprès de l'administrateur·rice de votre instance. Merci de ne pas créer de nouveau compte."
 menu: "Menu"
 divider: "Séparateur"
 addItem: "Ajouter un élément"
@@ -762,11 +766,13 @@ middle: "Moyen"
 low: "Basse"
 emailNotConfiguredWarning: "Vous n'avez pas configuré d'adresse e-mail."
 ratio: "Ratio"
+previewNoteText: "Voir l'aperçu"
 customCss: "CSS personnalisé"
 customCssWarn: "Utilisez cette fonctionnalité uniquement si vous savez exactement ce que vous faites. Une configuration inadaptée peut empêcher le client de s'exécuter normalement."
 global: "Global"
 squareAvatars: "Avatars carrés"
 sent: "Envoyer"
+received: "Reçu"
 searchResult: "Résultats de la recherche"
 hashtags: "Hashtags"
 troubleshooting: "Résolution de problèmes"
@@ -776,6 +782,32 @@ misskeyUpdated: "Misskey a été mis à jour !"
 whatIsNew: "Voir les derniers changements"
 translate: "Traduire"
 translatedFrom: "Traduit depuis {x}"
+accountDeletionInProgress: "La suppression de votre compte est en cours"
+usernameInfo: "C'est un nom qui identifie votre compte sur l'instance de manière unique. Vous pouvez utiliser des lettres de l'alphabet (minuscules et majuscules), des chiffres (de 0 à 9), ou bien le tiret « _ ». Vous ne pourrez pas modifier votre nom d'utilisateur·rice par la suite."
+aiChanMode: "Mode Ai"
+keepCw: "Garder le CW"
+pubSub: "Comptes Pub/Sub"
+lastCommunication: "Dernière communication"
+resolved: "Résolu"
+unresolved: "En attente"
+itsOn: "Activé"
+itsOff: "Désactivé"
+emailRequiredForSignup: "Une adresse e-mail est nécessaire pour créer un compte"
+unread: "Non lu"
+filter: "Filtre"
+controlPanel: "Panneau de contrôle"
+manageAccounts: "Gérer les comptes"
+_signup:
+  almostThere: "Bientôt fini"
+  emailAddressInfo: "Insérez votre adresse e-mail."
+  emailSent: "Un courriel de confirmation vient d'être envoyé à l'adresse que vous avez renseignée ({email}). Cliquez sur le lien contenu dans le message pour terminer la création de votre compte."
+_accountDelete:
+  accountDelete: "Supprimer le compte"
+  mayTakeTime: "La suppression de compte nécessitant beaucoup de ressources, l'exécution du processus peut prendre du temps, en fonction de la quantité de contenus que vous avez créés et du nombre de fichiers que vous avez téléversés."
+  sendEmail: "Une fois la suppression de votre compte effectuée, un courriel sera envoyé à l'adresse que vous aviez enregistrée."
+  requestAccountDelete: "Demander la suppression de votre compte"
+  started: "La procédure de suppression a commencé."
+  inProgress: "Suppression en cours"
 _docs:
   continueReading: "Lire plus"
   features: "Fonctionnalités"
@@ -883,6 +915,8 @@ _mfm:
   fontDescription: "Il est possible de choisir la police."
   rainbow: "Arc-en-ciel"
   rainbowDescription: "Permet d'afficher le contenu en couleurs arc-en-ciel."
+  sparkle: "Paillettes"
+  sparkleDescription: "Ajoute un effet scintillant au contenu."
 _reversi:
   reversi: "Reversi"
   gameSettings: "Réglages de la partie"
@@ -1109,6 +1143,10 @@ _permissions:
   "write:user-groups": "Éditer les groupes des utilisateur·rice·s"
   "read:channels": "Lire les canaux"
   "write:channels": "Gérer les canaux"
+  "read:gallery": "Voir la galerie"
+  "write:gallery": "Éditer la galerie"
+  "read:gallery-likes": "Voir les mentions « J'aime » dans la galerie"
+  "write:gallery-likes": "Gérer les mentions « J'aime » dans la galerie"
 _auth:
   shareAccess: "Autoriser \"{name}\" à accéder à votre compte ?"
   shareAccessAsk: "Voulez-vous vraiment autoriser cette application à accéder à votre compte?"
@@ -1149,6 +1187,7 @@ _widgets:
   jobQueue: "File d’attente"
   serverMetric: "Statistiques du serveur"
   aiscript: "Console AiScript"
+  aichan: "Ai"
 _cw:
   hide: "Masquer"
   show: "Afficher plus …"
@@ -1221,7 +1260,7 @@ _charts:
   federationInstancesTotal: "Nombre total d'instances fédérées"
   usersIncDec: "Variation du nombre d'utilisateur·rice·s"
   usersTotal: "Nombre des utilisateur·rice·s au total"
-  activeUsers: "Utilisateur·rice·s actif·ve·s"
+  activeUsers: "Nombre d'utilisateurices actif·ve·s"
   notesIncDec: "Variation du nombre des notes"
   localNotesIncDec: "Variation du nombre de notes locales"
   remoteNotesIncDec: "Variation du nombre de notes distantes"

locales/id-ID.yml

@@ -775,6 +775,19 @@ useBlurEffect: "Gunakan efek blur pada antarmuka"
 learnMore: "Pelajari lebih lanjut"
 misskeyUpdated: "Misskey telah dimutakhirkan!"
 whatIsNew: "Lihat perubahan pemutakhiran"
+translate: "Terjemahkan"
+translatedFrom: "Terjemahkan dari {x}"
+accountDeletionInProgress: "Penghapusan akun sedang dalam proses"
+usernameInfo: "Nama yang mengidentifikasikan akun kamu dari yang lain pada server ini. Kamu dapat menggunakan alfabet (a~z, A~Z), digit (0~9) atau garis bawah (_). Username tidak dapat diubah setelahnya."
+keepCw: "Biarkan Peringatan Konten"
+controlPanel: "Panel kontrol"
+_accountDelete:
+  accountDelete: "Hapus akun"
+  mayTakeTime: "Karena penghapusan akun merupakan proses yang berat dan intensif, kemungkinan dapat membutuhkan waktu untuk menyelesaikan tergantung daripada berapa banyak konten yang kamu buat dan berapa banyak berkas yang telah kamu unggah."
+  sendEmail: "Setelah penghapusan akun selesai, pemberitahuan akan dikirimkan ke alamat surel yang terdaftarkan pada akun ini."
+  requestAccountDelete: "Minta penghapusan akun"
+  started: "Penghapusan telah dimulai"
+  inProgress: "Penghapusan sedang dalam proses"
 _docs:
   continueReading: "Baca lebih lanjut"
   features: "Fitur"
@@ -1148,6 +1161,7 @@ _widgets:
   jobQueue: "Antrian kerja"
   serverMetric: "Statistik server"
   aiscript: "Konsol AiScript"
+  aichan: "Ai"
 _cw:
   hide: "Sembunyikan"
   show: "Lihat konten"

locales/index.js

@@ -19,9 +19,11 @@ const languages = [
 	'da-DK',
 	'de-DE',
 	'en-US',
+	'eo-UY',
 	'es-ES',
 	'fr-FR',
 	'id-ID',
+	'it-IT',
 	'ja-JP',
 	'ja-KS',
 	'kab-KAB',

locales/it-IT.yml

@@ -482,7 +482,7 @@ objectStorageSetPublicRead: "Imposta \"visibilità pubblica\" al momento di cari
 serverLogs: "Log del server"
 deleteAll: "Cancella cronologia"
 showFixedPostForm: "Visualizzare la finestra di pubblicazione in cima alla timeline"
-newNoteRecived: "Nuova nota ricevuta"
+newNoteRecived: "Vedi le nuove note"
 sounds: "Impostazioni suoni"
 listen: "Ascolta"
 none: "Niente"

locales/ja-JP.yml

@@ -81,6 +81,8 @@ somethingHappened: "問題が発生しました"
 retry: "再試行"
 pageLoadError: "ページの読み込みに失敗しました。"
 pageLoadErrorDescription: "これは通常、ネットワークまたはブラウザキャッシュが原因です。キャッシュをクリアするか、しばらく待ってから再度試してください。"
+serverIsDead: "サーバーの応答がありません。しばらく待ってから再度試してください。"
+youShouldUpgradeClient: "このページを表示するためには、リロードして新しいバージョンのクライアントをご利用ください。"
 enterListName: "リスト名を入力"
 privacy: "プライバシー"
 makeFollowManuallyApprove: "フォローを承認制にする"
@@ -529,6 +531,8 @@ removeAllFollowing: "フォローを全解除"
 removeAllFollowingDescription: "{host}からのフォローをすべて解除します。そのインスタンスがもう存在しなくなった場合などに実行してください。"
 userSuspended: "このユーザーは凍結されています。"
 userSilenced: "このユーザーはサイレンスされています。"
+yourAccountSuspendedTitle: "アカウントが凍結されています"
+yourAccountSuspendedDescription: "このアカウントは、サーバーの利用規約に違反したなどの理由により、凍結されています。詳細については管理者までお問い合わせください。新しいアカウントを作らないでください。"
 menu: "メニュー"
 divider: "分割線"
 addItem: "項目を追加"
@@ -616,6 +620,8 @@ reportAbuse: "通報"
 reportAbuseOf: "{name}を通報する"
 fillAbuseReportDescription: "通報理由の詳細を記入してください。対象のノートがある場合はそのURLも記入してください。"
 abuseReported: "内容が送信されました。ご報告ありがとうございました。"
+reporteeOrigin: "通報先"
+reporterOrigin: "通報元"
 send: "送信"
 abuseMarkAsResolved: "対応済みにする"
 openInNewTab: "新しいタブで開く"
@@ -762,6 +768,7 @@ middle: "中"
 low: "低"
 emailNotConfiguredWarning: "メールアドレスの設定がされていません。"
 ratio: "比率"
+previewNoteText: "本文をプレビュー"
 customCss: "カスタムCSS"
 customCssWarn: "この設定は必ず知識のある方が行ってください。不適切な設定を行うとクライアントが正常に使用できなくなる恐れがあります。"
 global: "グローバル"
@@ -777,14 +784,53 @@ misskeyUpdated: "Misskeyが更新されました！"
 whatIsNew: "更新情報を見る"
 translate: "翻訳"
 translatedFrom: "{x}から翻訳"
+accountDeletionInProgress: "アカウントの削除が進行中です"
+usernameInfo: "サーバー上であなたのアカウントを一意に識別するための名前。アルファベット(a~z, A~Z)、数字(0~9)、およびアンダーバー(_)が使用できます。ユーザー名は後から変更することは出来ません。"
+aiChanMode: "藍モード"
+keepCw: "CWを維持する"
+pubSub: "Pub/Subのアカウント"
+lastCommunication: "直近の通信"
+resolved: "解決済み"
+unresolved: "未解決"
+itsOn: "オンになっています"
+itsOff: "オフになっています"
+emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする"
+unread: "未読"
+filter: "フィルタ"
+controlPanel: "コントロールパネル"
+manageAccounts: "アカウントを管理"
+makeReactionsPublic: "リアクション一覧を公開する"
+makeReactionsPublicDescription: "あなたがしたリアクション一覧を誰でも見れるようにします。"
+classic: "クラシック"
+muteThread: "スレッドをミュート"
+unmuteThread: "スレッドのミュートを解除"
+ffVisibility: "つながりの公開範囲"
+ffVisibilityDescription: "自分のフォロー/フォロワー情報の公開範囲を設定できます。"
 
-_docs: 
+_emailUnavailable:
-  continueReading: "続きを読む"
+  used: "既に使用されています"
-  features: "機能"
+  format: "形式が正しくありません"
-  generalTopics: "一般的なトピック"
+  disposable: "恒久的に使用可能なアドレスではありません"
-  advancedTopics: "高度なトピック"
+  mx: "正しいメールサーバーではありません"
-  admin: "管理"
+  smtp: "メールサーバーが応答しません"
-  translateWarn: "このドキュメントは翻訳されたものです。オリジナルとは内容が異なる場合があります。"
+
+_ffVisibility:
+  public: "公開"
+  followers: "フォロワーだけに公開"
+  private: "非公開"
+
+_signup:
+  almostThere: "ほとんど完了です"
+  emailAddressInfo: "あなたが使っているメールアドレスを入力してください。"
+  emailSent: "入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。"
+
+_accountDelete:
+  accountDelete: "アカウントの削除"
+  mayTakeTime: "アカウントの削除は負荷のかかる処理であるため、作成したコンテンツの数やアップロードしたファイルの数が多いと完了までに時間がかかることがあります。"
+  sendEmail: "アカウントの削除が完了する際は、登録してあったメールアドレス宛に通知を送信します。"
+  requestAccountDelete: "アカウント削除をリクエスト"
+  started: "削除処理が開始されました。"
+  inProgress: "削除が進行中"
 
 _ad:
   back: "戻る"
@@ -894,6 +940,8 @@ _mfm:
   fontDescription: "内容のフォントを指定することができます。"
   rainbow: "レインボー"
   rainbowDescription: "内容をレインボーにします。"
+  sparkle: "キラキラ"
+  sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
 
 _reversi:
   reversi: "リバーシ"
@@ -1134,6 +1182,10 @@ _permissions:
   "write:user-groups": "ユーザーグループを操作する"
   "read:channels": "チャンネルを見る"
   "write:channels": "チャンネルを操作する"
+  "read:gallery": "ギャラリーを見る"
+  "write:gallery": "ギャラリーを操作する"
+  "read:gallery-likes": "ギャラリーのいいねを見る"
+  "write:gallery-likes": "ギャラリーのいいねを操作する"
 
 _auth:
   shareAccess: "「{name}」がアカウントにアクセスすることを許可しますか？"
@@ -1178,6 +1230,7 @@ _widgets:
   jobQueue: "ジョブキュー"
   serverMetric: "サーバーメトリクス"
   aiscript: "AiScriptコンソール"
+  aichan: "藍"
 
 _cw:
   hide: "隠す"

locales/ja-KS.yml

@@ -245,7 +245,7 @@ messageRead: "もう読んだ"
 noMoreHistory: "これより過去の履歴はあらへんで"
 startMessaging: "チャットやるで"
 nUsersRead: "{n}人が読んでもうた"
-agreeTo: "{0}はええで"
+agreeTo: "{0}に同意したで"
 tos: "利用規約"
 start: "始める"
 home: "ホーム"
@@ -346,7 +346,7 @@ antennaSource: "受信ソース(このソースは食われへん)"
 antennaKeywords: "受信キーワード"
 antennaExcludeKeywords: "除外キーワード"
 antennaKeywordsDescription: "スペースで区切ったるとAND指定で、改行で区切ったるとOR指定や"
-notifyAntenna: "新しいノートを追加すんで"
+notifyAntenna: "新しいノートを通知すんで"
 withFileAntenna: "なんか添付されたノートだけ"
 enableServiceworker: "ServiceWorkerをつこて"
 antennaUsersDescription: "ユーザー名を改行で区切ったってな"

locales/kab-KAB.yml

@@ -36,6 +36,7 @@ selectList: "Fren tabdart"
 youHaveNoLists: "Ulac ɣur-k·m ula d yiwet n tabdart"
 security: "Taɣellist"
 remove: "Kkes"
+connectService: "Qqen"
 userList: "Tibdarin"
 securityKey: "Tasarutt n tɣellist"
 securityKeyName: "Isem n tsarutt"

locales/ko-KR.yml

@@ -529,6 +529,8 @@ removeAllFollowing: "모든 팔로잉 해제"
 removeAllFollowingDescription: "{host}(으)로부터 모든 팔로잉을 해제합니다. 해당 인스턴스가 더 이상 존재하지 않게 된 경우 등에 실행해 주세요."
 userSuspended: "이 계정은 정지된 상태입니다."
 userSilenced: "이 계정은 사일런스된 상태입니다."
+yourAccountSuspendedTitle: "계정이 정지되었습니다"
+yourAccountSuspendedDescription: "이 계정은 서버의 이용 약관을 위반하거나, 기타 다른 이유로 인해 정지되었습니다. 자세한 사항은 관리자에게 문의해 주십시오. 계정을 새로 생성하지 마십시오."
 menu: "메뉴"
 divider: "구분선"
 addItem: "항목 추가"
@@ -777,6 +779,22 @@ misskeyUpdated: "Misskey가 업데이트 되었습니다!"
 whatIsNew: "패치 정보 보기"
 translate: "번역"
 translatedFrom: "{x}에서 번역"
+accountDeletionInProgress: "계정 삭제 작업을 진행하고 있습니다"
+usernameInfo: "서버상에서 계정을 식별하기 위한 이름. 알파벳(a~z, A~Z), 숫자(0~9) 및 언더바(_)를 사용할 수 있습니다. 사용자명은 나중에 변경할 수 없습니다."
+aiChanMode: "아이 모드"
+keepCw: "CW 유지하기"
+pubSub: "Pub/Sub 계정"
+lastCommunication: "마지막 통신"
+resolved: "해결됨"
+unresolved: "해결되지 않음"
+controlPanel: "제어판"
+_accountDelete:
+  accountDelete: "계정 삭제"
+  mayTakeTime: "계정 삭제는 서버에 부하를 가하기 때문에, 작성한 콘텐츠나 업로드한 파일의 수가 많으면 완료까지 시간이 걸릴 수 있습니다."
+  sendEmail: "계정 삭제가 완료되면 등록된 이메일 주소로 알림을 보냅니다."
+  requestAccountDelete: "계정 삭제 요청"
+  started: "삭제 작업이 시작되었습니다."
+  inProgress: "삭제 진행 중"
 _docs:
   continueReading: "계속 읽기"
   features: "기능"
@@ -884,6 +902,8 @@ _mfm:
   fontDescription: "내용의 글꼴을 지정할 수 있습니다."
   rainbow: "무지개"
   rainbowDescription: "내용을 무지개로 표시합니다."
+  sparkle: "반짝반짝"
+  sparkleDescription: "반짝이는 파티클 효과를 추가합니다."
 _reversi:
   reversi: "리버시"
   gameSettings: "대국 설정"
@@ -1105,11 +1125,15 @@ _permissions:
   "read:pages": "페이지를 봅니다"
   "write:pages": "페이지를 수정합니다"
   "read:page-likes": "페이지의 좋아요를 확인합니다"
-  "write:page-likes": "페이지의 좋아요를 추가하거나 삭제합니다"
+  "write:page-likes": "페이지에 좋아요를 추가하거나 취소합니다"
   "read:user-groups": "유저 그룹을 조회합니다"
   "write:user-groups": "유저 그룹을 만들거나, 초대하거나, 이름을 변경하거나, 양도하거나, 삭제합니다"
   "read:channels": "채널을 보기"
-  "write:channels": "채널을 변경하기"
+  "write:channels": "채널을 추가하거나 삭제합니다"
+  "read:gallery": "갤러리를 봅니다"
+  "write:gallery": "갤러리를 추가하거나 삭제합니다"
+  "read:gallery-likes": "갤러리의 좋아요를 확인합니다"
+  "write:gallery-likes": "갤러리에 좋아요를 추가하거나 취소합니다"
 _auth:
   shareAccess: "\"{name}\" 이 계정에 접근하는 것을 허용하시겠습니까?"
   shareAccessAsk: "이 애플리케이션이 계정에 접근하는 것을 허용하시겠습니까?"
@@ -1150,6 +1174,7 @@ _widgets:
   jobQueue: "작업 대기열"
   serverMetric: "서버 통계"
   aiscript: "AiScript 콘솔"
+  aichan: "아이"
 _cw:
   hide: "숨기기"
   show: "더 보기"

locales/ru-RU.yml

@@ -81,6 +81,8 @@ somethingHappened: "Что-то пошло не так"
 retry: "Повторить попытку"
 pageLoadError: "Не удалось загрузить страницу"
 pageLoadErrorDescription: "Обычно это случается из-за сбоев в сети или кэша браузера. Попробуйте очистить кэш, или подождать пару минут, а потом попытаться загрузить страницу снова."
+serverIsDead: "Ответа от сервера нет. Пожалуйста, подождите немного и повторите попытку."
+youShouldUpgradeClient: "Чтобы просмотреть эту страницу, пожалуйста, обновите ее."
 enterListName: "Название списка"
 privacy: "Конфиденциальность"
 makeFollowManuallyApprove: "Принимать подписчиков вручную"
@@ -529,6 +531,8 @@ removeAllFollowing: "Удалить всех подписчиков"
 removeAllFollowingDescription: "Отменить все подписки с домена {host}? Пожалуйста, применяйте это действие, если инстанс больше не существует."
 userSuspended: "Эта учётная запись заморожена"
 userSilenced: "Этот пользователь был заглушен"
+yourAccountSuspendedTitle: "Эта учетная запись заблокирована"
+yourAccountSuspendedDescription: "Эта учетная запись была заблокирована из-за нарушения условий предоставления услуг сервера. Свяжитесь с администратором, если вы хотите узнать более подробную причину. Пожалуйста, не создавайте новую учетную запись."
 menu: "Меню"
 divider: "Линия-разделитель"
 addItem: "Добавить элемент"
@@ -775,6 +779,13 @@ useBlurEffect: "Размытие в интерфейсе"
 learnMore: "Подробнее"
 misskeyUpdated: "Misskey обновился!"
 whatIsNew: "Что новенького?"
+translate: "Перевод"
+accountDeletionInProgress: "В настоящее время выполняется удаление учетной записи"
+usernameInfo: "Имя, которое отличает вашу учетную запись от других на этом сервере. Вы можете использовать алфавит (a~z, A~Z), цифры (0~9) или символы подчеркивания (_). Имена пользователей не могут быть изменены позже."
+aiChanMode: "ИИ режим"
+keepCw: "Сохраняйте Предупреждения о содержимом"
+controlPanel: "Панель управления"
+manageAccounts: "Управление аккаунтом"
 _docs:
   continueReading: "Читать подробнее"
   features: "Возможности"
@@ -1148,6 +1159,7 @@ _widgets:
   jobQueue: "Очередь заданий"
   serverMetric: "Показатели сервера"
   aiscript: "Консоль AiScript"
+  aichan: "Ай"
 _cw:
   hide: "Спрятать"
   show: "Показать еще"

locales/zh-CN.yml

@@ -81,6 +81,8 @@ somethingHappened: "出现了一些问题！"
 retry: "重试"
 pageLoadError: "页面加载失败。"
 pageLoadErrorDescription: "这通常是由于网络或浏览器缓存的原因。请清除缓存或等待片刻后重试。"
+serverIsDead: "服务器没有响应。 请稍等片刻，然后重试。"
+youShouldUpgradeClient: "请重新加载并使用新版本的客户端查看此页面。"
 enterListName: "输入列表名称"
 privacy: "隐私"
 makeFollowManuallyApprove: "关注者的关注请求需要批准"
@@ -529,6 +531,8 @@ removeAllFollowing: "取消所有关注"
 removeAllFollowingDescription: "取消{host}的所有关注者。当实例不存在时执行。"
 userSuspended: "该用户已被冻结。"
 userSilenced: "该用户已被禁言。"
+yourAccountSuspendedTitle: "账户已被冻结"
+yourAccountSuspendedDescription: "由于违反了服务器的服务条款或其他原因，该账户已被冻结。 您可以与管理员联系以了解更多信息。 请不要创建一个新的帐户。"
 menu: "菜单"
 divider: "分割线"
 addItem: "添加项目"
@@ -762,6 +766,7 @@ middle: "中"
 low: "低"
 emailNotConfiguredWarning: "电子邮件地址未设置。"
 ratio: "比率"
+previewNoteText: "预览文本"
 customCss: "自定义 CSS"
 customCssWarn: "这些设置必须有相关的基础知识，不当的配置可能导致客户端无法正常使用！"
 global: "全局"
@@ -777,6 +782,33 @@ misskeyUpdated: "Misskey更新完成！"
 whatIsNew: "显示更新信息"
 translate: "翻译"
 translatedFrom: "从 {x} 翻译"
+accountDeletionInProgress: "正在删除账户"
+usernameInfo: "在服务器上唯一标识您的帐户的名称。您可以使用字母 (a ~ z, A ~ Z)、数字 (0 ~ 9) 和下划线 (_)。用户名以后不能更改。"
+aiChanMode: "小蓝模式"
+keepCw: "保留CW"
+pubSub: "Pub/Sub账户"
+lastCommunication: "最近通信"
+resolved: "已解决"
+unresolved: "未解决"
+itsOn: "已开启"
+itsOff: "已关闭"
+emailRequiredForSignup: "注册账户需要电子邮件地址"
+unread: "未读"
+filter: "筛选"
+controlPanel: "控制面板"
+manageAccounts: "管理账户"
+classic: "经典"
+_signup:
+  almostThere: "即将完成"
+  emailAddressInfo: "请输入您所使用的电子邮件地址"
+  emailSent: "已将确认邮件发送至您输入的电子邮件地址 ({email})。请访问电子邮件中的链接以完成帐户创建。"
+_accountDelete:
+  accountDelete: "删除帐户"
+  mayTakeTime: "删除账号是一个性能损耗较大的处理，如果账号持有的内容数量和上传的文件数量较多的话，完成需要花费一段时间。"
+  sendEmail: "账户删除完成后，将向注册的电子邮件地址发送通知。"
+  requestAccountDelete: "请求删除账户"
+  started: "账户删除过程已开始。"
+  inProgress: "正在删除"
 _docs:
   continueReading: "继续阅读"
   features: "特性"
@@ -884,6 +916,8 @@ _mfm:
   fontDescription: "可以设置内容所使用的字体。"
   rainbow: "彩虹"
   rainbowDescription: "用彩虹色来显示内容。"
+  sparkle: "闪光"
+  sparkleDescription: "添加发光粒子效果。"
 _reversi:
   reversi: "黑白棋"
   gameSettings: "对局设置"
@@ -1110,6 +1144,10 @@ _permissions:
   "write:user-groups": "操作用户组"
   "read:channels": "查看频道"
   "write:channels": "管理频道"
+  "read:gallery": "浏览图库"
+  "write:gallery": "操作图库"
+  "read:gallery-likes": "读取喜欢的图片"
+  "write:gallery-likes": "操作喜欢的图片"
 _auth:
   shareAccess: "您要授权允许“{name}”访问您的帐户吗？"
   shareAccessAsk: "您确定要授权此应用程序访问您的帐户吗？"
@@ -1150,6 +1188,7 @@ _widgets:
   jobQueue: "作业队列"
   serverMetric: "服务器监控"
   aiscript: "AiScript控制台"
+  aichan: "小蓝"
 _cw:
   hide: "隐藏"
   show: "查看更多"

migration/1629512953000-user-is-deleted.ts

@@ -0,0 +1,15 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class isUserDeleted1629512953000 implements MigrationInterface {
+    name = 'isUserDeleted1629512953000'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user" ADD "isDeleted" boolean NOT NULL DEFAULT false`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isDeleted" IS 'Whether the User is deleted.'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isDeleted"`);
+    }
+
+}

migration/1629778475000-deepl-integration2.ts

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

migration/1633068642000-email-required-for-signup.ts

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

migration/1633071909016-user-pending.ts

@@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class userPending1633071909016 implements MigrationInterface {
+    name = 'userPending1633071909016'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "user_pending" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "code" character varying(128) NOT NULL, "username" character varying(128) NOT NULL, "email" character varying(128) NOT NULL, "password" character varying(128) NOT NULL, CONSTRAINT "PK_d4c84e013c98ec02d19b8fbbafa" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_4e5c4c99175638ec0761714ab0" ON "user_pending" ("code") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_4e5c4c99175638ec0761714ab0"`);
+        await queryRunner.query(`DROP TABLE "user_pending"`);
+    }
+
+}

migration/1634486652000-user-public-reactions.ts

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

migration/1634902659689-delete-log.ts

@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class deleteLog1634902659689 implements MigrationInterface {
+    name = 'deleteLog1634902659689'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+			await queryRunner.query(`DROP TABLE "log"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+    }
+
+}

migration/1635500777168-note-thread-mute.ts

@@ -0,0 +1,26 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class noteThreadMute1635500777168 implements MigrationInterface {
+    name = 'noteThreadMute1635500777168'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "note_thread_muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "threadId" character varying(256) NOT NULL, CONSTRAINT "PK_ec5936d94d1a0369646d12a3a47" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_29c11c7deb06615076f8c95b80" ON "note_thread_muting" ("userId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_c426394644267453e76f036926" ON "note_thread_muting" ("threadId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_ae7aab18a2641d3e5f25e0c4ea" ON "note_thread_muting" ("userId", "threadId") `);
+        await queryRunner.query(`ALTER TABLE "note" ADD "threadId" character varying(256)`);
+        await queryRunner.query(`CREATE INDEX "IDX_d4ebdef929896d6dc4a3c5bb48" ON "note" ("threadId") `);
+        await queryRunner.query(`ALTER TABLE "note_thread_muting" ADD CONSTRAINT "FK_29c11c7deb06615076f8c95b80a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "note_thread_muting" DROP CONSTRAINT "FK_29c11c7deb06615076f8c95b80a"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_d4ebdef929896d6dc4a3c5bb48"`);
+        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "threadId"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_ae7aab18a2641d3e5f25e0c4ea"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_c426394644267453e76f036926"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_29c11c7deb06615076f8c95b80"`);
+        await queryRunner.query(`DROP TABLE "note_thread_muting"`);
+    }
+
+}

migration/1636197624383-ff-visibility.ts

@@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class ffVisibility1636197624383 implements MigrationInterface {
+    name = 'ffVisibility1636197624383'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TYPE "public"."user_profile_ffvisibility_enum" AS ENUM('public', 'followers', 'private')`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "ffVisibility" "public"."user_profile_ffvisibility_enum" NOT NULL DEFAULT 'public'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "ffVisibility"`);
+        await queryRunner.query(`DROP TYPE "public"."user_profile_ffvisibility_enum"`);
+    }
+
+}

misskey-assets

@@ -0,0 +1 @@
+Subproject commit 0179793ec891856d6f37a3be16ba4c22f67a81b5

package.json

@@ -1,7 +1,6 @@
 {
 	"name": "misskey",
-	"author": "syuilo <syuilotan@yahoo.co.jp>",
+	"version": "12.95.0",
-	"version": "12.88.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -29,8 +28,9 @@
 		"lint": "tslint 'src/**/*.ts'",
 		"cy:open": "cypress open",
 		"cy:run": "cypress run",
-		"e2e": "start-server-and-test start:test http://localhost cy:run",
+		"e2e": "start-server-and-test start:test http://localhost:61812 cy:run",
-		"test": "cross-env TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" mocha",
+		"mocha": "cross-env TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" mocha",
+		"test": "npm run mocha",
 		"format": "gulp format"
 	},
 	"resolutions": {
@@ -38,6 +38,7 @@
 		"lodash": "^4.17.21"
 	},
 	"dependencies": {
+		"@discordapp/twemoji": "13.1.0",
 		"@elastic/elasticsearch": "7.11.0",
 		"@koa/cors": "3.1.0",
 		"@koa/multer": "3.0.0",
@@ -47,15 +48,15 @@
 		"@sinonjs/fake-timers": "7.1.2",
 		"@syuilo/aiscript": "0.11.1",
 		"@types/bcryptjs": "2.4.2",
-		"@types/bull": "3.15.3",
+		"@types/bull": "3.15.5",
 		"@types/cbor": "6.0.0",
 		"@types/dateformat": "3.0.1",
 		"@types/escape-regexp": "0.0.0",
-		"@types/glob": "7.1.4",
+		"@types/glob": "7.2.0",
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
 		"@types/is-url": "1.2.30",
-		"@types/js-yaml": "4.0.2",
+		"@types/js-yaml": "4.0.4",
 		"@types/jsdom": "16.2.13",
 		"@types/jsonld": "1.5.6",
 		"@types/katex": "0.11.1",
@@ -63,22 +64,21 @@
 		"@types/koa-bodyparser": "4.3.3",
 		"@types/koa-cors": "0.0.2",
 		"@types/koa-favicon": "2.0.21",
-		"@types/koa-logger": "3.1.1",
+		"@types/koa-logger": "3.1.2",
-		"@types/koa-mount": "4.0.0",
+		"@types/koa-mount": "4.0.1",
 		"@types/koa-send": "4.1.3",
 		"@types/koa-views": "7.0.0",
 		"@types/koa__cors": "3.0.3",
-		"@types/koa__multer": "2.0.3",
+		"@types/koa__multer": "2.0.4",
-		"@types/koa__router": "8.0.7",
+		"@types/koa__router": "8.0.8",
-		"@types/markdown-it": "12.0.3",
+		"@types/matter-js": "0.17.6",
-		"@types/matter-js": "0.17.5",
 		"@types/mocha": "8.2.3",
-		"@types/node": "16.6.2",
+		"@types/node": "16.11.7",
 		"@types/node-fetch": "2.5.12",
 		"@types/nodemailer": "6.4.4",
 		"@types/nprogress": "0.2.0",
 		"@types/oauth": "0.9.1",
-		"@types/parse5": "6.0.1",
+		"@types/parse5": "6.0.2",
 		"@types/parsimmon": "1.10.6",
 		"@types/portscanner": "2.1.1",
 		"@types/pug": "2.0.5",
@@ -86,68 +86,71 @@
 		"@types/qrcode": "1.4.1",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.2",
-		"@types/redis": "2.8.31",
+		"@types/redis": "2.8.32",
 		"@types/rename": "1.0.4",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "3.0.2",
 		"@types/seedrandom": "2.4.28",
-		"@types/sharp": "0.28.5",
+		"@types/sharp": "0.29.3",
-		"@types/sinonjs__fake-timers": "6.0.3",
+		"@types/sinonjs__fake-timers": "6.0.4",
 		"@types/speakeasy": "2.0.6",
 		"@types/throttle-debounce": "2.1.0",
 		"@types/tinycolor2": "1.4.3",
-		"@types/tmp": "0.2.1",
+		"@types/tmp": "0.2.2",
 		"@types/uuid": "8.3.1",
 		"@types/web-push": "3.3.2",
 		"@types/webpack": "5.28.0",
 		"@types/webpack-stream": "3.2.12",
 		"@types/websocket": "1.0.4",
-		"@types/ws": "7.4.7",
+		"@types/ws": "8.2.0",
-		"@typescript-eslint/parser": "4.29.2",
+		"@typescript-eslint/parser": "5.1.0",
-		"@vue/compiler-sfc": "3.2.4",
+		"@vue/compiler-sfc": "3.2.21",
 		"abort-controller": "3.0.0",
-		"apexcharts": "3.27.3",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.4",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.966.0",
+		"aws-sdk": "2.1013.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.4",
-		"broadcast-channel": "4.2.0",
+		"broadcast-channel": "4.5.0",
-		"bull": "3.28.1",
+		"bull": "4.1.0",
-		"cacheable-lookup": "6.0.0",
+		"cacheable-lookup": "6.0.4",
 		"cafy": "15.2.1",
-		"cbor": "8.0.0",
+		"cbor": "8.1.0",
 		"chalk": "4.1.2",
-		"chart.js": "2.9.4",
+		"chart.js": "3.6.0",
+		"chartjs-adapter-date-fns": "2.0.0",
+		"chartjs-plugin-zoom": "1.1.1",
 		"cli-highlight": "2.1.11",
-		"commander": "8.1.0",
 		"compare-versions": "3.6.0",
-		"concurrently": "6.2.1",
+		"concurrently": "6.3.0",
 		"content-disposition": "0.5.3",
 		"crc-32": "1.2.0",
-		"css-loader": "6.2.0",
+		"css-loader": "6.5.1",
-		"cssnano": "5.0.8",
+		"cssnano": "5.0.10",
+		"date-fns": "2.25.0",
 		"dateformat": "4.5.1",
+		"deep-email-validator": "0.1.18",
 		"escape-regexp": "0.0.1",
-		"eslint": "7.32.0",
+		"eslint": "8.2.0",
-		"eslint-plugin-vue": "7.16.0",
+		"eslint-plugin-vue": "8.0.3",
 		"eventemitter3": "4.0.7",
 		"feed": "4.2.2",
 		"file-type": "16.5.3",
 		"fluent-ffmpeg": "2.1.2",
-		"glob": "7.1.7",
+		"glob": "7.2.0",
 		"got": "11.8.2",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
 		"gulp-rename": "2.0.0",
 		"gulp-replace": "1.1.3",
-		"gulp-terser": "2.0.1",
+		"gulp-terser": "2.1.0",
 		"gulp-tslint": "8.1.4",
 		"hpagent": "0.1.2",
 		"http-signature": "1.3.5",
 		"idb-keyval": "5.1.3",
 		"insert-text-at-cursor": "0.3.0",
+		"ip-cidr": "3.0.4",
 		"is-svg": "4.3.1",
 		"js-yaml": "4.1.0",
 		"jsdom": "16.7.0",
@@ -155,8 +158,8 @@
 		"json5-loader": "4.0.1",
 		"jsonld": "5.2.0",
 		"jsrsasign": "8.0.20",
-		"katex": "0.13.13",
+		"katex": "0.13.18",
-		"koa": "2.13.1",
+		"koa": "2.13.4",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
 		"koa-json-body": "5.3.0",
@@ -164,31 +167,31 @@
 		"koa-mount": "4.0.0",
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
-		"koa-views": "7.0.1",
+		"koa-views": "7.0.2",
 		"langmap": "0.0.16",
-		"markdown-it": "12.2.0",
-		"markdown-it-anchor": "7.1.0",
 		"matter-js": "0.17.1",
-		"mfm-js": "0.19.0",
+		"mfm-js": "0.20.0",
-		"misskey-js": "0.0.6",
+		"misskey-js": "0.0.8",
 		"mocha": "8.4.0",
 		"ms": "2.1.3",
 		"multer": "1.4.3",
 		"nested-property": "4.0.0",
 		"node-fetch": "2.6.1",
-		"nodemailer": "6.6.3",
+		"nodemailer": "6.7.0",
 		"os-utils": "0.0.14",
 		"parse5": "6.0.1",
 		"pg": "8.7.1",
+		"photoswipe": "git://github.com/dimsemenov/photoswipe#v5-beta",
 		"portscanner": "2.2.0",
-		"postcss": "8.3.6",
+		"postcss": "8.3.11",
-		"postcss-loader": "6.1.1",
+		"postcss-loader": "6.2.0",
-		"prismjs": "1.24.1",
+		"prismjs": "1.25.0",
+		"private-ip": "2.3.3",
 		"probe-image-size": "7.2.1",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.2",
 		"punycode": "2.1.1",
-		"pureimage": "0.3.2",
+		"pureimage": "0.3.5",
 		"qrcode": "1.4.4",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
@@ -202,53 +205,55 @@
 		"rimraf": "3.0.2",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass": "1.38.0",
+		"sass": "1.43.4",
-		"sass-loader": "12.1.0",
+		"sass-loader": "12.3.0",
 		"seedrandom": "3.0.5",
-		"sharp": "0.29.0",
+		"sharp": "0.29.2",
 		"speakeasy": "2.0.0",
+		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"style-loader": "3.2.1",
+		"style-loader": "3.3.1",
 		"summaly": "2.4.1",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "5.8.0",
+		"systeminformation": "5.9.9",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"three": "0.117.1",
 		"throttle-debounce": "3.0.1",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
-		"ts-loader": "9.2.5",
+		"ts-loader": "9.2.6",
-		"ts-node": "10.2.1",
+		"ts-node": "10.4.0",
-		"tsc-alias": "1.3.9",
+		"tsc-alias": "1.3.10",
-		"tsconfig-paths": "3.10.1",
+		"tsconfig-paths": "3.11.0",
 		"tslint": "6.1.3",
 		"tslint-sonarts": "1.9.0",
 		"twemoji-parser": "13.1.0",
-		"typeorm": "0.2.37",
+		"typeorm": "0.2.39",
-		"typescript": "4.3.5",
+		"typescript": "4.4.4",
 		"ulid": "2.3.0",
 		"uuid": "8.3.2",
 		"v-debounce": "0.1.2",
-		"vue": "3.2.4",
+		"vanilla-tilt": "1.7.2",
-		"vue-loader": "16.5.0",
+		"vue": "3.2.21",
+		"vue-loader": "16.7.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vue-router": "4.0.5",
 		"vue-style-loader": "4.1.3",
 		"vue-svg-loader": "0.17.0-beta.2",
 		"vuedraggable": "4.0.1",
 		"web-push": "3.4.5",
-		"webpack": "5.51.0",
+		"webpack": "5.63.0",
-		"webpack-cli": "4.8.0",
+		"webpack-cli": "4.9.1",
 		"websocket": "1.0.34",
-		"ws": "8.2.0",
+		"ws": "8.2.3",
 		"xev": "2.0.1"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.44",
+		"@redocly/openapi-core": "1.0.0-beta.54",
 		"@types/fluent-ffmpeg": "2.1.17",
 		"cross-env": "7.0.3",
-		"cypress": "8.3.0",
+		"cypress": "8.5.0",
-		"start-server-and-test": "1.13.1"
+		"start-server-and-test": "1.14.0"
 	}
 }

src/argv.ts

@@ -1,23 +0,0 @@
-import { Command } from 'commander';
-import config from '@/config/index';
-
-const program = new Command();
-
-program.version(config.version);
-program.option('--no-daemons', 'Disable daemon processes (for debbuging)');
-program.option('--disable-clustering', 'Disable clustering');
-program.option('--only-server', 'Run server only (without job queue processing)');
-program.option('--only-queue', 'Pocessing job queue only (without server)');
-program.option('--quiet', 'Suppress all logs');
-program.option('--verbose', 'Enable all logs');
-program.option('--with-log-time', 'Include timestamp for each logs');
-program.option('--slow', 'Delay all requests (for debbuging)');
-program.option('--color', 'This option is a dummy for some external program\'s (e.g. forever) issue.');
-program.parse(process.argv);
-
-if (process.env.MK_ONLY_QUEUE) program.onlyQueue = true;
-if (process.env.NODE_ENV === 'test') program.disableClustering = true;
-//if (process.env.NODE_ENV === 'test') program.quiet = true;
-if (process.env.NODE_ENV === 'test') program.noDaemons = true;
-
-export { program };

src/boot/index.ts

@@ -3,7 +3,7 @@ import * as chalk from 'chalk';
 import Xev from 'xev';
 
 import Logger from '@/services/logger';
-import { program } from '../argv';
+import { envOption } from '../env';
 
 // for typeorm
 import 'reflect-metadata';
@@ -20,7 +20,7 @@ const ev = new Xev();
 export default async function() {
 	process.title = `Misskey (${cluster.isMaster ? 'master' : 'worker'})`;
 
-	if (cluster.isMaster || program.disableClustering) {
+	if (cluster.isMaster || envOption.disableClustering) {
 		await masterMain();
 
 		if (cluster.isMaster) {
@@ -28,7 +28,7 @@ export default async function() {
 		}
 	}
 
-	if (cluster.isWorker || program.disableClustering) {
+	if (cluster.isWorker || envOption.disableClustering) {
 		await workerMain();
 	}
 
@@ -60,7 +60,7 @@ cluster.on('exit', worker => {
 });
 
 // Display detail of unhandled promise rejection
-if (!program.quiet) {
+if (!envOption.quiet) {
 	process.on('unhandledRejection', console.dir);
 }
 

src/boot/master.ts

@@ -1,3 +1,6 @@
+import * as fs from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
 import * as os from 'os';
 import * as cluster from 'cluster';
 import * as chalk from 'chalk';
@@ -8,16 +11,21 @@ import Logger from '@/services/logger';
 import loadConfig from '@/config/load';
 import { Config } from '@/config/types';
 import { lessThan } from '@/prelude/array';
-import { program } from '../argv';
+import { envOption } from '../env';
 import { showMachineInfo } from '@/misc/show-machine-info';
 import { initDb } from '../db/postgre';
-import * as meta from '../meta.json';
+
+//const _filename = fileURLToPath(import.meta.url);
+const _filename = __filename;
+const _dirname = dirname(_filename);
+
+const meta = JSON.parse(fs.readFileSync(`${_dirname}/../meta.json`, 'utf-8'));
 
 const logger = new Logger('core', 'cyan');
 const bootLogger = logger.createSubLogger('boot', 'magenta', false);
 
 function greet() {
-	if (!program.quiet) {
+	if (!envOption.quiet) {
 		//#region Misskey logo
 		const v = `v${meta.version}`;
 		console.log('  _____ _         _           ');
@@ -65,13 +73,13 @@ export async function masterMain() {
 
 	bootLogger.succ('Misskey initialized');
 
-	if (!program.disableClustering) {
+	if (!envOption.disableClustering) {
 		await spawnWorkers(config.clusterLimit);
 	}
 
 	bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
 
-	if (!program.noDaemons) {
+	if (!envOption.noDaemons) {
 		require('../daemons/server-stats').default();
 		require('../daemons/queue-stats').default();
 		require('../daemons/janitor').default();

src/client/account.ts

@@ -1,7 +1,10 @@
+import { del, get, set } from '@client/scripts/idb-proxy';
 import { reactive } from 'vue';
 import { apiUrl } from '@client/config';
-import { waiting } from '@client/os';
+import { waiting, api, popup, popupMenu, success } from '@client/os';
-import { unisonReload } from '@client/scripts/unison-reload';
+import { unisonReload, reloadChannel } from '@client/scripts/unison-reload';
+import { showSuspendedDialog } from './scripts/show-suspended-dialog';
+import { i18n } from './i18n';
 
 // TODO: 他のタブと永続化されたstateを同期
 
@@ -10,6 +13,7 @@ type Account = {
 	token: string;
 	isModerator: boolean;
 	isAdmin: boolean;
+	isDeleted: boolean;
 };
 
 const data = localStorage.getItem('account');
@@ -17,22 +21,57 @@ const data = localStorage.getItem('account');
 // TODO: 外部からはreadonlyに
 export const $i = data ? reactive(JSON.parse(data) as Account) : null;
 
-export function signout() {
+export async function signout() {
+	waiting();
 	localStorage.removeItem('account');
+
+	//#region Remove account
+	const accounts = await getAccounts();
+	accounts.splice(accounts.findIndex(x => x.id === $i.id), 1);
+
+	if (accounts.length > 0) await set('accounts', accounts);
+	else await del('accounts');
+	//#endregion
+
+	//#region Remove service worker registration
+	try {
+		if (navigator.serviceWorker.controller) {
+			const registration = await navigator.serviceWorker.ready;
+			const push = await registration.pushManager.getSubscription();
+			if (push) {
+				await fetch(`${apiUrl}/sw/unregister`, {
+					method: 'POST',
+					body: JSON.stringify({
+						i: $i.token,
+						endpoint: push.endpoint,
+					}),
+				});
+			}
+		}
+
+		if (accounts.length === 0) {
+			await navigator.serviceWorker.getRegistrations()
+				.then(registrations => {
+					return Promise.all(registrations.map(registration => registration.unregister()));
+				});
+		}
+	} catch (e) {}
+	//#endregion
+
 	document.cookie = `igi=; path=/`;
-	location.href = '/';
+
+	if (accounts.length > 0) login(accounts[0].token);
+	else unisonReload('/');
 }
 
-export function getAccounts() {
+export async function getAccounts(): Promise<{ id: Account['id'], token: Account['token'] }[]> {
-	const accountsData = localStorage.getItem('accounts');
+	return (await get('accounts')) || [];
-	const accounts: { id: Account['id'], token: Account['token'] }[] = accountsData ? JSON.parse(accountsData) : [];
-	return accounts;
 }
 
-export function addAccount(id: Account['id'], token: Account['token']) {
+export async function addAccount(id: Account['id'], token: Account['token']) {
-	const accounts = getAccounts();
+	const accounts = await getAccounts();
 	if (!accounts.some(x => x.id === id)) {
-		localStorage.setItem('accounts', JSON.stringify(accounts.concat([{ id, token }])));
+		await set('accounts', accounts.concat([{ id, token }]));
 	}
 }
 
@@ -45,17 +84,20 @@ function fetchAccount(token): Promise<Account> {
 				i: token
 			})
 		})
+		.then(res => res.json())
 		.then(res => {
-			// When failed to authenticate user
+			if (res.error) {
-			if (res.status >= 400 && res.status < 500) {
+				if (res.error.id === 'a8c724b3-6e9c-4b46-b1a8-bc3ed6258370') {
-				return signout();
+					showSuspendedDialog().then(() => {
+						signout();
+					});
+				} else {
+					signout();
+				}
+			} else {
+				res.token = token;
+				done(res);
 			}
-
-			// Parse response
-			res.json().then(i => {
-				i.token = token;
-				done(i);
-			});
 		})
 		.catch(fail);
 	});
@@ -69,18 +111,98 @@ export function updateAccount(data) {
 }
 
 export function refreshAccount() {
-	fetchAccount($i.token).then(updateAccount);
+	return fetchAccount($i.token).then(updateAccount);
 }
 
-export async function login(token: Account['token']) {
+export async function login(token: Account['token'], redirect?: string) {
 	waiting();
 	if (_DEV_) console.log('logging as token ', token);
 	const me = await fetchAccount(token);
 	localStorage.setItem('account', JSON.stringify(me));
-	addAccount(me.id, token);
+	await addAccount(me.id, token);
+
+	if (redirect) {
+		// 他のタブは再読み込みするだけ
+		reloadChannel.postMessage(null);
+		// このページはredirectで指定された先に移動
+		location.href = redirect;
+		return;
+	}
+
 	unisonReload();
 }
 
+export async function openAccountMenu(ev: MouseEvent) {
+	function showSigninDialog() {
+		popup(import('@client/components/signin-dialog.vue'), {}, {
+			done: res => {
+				addAccount(res.id, res.i);
+				success();
+			},
+		}, 'closed');
+	}
+
+	function createAccount() {
+		popup(import('@client/components/signup-dialog.vue'), {}, {
+			done: res => {
+				addAccount(res.id, res.i);
+				switchAccountWithToken(res.i);
+			},
+		}, 'closed');
+	}
+
+	async function switchAccount(account: any) {
+		const storedAccounts = await getAccounts();
+		const token = storedAccounts.find(x => x.id === account.id).token;
+		switchAccountWithToken(token);
+	}
+
+	function switchAccountWithToken(token: string) {
+		login(token);
+	}
+
+	const storedAccounts = await getAccounts().then(accounts => accounts.filter(x => x.id !== $i.id));
+	const accountsPromise = api('users/show', { userIds: storedAccounts.map(x => x.id) });
+
+	const accountItemPromises = storedAccounts.map(a => new Promise(res => {
+		accountsPromise.then(accounts => {
+			const account = accounts.find(x => x.id === a.id);
+			if (account == null) return res(null);
+			res({
+				type: 'user',
+				user: account,
+				action: () => { switchAccount(account); }
+			});
+		});
+	}));
+
+	popupMenu([...[{
+		type: 'link',
+		text: i18n.locale.profile,
+		to: `/@${ $i.username }`,
+		avatar: $i,
+	}, null, ...accountItemPromises, {
+		icon: 'fas fa-plus',
+		text: i18n.locale.addAccount,
+		action: () => {
+			popupMenu([{
+				text: i18n.locale.existingAccount,
+				action: () => { showSigninDialog(); },
+			}, {
+				text: i18n.locale.createAccount,
+				action: () => { createAccount(); },
+			}], ev.currentTarget || ev.target);
+		},
+	}, {
+		type: 'link',
+		icon: 'fas fa-users',
+		text: i18n.locale.manageAccounts,
+		to: `/settings/accounts`,
+	}]], ev.currentTarget || ev.target, {
+		align: 'left'
+	});
+}
+
 // このファイルに書きたくないけどここに書かないと何故かVeturが認識しない
 declare module '@vue/runtime-core' {
 	interface ComponentCustomProperties {

src/client/components/abuse-report-window.vue

@@ -25,7 +25,7 @@
 <script lang="ts">
 import { defineComponent, markRaw } from 'vue';
 import XWindow from '@client/components/ui/window.vue';
-import MkTextarea from '@client/components/ui/textarea.vue';
+import MkTextarea from '@client/components/form/textarea.vue';
 import MkButton from '@client/components/ui/button.vue';
 import * as os from '@client/os';
 

src/client/components/autocomplete.vue

@@ -10,12 +10,12 @@
 		</li>
 		<li @click="chooseUser()" @keydown="onKeydown" tabindex="-1" class="choose">{{ $ts.selectUser }}</li>
 	</ol>
-	<ol class="hashtags" ref="suggests" v-if="hashtags.length > 0">
+	<ol class="hashtags" ref="suggests" v-else-if="hashtags.length > 0">
 		<li v-for="hashtag in hashtags" @click="complete(type, hashtag)" @keydown="onKeydown" tabindex="-1">
 			<span class="name">{{ hashtag }}</span>
 		</li>
 	</ol>
-	<ol class="emojis" ref="suggests" v-if="emojis.length > 0">
+	<ol class="emojis" ref="suggests" v-else-if="emojis.length > 0">
 		<li v-for="emoji in emojis" @click="complete(type, emoji.emoji)" @keydown="onKeydown" tabindex="-1">
 			<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="$store.state.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span>
 			<span class="emoji" v-else-if="!$store.state.useOsNativeEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
@@ -24,6 +24,11 @@
 			<span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span>
 		</li>
 	</ol>
+	<ol class="mfmTags" ref="suggests" v-else-if="mfmTags.length > 0">
+		<li v-for="tag in mfmTags" @click="complete(type, tag)" @keydown="onKeydown" tabindex="-1">
+			<span class="tag">{{ tag }}</span>
+		</li>
+	</ol>
 </div>
 </template>
 
@@ -106,6 +111,8 @@ emojiDefinitions.sort((a, b) => a.name.length - b.name.length);
 const emojiDb = markRaw(emojiDefinitions.concat(emjdb));
 //#endregion
 
+const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'font', 'blur', 'rainbow', 'sparkle'];
+
 export default defineComponent({
 	props: {
 		type: {
@@ -137,11 +144,6 @@ export default defineComponent({
 			type: Number,
 			required: true,
 		},
-
-		showing: {
-			type: Boolean,
-			required: true
-		},
 	},
 
 	emits: ['done', 'closed'],
@@ -154,18 +156,11 @@ export default defineComponent({
 			hashtags: [],
 			emojis: [],
 			items: [],
+			mfmTags: [],
 			select: -1,
 		}
 	},
 
-	watch: {
-		showing() {
-			if (!this.showing) {
-				this.$emit('closed');
-			}
-		}
-	},
-
 	updated() {
 		this.setPosition();
 		this.items = (this.$refs.suggests as Element | undefined)?.children || [];
@@ -236,7 +231,7 @@ export default defineComponent({
 				}
 			}
 
-			if (this.type == 'user') {
+			if (this.type === 'user') {
 				if (this.q == null) {
 					this.users = [];
 					this.fetching = false;
@@ -262,7 +257,7 @@ export default defineComponent({
 						sessionStorage.setItem(cacheKey, JSON.stringify(users));
 					});
 				}
-			} else if (this.type == 'hashtag') {
+			} else if (this.type === 'hashtag') {
 				if (this.q == null || this.q == '') {
 					this.hashtags = JSON.parse(localStorage.getItem('hashtags') || '[]');
 					this.fetching = false;
@@ -286,7 +281,7 @@ export default defineComponent({
 						});
 					}
 				}
-			} else if (this.type == 'emoji') {
+			} else if (this.type === 'emoji') {
 				if (this.q == null || this.q == '') {
 					// 最近使った絵文字をサジェスト
 					this.emojis = this.$store.state.recentlyUsedEmojis.map(emoji => emojiDb.find(e => e.emoji == emoji)).filter(x => x != null);
@@ -314,6 +309,13 @@ export default defineComponent({
 				}
 
 				this.emojis = matched;
+			} else if (this.type === 'mfmTag') {
+				if (this.q == null || this.q == '') {
+					this.mfmTags = MFM_TAGS;
+					return;
+				}
+
+				this.mfmTags = MFM_TAGS.filter(tag => tag.startsWith(this.q));
 			}
 		},
 
@@ -490,5 +492,11 @@ export default defineComponent({
 			margin: 0 0 0 8px;
 		}
 	}
+
+	> .mfmTags > li {
+
+		.name {
+		}
+	}
 }
 </style>

src/client/components/captcha.vue

@@ -39,7 +39,7 @@ export default defineComponent({
 			type: String,
 			required: true,
 		},
-		value: {
+		modelValue: {
 			type: String,
 		},
 	},
@@ -116,7 +116,7 @@ export default defineComponent({
 			}
 		},
 		callback(response?: string) {
-			this.$emit('update:value', typeof response == 'string' ? response : null);
+			this.$emit('update:modelValue', typeof response == 'string' ? response : null);
 		},
 	},
 });

src/client/components/channel-follow-button.vue

@@ -91,7 +91,7 @@ export default defineComponent({
 		width: 31px;
 	}
 
-	&:focus {
+	&:focus-visible {
 		&:after {
 			content: "";
 			pointer-events: none;

src/client/components/chart.vue

@@ -0,0 +1,691 @@
+<template>
+<div class="cbbedffa">
+	<canvas ref="chartEl"></canvas>
+	<div v-if="fetching" class="fetching">
+		<MkLoading/>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent, onMounted, ref, watch, PropType } from 'vue';
+import {
+	Chart,
+	ArcElement,
+	LineElement,
+	BarElement,
+	PointElement,
+	BarController,
+	LineController,
+	CategoryScale,
+	LinearScale,
+	TimeScale,
+	Legend,
+	Title,
+	Tooltip,
+	SubTitle,
+	Filler,
+} from 'chart.js';
+import 'chartjs-adapter-date-fns';
+import { enUS } from 'date-fns/locale';
+import zoomPlugin from 'chartjs-plugin-zoom';
+import * as os from '@client/os';
+import { defaultStore } from '@client/store';
+
+Chart.register(
+	ArcElement,
+	LineElement,
+	BarElement,
+	PointElement,
+	BarController,
+	LineController,
+	CategoryScale,
+	LinearScale,
+	TimeScale,
+	Legend,
+	Title,
+	Tooltip,
+	SubTitle,
+	Filler,
+	zoomPlugin,
+);
+
+const sum = (...arr) => arr.reduce((r, a) => r.map((b, i) => a[i] + b));
+const negate = arr => arr.map(x => -x);
+const alpha = (hex, a) => {
+	const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)!;
+	const r = parseInt(result[1], 16);
+	const g = parseInt(result[2], 16);
+	const b = parseInt(result[3], 16);
+	return `rgba(${r}, ${g}, ${b}, ${a})`;
+};
+
+const colors = ['#008FFB', '#00E396', '#FEB019', '#FF4560'];
+const getColor = (i) => {
+	return colors[i % colors.length];
+};
+
+export default defineComponent({
+	props: {
+		src: {
+			type: String,
+			required: true,
+		},
+		args: {
+			type: Object,
+			required: false,
+		},
+		limit: {
+			type: Number,
+			required: false,
+			default: 90
+		},
+		span: {
+			type: String as PropType<'hour' | 'day'>,
+			required: true,
+		},
+		detailed: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+		stacked: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+		aspectRatio: {
+			type: Number,
+			required: false,
+			default: null
+		},
+	},
+
+	setup(props) {
+		const now = new Date();
+		let chartInstance: Chart = null;
+		let data: {
+			series: {
+				name: string;
+				type: 'line' | 'area';
+				color?: string;
+				borderDash?: number[];
+				hidden?: boolean;
+				data: {
+					x: number;
+					y: number;
+				}[];
+			}[];
+		} = null;
+
+		const chartEl = ref<HTMLCanvasElement>(null);
+		const fetching = ref(true);
+
+		const getDate = (ago: number) => {
+			const y = now.getFullYear();
+			const m = now.getMonth();
+			const d = now.getDate();
+			const h = now.getHours();
+
+			return props.span === 'day' ? new Date(y, m, d - ago) : new Date(y, m, d, h - ago);
+		};
+
+		const format = (arr) => {
+			return arr.map((v, i) => ({
+				x: getDate(i).getTime(),
+				y: v
+			}));
+		};
+
+		const render = () => {
+			if (chartInstance) {
+				chartInstance.destroy();
+			}
+
+			const gridColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
+
+			// フォントカラー
+			Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
+
+			chartInstance = new Chart(chartEl.value, {
+				type: 'line',
+				data: {
+					labels: new Array(props.limit).fill(0).map((_, i) => getDate(i).toLocaleString()).slice().reverse(),
+					datasets: data.series.map((x, i) => ({
+						parsing: false,
+						label: x.name,
+						data: x.data.slice().reverse(),
+						pointRadius: 0,
+						tension: 0,
+						borderWidth: 2,
+						borderColor: x.color ? x.color : getColor(i),
+						borderDash: x.borderDash || [],
+						borderJoinStyle: 'round',
+						backgroundColor: alpha(x.color ? x.color : getColor(i), 0.1),
+						fill: x.type === 'area',
+						hidden: !!x.hidden,
+					})),
+				},
+				options: {
+					aspectRatio: props.aspectRatio || 2.5,
+					layout: {
+						padding: {
+							left: 16,
+							right: 16,
+							top: 16,
+							bottom: 8,
+						},
+					},
+					scales: {
+						x: {
+							type: 'time',
+							time: {
+								stepSize: 1,
+								unit: props.span === 'day' ? 'month' : 'day',
+							},
+							grid: {
+								color: gridColor,
+								borderColor: 'rgb(0, 0, 0, 0)',
+							},
+							ticks: {
+								display: props.detailed,
+							},
+							adapters: {
+								date: {
+									locale: enUS,
+								},
+							},
+							min: getDate(props.limit).getTime(),
+						},
+						y: {
+							position: 'left',
+							stacked: props.stacked,
+							grid: {
+								color: gridColor,
+								borderColor: 'rgb(0, 0, 0, 0)',
+							},
+							ticks: {
+								display: props.detailed,
+							},
+						},
+					},
+					interaction: {
+						intersect: false,
+					},
+					plugins: {
+						legend: {
+							display: props.detailed,
+							position: 'bottom',
+							labels: {
+								boxWidth: 16,
+							},
+						},
+						tooltip: {
+							mode: 'index',
+							animation: {
+								duration: 0,
+							},
+						},
+						zoom: {
+							pan: {
+								enabled: true,
+							},
+							zoom: {
+								wheel: {
+									enabled: true,
+								},
+								pinch: {
+									enabled: true,
+								},
+								drag: {
+									enabled: false,
+								},
+								mode: 'x',
+							},
+							limits: {
+								x: {
+									min: 'original',
+									max: 'original',
+								},
+								y: {
+									min: 'original',
+									max: 'original',
+								},
+							}
+						},
+					},
+				},
+			});
+		};
+
+		const exportData = () => {
+			// TODO
+		};
+
+		const fetchFederationInstancesChart = async (total: boolean): Promise<typeof data> => {
+			const raw = await os.api('charts/federation', { limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'Instances',
+					type: 'area',
+					data: format(total
+						? raw.instance.total
+						: sum(raw.instance.inc, negate(raw.instance.dec))
+					),
+				}],
+			};
+		};
+
+		const fetchNotesChart = async (type: string): Promise<typeof data> => {
+			const raw = await os.api('charts/notes', { limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'All',
+					type: 'line',
+					borderDash: [5, 5],
+					data: format(type == 'combined'
+						? sum(raw.local.inc, negate(raw.local.dec), raw.remote.inc, negate(raw.remote.dec))
+						: sum(raw[type].inc, negate(raw[type].dec))
+					),
+				}, {
+					name: 'Renotes',
+					type: 'area',
+					data: format(type == 'combined'
+						? sum(raw.local.diffs.renote, raw.remote.diffs.renote)
+						: raw[type].diffs.renote
+					),
+				}, {
+					name: 'Replies',
+					type: 'area',
+					data: format(type == 'combined'
+						? sum(raw.local.diffs.reply, raw.remote.diffs.reply)
+						: raw[type].diffs.reply
+					),
+				}, {
+					name: 'Normal',
+					type: 'area',
+					data: format(type == 'combined'
+						? sum(raw.local.diffs.normal, raw.remote.diffs.normal)
+						: raw[type].diffs.normal
+					),
+				}],
+			};
+		};
+
+		const fetchNotesTotalChart = async (): Promise<typeof data> => {
+			const raw = await os.api('charts/notes', { limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'Combined',
+					type: 'line',
+					data: format(sum(raw.local.total, raw.remote.total)),
+				}, {
+					name: 'Local',
+					type: 'area',
+					data: format(raw.local.total),
+				}, {
+					name: 'Remote',
+					type: 'area',
+					data: format(raw.remote.total),
+				}],
+			};
+		};
+
+		const fetchUsersChart = async (total: boolean): Promise<typeof data> => {
+			const raw = await os.api('charts/users', { limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'Combined',
+					type: 'line',
+					data: format(total
+						? sum(raw.local.total, raw.remote.total)
+						: sum(raw.local.inc, negate(raw.local.dec), raw.remote.inc, negate(raw.remote.dec))
+					),
+				}, {
+					name: 'Local',
+					type: 'area',
+					data: format(total
+						? raw.local.total
+						: sum(raw.local.inc, negate(raw.local.dec))
+					),
+				}, {
+					name: 'Remote',
+					type: 'area',
+					data: format(total
+						? raw.remote.total
+						: sum(raw.remote.inc, negate(raw.remote.dec))
+					),
+				}],
+			};
+		};
+
+		const fetchActiveUsersChart = async (): Promise<typeof data> => {
+			const raw = await os.api('charts/active-users', { limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'Combined',
+					type: 'line',
+					data: format(sum(raw.local.users, raw.remote.users)),
+				}, {
+					name: 'Local',
+					type: 'area',
+					data: format(raw.local.users),
+				}, {
+					name: 'Remote',
+					type: 'area',
+					data: format(raw.remote.users),
+				}],
+			};
+		};
+
+		const fetchDriveChart = async (): Promise<typeof data> => {
+			const raw = await os.api('charts/drive', { limit: props.limit, span: props.span });
+			return {
+				bytes: true,
+				series: [{
+					name: 'All',
+					type: 'line',
+					borderDash: [5, 5],
+					data: format(
+						sum(
+							raw.local.incSize,
+							negate(raw.local.decSize),
+							raw.remote.incSize,
+							negate(raw.remote.decSize)
+						)
+					),
+				}, {
+					name: 'Local +',
+					type: 'area',
+					data: format(raw.local.incSize),
+				}, {
+					name: 'Local -',
+					type: 'area',
+					data: format(negate(raw.local.decSize)),
+				}, {
+					name: 'Remote +',
+					type: 'area',
+					data: format(raw.remote.incSize),
+				}, {
+					name: 'Remote -',
+					type: 'area',
+					data: format(negate(raw.remote.decSize)),
+				}],
+			};
+		};
+
+		const fetchDriveTotalChart = async (): Promise<typeof data> => {
+			const raw = await os.api('charts/drive', { limit: props.limit, span: props.span });
+			return {
+				bytes: true,
+				series: [{
+					name: 'Combined',
+					type: 'line',
+					data: format(sum(raw.local.totalSize, raw.remote.totalSize)),
+				}, {
+					name: 'Local',
+					type: 'area',
+					data: format(raw.local.totalSize),
+				}, {
+					name: 'Remote',
+					type: 'area',
+					data: format(raw.remote.totalSize),
+				}],
+			};
+		};
+
+		const fetchDriveFilesChart = async (): Promise<typeof data> => {
+			const raw = await os.api('charts/drive', { limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'All',
+					type: 'line',
+					borderDash: [5, 5],
+					data: format(
+						sum(
+							raw.local.incCount,
+							negate(raw.local.decCount),
+							raw.remote.incCount,
+							negate(raw.remote.decCount)
+						)
+					),
+				}, {
+					name: 'Local +',
+					type: 'area',
+					data: format(raw.local.incCount),
+				}, {
+					name: 'Local -',
+					type: 'area',
+					data: format(negate(raw.local.decCount)),
+				}, {
+					name: 'Remote +',
+					type: 'area',
+					data: format(raw.remote.incCount),
+				}, {
+					name: 'Remote -',
+					type: 'area',
+					data: format(negate(raw.remote.decCount)),
+				}],
+			};
+		};
+
+		const fetchDriveFilesTotalChart = async (): Promise<typeof data> => {
+			const raw = await os.api('charts/drive', { limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'Combined',
+					type: 'line',
+					data: format(sum(raw.local.totalCount, raw.remote.totalCount)),
+				}, {
+					name: 'Local',
+					type: 'area',
+					data: format(raw.local.totalCount),
+				}, {
+					name: 'Remote',
+					type: 'area',
+					data: format(raw.remote.totalCount),
+				}],
+			};
+		};
+
+		const fetchInstanceRequestsChart = async (): Promise<typeof data> => {
+			const raw = await os.api('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'In',
+					type: 'area',
+					color: '#008FFB',
+					data: format(raw.requests.received)
+				}, {
+					name: 'Out (succ)',
+					type: 'area',
+					color: '#00E396',
+					data: format(raw.requests.succeeded)
+				}, {
+					name: 'Out (fail)',
+					type: 'area',
+					color: '#FEB019',
+					data: format(raw.requests.failed)
+				}]
+			};
+		};
+
+		const fetchInstanceUsersChart = async (total: boolean): Promise<typeof data> => {
+			const raw = await os.api('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'Users',
+					type: 'area',
+					color: '#008FFB',
+					data: format(total
+						? raw.users.total
+						: sum(raw.users.inc, negate(raw.users.dec))
+					)
+				}]
+			};
+		};
+
+		const fetchInstanceNotesChart = async (total: boolean): Promise<typeof data> => {
+			const raw = await os.api('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'Notes',
+					type: 'area',
+					color: '#008FFB',
+					data: format(total
+						? raw.notes.total
+						: sum(raw.notes.inc, negate(raw.notes.dec))
+					)
+				}]
+			};
+		};
+
+		const fetchInstanceFfChart = async (total: boolean): Promise<typeof data> => {
+			const raw = await os.api('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'Following',
+					type: 'area',
+					color: '#008FFB',
+					data: format(total
+						? raw.following.total
+						: sum(raw.following.inc, negate(raw.following.dec))
+					)
+				}, {
+					name: 'Followers',
+					type: 'area',
+					color: '#00E396',
+					data: format(total
+						? raw.followers.total
+						: sum(raw.followers.inc, negate(raw.followers.dec))
+					)
+				}]
+			};
+		};
+
+		const fetchInstanceDriveUsageChart = async (total: boolean): Promise<typeof data> => {
+			const raw = await os.api('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+			return {
+				bytes: true,
+				series: [{
+					name: 'Drive usage',
+					type: 'area',
+					color: '#008FFB',
+					data: format(total
+						? raw.drive.totalUsage
+						: sum(raw.drive.incUsage, negate(raw.drive.decUsage))
+					)
+				}]
+			};
+		};
+
+		const fetchInstanceDriveFilesChart = async (total: boolean): Promise<typeof data> => {
+			const raw = await os.api('charts/instance', { host: props.args.host, limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'Drive files',
+					type: 'area',
+					color: '#008FFB',
+					data: format(total
+						? raw.drive.totalFiles
+						: sum(raw.drive.incFiles, negate(raw.drive.decFiles))
+					)
+				}]
+			};
+		};
+
+		const fetchPerUserNotesChart = async (): Promise<typeof data> => {
+			const raw = await os.api('charts/user/notes', { userId: props.args.user.id, limit: props.limit, span: props.span });
+			return {
+				series: [...(props.args.withoutAll ? [] : [{
+					name: 'All',
+					type: 'line',
+					borderDash: [5, 5],
+					data: format(sum(raw.inc, negate(raw.dec))),
+				}]), {
+					name: 'Renotes',
+					type: 'area',
+					data: format(raw.diffs.renote),
+				}, {
+					name: 'Replies',
+					type: 'area',
+					data: format(raw.diffs.reply),
+				}, {
+					name: 'Normal',
+					type: 'area',
+					data: format(raw.diffs.normal),
+				}],
+			};
+		};
+
+		const fetchAndRender = async () => {
+			const fetchData = () => {
+				switch (props.src) {
+					case 'federation-instances': return fetchFederationInstancesChart(false);
+					case 'federation-instances-total': return fetchFederationInstancesChart(true);
+					case 'users': return fetchUsersChart(false);
+					case 'users-total': return fetchUsersChart(true);
+					case 'active-users': return fetchActiveUsersChart();
+					case 'notes': return fetchNotesChart('combined');
+					case 'local-notes': return fetchNotesChart('local');
+					case 'remote-notes': return fetchNotesChart('remote');
+					case 'notes-total': return fetchNotesTotalChart();
+					case 'drive': return fetchDriveChart();
+					case 'drive-total': return fetchDriveTotalChart();
+					case 'drive-files': return fetchDriveFilesChart();
+					case 'drive-files-total': return fetchDriveFilesTotalChart();
+					
+					case 'instance-requests': return fetchInstanceRequestsChart();
+					case 'instance-users': return fetchInstanceUsersChart(false);
+					case 'instance-users-total': return fetchInstanceUsersChart(true);
+					case 'instance-notes': return fetchInstanceNotesChart(false);
+					case 'instance-notes-total': return fetchInstanceNotesChart(true);
+					case 'instance-ff': return fetchInstanceFfChart(false);
+					case 'instance-ff-total': return fetchInstanceFfChart(true);
+					case 'instance-drive-usage': return fetchInstanceDriveUsageChart(false);
+					case 'instance-drive-usage-total': return fetchInstanceDriveUsageChart(true);
+					case 'instance-drive-files': return fetchInstanceDriveFilesChart(false);
+					case 'instance-drive-files-total': return fetchInstanceDriveFilesChart(true);
+
+					case 'per-user-notes': return fetchPerUserNotesChart();
+				}
+			};
+			fetching.value = true;
+			data = await fetchData();
+			fetching.value = false;
+			render();
+		};
+
+		watch(() => [props.src, props.span], fetchAndRender);
+
+		onMounted(() => {
+			fetchAndRender();
+		});
+
+		return {
+			chartEl,
+			fetching,
+		};
+	},
+});
+</script>
+
+<style lang="scss" scoped>
+.cbbedffa {
+	position: relative;
+
+	> .fetching {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		-webkit-backdrop-filter: var(--blur, blur(12px));
+		backdrop-filter: var(--blur, blur(12px));
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		cursor: wait;
+	}
+}
+</style>

src/client/components/cw-button.vue

@@ -1,7 +1,7 @@
 <template>
 <button class="nrvgflfu _button" @click="toggle">
-	<b>{{ value ? $ts._cw.hide : $ts._cw.show }}</b>
+	<b>{{ modelValue ? $ts._cw.hide : $ts._cw.show }}</b>
-	<span v-if="!value">{{ label }}</span>
+	<span v-if="!modelValue">{{ label }}</span>
 </button>
 </template>
 
@@ -12,7 +12,7 @@ import { concat } from '../../prelude/array';
 
 export default defineComponent({
 	props: {
-		value: {
+		modelValue: {
 			type: Boolean,
 			required: true
 		},
@@ -36,7 +36,7 @@ export default defineComponent({
 		length,
 
 		toggle() {
-			this.$emit('update:value', !this.value);
+			this.$emit('update:modelValue', !this.modelValue);
 		}
 	}
 });

src/client/components/debobigego/base.vue

@@ -21,39 +21,39 @@ export default defineComponent({
 <style lang="scss" scoped>
 .rbusrurv {
 	// 他のCSSからも参照されるので消さないように
-	--formXPadding: 32px;
+	--debobigegoXPadding: 32px;
-	--formYPadding: 32px;
+	--debobigegoYPadding: 32px;
 
-	--formContentHMargin: 16px;
+	--debobigegoContentHMargin: 16px;
 
 	font-size: 95%;
 	line-height: 1.3em;
 	background: var(--bg);
-	padding: var(--formYPadding) var(--formXPadding);
+	padding: var(--debobigegoYPadding) var(--debobigegoXPadding);
 	max-width: 750px;
 	margin: 0 auto;
 
 	&:not(.wide).max-width_400px {
-		--formXPadding: 0px;
+		--debobigegoXPadding: 0px;
 
 		> ::v-deep(*) {
-			._formPanel {
+			._debobigegoPanel {
 				border: solid 0.5px var(--divider);
 				border-radius: 0;
 				border-left: none;
 				border-right: none;
 			}
 
-			._form_group {
+			._debobigego_group {
-				> *:not(._formNoConcat) {
+				> *:not(._debobigegoNoConcat) {
-					&:not(:last-child):not(._formNoConcatPrev) {
+					&:not(:last-child):not(._debobigegoNoConcatPrev) {
-						&._formPanel, ._formPanel {
+						&._debobigegoPanel, ._debobigegoPanel {
 							border-bottom: solid 0.5px var(--divider);
 						}
 					}
 
-					&:not(:first-child):not(._formNoConcatNext) {
+					&:not(:first-child):not(._debobigegoNoConcatNext) {
-						&._formPanel, ._formPanel {
+						&._debobigegoPanel, ._debobigegoPanel {
 							border-top: none;
 						}
 					}

src/client/components/debobigego/button.vue

@@ -1,7 +1,7 @@
 <template>
-<div class="yzpgjkxe _formItem">
+<div class="yzpgjkxe _debobigegoItem">
-	<div class="_formLabel"><slot name="label"></slot></div>
+	<div class="_debobigegoLabel"><slot name="label"></slot></div>
-	<button class="main _button _formPanel _formClickable" :class="{ center, primary, danger }">
+	<button class="main _button _debobigegoPanel _debobigegoClickable" :class="{ center, primary, danger }">
 		<slot></slot>
 		<div class="suffix">
 			<slot name="suffix"></slot>
@@ -10,13 +10,13 @@
 			</div>
 		</div>
 	</button>
-	<div class="_formCaption"><slot name="desc"></slot></div>
+	<div class="_debobigegoCaption"><slot name="desc"></slot></div>
 </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import './form.scss';
+import './debobigego.scss';
 
 export default defineComponent({
 	props: {

src/client/components/debobigego/debobigego.scss

@@ -1,9 +1,9 @@
-._formPanel {
+._debobigegoPanel {
 	background: var(--panel);
 	border-radius: var(--radius);
 	transition: background 0.2s ease;
 
-	&._formClickable {
+	&._debobigegoClickable {
 		&:hover {
 			//background: var(--panelHighlight);
 		}
@@ -15,8 +15,8 @@
 	}
 }
 
-._formLabel,
+._debobigegoLabel,
-._formCaption {
+._debobigegoCaption {
 	font-size: 80%;
 	color: var(--fgTransparentWeak);
 
@@ -25,28 +25,28 @@
 	}
 }
 
-._formLabel {
+._debobigegoLabel {
 	position: sticky;
 	top: var(--stickyTop, 0px);
 	z-index: 2;
-	margin: -8px calc(var(--formXPadding) * -1) 0 calc(var(--formXPadding) * -1);
+	margin: -8px calc(var(--debobigegoXPadding) * -1) 0 calc(var(--debobigegoXPadding) * -1);
-	padding: 8px calc(var(--formContentHMargin) + var(--formXPadding)) 8px calc(var(--formContentHMargin) + var(--formXPadding));
+	padding: 8px calc(var(--debobigegoContentHMargin) + var(--debobigegoXPadding)) 8px calc(var(--debobigegoContentHMargin) + var(--debobigegoXPadding));
 	background: var(--X17);
 	-webkit-backdrop-filter: var(--blur, blur(10px));
 	backdrop-filter: var(--blur, blur(10px));
 }
 
-._themeChanging_ ._formLabel {
+._themeChanging_ ._debobigegoLabel {
 	transition: none !important;
 	background: transparent;
 }
 
-._formCaption {
+._debobigegoCaption {
-	padding: 8px var(--formContentHMargin) 0 var(--formContentHMargin);
+	padding: 8px var(--debobigegoContentHMargin) 0 var(--debobigegoContentHMargin);
 }
 
-._formItem {
+._debobigegoItem {
-	& + ._formItem {
+	& + ._debobigegoItem {
 		margin-top: 24px;
 	}
 }

src/client/components/debobigego/group.vue

@@ -1,10 +1,10 @@
 <template>
-<div class="vrtktovg _formItem _formNoConcat" v-size="{ max: [500] }" v-sticky-container>
+<div class="vrtktovg _debobigegoItem _debobigegoNoConcat" v-size="{ max: [500] }" v-sticky-container>
-	<div class="_formLabel"><slot name="label"></slot></div>
+	<div class="_debobigegoLabel"><slot name="label"></slot></div>
-	<div class="main _form_group" ref="child">
+	<div class="main _debobigego_group" ref="child">
 		<slot></slot>
 	</div>
-	<div class="_formCaption"><slot name="caption"></slot></div>
+	<div class="_debobigegoCaption"><slot name="caption"></slot></div>
 </div>
 </template>
 
@@ -20,9 +20,9 @@ export default defineComponent({
 			const els = Array.from(child.value.children);
 			for (let i = 0; i < els.length; i++) {
 				const el = els[i];
-				if (el.classList.contains('_formNoConcat')) {
+				if (el.classList.contains('_debobigegoNoConcat')) {
-					if (els[i - 1]) els[i - 1].classList.add('_formNoConcatPrev');
+					if (els[i - 1]) els[i - 1].classList.add('_debobigegoNoConcatPrev');
-					if (els[i + 1]) els[i + 1].classList.add('_formNoConcatNext');
+					if (els[i + 1]) els[i + 1].classList.add('_debobigegoNoConcatNext');
 				}
 			}
 		};
@@ -52,21 +52,21 @@ export default defineComponent({
 <style lang="scss" scoped>
 .vrtktovg {
 	> .main {
-		> ::v-deep(*):not(._formNoConcat) {
+		> ::v-deep(*):not(._debobigegoNoConcat) {
-			&:not(._formNoConcatNext) {
+			&:not(._debobigegoNoConcatNext) {
 				margin: 0;
 			}
 
-			&:not(:last-child):not(._formNoConcatPrev) {
+			&:not(:last-child):not(._debobigegoNoConcatPrev) {
-				&._formPanel, ._formPanel {
+				&._debobigegoPanel, ._debobigegoPanel {
 					border-bottom: solid 0.5px var(--divider);
 					border-bottom-left-radius: 0;
 					border-bottom-right-radius: 0;
 				}
 			}
 
-			&:not(:first-child):not(._formNoConcatNext) {
+			&:not(:first-child):not(._debobigegoNoConcatNext) {
-				&._formPanel, ._formPanel {
+				&._debobigegoPanel, ._debobigegoPanel {
 					border-top: none;
 					border-top-left-radius: 0;
 					border-top-right-radius: 0;

src/client/components/debobigego/info.vue

@@ -1,6 +1,6 @@
 <template>
-<div class="fzenkabp _formItem">
+<div class="fzenkabp _debobigegoItem">
-	<div class="_formPanel" :class="{ warn }">
+	<div class="_debobigegoPanel" :class="{ warn }">
 		<i v-if="warn" class="fas fa-exclamation-triangle"></i>
 		<i v-else class="fas fa-info-circle"></i>
 		<slot></slot>

src/client/components/debobigego/input.vue

@@ -1,49 +1,53 @@
 <template>
-<div class="matxzzsk">
+<FormGroup class="_debobigegoItem">
-	<div class="label" @click="focus"><slot name="label"></slot></div>
+	<template #label><slot></slot></template>
-	<div class="input" :class="{ inline, disabled, focused }">
+	<div class="ztzhwixg _debobigegoItem" :class="{ inline, disabled }">
-		<div class="prefix" ref="prefixEl"><slot name="prefix"></slot></div>
+		<div class="icon" ref="icon"><slot name="icon"></slot></div>
-		<input ref="inputEl"
+		<div class="input _debobigegoPanel">
-			:type="type"
+			<div class="prefix" ref="prefixEl"><slot name="prefix"></slot></div>
-			v-model="v"
+			<input ref="inputEl"
-			:disabled="disabled"
+				:type="type"
-			:required="required"
+				v-model="v"
-			:readonly="readonly"
+				:disabled="disabled"
-			:placeholder="placeholder"
+				:required="required"
-			:pattern="pattern"
+				:readonly="readonly"
-			:autocomplete="autocomplete"
+				:placeholder="placeholder"
-			:spellcheck="spellcheck"
+				:pattern="pattern"
-			:step="step"
+				:autocomplete="autocomplete"
-			@focus="focused = true"
+				:spellcheck="spellcheck"
-			@blur="focused = false"
+				:step="step"
-			@keydown="onKeydown($event)"
+				@focus="focused = true"
-			@input="onInput"
+				@blur="focused = false"
-			:list="id"
+				@keydown="onKeydown($event)"
-		>
+				@input="onInput"
-		<datalist :id="id" v-if="datalist">
+				:list="id"
-			<option v-for="data in datalist" :value="data"/>
+			>
-		</datalist>
+			<datalist :id="id" v-if="datalist">
-		<div class="suffix" ref="suffixEl"><slot name="suffix"></slot></div>
+				<option v-for="data in datalist" :value="data"/>
+			</datalist>
+			<div class="suffix" ref="suffixEl"><slot name="suffix"></slot></div>
+		</div>
 	</div>
-	<div class="caption"><slot name="caption"></slot></div>
+	<template #caption><slot name="desc"></slot></template>
 
-	<MkButton v-if="manualSave && changed" @click="updated" primary><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>
+	<FormButton v-if="manualSave && changed" @click="updated" primary><i class="fas fa-save"></i> {{ $ts.save }}</FormButton>
-</div>
+</FormGroup>
 </template>
 
 <script lang="ts">
 import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
-import MkButton from './button.vue';
+import './debobigego.scss';
-import { debounce } from 'throttle-debounce';
+import FormButton from './button.vue';
+import FormGroup from './group.vue';
 
 export default defineComponent({
 	components: {
-		MkButton,
+		FormGroup,
+		FormButton,
 	},
-
 	props: {
 		modelValue: {
-			required: true
+			required: false
 		},
 		type: {
 			type: String,
@@ -92,20 +96,13 @@ export default defineComponent({
 			required: false,
 			default: false
 		},
-		debounce: {
-			type: Boolean,
-			required: false,
-			default: false
-		},
 		manualSave: {
 			type: Boolean,
 			required: false,
 			default: false
 		},
 	},
-
 	emits: ['change', 'keydown', 'enter', 'update:modelValue'],
-
 	setup(props, context) {
 		const { modelValue, type, autofocus } = toRefs(props);
 		const v = ref(modelValue.value);
@@ -140,19 +137,13 @@ export default defineComponent({
 			}
 		};
 
-		const debouncedUpdated = debounce(1000, updated);
+		watch(modelValue.value, newValue => {
-
-		watch(modelValue, newValue => {
 			v.value = newValue;
 		});
 
 		watch(v, newValue => {
 			if (!props.manualSave) {
-				if (props.debounce) {
+				updated();
-					debouncedUpdated();
-				} else {
-					updated();
-				}
 			}
 
 			invalid.value = inputEl.value.validity.badInput;
@@ -205,68 +196,59 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.matxzzsk {
+.ztzhwixg {
-	margin: 1.5em 0;
+	position: relative;
 
-	> .label {
+	> .icon {
-		font-size: 0.85em;
+		position: absolute;
-		padding: 0 0 8px 12px;
+		top: 0;
-		user-select: none;
+		left: 0;
+		width: 24px;
+		text-align: center;
+		line-height: 32px;
 
-		&:empty {
+		&:not(:empty) + .input {
-			display: none;
+			margin-left: 28px;
-		}
-	}
-
-	> .caption {
-		font-size: 0.8em;
-		padding: 8px 0 0 12px;
-		color: var(--fgTransparentWeak);
-
-		&:empty {
-			display: none;
 		}
 	}
 
 	> .input {
-		$height: 42px;
+		$height: 48px;
 		position: relative;
 
 		> input {
-			appearance: none;
-			-webkit-appearance: none;
 			display: block;
 			height: $height;
 			width: 100%;
 			margin: 0;
-			padding: 0 12px;
+			padding: 0 16px;
 			font: inherit;
 			font-weight: normal;
 			font-size: 1em;
-			color: var(--fg);
+			line-height: $height;
-			background: var(--panel);
+			color: var(--inputText);
-			border: solid 1px var(--inputBorder);
+			background: transparent;
-			border-radius: 6px;
+			border: none;
+			border-radius: 0;
 			outline: none;
 			box-shadow: none;
 			box-sizing: border-box;
-			transition: border-color 0.1s ease-out;
 
-			&:hover {
+			&[type='file'] {
-				border-color: var(--inputBorderHover);
+				display: none;
 			}
 		}
 
 		> .prefix,
 		> .suffix {
-			display: flex;
+			display: block;
-			align-items: center;
 			position: absolute;
 			z-index: 1;
 			top: 0;
-			padding: 0 12px;
+			padding: 0 16px;
 			font-size: 1em;
-			height: $height;
+			line-height: $height;
+			color: var(--inputLabel);
 			pointer-events: none;
 
 			&:empty {
@@ -285,32 +267,25 @@ export default defineComponent({
 
 		> .prefix {
 			left: 0;
-			padding-right: 6px;
+			padding-right: 8px;
 		}
 
 		> .suffix {
 			right: 0;
-			padding-left: 6px;
+			padding-left: 8px;
 		}
+	}
 
-		&.inline {
+	&.inline {
-			display: inline-block;
+		display: inline-block;
-			margin: 0;
+		margin: 0;
-		}
+	}
 
-		&.focused {
+	&.disabled {
-			> input {
+		opacity: 0.7;
-				border-color: var(--accent);
-				//box-shadow: 0 0 0 4px var(--focus);
-			}
-		}
 
-		&.disabled {
+		&, * {
-			opacity: 0.7;
+			cursor: not-allowed !important;
-
-			&, * {
-				cursor: not-allowed !important;
-			}
 		}
 	}
 }

src/client/components/debobigego/key-value-view.vue

@@ -1,6 +1,6 @@
 <template>
-<div class="_formItem">
+<div class="_debobigegoItem">
-	<div class="_formPanel anocepby">
+	<div class="_debobigegoPanel anocepby">
 		<span class="key"><slot name="key"></slot></span>
 		<span class="value"><slot name="value"></slot></span>
 	</div>
@@ -9,7 +9,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import './form.scss';
+import './debobigego.scss';
 
 export default defineComponent({
 
@@ -20,7 +20,7 @@ export default defineComponent({
 .anocepby {
 	display: flex;
 	align-items: center;
-	padding: 14px var(--formContentHMargin);
+	padding: 14px var(--debobigegoContentHMargin);
 
 	> .key {
 		margin-right: 12px;

src/client/components/debobigego/link.vue

@@ -1,6 +1,6 @@
 <template>
-<div class="qmfkfnzi _formItem">
+<div class="qmfkfnzi _debobigegoItem">
-	<a class="main _button _formPanel _formClickable" :href="to" target="_blank" v-if="external">
+	<a class="main _button _debobigegoPanel _debobigegoClickable" :href="to" target="_blank" v-if="external">
 		<span class="icon"><slot name="icon"></slot></span>
 		<span class="text"><slot></slot></span>
 		<span class="right">
@@ -8,7 +8,7 @@
 			<i class="fas fa-external-link-alt icon"></i>
 		</span>
 	</a>
-	<MkA class="main _button _formPanel _formClickable" :class="{ active }" :to="to" :behavior="behavior" v-else>
+	<MkA class="main _button _debobigegoPanel _debobigegoClickable" :class="{ active }" :to="to" :behavior="behavior" v-else>
 		<span class="icon"><slot name="icon"></slot></span>
 		<span class="text"><slot></slot></span>
 		<span class="right">
@@ -21,7 +21,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import './form.scss';
+import './debobigego.scss';
 
 export default defineComponent({
 	props: {

src/client/components/debobigego/object-view.vue

@@ -1,8 +1,8 @@
 <template>
-<FormGroup class="_formItem">
+<FormGroup class="_debobigegoItem">
 	<template #label><slot></slot></template>
-	<div class="drooglns _formItem" :class="{ tall }">
+	<div class="drooglns _debobigegoItem" :class="{ tall }">
-		<div class="input _formPanel">
+		<div class="input _debobigegoPanel">
 			<textarea class="_monospace"
 				v-model="v"
 				readonly
@@ -17,7 +17,7 @@
 <script lang="ts">
 import { defineComponent, ref, toRefs, watch } from 'vue';
 import * as JSON5 from 'json5';
-import './form.scss';
+import './debobigego.scss';
 import FormGroup from './group.vue';
 
 export default defineComponent({
@@ -75,7 +75,7 @@ export default defineComponent({
 			max-width: 100%;
 			min-height: 130px;
 			margin: 0;
-			padding: 16px var(--formContentHMargin);
+			padding: 16px var(--debobigegoContentHMargin);
 			box-sizing: border-box;
 			font: inherit;
 			font-weight: normal;

src/client/components/debobigego/pagination.vue

@@ -1,5 +1,5 @@
 <template>
-<FormGroup class="uljviswt _formItem">
+<FormGroup class="uljviswt _debobigegoItem">
 	<template #label><slot name="label"></slot></template>
 	<slot :items="items"></slot>
 	<div class="empty" v-if="empty" key="_empty_">

src/client/components/debobigego/radios.vue

@@ -0,0 +1,112 @@
+<script lang="ts">
+import { defineComponent, h } from 'vue';
+import MkRadio from '@client/components/form/radio.vue';
+import './debobigego.scss';
+
+export default defineComponent({
+	components: {
+		MkRadio
+	},
+	props: {
+		modelValue: {
+			required: false
+		},
+	},
+	data() {
+		return {
+			value: this.modelValue,
+		}
+	},
+	watch: {
+		modelValue() {
+			this.value = this.modelValue;
+		},
+		value() {
+			this.$emit('update:modelValue', this.value);
+		}
+	},
+	render() {
+		const label = this.$slots.desc();
+		let options = this.$slots.default();
+
+		// なぜかFragmentになることがあるため
+		if (options.length === 1 && options[0].props == null) options = options[0].children;
+
+		return h('div', {
+			class: 'cnklmpwm _debobigegoItem'
+		}, [
+			h('div', {
+				class: '_debobigegoLabel',
+			}, label),
+			...options.map(option => h('button', {
+				class: '_button _debobigegoPanel _debobigegoClickable',
+				key: option.key,
+				onClick: () => this.value = option.props.value,
+			}, [h('span', {
+				class: ['check', { checked: this.value === option.props.value }],
+			}), option.children]))
+		]);
+	}
+});
+</script>
+
+<style lang="scss">
+.cnklmpwm {
+	> button {
+		display: block;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 14px 18px;
+		text-align: left;
+
+		&:not(:first-of-type) {
+			border-top: none !important;
+			border-top-left-radius: 0;
+			border-top-right-radius: 0;
+		}
+
+		&:not(:last-of-type) {
+			border-bottom: solid 0.5px var(--divider);
+			border-bottom-left-radius: 0;
+			border-bottom-right-radius: 0;
+		}
+
+		> .check {
+			display: inline-block;
+			vertical-align: bottom;
+			position: relative;
+			width: 16px;
+			height: 16px;
+			margin-right: 8px;
+			background: none;
+			border: 2px solid var(--inputBorder);
+			border-radius: 100%;
+			transition: inherit;
+
+			&:after {
+				content: "";
+				display: block;
+				position: absolute;
+				top: 3px;
+				right: 3px;
+				bottom: 3px;
+				left: 3px;
+				border-radius: 100%;
+				opacity: 0;
+				transform: scale(0);
+				transition: .4s cubic-bezier(.25,.8,.25,1);
+			}
+
+			&.checked {
+				border-color: var(--accent);
+
+				&:after {
+					background-color: var(--accent);
+					transform: scale(1);
+					opacity: 1;
+				}
+			}
+		}
+	}
+}
+</style>

src/client/components/debobigego/range.vue

@@ -0,0 +1,122 @@
+<template>
+<div class="ifitouly _debobigegoItem" :class="{ focused, disabled }">
+	<div class="_debobigegoLabel"><slot name="label"></slot></div>
+	<div class="_debobigegoPanel main">
+		<input
+			type="range"
+			ref="input"
+			v-model="v"
+			:disabled="disabled"
+			:min="min"
+			:max="max"
+			:step="step"
+			@focus="focused = true"
+			@blur="focused = false"
+			@input="$emit('update:value', $event.target.value)"
+		/>
+	</div>
+	<div class="_debobigegoCaption"><slot name="caption"></slot></div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	props: {
+		value: {
+			type: Number,
+			required: false,
+			default: 0
+		},
+		disabled: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+		min: {
+			type: Number,
+			required: false,
+			default: 0
+		},
+		max: {
+			type: Number,
+			required: false,
+			default: 100
+		},
+		step: {
+			type: Number,
+			required: false,
+			default: 1
+		},
+	},
+	data() {
+		return {
+			v: this.value,
+			focused: false
+		};
+	},
+	watch: {
+		value(v) {
+			this.v = parseFloat(v);
+		}
+	},
+});
+</script>
+
+<style lang="scss" scoped>
+.ifitouly {
+	position: relative;
+
+	> .main {
+		padding: 22px 16px;
+
+		> input {
+			display: block;
+			-webkit-appearance: none;
+			-moz-appearance: none;
+			appearance: none;
+			background: var(--X10);
+			height: 4px;
+			width: 100%;
+			box-sizing: border-box;
+			margin: 0;
+			outline: 0;
+			border: 0;
+			border-radius: 7px;
+
+			&.disabled {
+				opacity: 0.6;
+				cursor: not-allowed;
+			}
+
+			&::-webkit-slider-thumb {
+				-webkit-appearance: none;
+				appearance: none;
+				cursor: pointer;
+				width: 20px;
+				height: 20px;
+				display: block;
+				border-radius: 50%;
+				border: none;
+				background: var(--accent);
+				box-shadow: 0 0 6px rgba(0, 0, 0, 0.3);
+				box-sizing: content-box;
+			}
+
+			&::-moz-range-thumb {
+				-moz-appearance: none;
+				appearance: none;
+				cursor: pointer;
+				width: 20px;
+				height: 20px;
+				display: block;
+				border-radius: 50%;
+				border: none;
+				background: var(--accent);
+				box-shadow: 0 0 6px rgba(0, 0, 0, 0.3);
+			}
+		}
+	}
+}
+</style>

src/client/components/debobigego/select.vue

@@ -0,0 +1,145 @@
+<template>
+<div class="yrtfrpux _debobigegoItem" :class="{ disabled, inline }">
+	<div class="_debobigegoLabel"><slot name="label"></slot></div>
+	<div class="icon" ref="icon"><slot name="icon"></slot></div>
+	<div class="input _debobigegoPanel _debobigegoClickable" @click="focus">
+		<div class="prefix" ref="prefix"><slot name="prefix"></slot></div>
+		<select ref="input"
+			v-model="v"
+			:required="required"
+			:disabled="disabled"
+			@focus="focused = true"
+			@blur="focused = false"
+		>
+			<slot></slot>
+		</select>
+		<div class="suffix">
+			<i class="fas fa-chevron-down"></i>
+		</div>
+	</div>
+	<div class="_debobigegoCaption"><slot name="caption"></slot></div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import './debobigego.scss';
+
+export default defineComponent({
+	props: {
+		modelValue: {
+			required: false
+		},
+		required: {
+			type: Boolean,
+			required: false
+		},
+		disabled: {
+			type: Boolean,
+			required: false
+		},
+		inline: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+	},
+	data() {
+		return {
+		};
+	},
+	computed: {
+		v: {
+			get() {
+				return this.modelValue;
+			},
+			set(v) {
+				this.$emit('update:modelValue', v);
+			}
+		},
+	},
+	methods: {
+		focus() {
+			this.$refs.input.focus();
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.yrtfrpux {
+	position: relative;
+
+	> .icon {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 24px;
+		text-align: center;
+		line-height: 32px;
+
+		&:not(:empty) + .input {
+			margin-left: 28px;
+		}
+	}
+
+	> .input {
+		display: flex;
+		position: relative;
+
+		> select {
+			display: block;
+			flex: 1;
+			width: 100%;
+			padding: 0 16px;
+			font: inherit;
+			font-weight: normal;
+			font-size: 1em;
+			height: 48px;
+			background: none;
+			border: none;
+			border-radius: 0;
+			outline: none;
+			box-shadow: none;
+			appearance: none;
+			-webkit-appearance: none;
+			color: var(--fg);
+
+			option,
+			optgroup {
+				color: var(--fg);
+				background: var(--bg);
+			}
+		}
+
+		> .prefix,
+		> .suffix {
+			display: block;
+			align-self: center;
+			justify-self: center;
+			font-size: 1em;
+			line-height: 32px;
+			color: var(--inputLabel);
+			pointer-events: none;
+
+			&:empty {
+				display: none;
+			}
+
+			> * {
+				display: block;
+				min-width: 16px;
+			}
+		}
+
+		> .prefix {
+			padding-right: 4px;
+		}
+
+		> .suffix {
+			padding: 0 16px 0 0;
+			opacity: 0.7;
+		}
+	}
+}
+</style>

src/client/components/debobigego/suspense.vue

@@ -1,15 +1,15 @@
 <template>
 <transition name="fade" mode="out-in">
-	<div class="_formItem" v-if="pending">
+	<div class="_debobigegoItem" v-if="pending">
-		<div class="_formPanel">
+		<div class="_debobigegoPanel">
 			<MkLoading/>
 		</div>
 	</div>
-	<div v-else-if="resolved" class="_formItem">
+	<div v-else-if="resolved" class="_debobigegoItem">
 		<slot :result="result"></slot>
 	</div>
-	<div class="_formItem" v-else>
+	<div class="_debobigegoItem" v-else>
-		<div class="_formPanel eiurkvay">
+		<div class="_debobigegoPanel eiurkvay">
 			<div><i class="fas fa-exclamation-triangle"></i> {{ $ts.somethingHappened }}</div>
 			<MkButton inline @click="retry" class="retry"><i class="fas fa-redo-alt"></i> {{ $ts.retry }}</MkButton>
 		</div>
@@ -19,7 +19,7 @@
 
 <script lang="ts">
 import { defineComponent, PropType, ref, watch } from 'vue';
-import './form.scss';
+import './debobigego.scss';
 import MkButton from '@client/components/ui/button.vue';
 
 export default defineComponent({

src/client/components/debobigego/switch.vue

@@ -0,0 +1,132 @@
+<template>
+<div class="ijnpvmgr _debobigegoItem">
+	<div class="main _debobigegoPanel _debobigegoClickable"
+		:class="{ disabled, checked }"
+		:aria-checked="checked"
+		:aria-disabled="disabled"
+		@click.prevent="toggle"
+	>
+		<input
+			type="checkbox"
+			ref="input"
+			:disabled="disabled"
+			@keydown.enter="toggle"
+		>
+		<span class="button" v-tooltip="checked ? $ts.itsOn : $ts.itsOff">
+			<span class="handle"></span>
+		</span>
+		<span class="label">
+			<span><slot></slot></span>
+		</span>
+	</div>
+	<div class="_debobigegoCaption"><slot name="desc"></slot></div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import './debobigego.scss';
+
+export default defineComponent({
+	props: {
+		modelValue: {
+			type: Boolean,
+			default: false
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		}
+	},
+	computed: {
+		checked(): boolean {
+			return this.modelValue;
+		}
+	},
+	methods: {
+		toggle() {
+			if (this.disabled) return;
+			this.$emit('update:modelValue', !this.checked);
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.ijnpvmgr {
+	> .main {
+		position: relative;
+		display: flex;
+		padding: 14px 16px;
+		cursor: pointer;
+
+		> * {
+			user-select: none;
+		}
+
+		> input {
+			position: absolute;
+			width: 0;
+			height: 0;
+			opacity: 0;
+			margin: 0;
+		}
+
+		> .button {
+			position: relative;
+			display: inline-block;
+			flex-shrink: 0;
+			margin: 0;
+			width: 34px;
+			height: 22px;
+			background: var(--switchBg);
+			outline: none;
+			border-radius: 999px;
+			transition: all 0.3s;
+			cursor: pointer;
+
+			> .handle {
+				position: absolute;
+				top: 0;
+				left: 3px;
+				bottom: 0;
+				margin: auto 0;
+				border-radius: 100%;
+				transition: background-color 0.3s, transform 0.3s;
+				width: 16px;
+				height: 16px;
+				background-color: #fff;
+				pointer-events: none;
+			}
+		}
+
+		> .label {
+			margin-left: 12px;
+			display: block;
+			transition: inherit;
+			color: var(--fg);
+
+			> span {
+				display: block;
+				line-height: 20px;
+				transition: inherit;
+			}
+		}
+
+		&.disabled {
+			opacity: 0.6;
+			cursor: not-allowed;
+		}
+
+		&.checked {
+			> .button {
+				background-color: var(--accent);
+
+				> .handle {
+					transform: translateX(12px);
+				}
+			}
+		}
+	}
+}
+</style>

src/client/components/debobigego/textarea.vue

@@ -0,0 +1,161 @@
+<template>
+<FormGroup class="_debobigegoItem">
+	<template #label><slot></slot></template>
+	<div class="rivhosbp _debobigegoItem" :class="{ tall, pre }">
+		<div class="input _debobigegoPanel">
+			<textarea ref="input" :class="{ code, _monospace: code }"
+				v-model="v"
+				:required="required"
+				:readonly="readonly"
+				:pattern="pattern"
+				:autocomplete="autocomplete"
+				:spellcheck="!code"
+				@input="onInput"
+				@focus="focused = true"
+				@blur="focused = false"
+			></textarea>
+		</div>
+	</div>
+	<template #caption><slot name="desc"></slot></template>
+
+	<FormButton v-if="manualSave && changed" @click="updated" primary><i class="fas fa-save"></i> {{ $ts.save }}</FormButton>
+</FormGroup>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref, toRefs, watch } from 'vue';
+import './debobigego.scss';
+import FormButton from './button.vue';
+import FormGroup from './group.vue';
+
+export default defineComponent({
+	components: {
+		FormGroup,
+		FormButton,
+	},
+	props: {
+		modelValue: {
+			required: false
+		},
+		required: {
+			type: Boolean,
+			required: false
+		},
+		readonly: {
+			type: Boolean,
+			required: false
+		},
+		pattern: {
+			type: String,
+			required: false
+		},
+		autocomplete: {
+			type: String,
+			required: false
+		},
+		code: {
+			type: Boolean,
+			required: false
+		},
+		tall: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+		pre: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+		manualSave: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+	},
+	setup(props, context) {
+		const { modelValue } = toRefs(props);
+		const v = ref(modelValue.value);
+		const changed = ref(false);
+		const inputEl = ref(null);
+		const focus = () => inputEl.value.focus();
+		const onInput = (ev) => {
+			changed.value = true;
+			context.emit('change', ev);
+		};
+
+		const updated = () => {
+			changed.value = false;
+			context.emit('update:modelValue', v.value);
+		};
+
+		watch(modelValue.value, newValue => {
+			v.value = newValue;
+		});
+
+		watch(v, newValue => {
+			if (!props.manualSave) {
+				updated();
+			}
+		});
+		
+		return {
+			v,
+			updated,
+			changed,
+			focus,
+			onInput,
+		};
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.rivhosbp {
+	position: relative;
+
+	> .input {
+		position: relative;
+	
+		> textarea {
+			display: block;
+			width: 100%;
+			min-width: 100%;
+			max-width: 100%;
+			min-height: 130px;
+			margin: 0;
+			padding: 16px;
+			box-sizing: border-box;
+			font: inherit;
+			font-weight: normal;
+			font-size: 1em;
+			background: transparent;
+			border: none;
+			border-radius: 0;
+			outline: none;
+			box-shadow: none;
+			color: var(--fg);
+
+			&.code {
+				tab-size: 2;
+			}
+		}
+	}
+
+	&.tall {
+		> .input {
+			> textarea {
+				min-height: 200px;
+			}
+		}
+	}
+
+	&.pre {
+		> .input {
+			> textarea {
+				white-space: pre;
+			}
+		}
+	}
+}
+</style>

src/client/components/debobigego/tuple.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="wthhikgt _formItem" v-size="{ max: [500] }">
+<div class="wthhikgt _debobigegoItem" v-size="{ max: [500] }">
 	<slot></slot>
 </div>
 </template>

src/client/components/dialog.vue

@@ -40,8 +40,8 @@
 import { defineComponent } from 'vue';
 import MkModal from '@client/components/ui/modal.vue';
 import MkButton from '@client/components/ui/button.vue';
-import MkInput from '@client/components/ui/input.vue';
+import MkInput from '@client/components/form/input.vue';
-import MkSelect from '@client/components/ui/select.vue';
+import MkSelect from '@client/components/form/select.vue';
 
 export default defineComponent({
 	components: {

src/client/components/emoji-picker-window.vue

@@ -153,7 +153,7 @@ export default defineComponent({
 					height: var(--eachSize);
 					border-radius: 4px;
 
-					&:focus {
+					&:focus-visible {
 						outline: solid 2px var(--focus);
 						z-index: 1;
 					}

src/client/components/emoji-picker.vue

@@ -465,7 +465,7 @@ export default defineComponent({
 					height: var(--eachSize);
 					border-radius: 4px;
 
-					&:focus {
+					&:focus-visible {
 						outline: solid 2px var(--focus);
 						z-index: 1;
 					}

src/client/components/follow-button.vue

@@ -161,7 +161,7 @@ export default defineComponent({
 		width: 31px;
 	}
 
-	&:focus {
+	&:focus-visible {
 		&:after {
 			content: "";
 			pointer-events: none;

src/client/components/forgot-password.vue

@@ -7,21 +7,21 @@
 >
 	<template #header>{{ $ts.forgotPassword }}</template>
 
-	<form class="_monolithic_" @submit.prevent="onSubmit" v-if="$instance.enableEmail">
+	<form class="bafeceda" @submit.prevent="onSubmit" v-if="$instance.enableEmail">
-		<div class="_section">
+		<div class="main _formRoot">
-			<MkInput v-model="username" type="text" pattern="^[a-zA-Z0-9_]+$" spellcheck="false" autofocus required>
+			<MkInput class="_formBlock" v-model="username" type="text" pattern="^[a-zA-Z0-9_]+$" spellcheck="false" autofocus required>
 				<template #label>{{ $ts.username }}</template>
 				<template #prefix>@</template>
 			</MkInput>
 
-			<MkInput v-model="email" type="email" spellcheck="false" required>
+			<MkInput class="_formBlock" v-model="email" type="email" spellcheck="false" required>
 				<template #label>{{ $ts.emailAddress }}</template>
 				<template #caption>{{ $ts._forgotPassword.enterEmail }}</template>
 			</MkInput>
 
-			<MkButton type="submit" :disabled="processing" primary style="margin: 0 auto;">{{ $ts.send }}</MkButton>
+			<MkButton class="_formBlock" type="submit" :disabled="processing" primary style="margin: 0 auto;">{{ $ts.send }}</MkButton>
 		</div>
-		<div class="_section">
+		<div class="sub">
 			<MkA to="/about" class="_link">{{ $ts._forgotPassword.ifNoEmail }}</MkA>
 		</div>
 	</form>
@@ -35,7 +35,7 @@
 import { defineComponent } from 'vue';
 import XModalWindow from '@client/components/ui/modal-window.vue';
 import MkButton from '@client/components/ui/button.vue';
-import MkInput from '@client/components/ui/input.vue';
+import MkInput from '@client/components/form/input.vue';
 import * as os from '@client/os';
 
 export default defineComponent({
@@ -69,3 +69,16 @@ export default defineComponent({
 	}
 });
 </script>
+
+<style lang="scss" scoped>
+.bafeceda {
+	> .main {
+		padding: 24px;
+	}
+
+	> .sub {
+		border-top: solid 0.5px var(--divider);
+		padding: 24px;
+	}
+}
+</style>

src/client/components/form-dialog.vue

@@ -14,23 +14,23 @@
 	</template>
 	<FormBase class="xkpnjxcv">
 		<template v-for="item in Object.keys(form).filter(item => !form[item].hidden)">
-			<FormInput v-if="form[item].type === 'number'" v-model:value="values[item]" type="number" :step="form[item].step || 1">
+			<FormInput v-if="form[item].type === 'number'" v-model="values[item]" type="number" :step="form[item].step || 1">
 				<span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span>
 				<template v-if="form[item].description" #desc>{{ form[item].description }}</template>
 			</FormInput>
-			<FormInput v-else-if="form[item].type === 'string' && !form[item].multiline" v-model:value="values[item]" type="text">
+			<FormInput v-else-if="form[item].type === 'string' && !form[item].multiline" v-model="values[item]" type="text">
 				<span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span>
 				<template v-if="form[item].description" #desc>{{ form[item].description }}</template>
 			</FormInput>
-			<FormTextarea v-else-if="form[item].type === 'string' && form[item].multiline" v-model:value="values[item]">
+			<FormTextarea v-else-if="form[item].type === 'string' && form[item].multiline" v-model="values[item]">
 				<span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span>
 				<template v-if="form[item].description" #desc>{{ form[item].description }}</template>
 			</FormTextarea>
-			<FormSwitch v-else-if="form[item].type === 'boolean'" v-model:value="values[item]">
+			<FormSwitch v-else-if="form[item].type === 'boolean'" v-model="values[item]">
 				<span v-text="form[item].label || item"></span>
 				<template v-if="form[item].description" #desc>{{ form[item].description }}</template>
 			</FormSwitch>
-			<FormSelect v-else-if="form[item].type === 'enum'" v-model:value="values[item]">
+			<FormSelect v-else-if="form[item].type === 'enum'" v-model="values[item]">
 				<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
 				<option v-for="item in form[item].enum" :value="item.value" :key="item.value">{{ item.label }}</option>
 			</FormSelect>
@@ -38,7 +38,7 @@
 				<template #desc><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
 				<option v-for="item in form[item].options" :value="item.value" :key="item.value">{{ item.label }}</option>
 			</FormRadios>
-			<FormRange v-else-if="form[item].type === 'range'" v-model:value="values[item]" :min="form[item].mim" :max="form[item].max" :step="form[item].step">
+			<FormRange v-else-if="form[item].type === 'range'" v-model="values[item]" :min="form[item].mim" :max="form[item].max" :step="form[item].step">
 				<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
 				<template v-if="form[item].description" #desc>{{ form[item].description }}</template>
 			</FormRange>
@@ -53,14 +53,14 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import XModalWindow from '@client/components/ui/modal-window.vue';
-import FormBase from './form/base.vue';
+import FormBase from './debobigego/base.vue';
-import FormInput from './form/input.vue';
+import FormInput from './debobigego/input.vue';
-import FormTextarea from './form/textarea.vue';
+import FormTextarea from './debobigego/textarea.vue';
-import FormSwitch from './form/switch.vue';
+import FormSwitch from './debobigego/switch.vue';
-import FormSelect from './form/select.vue';
+import FormSelect from './debobigego/select.vue';
-import FormRange from './form/range.vue';
+import FormRange from './debobigego/range.vue';
-import FormButton from './form/button.vue';
+import FormButton from './debobigego/button.vue';
-import FormRadios from './form/radios.vue';
+import FormRadios from './debobigego/radios.vue';
 
 export default defineComponent({
 	components: {

src/client/components/form/input.vue

@@ -1,53 +1,49 @@
 <template>
-<FormGroup class="_formItem">
+<div class="matxzzsk">
-	<template #label><slot></slot></template>
+	<div class="label" @click="focus"><slot name="label"></slot></div>
-	<div class="ztzhwixg _formItem" :class="{ inline, disabled }">
+	<div class="input" :class="{ inline, disabled, focused }">
-		<div class="icon" ref="icon"><slot name="icon"></slot></div>
+		<div class="prefix" ref="prefixEl"><slot name="prefix"></slot></div>
-		<div class="input _formPanel">
+		<input ref="inputEl"
-			<div class="prefix" ref="prefixEl"><slot name="prefix"></slot></div>
+			:type="type"
-			<input ref="inputEl"
+			v-model="v"
-				:type="type"
+			:disabled="disabled"
-				v-model="v"
+			:required="required"
-				:disabled="disabled"
+			:readonly="readonly"
-				:required="required"
+			:placeholder="placeholder"
-				:readonly="readonly"
+			:pattern="pattern"
-				:placeholder="placeholder"
+			:autocomplete="autocomplete"
-				:pattern="pattern"
+			:spellcheck="spellcheck"
-				:autocomplete="autocomplete"
+			:step="step"
-				:spellcheck="spellcheck"
+			@focus="focused = true"
-				:step="step"
+			@blur="focused = false"
-				@focus="focused = true"
+			@keydown="onKeydown($event)"
-				@blur="focused = false"
+			@input="onInput"
-				@keydown="onKeydown($event)"
+			:list="id"
-				@input="onInput"
+		>
-				:list="id"
+		<datalist :id="id" v-if="datalist">
-			>
+			<option v-for="data in datalist" :value="data"/>
-			<datalist :id="id" v-if="datalist">
+		</datalist>
-				<option v-for="data in datalist" :value="data"/>
+		<div class="suffix" ref="suffixEl"><slot name="suffix"></slot></div>
-			</datalist>
-			<div class="suffix" ref="suffixEl"><slot name="suffix"></slot></div>
-		</div>
 	</div>
-	<template #caption><slot name="desc"></slot></template>
+	<div class="caption"><slot name="caption"></slot></div>
 
-	<FormButton v-if="manualSave && changed" @click="updated" primary><i class="fas fa-save"></i> {{ $ts.save }}</FormButton>
+	<MkButton v-if="manualSave && changed" @click="updated" primary><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>
-</FormGroup>
+</div>
 </template>
 
 <script lang="ts">
 import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
-import './form.scss';
+import MkButton from '@client/components/ui/button.vue';
-import FormButton from './button.vue';
+import { debounce } from 'throttle-debounce';
-import FormGroup from './group.vue';
 
 export default defineComponent({
 	components: {
-		FormGroup,
+		MkButton,
-		FormButton,
 	},
+
 	props: {
-		value: {
+		modelValue: {
-			required: false
+			required: true
 		},
 		type: {
 			type: String,
@@ -96,16 +92,23 @@ export default defineComponent({
 			required: false,
 			default: false
 		},
+		debounce: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
 		manualSave: {
 			type: Boolean,
 			required: false,
 			default: false
 		},
 	},
-	emits: ['change', 'keydown', 'enter'],
+
+	emits: ['change', 'keydown', 'enter', 'update:modelValue'],
+
 	setup(props, context) {
-		const { value, type, autofocus } = toRefs(props);
+		const { modelValue, type, autofocus } = toRefs(props);
-		const v = ref(value.value);
+		const v = ref(modelValue.value);
 		const id = Math.random().toString(); // TODO: uuid?
 		const focused = ref(false);
 		const changed = ref(false);
@@ -131,19 +134,25 @@ export default defineComponent({
 		const updated = () => {
 			changed.value = false;
 			if (type?.value === 'number') {
-				context.emit('update:value', parseFloat(v.value));
+				context.emit('update:modelValue', parseFloat(v.value));
 			} else {
-				context.emit('update:value', v.value);
+				context.emit('update:modelValue', v.value);
 			}
 		};
 
-		watch(value, newValue => {
+		const debouncedUpdated = debounce(1000, updated);
+
+		watch(modelValue, newValue => {
 			v.value = newValue;
 		});
 
 		watch(v, newValue => {
 			if (!props.manualSave) {
-				updated();
+				if (props.debounce) {
+					debouncedUpdated();
+				} else {
+					updated();
+				}
 			}
 
 			invalid.value = inputEl.value.validity.badInput;
@@ -196,59 +205,66 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.ztzhwixg {
+.matxzzsk {
-	position: relative;
+	> .label {
+		font-size: 0.85em;
+		padding: 0 0 8px 12px;
+		user-select: none;
 
-	> .icon {
+		&:empty {
-		position: absolute;
+			display: none;
-		top: 0;
+		}
-		left: 0;
+	}
-		width: 24px;
-		text-align: center;
-		line-height: 32px;
 
-		&:not(:empty) + .input {
+	> .caption {
-			margin-left: 28px;
+		font-size: 0.8em;
+		padding: 8px 0 0 12px;
+		color: var(--fgTransparentWeak);
+
+		&:empty {
+			display: none;
 		}
 	}
 
 	> .input {
-		$height: 48px;
+		$height: 42px;
 		position: relative;
 
 		> input {
+			appearance: none;
+			-webkit-appearance: none;
 			display: block;
 			height: $height;
 			width: 100%;
 			margin: 0;
-			padding: 0 16px;
+			padding: 0 12px;
 			font: inherit;
 			font-weight: normal;
 			font-size: 1em;
-			line-height: $height;
+			color: var(--fg);
-			color: var(--inputText);
+			background: var(--panel);
-			background: transparent;
+			border: solid 0.5px var(--inputBorder);
-			border: none;
+			border-radius: 6px;
-			border-radius: 0;
 			outline: none;
 			box-shadow: none;
 			box-sizing: border-box;
+			transition: border-color 0.1s ease-out;
 
-			&[type='file'] {
+			&:hover {
-				display: none;
+				border-color: var(--inputBorderHover);
 			}
 		}
 
 		> .prefix,
 		> .suffix {
-			display: block;
+			display: flex;
+			align-items: center;
 			position: absolute;
 			z-index: 1;
 			top: 0;
-			padding: 0 16px;
+			padding: 0 12px;
 			font-size: 1em;
-			line-height: $height;
+			height: $height;
-			color: var(--inputLabel);
 			pointer-events: none;
 
 			&:empty {
@@ -267,25 +283,32 @@ export default defineComponent({
 
 		> .prefix {
 			left: 0;
-			padding-right: 8px;
+			padding-right: 6px;
 		}
 
 		> .suffix {
 			right: 0;
-			padding-left: 8px;
+			padding-left: 6px;
 		}
-	}
 
-	&.inline {
+		&.inline {
-		display: inline-block;
+			display: inline-block;
-		margin: 0;
+			margin: 0;
-	}
+		}
 
-	&.disabled {
+		&.focused {
-		opacity: 0.7;
+			> input {
+				border-color: var(--accent);
+				//box-shadow: 0 0 0 4px var(--focus);
+			}
+		}
 
-		&, * {
+		&.disabled {
-			cursor: not-allowed !important;
+			opacity: 0.7;
+
+			&, * {
+				cursor: not-allowed !important;
+			}
 		}
 	}
 }

src/client/components/form/radios.vue

@@ -1,7 +1,6 @@
 <script lang="ts">
 import { defineComponent, h } from 'vue';
-import MkRadio from '@client/components/ui/radio.vue';
+import MkRadio from './radio.vue';
-import './form.scss';
 
 export default defineComponent({
 	components: {
@@ -18,95 +17,38 @@ export default defineComponent({
 		}
 	},
 	watch: {
-		modelValue() {
-			this.value = this.modelValue;
-		},
 		value() {
 			this.$emit('update:modelValue', this.value);
 		}
 	},
 	render() {
-		const label = this.$slots.desc();
 		let options = this.$slots.default();
 
 		// なぜかFragmentになることがあるため
 		if (options.length === 1 && options[0].props == null) options = options[0].children;
 
 		return h('div', {
-			class: 'cnklmpwm _formItem'
+			class: 'novjtcto'
 		}, [
-			h('div', {
+			...options.map(option => h(MkRadio, {
-				class: '_formLabel',
-			}, label),
-			...options.map(option => h('button', {
-				class: '_button _formPanel _formClickable',
 				key: option.key,
-				onClick: () => this.value = option.props.value,
+				value: option.props.value,
-			}, [h('span', {
+				modelValue: this.value,
-				class: ['check', { checked: this.value === option.props.value }],
+				'onUpdate:modelValue': value => this.value = value,
-			}), option.children]))
+			}, option.children))
 		]);
 	}
 });
 </script>
 
 <style lang="scss">
-.cnklmpwm {
+.novjtcto {
-	> button {
+	&:first-child {
-		display: block;
+		margin-top: 0;
-		width: 100%;
+	}
-		box-sizing: border-box;
-		padding: 14px 18px;
-		text-align: left;
 
-		&:not(:first-of-type) {
+	&:last-child {
-			border-top: none !important;
+		margin-bottom: 0;
-			border-top-left-radius: 0;
-			border-top-right-radius: 0;
-		}
-
-		&:not(:last-of-type) {
-			border-bottom: solid 0.5px var(--divider);
-			border-bottom-left-radius: 0;
-			border-bottom-right-radius: 0;
-		}
-
-		> .check {
-			display: inline-block;
-			vertical-align: bottom;
-			position: relative;
-			width: 16px;
-			height: 16px;
-			margin-right: 8px;
-			background: none;
-			border: 2px solid var(--inputBorder);
-			border-radius: 100%;
-			transition: inherit;
-
-			&:after {
-				content: "";
-				display: block;
-				position: absolute;
-				top: 3px;
-				right: 3px;
-				bottom: 3px;
-				left: 3px;
-				border-radius: 100%;
-				opacity: 0;
-				transform: scale(0);
-				transition: .4s cubic-bezier(.25,.8,.25,1);
-			}
-
-			&.checked {
-				border-color: var(--accent);
-
-				&:after {
-					background-color: var(--accent);
-					transform: scale(1);
-					opacity: 1;
-				}
-			}
-		}
 	}
 }
 </style>

src/client/components/form/range.vue

@@ -1,21 +1,20 @@
 <template>
-<div class="ifitouly _formItem" :class="{ focused, disabled }">
+<div class="timctyfi" :class="{ focused, disabled }">
-	<div class="_formLabel"><slot name="label"></slot></div>
+	<div class="icon"><slot name="icon"></slot></div>
-	<div class="_formPanel main">
+	<span class="label"><slot name="label"></slot></span>
-		<input
+	<input
-			type="range"
+		type="range"
-			ref="input"
+		ref="input"
-			v-model="v"
+		v-model="v"
-			:disabled="disabled"
+		:disabled="disabled"
-			:min="min"
+		:min="min"
-			:max="max"
+		:max="max"
-			:step="step"
+		:step="step"
-			@focus="focused = true"
+		:autofocus="autofocus"
-			@blur="focused = false"
+		@focus="focused = true"
-			@input="$emit('update:value', $event.target.value)"
+		@blur="focused = false"
-		/>
+		@input="$emit('update:value', $event.target.value)"
-	</div>
+	/>
-	<div class="_formCaption"><slot name="caption"></slot></div>
 </div>
 </template>
 
@@ -49,6 +48,10 @@ export default defineComponent({
 			required: false,
 			default: 1
 		},
+		autofocus: {
+			type: Boolean,
+			required: false
+		}
 	},
 	data() {
 		return {
@@ -61,61 +64,75 @@ export default defineComponent({
 			this.v = parseFloat(v);
 		}
 	},
+	mounted() {
+		if (this.autofocus) {
+			this.$nextTick(() => {
+				this.$refs.input.focus();
+			});
+		}
+	}
 });
 </script>
 
 <style lang="scss" scoped>
-.ifitouly {
+.timctyfi {
 	position: relative;
+	margin: 8px;
 
-	> .main {
+	> .icon {
-		padding: 22px 16px;
+		display: inline-block;
+		width: 24px;
+		text-align: center;
+	}
 
-		> input {
+	> .title {
-			display: block;
+		pointer-events: none;
+		font-size: 16px;
+		color: var(--inputLabel);
+		overflow: hidden;
+	}
+
+	> input {
+		-webkit-appearance: none;
+		-moz-appearance: none;
+		appearance: none;
+		background: var(--X10);
+		height: 7px;
+		margin: 0 8px;
+		outline: 0;
+		border: 0;
+		border-radius: 7px;
+
+		&.disabled {
+			opacity: 0.6;
+			cursor: not-allowed;
+		}
+
+		&::-webkit-slider-thumb {
 			-webkit-appearance: none;
+			appearance: none;
+			cursor: pointer;
+			width: 20px;
+			height: 20px;
+			display: block;
+			border-radius: 50%;
+			border: none;
+			background: var(--accent);
+			box-shadow: 0 0 6px rgba(0, 0, 0, 0.3);
+			box-sizing: content-box;
+		}
+
+		&::-moz-range-thumb {
 			-moz-appearance: none;
 			appearance: none;
-			background: var(--X10);
+			cursor: pointer;
-			height: 4px;
+			width: 20px;
-			width: 100%;
+			height: 20px;
-			box-sizing: border-box;
+			display: block;
-			margin: 0;
+			border-radius: 50%;
-			outline: 0;
+			border: none;
-			border: 0;
+			background: var(--accent);
-			border-radius: 7px;
+			box-shadow: 0 0 6px rgba(0, 0, 0, 0.3);
-
-			&.disabled {
-				opacity: 0.6;
-				cursor: not-allowed;
-			}
-
-			&::-webkit-slider-thumb {
-				-webkit-appearance: none;
-				appearance: none;
-				cursor: pointer;
-				width: 20px;
-				height: 20px;
-				display: block;
-				border-radius: 50%;
-				border: none;
-				background: var(--accent);
-				box-shadow: 0 0 6px rgba(0, 0, 0, 0.3);
-				box-sizing: content-box;
-			}
-
-			&::-moz-range-thumb {
-				-moz-appearance: none;
-				appearance: none;
-				cursor: pointer;
-				width: 20px;
-				height: 20px;
-				display: block;
-				border-radius: 50%;
-				border: none;
-				background: var(--accent);
-				box-shadow: 0 0 6px rgba(0, 0, 0, 0.3);
-			}
 		}
 	}
 }