Merge branch 'develop'

12.73.0
New Crowdin updates (#7277 )
2021-03-03 01:04:45 +09:00 · 2021-03-03 01:04:29 +09:00 · 2021-03-03 01:03:49 +09:00 · 2021-03-03 01:03:29 +09:00 · 2021-03-03 00:25:13 +09:00 · 2021-03-02 23:39:26 +09:00
2185 changed files with 123051 additions and 84171 deletions
--- a/.babelrc
+++ b/.babelrc
@ -0,0 +1,13 @@
+{
+	"plugins": [
+		[
+			"@babel/plugin-transform-runtime",
+			{
+				"corejs": {
+					"version": 3,
+					"proposals": true
+				}
+			}
+		]
+	]
+}
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -1,76 +1,12 @@
 version: 2.1

 executors:
-  default:
-    working_directory: /tmp/workspace
-    docker:
-      - image: misskey/ci:v11-node11
-      - image: circleci/redis:latest
-      - image: circleci/postgres:latest
  docker:
    working_directory: /tmp/workspace
    docker:
      - image: docker:latest

 jobs:
-  build:
-    executor: default
-    steps:
-      - checkout
-      - run:
-          name: Ensure yarn.lock
-          command: |
-            touch yarn.lock
-      - restore_cache:
-          name: Restore npm package caches
-          keys:
-            - yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
-            - yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-
-            - yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-
-            - yarn-v1-arch-{{ arch }}-
-            - yarn-v1-
-      - run:
-          name: Install Dependencies
-          command: |
-            yarn install
-      - run:
-          name: Configure
-          command: |
-            cp .circleci/misskey/default.yml .config
-            cp .circleci/misskey/test.yml .config
-      - run:
-          name: Build
-          command: |
-            yarn build
-            touch yarn.lock
-      - save_cache:
-          name: Cache npm packages
-          key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
-          paths:
-            - node_modules
-      - persist_to_workspace:
-          root: .
-          paths:
-            - .
-  test:
-    parameters:
-      executor:
-        type: string
-        default: "default"
-    executor: <<parameters.executor>>
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          name: Test
-          command: |
-            yarn test
-            touch yarn.lock
-      - save_cache:
-          name: Cache npm packages
-          key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
-          paths:
-            - node_modules
  docker:
    parameters:
      with_deploy:
@ -79,7 +15,8 @@ jobs:
    executor: docker
    steps:
      - checkout
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: 19.03.13
      - run:
          name: Build
          command: |
@ -95,62 +32,15 @@ jobs:
                    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 misskey/misskey
+                    docker push -a misskey/misskey
                   else
                    echo -e '\033[0;33mAborted deploying to Docker Hub\033[0;39m'
                  fi

 workflows:
  version: 2
-  nodejs:
-    jobs:
-      - hold:
-          name: manual-build-trigger
-          type: approval
-          filters:
-            branches:
-              ignore: master
-      - build:
-          name: manual-build
-          requires:
-            - manual-build-trigger
-          filters:
-            branches:
-              ignore: master
-      - build:
-          name: auto-build
-          filters:
-            branches:
-              only: master
-      - test:
-          name: manual-test
-          requires:
-            - manual-build
-          filters:
-            branches:
-              ignore: master
-      - test:
-          name: auto-test
-          requires:
-            - auto-build
-          filters:
-            branches:
-              only: master
  docker:
    jobs:
-      - hold:
-          name: manual-build-trigger
-          type: approval
-          filters:
-            branches:
-              ignore: master
-      - docker:
-          name: manual-build
-          requires:
-            - manual-build-trigger
-          filters:
-            branches:
-              ignore: master
      - docker:
          name: auto-build
          with_deploy: true
--- a/.circleci/misskey/default.yml
+++ b/.circleci/misskey/default.yml
@ -1,12 +1,12 @@
 url: 'http://misskey.local'
-port: 80
-mongodb:
+port: 8080
+db:
  host: localhost
-  port: 27017
-  db: misskey
-  user: syuilo
+  port: 5432
+  db: test-misskey
+  user: postgres
  pass: ''
 redis:
  host: localhost
  port: 6379
-  pass: ''
+id: aid
--- a/.circleci/misskey/test.yml
+++ b/.circleci/misskey/test.yml
@ -1,13 +1,12 @@
 url: 'http://misskey.local'
-port: 80
-mongodb:
+port: 8080
+db:
  host: localhost
-  port: 27017
+  port: 5432
  db: test-misskey
-  user: admin
+  user: postgres
  pass: ''
-# __REDIS__
 redis:
  host: localhost
  port: 6379
-  pass: ''
+id: aid
--- a/.config/example.yml
+++ b/.config/example.yml
@ -79,6 +79,8 @@ redis:
  host: localhost
  port: 6379
  #pass: example-pass
+  #prefix: example-prefix
+  #db: 1

 #   ┌─────────────────────────────┐
 #───┘ Elasticsearch configuration └─────────────────────────────
@ -86,7 +88,9 @@ redis:
 #elasticsearch:
 #  host: localhost
 #  port: 9200
-#  pass: null
+#  ssl: false
+#  user: 
+#  pass: 

 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
@ -109,15 +113,47 @@ id: 'aid'
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────

-# If enabled:
-#  The first account created is automatically marked as Admin.
-autoAdmin: true
-
 # Whether disable HSTS
 #disableHsts: true

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

+# Job concurrency per worker
+# deliverJobConcurrency: 128
+# inboxJobConcurrency: 16
+
+# Job rate limiter
+# deliverJobPerSec: 128
+# inboxJobPerSec: 16
+
+# Job attempts
+# deliverJobMaxAttempts: 12
+# inboxJobMaxAttempts: 8
+
 # IP address family used for outgoing request (ipv4, ipv6 or dual)
 #outgoingAddressFamily: ipv4
+
+# Syslog option
+#syslog:
+#  host: localhost
+#  port: 514
+
+# Proxy for HTTP/HTTPS
+#proxy: http://127.0.0.1:3128
+
+#proxyBypassHosts: [
+#  'example.com',
+#  '192.0.2.8'
+#]
+
+# Proxy for SMTP/SMTPS
+#proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
+#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
+#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
+
+# Media Proxy
+#mediaProxy: https://example.com/proxy
+
+# Sign to ActivityPub GET request (default: false)
+#signToActivityPubGet: true
--- a/.dockerignore
+++ b/.dockerignore
@ -5,8 +5,10 @@
 .vscode
 Dockerfile
 build/
+built/
 db/
 docker-compose.yml
 elasticsearch/
 node_modules/
 redis/
+files/
--- a/.gitattributes
+++ b/.gitattributes
@ -1,3 +1,7 @@
 *.svg -diff -text
 *.psd -diff -text
 *.ai -diff -text
+*.mqo -diff -text
+*.glb -diff -text
+*.blend -diff -text
+*.afdesign -diff -text
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -6,7 +6,6 @@
 /.github/                                       @syuilo @AyaMorisawa @acid-chicken
 /.vscode/                                       @acid-chicken
 /assets/                                        @syuilo # @tamaina
-/cli/                                           @syuilo
 /docs/                                          @syuilo
 /docs/*.en.md                                   @AyaMorisawa # @skid9000
 # /docs/*.fr.md                                 @BoFFire
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@ -0,0 +1,53 @@
+name: Node.js CI
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x, 14.x, 15.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: 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
--- a/.gitignore
+++ b/.gitignore
@ -1,16 +1,18 @@
 # Visual Studio Code
 /.vscode
+!/.vscode/extensions.json

 # Intelij-IDEA
 /.idea

 # Node.js
 /node_modules
+report.*.json

 # config
 /.config/*
 !/.config/example.yml
-!/.config/mongo_initdb_example.js
+!/.config/docker_example.env

 # misskey
 /build
@ -29,3 +31,10 @@ api-docs.json
 .DS_Store
 /files
 ormconfig.json
+
+# blender backups
+*.blend1
+*.blend2
+*.blend3
+*.blend4
+*.blend5
--- a/.imgbotconfig
+++ b/.imgbotconfig
@ -0,0 +1,5 @@
+{
+	"ignoredFiles": [
+		"test/resources/*"
+	]
+}
--- a/.mocharc.json
+++ b/.mocharc.json
@ -0,0 +1,7 @@
+{
+	"extension": ["ts","js","cjs","mjs"],
+	"require": "ts-node/register",
+	"slow": 1000,
+	"timeout": 30000,
+	"exit": true
+}
--- a/.node-version
+++ b/.node-version
@ -1 +1 @@
-v12.6.0
+v14.15.4
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@ -2,10 +2,10 @@
 	"recommendations": [
 		"ducksoupdev.vue2",
 		"editorconfig.editorconfig",
-		"eg2.tslint",
 		"eg2.vscode-npm-script",
 		"hollowtree.vue-snippets",
 		"ms-vscode.typescript-javascript-grammar",
+		"ms-vscode.vscode-typescript-tslint-plugin",
 		"octref.vetur",
 		"sysoev.language-stylus"
 	]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,18 +1,30 @@
 # Contribution guide
 :v: Thanks for your contributions :v:

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

 * Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one.
 * If you have multiple independent issues, please submit them separately.

+## Branches
+* **master** branch is tracking the latest release and used for production purposes.
+* **develop** branch is where we work for the next release.
+* **l10n_develop** branch is reserved for localization management.
+
 ## Localization (l10n)
 Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
 You can improve our translations with your Crowdin account.
-Changes you make in Crowdin will be merged into the develop branch by @syuilo.
+Your changes in Crowdin are automatically submitted as a PR (with the title "New Crowdin translations") to the repository.
+The owner [@syuilo](https://github.com/syuilo) merges the PR into the develop branch before the next release.

-If you cannot find the language you want to contribute with, please open an issue.
+If your language is not listed in Crowdin, please open an issue.

 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)

@ -32,8 +44,18 @@ Documentation of Vue I18n is available at http://kazupon.github.io/vue-i18n/intr
 Misskey uses CircleCI for executing automated tests.
 Configuration files are located in [`/.circleci`](/.circleci).

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

+If you have no experience on 3D modeling, we suggest to use the free 3DCG software [Blender](https://www.blender.org/).
+You can find information on glTF 2.0 at [glTF 2.0 — Blender Manual]( https://docs.blender.org/manual/en/dev/addons/io_scene_gltf2.html).
+
+## FAQ
 ### How to resolve conflictions occurred at yarn.lock?

 Just execute `yarn` to fix it.
@ -93,6 +115,8 @@ Good:
 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 `===`.
 🥰

@ -216,39 +240,13 @@ SQLでは配列のインデックスは**1始まり**。
 MongoDBの時とは違い、findOneでレコードを取得する時に対象レコードが存在しない場合 **`undefined`** が返ってくるので注意。
 MongoDBは`null`で返してきてたので、その感覚で`if (x === null)`とか書くとバグる。代わりに`if (x == null)`と書いてください

-### 簡素な`undefined`チェック
-データベースからレコードを取得するときに、プログラムの流れ的に(ほぼ)絶対`undefined`にはならない場合でも、`undefined`チェックしないとTypeScriptに怒られます。
-でもいちいち複数行を費やして、発生するはずのない`undefined`をチェックするのも面倒なので、`ensure`というユーティリティ関数を用意しています。
-例えば、
-``` ts
-const user = await Users.findOne(userId);
-// この時点で user の型は User | undefined
-if (user == null) {
-	throw 'missing user';
-}
-// この時点で user の型は User
-```
-という処理を`ensure`を使うと
-``` ts
-const user = await Users.findOne(userId).then(ensure);
-// この時点で user の型は User
-```
-という風に書けます。
-もちろん`ensure`内部でエラーを握りつぶすようなことはしておらず、万が一`undefined`だった場合はPromiseがRejectされ後続の処理は実行されません。
-``` ts
-const user = await Users.findOne(userId).then(ensure);
-// 万が一 Users.findOne の結果が undefined だったら、ensure でエラーが発生するので
-// この行に到達することは無い
-// なので、.then(ensure) は
-// if (user == null) {
-//	throw 'missing user';
-// }
-// の糖衣構文のような扱いです
-```
-
 ### Migration作成方法
 ```
 npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
 ```

 作成されたスクリプトは不必要な変更を含むため除去してください。
+
+## その他
+### HTMLのクラス名で follow という単語は使わない
+広告ブロッカーで誤ってブロックされる
--- a/19
+++ b/19
@ -0,0 +1,19 @@
+Unless otherwise stated this repository is
+Copyright © 2014-2020 syuilo and contributers
+
+And is distributed under The GNU Affero General Public License Version 3, you should have received a copy of the license file as LICENSE.
+
+
+Misskey includes several third-party Open-Source softwares.
+
+Unicode emoji regular expressions by Twitter, Inc.
+License: MIT
+https://github.com/twitter/twemoji-parser/blob/master/LICENSE.md
+
+Emoji keywords for Unicode 11 and below by Mu-An Chiou
+License: MIT
+https://github.com/muan/emojilib/blob/master/LICENSE
+
+RsaSignature2017 implementation by Transmute Industries Inc
+License: MIT
+https://github.com/transmute-industries/RsaSignature2017/blob/master/LICENSE
--- a/7
+++ b/7
@ -1,9 +1,7 @@
-FROM node:12.6-alpine AS base
+FROM node:14.15.4-alpine AS base

 ENV NODE_ENV=production

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

 FROM base AS builder
@ -12,6 +10,7 @@ RUN apk add --no-cache \
    autoconf \
    automake \
    file \
+		git \
    g++ \
    gcc \
    libc-dev \
@ -22,7 +21,7 @@ RUN apk add --no-cache \
    python \
    zlib-dev

-COPY package.json ./
+COPY package.json yarn.lock ./
 RUN yarn install
 COPY . ./
 RUN yarn build
--- a/README.md
+++ b/README.md
@ -1,77 +1,62 @@
-<a href="https://xn--931a.moe/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
+[![Misskey](/assets/about/banner.svg)](https://join.misskey.page/)

-[![Misskey](/assets/title.png)](https://misskey.io/)
-================================================================
+<h1 align="center">Misskey</h1>
+
+<div align="center">

 [![CircleCI](https://img.shields.io/circleci/project/github/syuilo/misskey.svg?style=for-the-badge&logo=circleci)](https://circleci.com/gh/syuilo/misskey)
 [![Dependencies](https://img.shields.io/david/syuilo/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/syuilo/misskey)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge&logo=github)](http://makeapullrequest.com)
+[![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)

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

-<p align="justify">
-<a href="https://misskey.io">Misskey</a> is a decentralized microblogging platform born on Earth.
+<a href="https://join.misskey.page/">Misskey</a> is a decentralized microblogging platform born on Earth.
 Since it exists within the Fediverse (a universe where various social media platforms are organized),
 it is mutually linked with other social media platforms.
-Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://joinmisskey.github.io/">Find an instance!</a>
-</p>
+Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? <a href="https://join.misskey.page/">Find an instance!</a>

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

+</div>
+
+---
+
 ![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg)

 :sparkles: Features
 ----------------------------------------------------------------
+<a href="https://xn--931a.moe/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>

-<img src="/assets/about/post.png" align="left" height="200px"/>
-
-<h3 align="left">Posting</h3>
-<p align="justify">
+<h3>Posting</h3>
+<p>
 Post your ideas, discussion topics, fun moments, or anything else you want to share! Misskey supports text, emoji, pictures, videos, and polls!
 </p>

 ---

-<img src="/assets/about/reaction.png" align="right" height="200px"/>
-
-<h3 align="right">Reactions</h3>
-<p align="justify">
+<h3 >Reactions</h3>
+<p>
 Reactions are the simplest way to respond to others' posts. Simply pick a reaction emote from the list! Reactions on Misskey are much more expressive than other social media services which only allow “liking”.
 </p>

 ---

-<img src="/assets/about/ui.png" align="left" height="200px"/>
-
-<h3 align="left">Interface</h3>
-<p align="justify">
+<h3>Interface</h3>
+<p>
 Customize the UI to your own tastes! No UI will work for everyone, so Misskey is completely customizable. Make Misskey *yours* by editing the style, adjusting timeline layouts, and placing widgets.
 </p>

 ---

-<img src="/assets/about/drive.png" align="right" width="300px"/>
-
-<h3 align="right">Misskey Drive</h3>
-<p align="justify">
+<h3>Misskey Drive</h3>
+<p>
 Organize and store your files! Want to post a picture you have already uploaded? Wish you could organize your files into folders? Misskey Drive is a solution!
 </p>

 ---

-...and more! Experience Misskey with your own eyes at [misskey.io](https://misskey.io/) or join one of the [other instances](https://joinmisskey.github.io/) that are available.
-
-Screen shots
----------------------------------------------------------------
-### Profile page
-<img src="/assets/ss/user.jpg" width="500px"/>
-
-### Explore users
-<img src="/assets/ss/explore.jpg" width="500px"/>
-
-:new: What's new
----------------------------------------------------------------
-Please see the [Release notes](./CHANGELOG.md).
+...and more!

 :package: Create your own instance
 ----------------------------------------------------------------
@ -89,6 +74,9 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 		<td><img src="https://avatars1.githubusercontent.com/u/30769358?s=460&v=4" alt="mei23" width="100"></td>
 		<td><img src="https://avatars2.githubusercontent.com/u/20679825?s=460&v=4" alt="acid-chicken" width="100"></td>
 		<td><img src="https://avatars2.githubusercontent.com/u/6533808?s=460&v=4" alt="rinsuki" width="100"></td>
+		<td><img src="https://avatars0.githubusercontent.com/u/7973572?s=460&v=4" alt="tamaina" width="100"></td>
+		<td><img src="https://avatars1.githubusercontent.com/u/7106976?s=460&v=4" alt="Xeltica" width="100"></td>
+		<td><img src="https://avatars1.githubusercontent.com/u/17376330?s=460&v=4" alt="u1-liquid" width="100"></td>
 	</tr>
 	<tr>
 		<td align="center"><a href="https://github.com/syuilo">@syuilo</a></td>
@ -96,97 +84,122 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 		<td align="center"><a href="https://github.com/mei23">@mei23</a></td>
 		<td align="center"><a href="https://github.com/acid-chicken">@acid-chicken</a></td>
 		<td align="center"><a href="https://github.com/rinsuki">@rinsuki</a></td>
+		<td align="center"><a href="https://github.com/tamaina">@tamaina</a></td>
+		<td align="center"><a href="https://github.com/Xeltica">@Xeltica</a></td>
+		<td align="center"><a href="https://github.com/u1-liquid">@u1-liquid</a></td>
 	</tr>
 </table>

+---
+
+To receive updates of this repo, follow [@repo@misskey.io](https://misskey.io/@repo) on fediverse.
+
 :heart: Backers
 ----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5888816/36da0f7c15954df0ab13f9abdf227f66/1.jpeg?token-time=2145916800&token-hash=at8QpJXJ8C0zINY_NmoMKv-MhXVoUK-YzTgaJPJzJYU%3D" alt="Hiroshi Seki" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weepjp" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19045173/cb91c0f345c24d4ebfd05f19906d5e26/1.png?token-time=2145916800&token-hash=o_zKBytJs_AxHwSYw_5R8eD0eSJe3RoTR3kR3Q0syN0%3D" alt="kiritan" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/776209" alt="Denshi" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/557245" alt="mkatze" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13099460/43cecdbaa63a40d79bf50a96b9910b9d/1.jpe?token-time=2145916800&token-hash=bqwLTk0Wo0hUJJ8J5y7ii05bLzz-_CDA7Bo0Mp4RFU0%3D" alt="ne_moni" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/4.jpe?token-time=2145916800&token-hash=zEyJqVM7u9d8Ri-65fJYSJcWF1jBH1nJ5a3taRzrTmw%3D" alt="Melilot" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/20832595" alt="Roujo " width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/27956229" alt="Oliver Maximilian Seidel" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/3.png?token-time=2145916800&token-hash=oH_i7gJjNT7Ot6j9JiVwy7ZJIBqACVnzLqlz4YrDAZA%3D" alt="weepjp " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19045173/cb91c0f345c24d4ebfd05f19906d5e26/1.png?token-time=2145916800&token-hash=o_zKBytJs_AxHwSYw_5R8eD0eSJe3RoTR3kR3Q0syN0%3D" alt="kiritan " width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/27648259" alt="みなしま " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/24430516/b1964ac5b9f746d2a12ff53dbc9aa40a/1.jpg?token-time=2145916800&token-hash=bmEiMGYpp3bS7hCCbymjGGsHBZM3AXuBOFO3Kro37PU%3D" alt="Eduardo Quiros" width="100"></td>
 </tr><tr>
-<td><a href="https://www.patreon.com/rane_hs">Hiroshi Seki</a></td>
-<td><a href="https://www.patreon.com/weepjp">weepjp</a></td>
-<td><a href="https://www.patreon.com/user?u=19045173">kiritan</a></td>
-<td><a href="https://www.patreon.com/user?u=776209">Denshi</a></td>
-<td><a href="https://www.patreon.com/user?u=557245">mkatze</a></td>
-<td><a href="https://www.patreon.com/user?u=13099460">ne_moni</a></td>
-<td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
-<td><a href="https://www.patreon.com/osapon">osapon</a></td>
+<td><a href="https://www.patreon.com/user?u=20832595">Roujo </a></td>
+<td><a href="https://www.patreon.com/user?u=27956229">Oliver Maximilian Seidel</a></td>
+<td><a href="https://www.patreon.com/weepjp">weepjp </a></td>
+<td><a href="https://www.patreon.com/user?u=19045173">kiritan </a></td>
+<td><a href="https://www.patreon.com/user?u=27648259">みなしま </a></td>
+<td><a href="https://www.patreon.com/user?u=24430516">Eduardo Quiros</a></td>
 </tr></table>
 <table><tr>
-<td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1.png?token-time=2145916800&token-hash=9nEQje_eMvUjq9a7L3uBqW-MQbS-rRMaMgd7UYVoFNM%3D" alt="mydarkstar" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1.jpe?token-time=2145916800&token-hash=UQRWf01TwHDV4Cls1K0YAOAjM29ssif7hLVq0ESQ0hs%3D" alt="nemu" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/14215107/1cbe1912c26143919fa0faca16f12ce1/4.jpg?token-time=2145916800&token-hash=BslMqDjTjz8KYANLvxL87agHTugHa0dMPUzT-hwR6Vk%3D" alt="Nesakko" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/776209" alt="Demogrognard" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/3075183/c2ae575c604e420297f000ccc396e395/1.jpeg?token-time=2145916800&token-hash=O9qmPtpo6wWb0OuvnkEekhk_1WO2MTdytLr7ZgsAr80%3D" alt="Liaizon Wakest" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/557245" alt="mkatze " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/23915207/25428766ecd745478e600b3d7f871eb2/1.png?token-time=2145916800&token-hash=urCLLA4KjJZX92Y1CxcBP4d8bVTHGkiaPnQZp-Tqz68%3D" alt="kabo2468y " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/8249688/4aacf36b6b244ab1bc6653591b6640df/2.png?token-time=2145916800&token-hash=1ZEf2w6L34253cZXS_HlVevLEENWS9QqrnxGUAYblPo%3D" alt="AureoleArk " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5670915/ee175f0bfb6347ffa4ea101a8c097bff/1.jpg?token-time=2145916800&token-hash=mPLM9CA-riFHx-myr3bLZJuH2xBRHA9se5VbHhLIOuA%3D" alt="osapon " width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/36813045/29876ea679d443bcbba3c3f16edab8c2/2.jpeg?token-time=2145916800&token-hash=YCKWnIhrV9rjUCV9KqtJnEqjy_uGYF3WMXftjUdpi7o%3D" alt="Wataru Manji (manji0)" width="100"></td>
+</tr><tr>
+<td><a href="https://www.patreon.com/Nesakko">Nesakko</a></td>
+<td><a href="https://www.patreon.com/user?u=776209">Demogrognard</a></td>
+<td><a href="https://www.patreon.com/wakest">Liaizon Wakest</a></td>
+<td><a href="https://www.patreon.com/user?u=557245">mkatze </a></td>
+<td><a href="https://www.patreon.com/user?u=23915207">kabo2468y </a></td>
+<td><a href="https://www.patreon.com/AureoleArk">AureoleArk </a></td>
+<td><a href="https://www.patreon.com/osapon">osapon </a></td>
+<td><a href="https://www.patreon.com/user?u=16869916">見当かなみ </a></td>
+<td><a href="https://www.patreon.com/user?u=36813045">Wataru Manji (manji0)</a></td>
+</tr></table>
+<table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61 " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5788159/af42076ab3354bb49803cfba65f94bee/1.jpg?token-time=2145916800&token-hash=iSaxp_Yr2-ZiU2YVi9rcpZZj9mj3UvNSMrZr4CU4qtA%3D" alt="mewl hayabusa" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/28779508/3cd4cb7f017f4ee0864341e3464d42f9/1.png?token-time=2145916800&token-hash=eGQtR15be44kgvh8fw2Jx8Db4Bv15YBp2ldxh0EKRxA%3D" alt="S Y" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/16542964" alt="Takumi Sugita" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin " width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/17463605" alt="Sampot" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/38837364/9421361c54c645ac8f5fc442a40c32e9/1.png?token-time=2145916800&token-hash=TUZB48Nem3BeUPLBH6s3P6WyKBnQOy0xKaDSTBBUNzA%3D" alt="xianon" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/26340354/08834cf767b3449e93098ef73a434e2f/2.png?token-time=2145916800&token-hash=nyM8DnKRL8hR47HQ619mUzsqVRpkWZjgtgBU9RY15Uc%3D" alt="totokoro " width="100"></td>
 </tr><tr>
-<td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
-<td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61</a></td>
-<td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
-<td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
-<td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin</a></td>
+<td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61 </a></td>
+<td><a href="https://www.patreon.com/hs_sh_net">mewl hayabusa</a></td>
+<td><a href="https://www.patreon.com/user?u=28779508">S Y</a></td>
+<td><a href="https://www.patreon.com/user?u=16542964">Takumi Sugita</a></td>
+<td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin </a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
-<td><a href="https://www.patreon.com/user?u=17463605">Sampot</a></td>
-<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s</a></td>
+<td><a href="https://www.patreon.com/user?u=38837364">xianon</a></td>
+<td><a href="https://www.patreon.com/user?u=26340354">totokoro </a></td>
 </tr></table>
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/19356899/496b4681d33b4520bd7688e0fd19c04d/2.jpeg?token-time=2145916800&token-hash=_sTj3dUBOhn9qwiJ7F19Qd-yWWfUqJC_0jG1h0agEqQ%3D" alt="sheeta.s " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5827393/59893c191dda408f9cabd0f20a3a5627/1.jpeg?token-time=2145916800&token-hash=i9N05vOph-eP1LTLb9_npATjYOpntL0ZsHNaZFSsPmE%3D" alt="motcha " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/20494440/540beaf2445f408ea6597bc61e077bb3/1.png?token-time=2145916800&token-hash=UJ0JQge64Bx9XmN_qYA1inMQhrWf4U91fqz7VAKJeSg%3D" alt="axtuki1 " width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13737140/1adf7835017d479280d90fe8d30aade2/1.png?token-time=2145916800&token-hash=0pdle8h5pDZrww0BDOjdz6zO-HudeGTh36a3qi1biVU%3D" alt="Satsuki Yanagi" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpe?token-time=2145916800&token-hash=CPxGQhKIlEaa6WUcgbyHixyKEhakiw9RFdOhsIJBQ_o%3D" alt="takimura" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/83884b38afc74d4cbe83c30a13b10edd/1.png?token-time=2145916800&token-hash=R5Tog8RWg0rguRoCIoir3lThokrdPvs8Utfikhc0nhY%3D" alt="Atsuko Tominaga" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/17880724/311738c8a48f4a6b9443c2445a75adde/1.jpg?token-time=2145916800&token-hash=nVAntpybQrznE0rg05keLrSE6ogPKJXB13rmrJng42c%3D" alt="takimura " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13100201/fc5be4fa90444f09a9c8a06f72385272/1.png?token-time=2145916800&token-hash=i8PjlgfOB2LPEdbtWyx8ZPsBKhGcNZqcw_FQmH71UGU%3D" alt="aqz tamaina" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/9109588/e3cffc48d20a4e43afe04123e696781d/3.png?token-time=2145916800&token-hash=T_VIUA0IFIbleZv4pIjiszZGnQonwn34sLCYFIhakBo%3D" alt="nafuchoco " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/16900731/619ab87cc08448439222631ebb26802f/1.gif?token-time=2145916800&token-hash=o27K7M02s1z-LkDUEO5Oa7cu-GviRXeOXxryi4o_6VU%3D" alt="Atsuko Tominaga" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4389829/9f709180ac714651a70f74a82f3ffdb9/3.png?token-time=2145916800&token-hash=FTm3WVom4dJ9NwWMU4OpCL_8Yc13WiwEbKrDPyTZTPs%3D" alt="natalie" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1.jpe?token-time=2145916800&token-hash=EWxXhVbZYH7KB4IDT3joc8TbIg8zPO40x1r5IDn3R7c%3D" alt="Hiratake" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5923936/2a743cbfbff946c2af3f09026047c0da/2.png?token-time=2145916800&token-hash=h6yphW1qnM0n_NOWaf8qtszMRLXEwIxfk5beu4RxdT0%3D" alt="noellabo" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/2384390/5681180e1efb46a8b28e0e8d4c8b9037/1.jpg?token-time=2145916800&token-hash=SJcMy-Q1BcS940-LFUVOMfR7-5SgrzsEQGhYb3yowFk%3D" alt="CG" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.jpe?token-time=2145916800&token-hash=qA8j97lIZNc-74AuZ0p4F3ms6sKPeKjtNt2vEuwpsyo%3D" alt="Hekovic" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/10789744/97175095d8f04c0f86225ff47cb98d40/1.jpeg?token-time=2145916800&token-hash=l4AoMR7Nj7K4yAHrkrk2hAoggPkbSPm12m1nmbe9Pb8%3D" alt="Naoki Hirayama" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/26144593/9514b10a5c1b42a3af58621aee213d1d/1.png?token-time=2145916800&token-hash=v1PYRsjzu4c_mndN4Hvi_dlispZJsuGRCQeNS82pUSM%3D" alt="EBISUME" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5923936/2a743cbfbff946c2af3f09026047c0da/2.png?token-time=2145916800&token-hash=h6yphW1qnM0n_NOWaf8qtszMRLXEwIxfk5beu4RxdT0%3D" alt="noellabo " width="100"></td>
 </tr><tr>
+<td><a href="https://www.patreon.com/user?u=19356899">sheeta.s </a></td>
+<td><a href="https://www.patreon.com/user?u=5827393">motcha </a></td>
+<td><a href="https://www.patreon.com/user?u=20494440">axtuki1 </a></td>
 <td><a href="https://www.patreon.com/user?u=13737140">Satsuki Yanagi</a></td>
-<td><a href="https://www.patreon.com/takimura">takimura</a></td>
+<td><a href="https://www.patreon.com/takimura">takimura </a></td>
+<td><a href="https://www.patreon.com/aqz">aqz tamaina</a></td>
+<td><a href="https://www.patreon.com/user?u=9109588">nafuchoco </a></td>
 <td><a href="https://www.patreon.com/user?u=16900731">Atsuko Tominaga</a></td>
 <td><a href="https://www.patreon.com/user?u=4389829">natalie</a></td>
-<td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
-<td><a href="https://www.patreon.com/noellabo">noellabo</a></td>
-<td><a href="https://www.patreon.com/Corset">CG</a></td>
-<td><a href="https://www.patreon.com/hekovic">Hekovic</a></td>
-<td><a href="https://www.patreon.com/spinlock">Naoki Hirayama</a></td>
+<td><a href="https://www.patreon.com/user?u=26144593">EBISUME</a></td>
+<td><a href="https://www.patreon.com/noellabo">noellabo </a></td>
 </tr></table>
 <table><tr>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1.jpeg?token-time=2145916800&token-hash=L55UhJ0rcuNAH3w_ryeeGN4hC6taoOixyAhraEi0bzw%3D" alt="dansup" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1.jpeg?token-time=2145916800&token-hash=d8jBQLMOHD87KtXs5C9fk1o58DMF73pQ-dYH3uZJPBE%3D" alt="Gargron" width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/2384390/5681180e1efb46a8b28e0e8d4c8b9037/1.jpg?token-time=2145916800&token-hash=SJcMy-Q1BcS940-LFUVOMfR7-5SgrzsEQGhYb3yowFk%3D" alt="CG " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18072312/98e894d960314fa7bc236a72a39488fe/1.jpg?token-time=2145916800&token-hash=7bkMqTwHPRsJPGAq42PYdDXDZBVGLqdgr1ZmBxX8GFQ%3D" alt="Hekovic " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/24641572/b4fd175424814f15b0ca9178d2d2d2e4/1.png?token-time=2145916800&token-hash=e2fyqdbuJbpCckHcwux7rbuW6OPkKdERcus0u2wIEWU%3D" alt="uroco @99" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/14661394" alt="Chandler " width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1.png?token-time=2145916800&token-hash=hBayGfOmQH3kRMdNnDe4oCZD_9fsJWSt29xXR3KRMVk%3D" alt="Nokotaro Takeda" width="100"></td>
+<td><img src="https://c8.patreon.com/2/200/23932002" alt="nenohi " width="100"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/9481273/7fa89168e72943859c3d3c96e424ed31/4.jpeg?token-time=2145916800&token-hash=5w1QV1qXe-NdWbdFmp1H7O_-QBsSiV0haumk3XTHIEg%3D" alt="Efertone " width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1.jpeg?token-time=2145916800&token-hash=vGe7wXGqmA8Q7m-kDNb6fyGdwk-Dxk4F-ut8ZZu51RM%3D" alt="Takashi Shibuya" width="100"></td>
 </tr><tr>
-<td><a href="https://www.patreon.com/dansup">dansup</a></td>
-<td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
+<td><a href="https://www.patreon.com/Corset">CG </a></td>
+<td><a href="https://www.patreon.com/hekovic">Hekovic </a></td>
+<td><a href="https://www.patreon.com/user?u=24641572">uroco @99</a></td>
+<td><a href="https://www.patreon.com/user?u=14661394">Chandler </a></td>
 <td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
+<td><a href="https://www.patreon.com/user?u=23932002">nenohi </a></td>
+<td><a href="https://www.patreon.com/efertone">Efertone </a></td>
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>

-**Last updated:** Tue, 16 Jul 2019 10:23:06 UTC
+**Last updated:** Sun, 26 Jul 2020 07:00:10 UTC
 <!-- PATREON_END -->

-:four_leaf_clover: Copyright
----------------------------------------------------------------
-> Copyright (c) 2014-2019 syuilo
-
-Misskey is open-source software licensed under the [GNU AGPLv3](LICENSE).
-
-[![][agpl-3.0-badge]][AGPL-3.0]
-
-[agpl-3.0]:           https://www.gnu.org/licenses/agpl-3.0.en.html
-[agpl-3.0-badge]:     https://img.shields.io/badge/license-AGPL--3.0-444444.svg?style=for-the-badge
-
 [backer-url]: #backers
 [backer-badge]: https://opencollective.com/misskey/backers/badge.svg
 [backers-image]: https://opencollective.com/misskey/backers.svg
--- a/assets/about/banner.svg
+++ b/assets/about/banner.svg
--- a/assets/apple-touch-icon.png
+++ b/assets/apple-touch-icon.png
--- a/assets/banner.afdesign
+++ b/assets/banner.afdesign
--- a/assets/favicon.ico
+++ b/assets/favicon.ico
--- a/assets/favicon.png
+++ b/assets/favicon.png
--- a/assets/favicon/favicon.png
+++ b/assets/favicon/favicon.png
--- a/assets/favicon/favicon.svg
+++ b/assets/favicon/favicon.svg
@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 135.46667 135.46667"
-   height="512"
-   width="512">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="fill:#2fa3bc;fill-opacity:1"
-     transform="translate(-30.809093,-111.78601)"
-     id="layer1">
-    <g
-       style="fill:#2fa3bc;fill-opacity:1"
-       transform="matrix(1.096096,0,0,1.096096,-2.960633,-44.023579)"
-       id="g4502">
-      <g
-         id="g5125"
-         transform="translate(-1.3333333e-6,-1.3439941e-6)"
-         style="fill:#2fa3bc;fill-opacity:1">
-        <g
-           aria-label="Mi"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:141.03404236px;line-height:476.69509888px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#2fa3bc;fill-opacity:1;stroke:none;stroke-width:0.28950602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="text4489"
-           transform="matrix(0.91391326,0,0,0.91391326,7.9719907,17.595761)">
-          <path
-             id="path5210"
-             transform="matrix(0.26412464,0,0,0.26412464,24.988264,136.28626)"
-             d="m 62.474609,76.585938 c -7.47555,0 -14.595784,1.246427 -21.359375,3.738281 C 29.011968,84.595952 19.044417,92.249798 11.212891,103.28516 3.7373405,113.96451 0,125.88934 0,139.06055 v 233.8789 c 0,17.08697 6.0510264,31.85913 18.154297,44.31836 12.459246,12.10327 27.233346,18.15625 44.320312,18.15625 17.442947,0 32.215089,-6.05298 44.318361,-18.15625 12.45925,-12.45923 18.68945,-27.23139 18.68945,-44.31836 V 330.4082 c 0.13441,-9.21122 9.6225,-6.79429 14.41797,0 8.98111,15.55395 28.02226,28.91242 50.19141,28.83594 22.16915,-0.0764 40.58194,-11.03699 50.19336,-28.83594 3.63981,-4.29263 13.89902,-11.60675 14.95117,0 v 42.53125 c 0,17.08697 6.05102,31.85913 18.15429,44.31836 12.45923,12.10327 27.23335,18.15625 44.32032,18.15625 17.44294,0 32.21509,-6.05298 44.31836,-18.15625 12.45923,-12.45923 18.68945,-27.23139 18.68945,-44.31836 v -233.8789 c 0,-13.17121 -3.9146,-25.09604 -11.74609,-35.77539 -7.47557,-11.035362 -17.26588,-18.689208 -29.36914,-22.960941 -7.11956,-2.491854 -14.23982,-3.738281 -21.35938,-3.738281 -19.22286,0 -35.41865,7.476649 -48.58984,22.427734 l -63.40235,74.199218 c -1.42391,1.06791 -6.14093,9.23242 -16.16015,9.23242 -10.01923,0 -14.20109,-8.16451 -15.625,-9.23242 L 110.53125,99.013672 C 97.716024,84.062587 81.697447,76.585938 62.474609,76.585938 Z m 395.060551,0 c -14.9511,-10e-7 -27.76596,5.340179 -38.44532,16.019531 -10.32338,10.323381 -15.48437,22.961011 -15.48437,37.912111 0,14.9511 5.16099,27.76596 15.48437,38.44531 10.67936,10.32338 23.49422,15.48633 38.44532,15.48633 14.95109,0 27.76596,-5.16295 38.44531,-15.48633 C 506.65982,158.28354 512,145.46868 512,130.51758 512,115.56648 506.65982,102.92885 495.98047,92.605469 485.30112,81.926117 472.48625,76.585938 457.53516,76.585938 Z m 0.5332,118.541012 c -14.9511,0 -27.76596,5.34018 -38.44531,16.01953 -10.67936,10.67936 -16.01758,23.49422 -16.01758,38.44532 v 131.89062 c 0,14.9511 5.33822,27.76596 16.01758,38.44531 10.67935,10.32339 23.49421,15.48633 38.44531,15.48633 14.9511,0 27.58873,-5.16294 37.91211,-15.48633 C 506.65982,409.24838 512,396.43352 512,381.48242 V 249.5918 c 0,-14.9511 -5.34018,-27.76596 -16.01953,-38.44532 -10.32338,-10.67935 -22.96101,-16.01953 -37.91211,-16.01953 z"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#2fa3bc;fill-opacity:1;stroke-width:1.09609616px" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
--- a/assets/icons/128.png
+++ b/assets/icons/128.png
--- a/assets/icons/16.png
+++ b/assets/icons/16.png
--- a/assets/icons/192.png
+++ b/assets/icons/192.png
--- a/assets/icons/256.png
+++ b/assets/icons/256.png
--- a/assets/icons/32.png
+++ b/assets/icons/32.png
--- a/assets/icons/512.png
+++ b/assets/icons/512.png
--- a/assets/icons/64.png
+++ b/assets/icons/64.png
--- a/assets/mi-white.afdesign
+++ b/assets/mi-white.afdesign
--- a/assets/mi-white.png
+++ b/assets/mi-white.png
--- a/assets/mi.afdesign
+++ b/assets/mi.afdesign
--- a/assets/mi.svg
+++ b/assets/mi.svg
@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 135.46667 135.46667"
-   height="512"
-   width="512">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-30.809093,-111.78601)"
-     id="layer1">
-    <g
-       transform="matrix(1.096096,0,0,1.096096,-2.960633,-44.023579)"
-       id="g4502">
-      <g
-         id="g5125"
-         transform="translate(-1.3333333e-6,-1.3439941e-6)"
-         style="fill:#000000;fill-opacity:1">
-        <g
-           aria-label="Mi"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:141.03404236px;line-height:476.69509888px;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28950602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="text4489"
-           transform="matrix(0.91391326,0,0,0.91391326,7.9719907,17.595761)">
-          <path
-             id="path5210"
-             transform="matrix(0.26412464,0,0,0.26412464,24.988264,136.28626)"
-             d="m 62.474609,76.585938 c -7.47555,0 -14.595784,1.246427 -21.359375,3.738281 C 29.011968,84.595952 19.044417,92.249798 11.212891,103.28516 3.7373405,113.96451 0,125.88934 0,139.06055 v 233.8789 c 0,17.08697 6.0510264,31.85913 18.154297,44.31836 12.459246,12.10327 27.233346,18.15625 44.320312,18.15625 17.442947,0 32.215089,-6.05298 44.318361,-18.15625 12.45925,-12.45923 18.68945,-27.23139 18.68945,-44.31836 V 330.4082 c 0.13441,-9.21122 9.6225,-6.79429 14.41797,0 8.98111,15.55395 28.02226,28.91242 50.19141,28.83594 22.16915,-0.0764 40.58194,-11.03699 50.19336,-28.83594 3.63981,-4.29263 13.89902,-11.60675 14.95117,0 v 42.53125 c 0,17.08697 6.05102,31.85913 18.15429,44.31836 12.45923,12.10327 27.23335,18.15625 44.32032,18.15625 17.44294,0 32.21509,-6.05298 44.31836,-18.15625 12.45923,-12.45923 18.68945,-27.23139 18.68945,-44.31836 v -233.8789 c 0,-13.17121 -3.9146,-25.09604 -11.74609,-35.77539 -7.47557,-11.035362 -17.26588,-18.689208 -29.36914,-22.960941 -7.11956,-2.491854 -14.23982,-3.738281 -21.35938,-3.738281 -19.22286,0 -35.41865,7.476649 -48.58984,22.427734 l -63.40235,74.199218 c -1.42391,1.06791 -6.14093,9.23242 -16.16015,9.23242 -10.01923,0 -14.20109,-8.16451 -15.625,-9.23242 L 110.53125,99.013672 C 97.716024,84.062587 81.697447,76.585938 62.474609,76.585938 Z m 395.060551,0 c -14.9511,-10e-7 -27.76596,5.340179 -38.44532,16.019531 -10.32338,10.323381 -15.48437,22.961011 -15.48437,37.912111 0,14.9511 5.16099,27.76596 15.48437,38.44531 10.67936,10.32338 23.49422,15.48633 38.44532,15.48633 14.95109,0 27.76596,-5.16295 38.44531,-15.48633 C 506.65982,158.28354 512,145.46868 512,130.51758 512,115.56648 506.65982,102.92885 495.98047,92.605469 485.30112,81.926117 472.48625,76.585938 457.53516,76.585938 Z m 0.5332,118.541012 c -14.9511,0 -27.76596,5.34018 -38.44531,16.01953 -10.67936,10.67936 -16.01758,23.49422 -16.01758,38.44532 v 131.89062 c 0,14.9511 5.33822,27.76596 16.01758,38.44531 10.67935,10.32339 23.49421,15.48633 38.44531,15.48633 14.9511,0 27.58873,-5.16294 37.91211,-15.48633 C 506.65982,409.24838 512,396.43352 512,381.48242 V 249.5918 c 0,-14.9511 -5.34018,-27.76596 -16.01953,-38.44532 -10.32338,-10.67935 -22.96101,-16.01953 -37.91211,-16.01953 z"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'OTADESIGN Rounded';-inkscape-font-specification:'OTADESIGN Rounded';fill:#000000;fill-opacity:1;stroke-width:1.09609616px" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
--- a/assets/ss/user.jpg
+++ b/assets/ss/user.jpg
--- a/crowdin.yml
+++ b/crowdin.yml
@ -1,3 +1,7 @@
 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
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -13,6 +13,8 @@ services:
    networks:
      - internal_network
      - external_network
+    volumes:
+      - ./files:/misskey/files

  redis:
    restart: always
@ -24,7 +26,7 @@ services:

  db:
    restart: always
-    image: postgres:11.2-alpine
+    image: postgres:12.2-alpine
    networks:
      - internal_network
    env_file:
--- a/docs/README.md
+++ b/docs/README.md
@ -4,3 +4,30 @@ Docs for users are located in `src/docs`.

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

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

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

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

@ -88,7 +89,7 @@ Just `docker-compose up -d`. GLHF!
 7. `docker-compose stop && docker-compose up -d`

 ### How to execute [cli commands](manage.en.md):
-`docker-compose run --rm web node cli/mark-admin @example`
+`docker-compose run --rm web node built/tools/mark-admin @example`

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

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

 Ce guide explique comment installer et configurer Misskey avec Docker.

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

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

@ -55,7 +56,7 @@ Utilisez la commande `docker-compose up -d`. GLHF!
 7. `docker-compose stop && docker-compose up -d`

 ### Comment exécuter des [commandes](manage.fr.md)
-`docker-compose run --rm web node cli/mark-admin @example`
+`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
--- a/docs/docker.ja.md
+++ b/docs/docker.ja.md
@ -3,7 +3,8 @@ Dockerを使ったMisskey構築方法

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

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

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

@ -89,7 +90,7 @@ docker-compose run --rm web yarn run init

 ### cliコマンドを実行する方法:

-`docker-compose run --rm web node cli/mark-admin @example`
+`docker-compose run --rm web node built/tools/mark-admin @example`

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

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

 # For WebSocket
@ -25,10 +25,9 @@ server {
 }

 server {
-    listen 443 http2;
-    listen [::]:443 http2;
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
    server_name example.tld;
-    ssl on;
    ssl_session_cache shared:ssl_session_cache:10m;

    # To use Let's Encrypt certificate
@ -40,8 +39,8 @@ server {
    #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;

    # SSL protocol settings
-    ssl_protocols TLSv1 TLSv1.2;
-    ssl_ciphers ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:AES128-SHA;
+    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
@ -51,11 +50,13 @@ server {
    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;
-        proxy_http_version 1.1;
-        proxy_redirect off;

        # For WebSocket
        proxy_set_header Upgrade $http_upgrade;
--- a/docs/manage.en.md
+++ b/docs/manage.en.md
@ -5,14 +5,10 @@ coming soon

 ## Mark as 'admin' user
 ``` shell
-node cli/mark-admin (User-ID or Username)
+node built/tools/mark-admin (Username)
 ```

 e.g.
 ``` shell
-# By id
-node cli/mark-admin 57d01a501fdf2d07be417afe
-
-# By username
-node cli/suspend @syuilo
+node built/tools/mark-admin @syuilo
 ```
--- a/docs/manage.fr.md
+++ b/docs/manage.fr.md
@ -5,14 +5,10 @@ coming soon

 ## Marquer un utilisateur en tant que 'admin'
 ``` shell
-node cli/mark-admin (ID utilisateur ou nom d'utilisateur)
+node built/tools/mark-admin (nom d'utilisateur)
 ```

 Exemple :
 ``` shell
-# Par id
-node cli/mark-admin 57d01a501fdf2d07be417afe
-
-# Par nom d'utilisateur
-node cli/suspend @syuilo
+node built/tools/mark-admin @syuilo
 ```
--- a/docs/manage.ja.md
+++ b/docs/manage.ja.md
@ -5,14 +5,10 @@ coming soon

 ## 管理者ユーザーを設定する
 ``` shell
-node cli/mark-admin (ユーザーID または ユーザー名)
+node built/tools/mark-admin (ユーザー名)
 ```

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

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

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

@ -22,8 +23,8 @@ adduser --disabled-password --disabled-login misskey
 Please install and setup these softwares:

 #### Dependencies :package:
-* **[Node.js](https://nodejs.org/en/)** >= 11.7.0
-* **[PostgreSQL](https://www.postgresql.org/)** >= 10
+* **[Node.js](https://nodejs.org/en/)** (12.x, 14.x)
+* **[PostgreSQL](https://www.postgresql.org/)** (>= 10)
 * **[Redis](https://redis.io/)**

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

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

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

@ -22,8 +24,8 @@ adduser --disabled-password --disabled-login misskey
 Installez les paquets suivants :

 #### Dépendences :package:
-* **[Node.js](https://nodejs.org/en/)** >= 11.7.0
-* **[PostgreSQL](https://www.postgresql.org/)** >= 10
+* **[Node.js](https://nodejs.org/en/)** (12.x, 14.x)
+* **[PostgreSQL](https://www.postgresql.org/)** (>= 10)
 * **[Redis](https://redis.io/)**

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

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

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

@ -22,7 +23,7 @@ adduser --disabled-password --disabled-login misskey
 これらのソフトウェアをインストール・設定してください:

 #### 依存関係 :package:
-* **[Node.js](https://nodejs.org/en/)** (11.7.0以上)
+* **[Node.js](https://nodejs.org/en/)** (12.x, 14.x)
 * **[PostgreSQL](https://www.postgresql.org/)** (10以上)
 * **[Redis](https://redis.io/)**

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

+import * as fs from 'fs';
 import * as gulp from 'gulp';
-import * as gutil from 'gulp-util';
 import * as ts from 'gulp-typescript';
-const sourcemaps = require('gulp-sourcemaps');
-import tslint from 'gulp-tslint';
-const cssnano = require('gulp-cssnano');
-const stylus = require('gulp-stylus');
-import * as uglifyComposer from 'gulp-uglify/composer';
 import * as rimraf from 'rimraf';
-import chalk from 'chalk';
-const imagemin = require('gulp-imagemin');
 import * as rename from 'gulp-rename';
-import * as mocha from 'gulp-mocha';
 import * as replace from 'gulp-replace';
-const uglifyes = require('uglify-es');
+const terser = require('gulp-terser');
+const cssnano = require('gulp-cssnano');

-const locales = require('./locales');
-
-const uglify = uglifyComposer(uglifyes, console);
-
-const env = process.env.NODE_ENV || 'development';
-const isProduction = env === 'production';
-const isDebug = !isProduction;
-
-if (isDebug) {
-	console.warn(chalk.yellow.bold('WARNING! NODE_ENV is not "production".'));
-	console.warn(chalk.yellow.bold('         built script will not be compressed.'));
-}
+const locales: { [x: string]: any } = require('./locales');
+const meta = require('./package.json');

 gulp.task('build:ts', () => {
 	const tsProject = ts.createProject('./tsconfig.json');

 	return tsProject
 		.src()
-		.pipe(sourcemaps.init())
 		.pipe(tsProject())
 		.on('error', () => {})
-		.pipe(sourcemaps.write('.', { includeContent: false, sourceRoot: '../built' }))
 		.pipe(gulp.dest('./built/'));
 });

@ -47,42 +28,47 @@ gulp.task('build:copy:views', () =>
 	gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views'))
 );

-gulp.task('build:copy', gulp.parallel('build:copy:views', () =>
+gulp.task('build:copy:fonts', () =>
+	gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/client/assets/fonts/'))
+);
+
+gulp.task('build:copy:locales', cb => {
+	fs.mkdirSync('./built/client/assets/locales', { recursive: true });
+
+	const v = { '_version_': meta.version };
+
+	for (const [lang, locale] of Object.entries(locales)) {
+		fs.writeFileSync(`./built/client/assets/locales/${lang}.${meta.version}.json`, JSON.stringify({ ...locale, ...v }), 'utf-8');
+	}
+
+	cb();
+});
+
+gulp.task('build:client:script', () => {
+	return gulp.src(['./src/server/web/boot.js', './src/server/web/bios.js', './src/server/web/cli.js'])
+		.pipe(replace('VERSION', JSON.stringify(meta.version)))
+		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
+		.pipe(terser({
+			toplevel: true
+		}))
+		.pipe(gulp.dest('./built/server/web/'));
+});
+
+gulp.task('build:client:style', () => {
+	return gulp.src(['./src/server/web/style.css', './src/server/web/bios.css', './src/server/web/cli.css'])
+		.pipe(cssnano())
+		.pipe(gulp.dest('./built/server/web/'));
+});
+
+gulp.task('build:copy', gulp.parallel('build:copy:locales', 'build:copy:views', 'build:client:script', 'build:client:style', 'build:copy:fonts', () =>
 	gulp.src([
-		'./src/const.json',
+		'./src/emojilist.json',
 		'./src/server/web/views/**/*',
 		'./src/**/assets/**/*',
-		'!./src/client/app/**/assets/**/*'
+		'!./src/client/assets/**/*'
 	]).pipe(gulp.dest('./built/'))
 ));

-gulp.task('lint', () =>
-	gulp.src('./src/**/*.ts')
-		.pipe(tslint({
-			formatter: 'verbose'
-		}))
-		.pipe(tslint.report())
-);
-
-gulp.task('format', () =>
-	gulp.src('./src/**/*.ts')
-		.pipe(tslint({
-			formatter: 'verbose',
-			fix: true
-		}))
-		.pipe(tslint.report())
-);
-
-gulp.task('mocha', () =>
-	gulp.src('./test/**/*.ts')
-		.pipe(mocha({
-			exit: true,
-			require: 'ts-node/register'
-		} as any))
-);
-
-gulp.task('test', gulp.task('mocha'));
-
 gulp.task('clean', cb =>
 	rimraf('./built', cb)
 );
@ -91,57 +77,33 @@ gulp.task('cleanall', gulp.parallel('clean', cb =>
 	rimraf('./node_modules', cb)
 ));

-gulp.task('build:client:script', () => {
-	const client = require('./built/client/meta.json');
-	return gulp.src(['./src/client/app/boot.js', './src/client/app/safe.js'])
-		.pipe(replace('VERSION', JSON.stringify(client.version)))
-		.pipe(replace('ENV', JSON.stringify(env)))
-		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
-		.pipe(isProduction ? uglify({
-			toplevel: true
-		} as any) : gutil.noop())
-		.pipe(gulp.dest('./built/client/assets/'));
-});
-
-gulp.task('build:client:styles', () =>
-	gulp.src('./src/client/app/init.css')
-		.pipe(isProduction
-			? (cssnano as any)()
-			: gutil.noop())
-		.pipe(gulp.dest('./built/client/assets/'))
-);
-
 gulp.task('copy:client', () =>
 		gulp.src([
 			'./assets/**/*',
 			'./src/client/assets/**/*',
-			'./src/client/app/*/assets/**/*'
 		])
-			.pipe(isProduction ? (imagemin as any)() : gutil.noop())
 			.pipe(rename(path => {
 				path.dirname = path.dirname!.replace('assets', '.');
 			}))
 			.pipe(gulp.dest('./built/client/assets/'))
 );

-gulp.task('doc', () =>
-	gulp.src('./src/docs/**/*.styl')
-		.pipe(stylus())
-		.pipe((cssnano as any)())
-		.pipe(gulp.dest('./built/docs/assets/'))
+gulp.task('copy:docs', () =>
+		gulp.src([
+			'./src/docs/**/*',
+		])
+		.pipe(gulp.dest('./built/client/assets/docs/'))
 );

 gulp.task('build:client', gulp.parallel(
-	'build:client:script',
-	'build:client:styles',
-	'copy:client'
+	'copy:client',
+	'copy:docs'
 ));

 gulp.task('build', gulp.parallel(
 	'build:ts',
 	'build:copy',
 	'build:client',
-	'doc'
 ));

 gulp.task('default', gulp.task('build'));
--- a/index.js
+++ b/index.js
@ -1 +1,7 @@
-require('./built').default();
+const fs = require('fs');
+
+if (fs.existsSync('./built')) {
+	require('./built').default();
+} else {
+	console.log('Built code is not found. Probably an error occurred during a build or you just forgot to build.');
+}
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@ -0,0 +1,611 @@
+---
+_lang_: "العربية"
+introMisskey: "اهلا بك! ميسكي هو منصة تدوين مصغر لا مركزية ومفتوحة المصدر.\nيمكنك مشاركة \"ملاحظات\" عن ما يجري حولك، وإخبار الجميع عن نفسك 📡\nتسمح لك \"الانفعالات\" بتعبير عن شعورك حول ملاحظات الآخرين 👍\nاكتشف عالمًا جديدًا 🚀"
+monthAndDay: "{day}/{month}"
+search: "البحث"
+notifications: "الإشعارات"
+username: "اسم المستخدم"
+password: "الكلمة السرية"
+fetchingAsApObject: "جارٍ جلبه مِن الفديفرس…"
+ok: " حسناً"
+gotIt: "فهِمت"
+cancel: " إلغاء"
+enterUsername: "أدخِل إسم مسخدم"
+noNotes: "لم يتم العثور على أية ملاحظات"
+noNotifications: "ليس هناك أية اشعارات"
+instance: "مثيل الخادم"
+settings: "الاعدادات"
+basicSettings: "الاعدادات الأساسية"
+otherSettings: "إعدادات أخرى"
+openInWindow: "افتح في نافذة جديدة"
+profile: "الملف التعريفي"
+timeline: "الخيط الزمني"
+noAccountDescription: "لم يكتب هذا المستخدم سيرته بعد."
+login: "لِج"
+loggingIn: "جارٍ تسجيل الدخول"
+logout: "الخروج"
+signup: "أنشئ حسابًا"
+uploading: "عملية الإرسال جارية"
+save: "حفظ"
+users: "المستخدمون"
+addUser: "اضافة مستخدم"
+favorite: "إضافة إلى المفضلة"
+favorites: "المفضلات"
+unfavorite: "إزالة من المفضلة"
+favorited: "تمت الإضافة إلى المفضلة."
+alreadyFavorited: "تمت إضافته بالفعل إلى المفضلة."
+cantFavorite: "تعذرت الإضافة إلى المفضلة."
+pin: "دبّسها على الصفحة الشخصية"
+unpin: "ألغ تثبيتها من ملفك الشخصي"
+copyContent: "انسخ المحتوى"
+copyLink: "انسخ الرابط"
+delete: "حذف"
+deleteAndEdit: "إزالة وإعادة الصياغة"
+deleteAndEditConfirm: "أمتأكد من حذف الملاحظة؟ ستفقد كل مشاركاتها، والتفاعلات، والردود عليها."
+addToList: "أضفه إلى قائمة"
+sendMessage: "أرسل رسالة"
+copyUsername: "انسخ اسم المستخدم"
+searchUser: "ابحث عن مستخدمين"
+reply: "رد"
+loadMore: "عرض المزيد"
+showMore: "عرض المزيد"
+youGotNewFollower: "يتابعك"
+receiveFollowRequest: "تلقيت طلب متابعة"
+followRequestAccepted: "قُبل طلب المتابعة"
+mention: "أشر الى"
+mentions: "الإشارات"
+directNotes: "الملاحظات المباشرة"
+importAndExport: "إستورد / صدر"
+import: "استيراد"
+export: "تصدير"
+files: "الملفات"
+download: "تنزيل"
+driveFileDeleteConfirm: "أمتأكد من حذف ملف {name}؟ كل الملاحظات المُرفق بها هذا الملف ستحذف."
+unfollowConfirm: "أمتأكد من إلغاء متابعة {name}؟"
+lists: "القوائم"
+noLists: "ليس لديك أية قائمة"
+note: "ملاحظة"
+notes: "الملاحظات"
+following: "المتابَعون"
+followers: "المتابِعين"
+followsYou: "يتابعك"
+createList: "إنشاء قائمة"
+manageLists: "إدارة القوائم"
+error: "خطأ"
+somethingHappened: "حدث خطأ"
+retry: "حاول مجددًا"
+pageLoadError: "فشل تحميل الصفحة"
+enterListName: "اسم القائمة"
+privacy: "الخصوصية"
+makeFollowManuallyApprove: "القبول يدويا طلبات الإشتراك"
+defaultNoteVisibility: "مدى الرؤية الافتراضي"
+follow: "تابِع"
+followRequest: "طلب اشتراك"
+followRequests: "طلبات الإشتراك"
+unfollow: "إلغاء الاشتراك"
+followRequestPending: "طلبات الإشتراك المعلّقة"
+enterEmoji: "أدخل إيموجي"
+unrenote: "إلغاء مشاركة الملاحظة"
+quote: "اقتبس"
+pinnedNote: "ملاحظة مدبسة"
+pinned: "دبّسها على الصفحة الشخصية"
+you: "أنت"
+clickToShow: "اضغط للعرض"
+sensitive: "محتوى حساس"
+add: "إضافة"
+reaction: "تفاعل"
+rememberNoteVisibility: "تذكر إعدادت مدى رؤية الملاحظات"
+attachCancel: "أزل المرفق"
+enterFileName: "ادخل اسم الملف"
+mute: "اكتم"
+unmute: "إلغاء الكتم"
+block: "احجب"
+unblock: "إلغاء الحجب"
+suspend: "علِق"
+unsuspend: "ألغ التعليق"
+blockConfirm: "أمتأكد من حجب هذا الحساب؟"
+unblockConfirm: "أمتأكد من إلغاء حجب هذا الحساب؟"
+selectList: "اختر قائمة"
+editWidgetsExit: "تم"
+customEmojis: "إيموجي مخصص"
+addEmoji: "إضافة إيموجي"
+cacheRemoteFiles: "خزن مؤقتا الملفات البعيدة"
+autoAcceptFollowed: "اقبل طلبات المتابعة تلقائيا من الحسابات المتابَعة"
+addAcount: "إضافة حساب"
+loginFailed: "فشل الولوج"
+showOnRemote: "رؤيته على مثيل الخادم البُعدي"
+general: "الرئيسية"
+wallpaper: "خلفية الشاشة"
+setWallpaper: "استخدم خلفية الشاشة"
+removeWallpaper: "إزالة خلفية الشاشة"
+searchWith: "البحث: {q}"
+youHaveNoLists: "لا تمتلك أية قائمة"
+followConfirm: "أتريد متابعة {name}؟"
+proxyAccount: "حساب وكيل البروكسي"
+host: "المضيف"
+selectUser: "حدّد مستخدمًا"
+recipient: "المرسَل إليه·ها"
+annotation: "التعليقات"
+federation: "الفديرالية"
+instances: "مثيل الخادم"
+latestRequestSentAt: "آخر طلب أرسِل في"
+latestRequestReceivedAt: "آخر طلب تُلقي في"
+storageUsage: "مساحة التخزين المستخدمة"
+charts: "المنحنيات البيانية"
+perHour: "في الساعة"
+perDay: "في اليوم"
+stopActivityDelivery: "وقف إرسال النشاط"
+blockThisInstance: "احجب مثيل الخادم هذا"
+operations: "الإجراءات"
+software: "البرنامج"
+version: "الإصدار"
+metadata: "البيانات الوصفية"
+withNFiles: "{n} ملف (ملفات)"
+monitor: "شاشة التحكم"
+jobQueue: "قائمة الانتظار"
+cpuAndMemory: "وحدة المعالجة المركزية والذاكرة"
+network: "الشبكة"
+disk: "قرص التخزين"
+instanceInfo: "معلومات مثيل الخادم"
+statistics: "الإحصائيات"
+clearQueue: "تفريغ قائمة الإنتظار"
+muteAndBlock: "تم كتمها / تم حجبها"
+mutedUsers: "الحسابات التي تم كتمها"
+blockedUsers: "الحسابات التي تم حظرها"
+noUsers: "ليس هناك مستخدمون"
+editProfile: "تعديل الملف التعريفي"
+noteDeleteConfirm: "هل تريد حذف هذه الملاحظة؟"
+pinLimitExceeded: "لا يمكنك تدبيس الملاحظات بعد الآن."
+intro: "لقد انتهت عملية تنصيب Misskey. الرجاء إنشاء حساب إداري."
+done: "تمّ"
+processing: "المعالجة جارية"
+preview: "معاينة"
+default: "افتراضي"
+noCustomEmojis: "ليس هناك إيموجيات"
+federating: "الفديرالية جارية"
+blocked: "محجوب"
+suspended: "مُعلّق"
+all: "الكل"
+notResponding: "لا يستجيب"
+changePassword: "تغيير الكلمة السرية"
+security: "الأمان"
+more: "المزيد!"
+featured: "المتداولة"
+usernameOrUserId: "اسم المستخدم أو معرّفه"
+noSuchUser: "لم يُعثَر على المستخدم"
+lookup: "البحث"
+announcements: "الإعلانات"
+imageUrl: "عنوان URL للصورة"
+remove: "حذف"
+removed: "تم حذفه بنجاح"
+removeAreYouSure: "متأكد من أنك تريد حذف {x}؟"
+deleteAreYouSure: "متأكد من أنك تريد حذف {x}؟"
+resetAreYouSure: "هل تريد إعادة التعيين؟"
+saved: "تم حفظه"
+messaging: "الدردشة"
+upload: "تحميل"
+fromDrive: "من المخزن"
+fromUrl: "من عنوان URL"
+uploadFromUrl: "التحميل عبر URL"
+uploadFromUrlDescription: "رابط الملف المراد تحميله "
+uploadFromUrlRequested: "الرفع مطلوب"
+uploadFromUrlMayTakeTime: "سيستغرق بعض الوقت لاتمام الرفع "
+explore: "استكشاف"
+games: "ألعاب Misskey"
+messageRead: "مقروءة"
+noMoreHistory: "لا يوجد المزيد من التاريخ"
+startMessaging: "ابدأ الدردشة"
+nUsersRead: "تمت القراءة من {n}"
+agreeTo: "اوافق على {0}"
+tos: "شروط الخدمة"
+start: "البداية"
+home: "الرئيسي"
+activity: "النشاط"
+images: "الصور"
+birthday: "تاريخ الميلاد"
+yearsOld: "{age} سنة"
+registeredDate: "انظم في"
+location: "المكان"
+theme: "المظهر"
+themeForLightMode: "الحلة في الوضع الفاتح"
+themeForDarkMode: "الحلة في الوضع الداكن"
+light: "فاتح"
+dark: "داكن"
+lightThemes: "الحلة الفاتحة"
+darkThemes: "الحلة الداكنة"
+syncDeviceDarkMode: "مطابقة الوضع المضلمومع اعدادات الجهاز"
+drive: "قرص التخرين"
+fileName: "اسم الملف"
+selectFile: "اختر ملفًا"
+selectFiles: "اختر ملفات"
+selectFolder: "اختر مجلدًا"
+selectFolders: "اختر مجلدات"
+renameFile: "إعادة تسمية الملف"
+folderName: "اسم المجلد"
+createFolder: "أنشئ مجلدًا"
+renameFolder: "إعادة تسمية المجلد"
+deleteFolder: "احذف هذا المجلد"
+addFile: "إضافة ملف"
+emptyDrive: "قرص التخزين فارغ"
+emptyFolder: "هذا المجلد فارغ"
+unableToDelete: "لا يمكن حذفه"
+inputNewFileName: "ادخل الإسم الجديد للملف"
+inputNewFolderName: "ادخل الإسم الجديد للمجلد"
+hasChildFilesOrFolders: "الان الملف غير فارغ. لا يمكن حذفه"
+copyUrl: "انسخ عنوان URL"
+rename: "إعادة التسمية"
+avatar: "الصورة الرمزية"
+banner: "الصورة الرأسية"
+nsfw: "محتوى حساس"
+whenServerDisconnected: "عند فقدان الاتصال بالخادم"
+disconnectedFromServer: "قُطِع الإتصال بالخادم"
+reload: "انعش"
+doNothing: "تجاهل"
+reloadConfirm: "هل ترغب في تحديث الجدول الزمني؟"
+watch: "راقب"
+unwatch: "إلغاء المراقبة"
+accept: "السماح"
+reject: "رفض"
+normal: "عادي"
+instanceName: "اسم مثيل الخادم"
+instanceDescription: "وصف مثيل الخادم"
+maintainerName: "المدير"
+maintainerEmail: "عنوان بريد المدير الإلكتروني"
+tosUrl: "عنوان URL لشروط الخدمة"
+thisYear: "هذا العام"
+thisMonth: "هذا الشهر"
+today: "اليوم"
+dayX: "{day}"
+monthX: "{month}"
+yearX: "{year}"
+pages: "الصفحات"
+integration: "دمج"
+connectSerice: "أوصل"
+disconnectSerice: "قطع الاتصال"
+enableLocalTimeline: "تفعيل الخيط المحلي"
+enableGlobalTimeline: "تفعيل الخيط الزمني الشامل"
+disablingTimelinesInfo: "سيتمكن المسؤولون ومن تعديل دائمًا و من الوصول إلى جميع المخططات الزمنية ، حتى إذا لم يتم تمكينها."
+registration: "إنشاء حساب"
+enableRegistration: "تفعيل إنشاء الحسابات الجديدة"
+invite: "دعوة"
+basicInfo: "المعلومات الأساسية "
+pinnedNotes: "ملاحظة مدبسة"
+hcaptchaSiteKey: "مفتاح الموقع"
+hcaptchaSecretKey: "المفتاح السري"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "تمكين reCAPTCHA"
+recaptchaSiteKey: "مفتاح الموقع"
+recaptchaSecretKey: "المفتاح السري"
+antennas: "الهوائيات"
+manageAntennas: "إدارة الهوائيات"
+name: "الإسم"
+antennaSource: "مصدر الهوائي"
+antennaKeywords: "الكلمات المفتاحية للإستقبال"
+withReplies: "بالردود"
+notesAndReplies: "الملاحظات والردود"
+withFiles: "بالمرفقات"
+silence: "اكتم"
+unsilence: "إلغاء الكتم"
+popularUsers: "المستخدمون الشائعون"
+exploreFediverse: "استكشف الفديفرس"
+popularTags: "الوسوم الرائجة"
+userList: "القوائم"
+about: "عن"
+aboutMisskey: "عن Misskey"
+administrator: "المدير"
+token: "الرمز المميز"
+twoStepAuthentication: "الإستيثاق بعاملَيْن"
+moderator: "مشرِف"
+nUsersMentioned: "{n} مستخدمين تمت الإشارة إليهم"
+securityKey: "مفتاح الأمان"
+securityKeyName: "اسم المفتاح"
+lastUsed: "آخر استخدام"
+unregister: "إلغاء التسجيل"
+passwordLessLogin: "لِج مِن دون كلمة سرية"
+resetPassword: "أعد تعيين كلمتك السرية"
+newPasswordIs: "كلمتك السرية الجديدة هي {password}"
+share: "شارِك"
+notFound: "غير موجود"
+cacheClear: "مسح ذاكرة التخزين المؤقت"
+markAsReadAllNotifications: "وضع جميع الإشعارات كأنها مقروءة"
+help: "المساعدة"
+inputMessageHere: "اكتب رسالتك هنا"
+close: "اغلق"
+group: "الفريق"
+groups: "الفِرَق"
+createGroup: "انشئ فريقًا"
+invites: "دعوة"
+groupName: "اسم الفريق"
+members: "الأعضاء"
+transfer: "نقل"
+messagingWithUser: "الدردشة مع مستخدم آخر"
+messagingWithGroup: "دردشة جماعية"
+title: "العنوان"
+text: "النص"
+enable: "تشغيل"
+next: "التالية"
+retype: "أعد الكتابة"
+noteOf: "ملاحظات {user}"
+inviteToGroup: "دعوة إلى فريق"
+noMessagesYet: "ليس هناك رسائل بعد"
+newMessageExists: "لقد تلقيت رسالة جديدة"
+invitations: "دعوة"
+invitationCode: "رمز الدعوة"
+checking: "التحقق جارٍ"
+available: "متوفر"
+unavailable: "غير متوفر"
+tooShort: "قصير جدًا"
+tooLong: "طويل جدًا"
+weakPassword: "الكلمة السرية ضعيفة"
+normalPassword: "الكلمة السرية جيدة"
+strongPassword: "الكلمة السرية قوية"
+passwordMatched: "التطابق صحيح!"
+passwordNotMatched: "غير متطابقتان"
+signinWith: "الولوج عبر {x}"
+or: "أو"
+uiLanguage: "لغة واجهة المستخدم"
+aboutX: "عن {x}"
+useOsNativeEmojis: "استخدم الإيموجيات الخاصة بنظام التشغيل"
+youHaveNoGroups: "لا تمتلك أية فِرَق"
+noHistory: "السجل فارغ"
+signinHistory: "تاريخ تسجيل الدخول"
+doing: "انتظر لحظة"
+category: "الفئات"
+tags: "الوسوم"
+docSource: "مصدر هذا المستند"
+createAccount: "أنشئ حسابًا"
+existingAcount: "الحسابات الموجودة"
+regenerate: "أعِد التوليد"
+fontSize: "حجم الخط"
+openImageInNewTab: "إفتح الصورة بصفحة جديدة"
+dashboard: "لوحة التحكم"
+local: "المحلي"
+remote: "بُعدي"
+total: "المجموع"
+weekOverWeekChanges: "أسبوعيا"
+dayOverDayChanges: "يوميا"
+appearance: "المظهر"
+accountSettings: "إعدادات الحساب"
+promotion: "ترقية"
+promote: "روِّج"
+numberOfDays: "عدد الأيام"
+hideThisNote: "إخفاء هذه الملاحظة"
+deleteAll: "حذف الكل"
+sounds: "الرنات"
+listen: "استمع"
+none: "لا شيء"
+volume: "مستوى الصوت"
+details: "التفاصيل"
+chooseEmoji: "اختر إيموجي"
+recentUsed: "المستخدمة مؤخرا"
+install: "التثبيت"
+uninstall: "إلغاء التثبيت"
+installedApps: "التطبيقات المُخوّلة"
+lastUsedDate: "آخر استخدام"
+state: "الحالة"
+sort: "ترتيب حسب"
+output: "الخارجة"
+updateRemoteUser: "تحديث المعلومات عن المستخدم البعيد"
+deleteAllFiles: "حذف كافة الملفات"
+userSuspended: "تم تعليق هذا المستخدم."
+userSilenced: "تم إسكات هذا المستخدم."
+sidebar: "الشريط الجانبي"
+addItem: "إضافة عنصر"
+rooms: "الغرفة"
+relays: "المُرَحلات"
+addRelay: "إضافة مُرحّل"
+addedRelays: "المرحلات التي تم إضافتها"
+deletedNote: "ملاحظة محذوفة"
+invisibleNote: "ملاحظة مخفية"
+poll: "استطلاع رأي"
+useCw: "إخفاء المحتوى"
+themeEditor: "مصمم القوالب"
+manage: "إدارة "
+plugins: "الإضافات"
+width: "العرض"
+height: "الإرتفاع"
+large: "كبير"
+medium: "متوسط"
+small: "صغير"
+permission: "أذونات"
+enableAll: "تشغيل الكل"
+disableAll: "تعطيل الكل"
+tokenRequested: "منح حق الوصول إلى الحساب"
+notificationType: "أنواع الإشعارات"
+edit: "التعديل"
+email: "البريد الإلكتروني "
+emailAddress: "عنوان البريد الالكتروني"
+smtpHost: "المضيف"
+smtpPort: "المنفذ"
+smtpUser: "اسم المستخدم"
+smtpPass: "الكلمة السرية"
+makeActive: "تفعيل"
+display: "المظهر"
+copy: "نسخ"
+metrics: "المقاييس"
+public: "للعامة"
+currentVersion: "الإصدار الحالي"
+latestVersion: "آخر نسخة مستقرة"
+usageAmount: "الإستخدام"
+capacity: "السعة"
+inUse: "مستخدم"
+_email:
+  _follow:
+    title: "يتابعك"
+_mfm:
+  mention: "أشر الى"
+  quote: "اقتبس"
+  emoji: "إيموجي مخصص"
+  search: "البحث"
+_reversi:
+  total: "المجموع"
+_channel:
+  featured: "المتداوَلة"
+_sidebar:
+  full: "كامل"
+  icon: "الصورة الرمزية"
+  hide: "إخفاء"
+_theme:
+  explore: "استكشف قوالب المظهر"
+  install: "تنصيب قالب"
+  manage: "إدارة القوالب"
+  code: "شيفرة القالب"
+  installed: "تم تنصيب {name}"
+  make: "إنشاء قالب"
+  alpha: "الشفافية"
+  keys:
+    mention: "أشر الى"
+    messageBg: "خلفية الدردشة"
+_sfx:
+  note: "الملاحظات"
+  noteMy: "ملاحظتي"
+  notification: "الإشعارات"
+  chat: "الدردشة"
+_ago:
+  unknown: "مجهول"
+  future: "المستقبَل"
+  justNow: "اللحظة"
+  secondsAgo: "منذ {n} ثوانٍ"
+  minutesAgo: "منذ {n} دقائق"
+  hoursAgo: "منذ {n} ساعة"
+  daysAgo: "منذ {n} أيام"
+  weeksAgo: "منذ {n} أسابيع"
+  monthsAgo: "منذ {n} أشهر"
+  yearsAgo: "منذ {n} سنوات"
+_time:
+  second: "ثا"
+  minute: "د"
+  hour: "سا"
+  day: "ي"
+_tutorial:
+  title: "كيف تستخدم Misskey"
+  step1_1: "مرحبًا!"
+_2fa:
+  registerKey: "تسجيل مفتاح أمان جديد"
+_permissions:
+  "write:account": "تعديل معلومات حسابك"
+  "read:notifications": "اظهر الإشعارات"
+_weekday:
+  sunday: "الأحد"
+  monday: "الإثنين"
+  tuesday: "الثلاثاء"
+  wednesday: "الأربعاء"
+  thursday: "الخميس"
+  friday: "الجمعة"
+  saturday: "السبت"
+_widgets:
+  memo: "ملاحظة لاصقة"
+  notifications: "الإشعارات"
+  timeline: "الخيط الزمني"
+  calendar: "التقويم"
+  trends: "المتداوَلة"
+  clock: "الساعة"
+  rss: "تدفق RSS"
+  activity: "النشاط"
+  photos: "الصور"
+  federation: "الفديرالية"
+  jobQueue: "قائمة الانتظار"
+_cw:
+  hide: "إخفاء"
+  show: "عرض المزيد"
+  chars: "{count} أحرف"
+  files: "{count} ملفات"
+_poll:
+  noOnlyOneChoice: "تحتاج إلى خيارَين على الأقل"
+  choiceN: "الخيار {n}"
+  noMore: "لا يمكنك إضافة خيارات أخرى"
+  canMultipleVote: "السماح بالإجابات المتعددة"
+  expiration: "ينتهي استطلاع الرأي في"
+  infinite: "أبدًا"
+  at: "تاريخ الإنتهاء"
+  after: "ينتهي بعد…"
+  deadlineDate: "تاريخ الانتهاء"
+  deadlineTime: "سا"
+  duration: "المدة"
+  votesCount: "{n} أصوات"
+  totalVotes: "المجموع {n} أصوات"
+  vote: "قم بالتصويت"
+  showResult: "اعرض النتائج"
+  voted: "تم التصويت"
+  closed: "انتهى"
+  remainingDays: "{d} أيام و {h} ساعات متبقية"
+  remainingHours: "{h} ساعات و {m} دقائق متبقية"
+  remainingMinutes: "{m} دقائق و {s} ثوانٍ متبقية"
+  remainingSeconds: "{s} ثوانٍ متبقية"
+_visibility:
+  public: "للعامة"
+  home: "الرئيسي"
+  followers: "المتابِعين"
+  specified: "مباشرة"
+  localOnly: "المحلي فقط"
+_postForm:
+  replyPlaceholder: "رد على هذه الملاحظة…"
+  quotePlaceholder: "اقتبس هذه الملاحظة…"
+_profile:
+  name: "الإسم"
+  username: "اسم المستخدم"
+  youCanIncludeHashtags: "يمكنك أيضًا إضافة وسوم إلى نبذتك التعريفية."
+_exportOrImport:
+  allNotes: "كل الملاحظات"
+  followingList: "المتابَعون"
+  muteList: "اكتم"
+  blockingList: "احجب"
+  userLists: "القوائم"
+_charts:
+  usersTotal: "مجموع عدد المستخدمين والمستخدمات"
+  activeUsers: "المستخدمون النشطون"
+_timelines:
+  home: "الرئيسي"
+  local: "المحلي"
+  social: "الاجتماعي"
+  global: "الشامل"
+_rooms:
+  _roomType:
+    default: "افتراضي"
+  _furnitures:
+    monitor: "شاشة التحكم"
+    banknote: "أوراق نقدية"
+_pages:
+  blocks:
+    image: "الصور"
+  script:
+    categories:
+      list: "القوائم"
+    blocks:
+      _strReplace:
+        arg1: "نص"
+        arg3: "استُبدِل بـ"
+      _join:
+        arg1: "القوائم"
+        arg2: "فاصل"
+      add: "إضافة"
+      _randomPick:
+        arg1: "القوائم"
+      _dailyRandomPick:
+        arg1: "القوائم"
+      _seedRandomPick:
+        arg2: "القوائم"
+      _pick:
+        arg1: "القوائم"
+      _listLen:
+        arg1: "القوائم"
+    types:
+      array: "القوائم"
+_notification:
+  youGotPoll: "شارك {name} في استطلاع الرأي"
+  youGotMessagingMessageFromUser: "لقد تلقيت رسالة مِن {name}"
+  youGotMessagingMessageFromGroup: "لقد أرسِلَت رسالة إلى الفريق {name}"
+  youWereFollowed: "يتابعك"
+  _types:
+    follow: "المتابَعون"
+    mention: "أشر الى"
+    quote: "اقتبس"
+    reaction: "تفاعل"
+_deck:
+  _columns:
+    notifications: "الإشعارات"
+    tl: "الخيط الزمني"
+    antenna: "الهوائيات"
+    list: "القوائم"
+    mentions: "الإشارات"
+    direct: "مباشرة"
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
--- a/locales/da-DK.yml
+++ b/locales/da-DK.yml
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
--- a/locales/ht-HT.yml
+++ b/locales/ht-HT.yml
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@ -0,0 +1,257 @@
+---
+_lang_: "Bahasa Jepang"
+headlineMisskey: "Catatan terhubung jaringan"
+introMisskey: "Selamat datang! Misskey adalah perangkat mikroblog tercatu bersifat sumber terbuka.\nMulailah menuliskan catatan, bagikan peristiwa terkini, serta ceritakan segala tentangmu.📡\nTunjukkan juga reaksimu pada catatan pengguna lain.👍\nMari jelajahi dunia baru🚀"
+monthAndDay: "{day} {month}"
+search: "Pencarian"
+notifications: "Notifikasi"
+username: "Nama Pengguna"
+password: "Kata sandi"
+ok: "OK"
+gotIt: "Saya mengerti"
+cancel: "Batalkan"
+enterUsername: "Masukkan nama pengguna"
+renotedBy: "direnote oleh {user}"
+noNotes: "Tidak ada notes"
+noNotifications: "Tidak ada notifikasi"
+settings: "Pengaturan"
+basicSettings: "Pengaturan umum"
+otherSettings: "Pengaturan lainnya"
+openInWindow: "Buka di jendela"
+profile: "Profil"
+timeline: "Linimasa"
+noAccountDescription: "Pengguna ini belum menulis bio"
+login: "Masuk"
+loggingIn: "Sedang masuk"
+logout: "Keluar"
+signup: "Daftar"
+uploading: "Sedang mengunggah"
+save: "Simpan"
+users: "Pengguna"
+addUser: "Tambah pengguna"
+favorite: "Favorit"
+favorites: "Favorit"
+unfavorite: "Hapus favorit"
+favorited: "Ditambahkan ke favorit"
+alreadyFavorited: "Telah ditambahkan ke favorit"
+cantFavorite: "Tidak dapat menambahkan ke favorit"
+pin: "Sematkan ke profil"
+unpin: "Lepas sematan dari profil"
+copyContent: "Salin konten"
+copyLink: "Salin tautan"
+delete: "Hapus"
+deleteAndEdit: "Hapus dan sunting"
+addToList: "Tambahkan ke daftar"
+sendMessage: "Kirim pesan"
+copyUsername: "Salin nama pengguna"
+searchUser: "Cari pengguna"
+reply: "Balas"
+loadMore: "Selebihnya"
+showMore: "Selebihnya"
+youGotNewFollower: "Sedang mengikuti"
+receiveFollowRequest: "Permintaan mengikuti terkirim"
+mention: "Panggilan"
+files: "Berkas"
+download: "Unduh"
+driveFileDeleteConfirm: "Hapus {name}? Catatan dengan berkas terkait juga akan terhapus."
+unfollowConfirm: "Berhenti mengikuti {name}?"
+following: "Ikuti"
+followers: "Pengikut"
+followsYou: "Mengikuti Anda"
+error: "Galat"
+somethingHappened: "Terjadi kesalahan"
+retry: "Coba lagi"
+pageLoadError: "Gagal memuat halaman."
+pageLoadErrorDescription: "Umumnya disebabkan jaringan atau tembolok perambah. Cobalah bersihkan tembolok peramban lalu tunggu sesaat sebelum mencoba kembali."
+privacy: "Keleluasaan"
+follow: "Ikuti"
+unfollow: "Berhenti mengikuti"
+cantReRenote: "Renote tidak dapat direnote"
+quote: "Kutip"
+pinnedNote: "Note yang disematkan"
+pinned: "Sematkan ke profil"
+you: "Anda"
+clickToShow: "Klik untuk melihat"
+sensitive: "Konten sensitif"
+add: "Tambahkan"
+reaction: "Reaksi"
+reactionSettingDescription: "Masukkan reaksi favorit yang ingin anda sematkan pada bilah reaksi"
+reactionSettingDescription2: "Geser untuk memindah urutkan, klik untuk menghapus, tekan \"+\" untuk menambahkan"
+rememberNoteVisibility: "Ingat pengaturan visibilitas note"
+attachCancel: "Hapus lampiran"
+markAsSensitive: "Tandai sebagai konten sensitif"
+unmarkAsSensitive: "Hapus tanda konten sensitif"
+enterFileName: "Masukkan nama berkas"
+mute: "Bisukan"
+unmute: "Hapus bisukan"
+block: "Blokir"
+unblock: "Buka blokir"
+suspend: "Bekukan"
+unsuspend: "Buka pembekuan"
+blockConfirm: "Apakah anda yakin ingin memblokir akun ini?"
+unblockConfirm: "Apakah anda yakin ingin membuka blokir akun ini?"
+suspendConfirm: "Apakah anda yakin ingin membekukan akun ini?"
+unsuspendConfirm: "Apakah anda yakin ingin membuka pembekuan akun ini?"
+selectList: "Pilih daftar"
+selectAntenna: "Pilih Antena"
+selectWidget: "Pilih gawit"
+editWidgets: "Sunting gawit"
+editWidgetsExit: "Selesai"
+customEmojis: "Emoji kustom"
+emoji: "Emoji"
+emojiName: "Nama emoji"
+emojiUrl: "URL Emoji"
+addEmoji: "Tambahkan emoji"
+settingGuide: "Pengaturan rekomendasi"
+cacheRemoteFiles: "Tembolokkan berkas remote"
+flagAsBot: "Atur akun ini sebagai Bot"
+flagAsCat: "Atur akun ini sebagai kucing"
+autoAcceptFollowed: "Setujui otomatis permintaan mengikuti dari pengguna yang anda ikuti"
+addAcount: "Tambahkan akun"
+loginFailed: "Gagal untuk masuk"
+showOnRemote: "Lihat profil asli"
+general: "Umum"
+wallpaper: "Wallpaper"
+setWallpaper: "Atur wallpaper"
+removeWallpaper: "Hapus wallpaper"
+intro: "Instalasi Misskey telah selesai! Mohon untuk membuat pengguna admin."
+done: "Selesai"
+processing: "Memproses"
+preview: "Pratinjau"
+default: "Bawaan"
+noCustomEmojis: "Tidak ada emoji kustom"
+federating: "memfederasi"
+blocked: "Diblokir"
+all: "Semua"
+subscribing: "Berlangganan"
+publishing: "Sedang menyiarkan langsung"
+notResponding: "Tidak ada respon"
+instanceFollowing: "Mengikuti instance"
+instanceFollowers: "Pengikut instance"
+instanceUsers: "Pengguna pada instance ini"
+changePassword: "Ubah kata sandi"
+security: "Keamanan"
+retypedNotMatch: "Input tidak sama"
+currentPassword: "Kata sandi saat ini"
+newPassword: "Kata sandi baru"
+newPasswordRetype: "Ulangi kata sandi baru"
+attachFile: "Lampirkan berkas"
+more: "Lagi !"
+featured: "Sorotan"
+usernameOrUserId: "Nama pengguna atau User ID"
+noSuchUser: "Pengguna tidak ditemukan"
+lookup: "Mencari"
+announcements: "Pengumuman"
+imageUrl: "URL Gambar"
+remove: "Hapus"
+removed: "Telah dihapus"
+removeAreYouSure: "Apakah anda yakin ingin menghapus \"{x}\"?"
+deleteAreYouSure: "Apakah anda yakin ingin menghapus \"{x}\"?"
+saved: "Telah disimpan"
+messaging: "Pesan"
+upload: "Unggah"
+fromDrive: "Dari Drive"
+fromUrl: "Dari URL"
+uploadFromUrl: "Unggah dari URL"
+uploadFromUrlDescription: "URL berkas yang ingin anda unggah"
+uploadFromUrlRequested: "Pengunggahan telah diminta"
+uploadFromUrlMayTakeTime: "Membutuhkan beberapa waktu hingga pengunggahan selesai"
+explore: "Jelajahi"
+games: "Permainan Misskey"
+messageRead: "Telah dibaca"
+noMoreHistory: "Tidak ada sejarah lagi"
+startMessaging: "Mulai mengirim pesan"
+nUsersRead: "Dibaca oleh {n}"
+nsfw: "Konten sensitif"
+watch: "Tonton"
+unwatch: "Batal tonton"
+accept: "Terima"
+reject: "Tolak"
+normal: "Normal"
+instanceName: "Nama instance"
+instanceDescription: "Tentang instance"
+maintainerName: "Pengelola"
+maintainerEmail: "Surel pengelola"
+tosUrl: "URL Syarat dan Ketentuan"
+thisYear: "Tahun ini"
+thisMonth: "Bulan ini"
+today: "Hari ini"
+dayX: "{day}"
+monthX: "{month}"
+yearX: "{year}"
+pages: "Halaman"
+integration: "Integrasi"
+connectSerice: "Sambungkan"
+disconnectSerice: "Putuskan"
+enableLocalTimeline: "Nyalakan linimasa lokal"
+enableGlobalTimeline: "Nyalakan linimasa global"
+registration: "Pendaftaran"
+enableRegistration: "Nyalakan pendaftaran pengguna baru"
+invite: "Undang"
+proxyRemoteFiles: "Proksi berkas remote"
+driveCapacityPerLocalAccount: "Kapasitas drive per pengguna lokal"
+driveCapacityPerRemoteAccount: "Kapasitas drive per pengguna remote"
+inMb: "dalam Megabytes"
+iconUrl: "URL Gambar ikon"
+bannerUrl: "URL Banner"
+basicInfo: "Informasi Umum"
+pinnedUsers: "Pengguna yang disematkan"
+pinnedPages: "Halaman yang disematkan"
+pinnedNotes: "Note yang disematkan"
+hcaptcha: "hCaptcha"
+enableHcaptcha: "Nyalakan hCaptcha"
+hcaptchaSiteKey: "Site Key"
+hcaptchaSecretKey: "Secret Key"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "Nyalakan reCAPTCHA"
+recaptchaSiteKey: "Site key"
+recaptchaSecretKey: "Secret Key"
+antennas: "Antena"
+manageAntennas: "Pengelola Antena"
+notFound: "Tidak dapat ditemukan"
+invites: "Undang"
+invitations: "Undang"
+smtpUser: "Nama Pengguna"
+smtpPass: "Kata sandi"
+_email:
+  _follow:
+    title: "Sedang mengikuti"
+_mfm:
+  mention: "Panggilan"
+  quote: "Kutip"
+  emoji: "Emoji kustom"
+  search: "Pencarian"
+_theme:
+  keys:
+    mention: "Panggilan"
+_sfx:
+  notification: "Notifikasi"
+  chat: "Pesan"
+_widgets:
+  notifications: "Notifikasi"
+  timeline: "Linimasa"
+_cw:
+  show: "Selebihnya"
+_visibility:
+  followers: "Pengikut"
+_profile:
+  username: "Nama Pengguna"
+_exportOrImport:
+  followingList: "Ikuti"
+  muteList: "Bisukan"
+  blockingList: "Blokir"
+_rooms:
+  _roomType:
+    default: "Bawaan"
+_notification:
+  youWereFollowed: "Sedang mengikuti"
+  _types:
+    follow: "Ikuti"
+    mention: "Panggilan"
+    quote: "Kutip"
+    reaction: "Reaksi"
+_deck:
+  _columns:
+    notifications: "Notifikasi"
+    tl: "Linimasa"
+    antenna: "Antena"
--- a/locales/index.js
+++ b/locales/index.js
@ -14,6 +14,7 @@ const merge = (...args) => args.reduce((a, c) => ({
 }), {});

 const languages = [
+	'ar-SA',
 	'cs-CZ',
 	'da-DK',
 	'de-DE',
@ -22,9 +23,16 @@ const languages = [
 	'fr-FR',
 	'ja-JP',
 	'ja-KS',
+	'kab-KAB',
+	'kn-IN',
 	'ko-KR',
 	'nl-NL',
+	'no-NO',
 	'pl-PL',
+	'pt-PT',
+	'ru-RU',
+	'ug-CN',
+	'uk-UA',
 	'zh-CN',
 	'zh-TW',
 ];
@ -35,7 +43,7 @@ const primaries = {
 	'zh': 'CN',
 };

-const locales = languages.reduce((a, c) => (a[c] = yaml.safeLoad(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8')) || {}, a), {});
+const locales = languages.reduce((a, c) => (a[c] = yaml.load(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8')) || {}, a), {});

 module.exports = Object.entries(locales)
 	.reduce((a, [k ,v]) => (a[k] = (() => {
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@ -1,6 +1,577 @@
 ---
-meta:
-  lang: "Italiano"
-common:
-  misskey: "A ⭐ of the fediverse"
-  about-title: "A ⭐ of the fediverse."
+_lang_: "Italiano"
+monthAndDay: "{day}/{month}"
+search: "Cerca"
+notifications: "Notifiche"
+username: "Nome utente"
+password: "Password"
+ok: "OK"
+cancel: "Annulla"
+enterUsername: "Inserisci un nome utente"
+renotedBy: "Rinotta da {user}"
+noNotes: "Nessuna note"
+noNotifications: "Nessuna notifica"
+instance: "Istanza"
+settings: "Impostazioni"
+basicSettings: "Impostazioni generali"
+otherSettings: "Altre impostazioni"
+profile: "Profilo"
+timeline: "Timeline"
+login: "Accedi"
+logout: "Logout"
+signup: "Iscriviti"
+uploading: "Caricamento..."
+save: "Salva"
+users: "Utente"
+favorite: "Segnalibri"
+favorites: "Segnalibri"
+unfavorite: "Rimuovi Nota dai segnalibri"
+favorited: "Nota salvato nei segnalibri."
+alreadyFavorited: "Tweet salvato nei segnalibri."
+pin: "Fissa sul profilo"
+unpin: "Non fissare più sul profilo"
+copyContent: "Copia il contenuto del Nota"
+copyLink: "Copia link"
+delete: "Elimina"
+deleteAndEdit: "Elimina & Modifica"
+addToList: "Aggiungi alla lista"
+sendMessage: "Invia messaggio"
+copyUsername: "Copia nome utente"
+searchUser: "Cerca Utente"
+reply: "Rispondi"
+loadMore: "Mostra altre"
+showMore: "Mostra altre"
+youGotNewFollower: "Nuovo seguace"
+receiveFollowRequest: "Nuova richiesta di essere seguito"
+mention: "Menzioni"
+mentions: "Menzioni"
+directNotes: "Note diretti"
+importAndExport: "Importa ed Esporta"
+import: "Importa"
+export: "Esporta"
+files: "Allegato"
+download: "Scarica"
+lists: "Liste"
+noLists: "Qui non c'è ancora niente"
+note: "Nota"
+notes: "Nota"
+following: "Seiguiti"
+followers: "Seguaci"
+followsYou: "Ti segue"
+createList: "Crea una nuova lista"
+manageLists: "Modifica lista"
+error: "Errore"
+somethingHappened: "Qualcosa è andato storto."
+retry: "Riprova"
+enterListName: "Inserisci il nome della lista"
+privacy: "Privacy"
+follow: "Segui"
+followRequest: "Richiesta di seguire"
+followRequests: "Richiesta di seguire"
+unfollow: "Smetti di seguire"
+followRequestPending: "In sospeso"
+renote: "Rinotta"
+unrenote: "Annulla rinotta"
+quote: "Cita Nota"
+pinned: "Fissa sul profilo"
+you: "Tu"
+clickToShow: "Clicca per visualizzare"
+sensitive: "Contenuto sensibile"
+add: "Aggiungi"
+reaction: "Reazione"
+attachCancel: "Rimuovi allegato"
+markAsSensitive: "Segna come sensibile"
+unmarkAsSensitive: "Segna come non sensibile"
+mute: "Silenzia"
+unmute: "Riattiva"
+block: "Blocca"
+unblock: "Sblocca"
+suspend: "Sospendi"
+unsuspend: "Annulla la sospensione dell'account"
+blockConfirm: "Vuoi bloccare?"
+unblockConfirm: "Vuoi sbloccare?"
+editWidgetsExit: "Modifica fine"
+emoji: "Emoji"
+addAcount: "Aggiungi un account esistente"
+general: "Generali"
+wallpaper: "Sfondo"
+setWallpaper: "Imposta sfondo"
+searchWith: "Cerca: {q}"
+annotation: "Descrizione"
+federation: "Federazione"
+instances: "Istanza"
+storageUsage: "Volume di dischi"
+charts: "Grafici"
+perHour: "All'ora"
+perDay: "al giorno"
+software: "Software"
+version: "Versione"
+metadata: "Metadato"
+network: "Rete"
+disk: "Disco"
+statistics: "Statistiche"
+blockedInstances: "Istanza bloccati"
+muteAndBlock: "Silenziamento e blocco"
+mutedUsers: "Account silenziati"
+blockedUsers: "Account bloccati"
+editProfile: "Modifica profilo"
+noteDeleteConfirm: "Eliminare questo Nota?"
+done: "Fine"
+processing: "In elaborazione"
+blocked: "Bloccati"
+all: "Tutti"
+notResponding: "Nessuna risposta"
+changePassword: "Aggiorna Password"
+security: "Sicurezza"
+retypedNotMatch: "Le password non corrispondono."
+currentPassword: "Password attuale"
+newPassword: "Nuova Password"
+newPasswordRetype: "Conferma nuova password"
+more: "Altri!"
+lookup: "Cercare"
+announcements: "Annuncio"
+imageUrl: "URL dell'immagine"
+remove: "Elimina"
+removed: "Il tuo Tweet è stato eliminato"
+removeAreYouSure: "Eliminare \"{x}\"?"
+deleteAreYouSure: "Eliminare \"{x}\"?"
+resetAreYouSure: "Reimposta"
+saved: "Salvato"
+messaging: "Messaggi"
+upload: "Carica"
+uploadFromUrl: "Incolla URL immagine"
+explore: "Esplora"
+games: "Misskey Giochi"
+messageRead: "Visualizzato"
+startMessaging: "Nuovo messaggio"
+tos: "Termini di servizio"
+home: "Home"
+images: "Immagini"
+birthday: "Compleanno"
+yearsOld: "{age}Anni"
+registeredDate: "Iscrizione a.."
+location: "Posizione"
+theme: "Tema"
+light: "Chiaro"
+dark: "Scuro"
+lightThemes: "Tema Chiaro"
+darkThemes: "Tema Scuro"
+drive: "Drive"
+fileName: "Nome dell'allegato"
+copyUrl: "Copia URL"
+rename: "Modifica nome"
+avatar: "Foto del profilo"
+banner: "Foto d'intestazione"
+nsfw: "Contenuti sensibili"
+reload: "Ricarica"
+watch: "Osserva"
+unwatch: "Smetti di Osserva"
+accept: "Accetta"
+reject: "Rifiuta"
+normal: "Normale"
+instanceName: "Nome dell'istanza"
+instanceDescription: "Descrizione dell'istanza"
+maintainerName: "Nome dell'Amministratore"
+maintainerEmail: "Indirizzo e-mail dell'Amministratore"
+tosUrl: "Termini di servizio URL"
+thisYear: "Anno"
+thisMonth: "Mese"
+today: "Oggi"
+dayX: "{day}"
+monthX: "{month}"
+yearX: "{year}"
+integration: "App collegate"
+connectSerice: "Connetti"
+disconnectSerice: "Disconnetti"
+registration: "Iscriviti"
+invite: "Invita"
+bannerUrl: "indirizzo Foto d'intestazione"
+basicInfo: "Informazioni fondamentali"
+hcaptcha: "hCaptcha"
+enableHcaptcha: "Abilita hCaptcha"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "Abilita reCAPTCHA"
+name: "Nome"
+serviceworker: "ServiceWorker"
+exploreFediverse: "Esplora Fediverse"
+popularTags: "Tag di tendenza"
+userList: "Liste"
+about: "Informazioni"
+aboutMisskey: "Informazioni di Misskey"
+administrator: "Amministratore"
+token: "Token"
+twoStepAuthentication: "Autenticazione a due fattori"
+moderator: "Moderatore"
+lastUsed: "Ultima attività"
+unregister: "Disattiva account"
+resetPassword: "Reimposta password"
+share: "Condividi"
+cacheClear: "Svuota cache"
+help: "Guida"
+close: "Chiudi"
+group: "Gruppo"
+groups: "Gruppi"
+createGroup: "Nuovo gruppo"
+invites: "Invita"
+transfer: "Trasferisci"
+title: "Titolo"
+next: "Avanti"
+invitations: "Invita"
+invitationCode: "Codice di invito"
+available: "Consigliati"
+unavailable: "Il nome utente è già in uso"
+usernameInvalidFormat: "Il nome utente può contenere solo lettere, numeri e '_'"
+tooShort: "Troppo breve"
+tooLong: "Troppo lungo"
+passwordNotMatched: "Le password non corrispondono."
+signinHistory: "Cronologia di accesso all'account"
+tags: "Tag"
+createAccount: "Crea il tuo account"
+existingAcount: "Account esistente"
+local: "Locale"
+remote: "Remoto"
+accountSettings: "Impostazioni Account"
+promote: "Pubblicizza"
+objectStorageBucket: "Bucket"
+objectStorageEndpoint: "Endpoint"
+objectStorageRegion: "Region"
+serverLogs: "Log del server"
+deleteAll: "Cancella cronologia"
+volume: "Volume"
+details: "Dettagli"
+install: "Installa"
+uninstall: "Disinstalla"
+installedDate: "Data installazione"
+sort: "Ordina per"
+visibility: "Privacy dei post"
+poll: "Sondaggio"
+useCw: "Nascondere media"
+description: "Descrizione"
+author: "Autore"
+width: "Larghezza"
+height: "Altezza"
+large: "Grande"
+medium: "Predefinito"
+small: "Piccolo"
+edit: "Modifica"
+email: "Email"
+smtpUser: "Nome utente"
+smtpPass: "Password"
+wordMute: "Parole silenziate"
+display: "Visualizza"
+copy: "Copia"
+logs: "Log"
+database: "Base di dati"
+channel: "Canale"
+notificationSetting: "impostazioni delle notifiche"
+other: "Avanzate"
+abuseReports: "Segnala"
+reportAbuse: "Segnala"
+reportAbuseOf: "Segnala {name}"
+send: "Inviare"
+openInNewTab: "Apri in una nuova scheda"
+random: "Casuale"
+system: "Sistema"
+desktop: "Desktop"
+optional: "Opzionale"
+public: "Pubblico"
+yes: "Sì"
+no: "No"
+contact: "Contatti"
+developer: "Sviluppatore"
+duplicate: "Duplica"
+left: "Sinistra"
+center: "Centro"
+wide: "Largo"
+nNotes: "{n}Nota"
+backgroundColor: "Sfondo"
+value: "Valore"
+saveConfirm: "Vuoi salvare le modifiche?"
+deleteConfirm: "Rimuovere?"
+registry: "Registro"
+closeAccount: "Disattiva account"
+currentVersion: "Versione attuale"
+latestVersion: "Ultima versione"
+editCode: "Modifica codice"
+apply: "Applica"
+_email:
+  _follow:
+    title: "Nuovo seguace"
+_registry:
+  key: "Dati"
+  keys: "Dati"
+_aboutMisskey:
+  morePatrons: "Ci sono molti altri che ci sostengono. Grazie 🥰"
+_mfm:
+  mention: "Menzioni"
+  url: "URL"
+  link: "Link"
+  bold: "Grassetto"
+  blockCode: "Codice(blocco)"
+  inlineMath: "Espressione matematica(Immersione)"
+  blockMath: "Espressione matematica(blocco)"
+  quote: "Cita il nota"
+  search: "Cerca"
+  blur: "Sfocatura"
+  font: "Tipo di carattere"
+_reversi:
+  black: "Nero"
+  white: "Bianco"
+  ended: "Esci"
+_channel:
+  featured: "Tendenze"
+_sidebar:
+  icon: "Foto del profilo"
+  hide: "Nascondere"
+_theme:
+  constant: "Costante"
+  defaultValue: "Valore predefinito"
+  color: "Colore"
+  func: "Funzione"
+  darken: "Scuro"
+  lighten: "Chiaro"
+  keys:
+    bg: "Sfondo"
+    shadow: "Ombra"
+    mention: "Menzioni"
+    renote: "Rinotta"
+    divider: "Interruzione di linea"
+_sfx:
+  note: "Nota"
+  notification: "Notifiche"
+  chat: "Messaggi"
+_ago:
+  unknown: "Sconosciuto"
+  future: "Futuro"
+  justNow: "Ora"
+  secondsAgo: "{n}s fa"
+  minutesAgo: "{n}min fa"
+  hoursAgo: "{n}h fa"
+  daysAgo: "{1} giorni fa"
+  weeksAgo: "{n} settimane fa"
+  monthsAgo: "{n} mesi fa"
+  yearsAgo: "{n} anni fa"
+_time:
+  second: "s"
+  minute: "min"
+  hour: "ore"
+  day: "giorni"
+_tutorial:
+  title: "Come usare Misskey"
+  step1_1: "Benvenuto"
+_permissions:
+  "read:blocks": "Visualizza gli account che hai bloccato."
+  "write:blocks": "Gestisci gli account che hai bloccato."
+  "read:favorites": "Visualizza Segnalibri"
+  "write:favorites": "Gestisci Segnalibri"
+  "write:following": "Seguiti/ Smetti di seguire"
+  "read:notifications": "Visualizza notifiche"
+_weekday:
+  sunday: "Domenica"
+  monday: "Lunedì"
+  tuesday: "Martedì"
+  wednesday: "Mercoledì"
+  thursday: "Giovedì"
+  friday: "Venerdì"
+  saturday: "Sabato"
+_widgets:
+  memo: "Memo"
+  notifications: "Notifiche"
+  timeline: "Timeline"
+  calendar: "Calendario"
+  trends: "Tendenze"
+  clock: "Orologio"
+  rss: "Aggregatore rss"
+  activity: "Attività"
+  photos: "Foto"
+  digitalClock: "Orologio digitale"
+  federation: "Federazione"
+_cw:
+  hide: "Nascondere"
+  show: "Mostra altre"
+_poll:
+  noMore: "Hai aggiunto il numero massimo di opzioni."
+  canMultipleVote: "Risposte multiple"
+  expiration: "Scadenza"
+  infinite: "Permanente"
+  deadlineDate: "Data di scadenza"
+  deadlineTime: "h"
+  voted: "Votato"
+  closed: "Terminato"
+_visibility:
+  public: "Pubblico"
+  home: "Home"
+  followers: "Seguaci"
+  localOnly: "Solo Locale"
+  localOnlyDescription: "Solo locale"
+_postForm:
+  replyPlaceholder: "Nota la tua risposta.."
+  quotePlaceholder: "Cita Nota..."
+_profile:
+  name: "Nome"
+  username: "Nome utente"
+  description: "Bio"
+  metadata: "Metadati"
+  metadataLabel: "Etichetta"
+  metadataContent: "Contenuto"
+_exportOrImport:
+  followingList: "Seiguiti"
+  muteList: "Silenzia"
+  blockingList: "Blocca"
+  userLists: "Liste"
+_timelines:
+  home: "Home"
+  local: "Locale"
+_rooms:
+  _roomType:
+    washitsu: "Washitsu"
+  _furnitures:
+    milk: "Cartone del latte"
+    bed: "Letto"
+    low-table: "Tavolino Coffee"
+    desk: "Tavolo"
+    chair: "Sedia"
+    chair2: "Sedia 2"
+    fan: "Ventilatore"
+    pc: "PC"
+    plant: "Pianta da appartamento"
+    plant2: "Pianta da appartamento2"
+    eraser: "Gomma"
+    pencil: "Matita"
+    pudding: "Pudding"
+    book: "Libro"
+    book2: "Libro2"
+    piano: "Pianoforte"
+    server: "Server"
+    moon: "Luna"
+    corkboard: "Bacheca"
+    mousepad: "Tappetino per il mouse"
+    monitor: "Monitor "
+    keyboard: "Tastiera"
+    mat: "Zerbino"
+    color-box: "Libreria"
+    wall-clock: "Orologio da parete"
+    photoframe: "Cornice"
+    cube: "Cubo"
+    tv: "Televisore"
+    pinguin: "Pinguini"
+    bin: "Cestino"
+    cup-noodle: "Noodle istantanei"
+_pages:
+  like: "Mi piace"
+  unlike: "Togli Mi piace"
+  variables: "Variabili"
+  title: "Titolo"
+  font: "Tipo di carattere"
+  blocks:
+    image: "Immagini"
+    if: "Se"
+    _if:
+      variable: "Variabili"
+    _post:
+      text: "Contenuto"
+    _textInput:
+      text: "Titolo"
+    _textareaInput:
+      text: "Titolo"
+    _numberInput:
+      text: "Titolo"
+    _switch:
+      text: "Titolo"
+    _counter:
+      text: "Titolo"
+    _button:
+      text: "Titolo"
+      _action:
+        _dialog:
+          content: "Contenuto"
+    _radioButton:
+      title: "Titolo"
+  script:
+    categories:
+      comparison: "Metodo comparativo"
+      random: "Aleatorietà"
+      value: "Valore"
+      fn: "Funzione"
+      list: "Liste"
+    blocks:
+      _join:
+        arg1: "Liste"
+      _add:
+        arg1: "A"
+        arg2: "B"
+      _subtract:
+        arg1: "A"
+        arg2: "B"
+      _multiply:
+        arg1: "A"
+        arg2: "B"
+      _divide:
+        arg1: "A"
+        arg2: "B"
+      _mod:
+        arg1: "A"
+        arg2: "B"
+      _eq:
+        arg1: "A"
+        arg2: "B"
+      notEq: "A non è uguale a B"
+      _notEq:
+        arg1: "A"
+        arg2: "B"
+      and: "A e B"
+      _and:
+        arg1: "A"
+        arg2: "B"
+      or: "A o B"
+      _or:
+        arg1: "A"
+        arg2: "B"
+      _lt:
+        arg1: "A"
+        arg2: "B"
+      _gt:
+        arg1: "A"
+        arg2: "B"
+      _ltEq:
+        arg1: "A"
+        arg2: "B"
+      _gtEq:
+        arg1: "A"
+        arg2: "B"
+      _if:
+        arg1: "Se"
+      random: "Aleatorietà"
+      _randomPick:
+        arg1: "Liste"
+      _dailyRandomPick:
+        arg1: "Liste"
+      _seedRandomPick:
+        arg2: "Liste"
+      _pick:
+        arg1: "Liste"
+      _listLen:
+        arg1: "Liste"
+      ref: "Variabili"
+      fn: "Funzione"
+    types:
+      array: "Liste"
+_notification:
+  youGotQuote: "{name} ha citato il tuo Nota e ha detto"
+  youRenoted: "{name} ha rinotta"
+  youGotPoll: "{name} ha volluto."
+  youWereFollowed: "Nuovo seguace"
+  _types:
+    all: "Tutto"
+    follow: "Seiguiti"
+    mention: "Menzioni"
+    reply: "Rispondi"
+    renote: "Rinotta"
+    quote: "Cita il nota"
+    reaction: "Reazione"
+_deck:
+  _columns:
+    notifications: "Notifiche"
+    tl: "Timeline"
+    list: "Liste"
+    mentions: "Menzioni"
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
--- a/locales/kab-KAB.yml
+++ b/locales/kab-KAB.yml
@ -0,0 +1,100 @@
+---
+_lang_: "Taqbaylit"
+monthAndDay: "{day}/{month}"
+search: "Nadi"
+notifications: "Ilɣuyen"
+username: "Isem n umseqdac"
+password: "Awal uffir"
+ok: "IH"
+settings: "Iɣewwaṛen"
+profile: "Amaɣnu"
+save: "Sekles"
+delete: "Kkes"
+addToList: "Rnu ɣer tebdart"
+reply: "Err"
+loadMore: "Wali ugar"
+showMore: "Wali ugar"
+youGotNewFollower: "Yeṭṭafaṛ-ik·em-id"
+mention: "Bder"
+import: "Kter"
+export: "Sifeḍ"
+files: "Ifuyla"
+download: "Sider"
+lists: "Tibdarin"
+noLists: "Ulac ɣur-k·m ula d yiwet n tabdart"
+following: "Ig ṭṭafaṛ"
+followers: "Imeḍfaṛen"
+followsYou: "Yeṭṭafaṛ-ik·em-id"
+createList: "Snulfu-d tabdart"
+enterListName: "Isem n tebdart"
+follow: "Ḍfeṛ"
+you: "Kečči·mmi"
+selectList: "Fren tabdart"
+youHaveNoLists: "Ulac ɣur-k·m ula d yiwet n tabdart"
+remove: "Kkes"
+userList: "Tibdarin"
+uiLanguage: "Tutlayt n wegrudem"
+smtpUser: "Isem n umseqdac"
+smtpPass: "Awal uffir"
+_email:
+  _follow:
+    title: "Yeṭṭafaṛ-ik·em-id"
+_mfm:
+  mention: "Bder"
+  search: "Nadi"
+  font: "Tasefsit"
+_theme:
+  keys:
+    mention: "Bder"
+_sfx:
+  notification: "Ilɣuyen"
+_widgets:
+  notifications: "Ilɣuyen"
+_cw:
+  show: "Wali ugar"
+_visibility:
+  followers: "Imeḍfaṛen"
+_profile:
+  username: "Isem n umseqdac"
+_exportOrImport:
+  followingList: "Ig ṭṭafaṛ"
+  muteList: "Sgugem"
+  blockingList: "Seḥbes"
+  userLists: "Tibdarin"
+_pages:
+  contents: "Agbur"
+  font: "Tasefsit"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  eyeCatchingImageRemove: "Kkes tugna i d-ijebden"
+  selectType: "Fren anaw"
+  contentBlocks: "Agbur"
+  inputBlocks: "Anekcum"
+  specialBlocks: "Uzzig"
+  script:
+    categories:
+      list: "Tibdarin"
+    blocks:
+      _join:
+        arg1: "Tibdarin"
+      _randomPick:
+        arg1: "Tibdarin"
+      _dailyRandomPick:
+        arg1: "Tibdarin"
+      _seedRandomPick:
+        arg2: "Tibdarin"
+      _pick:
+        arg1: "Tibdarin"
+      _listLen:
+        arg1: "Tibdarin"
+    types:
+      array: "Tibdarin"
+_notification:
+  youWereFollowed: "Yeṭṭafaṛ-ik·em-id"
+  _types:
+    follow: "Ig ṭṭafaṛ"
+    mention: "Bder"
+_deck:
+  _columns:
+    notifications: "Ilɣuyen"
+    list: "Tibdarin"
--- a/locales/kn-IN.yml
+++ b/locales/kn-IN.yml
@ -0,0 +1,81 @@
+---
+_lang_: "ಕನ್ನಡ"
+introMisskey: "ಸ್ವಾಗತ! Misskey ಓಪನ್ ಸೋರ್ಸ್ ಒಕ್ಕೂಟ ಮೈಕ್ರೋಬ್ಲಾಗಿಂಗ್ ಸೇವೆಯಾಗಿದೆ.\n ಏನಾಗುತ್ತಿದೆ ಎಂಬುದನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಥವಾ ನಿಮ್ಮ ಬಗ್ಗೆ ಎಲ್ಲರಿಗೂ ಹೇಳಲು \"ಟಿಪ್ಪಣಿ\"ಗಳನ್ನು ರಚಿಸಿ📡\n \"ಸ್ಪಂದನೆ\" ಕ್ರಿಯೆಯೊಂದಿಗೆ, ನೀವು ಎಲ್ಲರ ಟಿಪ್ಪಣಿಗಳಿಗೆ ತ್ವರಿತವಾಗಿ ಸ್ಪಂದನೆಗಳನ್ನು ಕೂಡ ಸೇರಿಸಬಹುದು.👍\n ಹೊಸ ಜಗತ್ತನ್ನು ಅನ್ವೇಷಿಸಿ🚀"
+monthAndDay: "{month}ನೇ ತಿಂಗಳ {day}ನೇ ದಿನ"
+search: "ಹುಡುಕು"
+notifications: "ಅಧಿಸೂಚನೆಗಳು"
+username: "ಬಳಕೆಹೆಸರು"
+password: "ಗುಪ್ತಪದ"
+fetchingAsApObject: "ಒಕ್ಕೂಟದಿಂದ ಪಡೆಯಲಾಗುತ್ತಿದೆ..."
+ok: "ಸರಿ"
+gotIt: "ಅರ್ಥವಾಯಿತು!"
+cancel: "ರದ್ದು"
+enterUsername: "ಬಳಕೆಹೆಸರನ್ನು ಭರ್ತಿ ಮಾಡಿ"
+renotedBy: "{user} ಪುನರಾವರ್ತಿಸಿದರು"
+noNotes: "ಟಿಪ್ಪಣಿಗಳಿಲ್ಲ"
+noNotifications: "ಅಧಿಸೂಚನೆಗಳಿಲ್ಲ"
+instance: "ನಿದರ್ಶನ"
+settings: "ಸಿದ್ಧತೆಗಳು"
+profile: "ಪ್ರೊಫೈಲು"
+timeline: "ಸಮಯಸಾಲು"
+noAccountDescription: "ಇವರು ಸ್ವಯಂ ಪರಿಚಯ ರಚಿಸಿಲ್ಲ"
+login: "ಪ್ರವೇಶ"
+loggingIn: "ಪ್ರವೇಶಿಸುತ್ತಾ..."
+logout: "ಆಚೆಗೆ"
+signup: "ನೋಂದಣಿ"
+uploading: "ಅಪ್‌ಲೋಡಾಗುತ್ತಿದೆ"
+save: "ಉಳಿಸಿ"
+users: "ಬಳಕೆದಾರ"
+addUser: "ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ"
+favorite: "ಮೆಚ್ಚಿನ"
+favorites: "ಮೆಚ್ಚಿನವುಗಳು"
+unfavorite: "ಮೆಚ್ಚುಗೆ ಅಳಿಸು"
+pin: "ಪ್ರೊಫ಼ೈಲಿಗೆ ಅಂಟಿಸು"
+unpin: "ಪ್ರೊಫ಼ೈಲಿಂದ ಅಂಟುತೆಗೆ"
+copyContent: "ವಿಷಯವನ್ನು ನಕಲಿಸು"
+copyLink: "ಲಿಂಕನ್ನು ನಕಲಿಸು"
+delete: "ಅಳಿಸು"
+addToList: "ಪಟ್ಟಿಗೆ ಸೇರಿಸು"
+sendMessage: "ಸಂದೇಶ ಕಳುಹಿಸು"
+copyUsername: "ಬಳಕೆಹೆಸರು ನಕಲಿಸು"
+reply: "ಉತ್ತರಿಸು"
+loadMore: "ಇನ್ನಷ್ಟು ನೋಡು"
+showMore: "ಇನ್ನಷ್ಟು ನೋಡು"
+youGotNewFollower: "ಹಿಂಬಾಲಿಸಿದರು"
+receiveFollowRequest: "ಹಿಂಬಾಲನೆ ವಿನಂತಿ ಬಂದಿದೆ"
+followRequestAccepted: "ಹಿಂಬಾಲನೆ ವಿನಂತಿ ಸ್ವೀಕರಿಸಲಾಯಿತು"
+mentions: "ಹೆಸರಿಸಿದ"
+directNotes: "ನೇರ ಟಿಪ್ಪಣಿಗಳು"
+importAndExport: "ಆಮದು/ರಫ್ತು"
+import: "ಆಮದು"
+export: "ರಫ್ತು"
+files: "ಕಡತಗಳು"
+download: "ಜಾಲದಿಂದಿಳಿಸು"
+driveFileDeleteConfirm: "\"{name}\" ಕಡತವನ್ನು ಅಳಿಸಲು ನೀವು ಬಯಸುವಿರಾ? ಈ ನೋಡಿರಿ ಲಗತ್ತಿಸಲಾದ ಟಿಪ್ಪಣಿ ಸಹ ಕಣ್ಮರೆಯಾಗುತ್ತದೆ."
+unfollowConfirm: "{name}ಅನ್ನು ಹಿಂಬಾಲಿಸದಿರುವುದೇ?"
+pinned: "ಪ್ರೊಫ಼ೈಲಿಗೆ ಅಂಟಿಸು"
+instances: "ನಿದರ್ಶನ"
+remove: "ಅಳಿಸು"
+smtpUser: "ಬಳಕೆಹೆಸರು"
+smtpPass: "ಗುಪ್ತಪದ"
+_email:
+  _follow:
+    title: "ಹಿಂಬಾಲಿಸಿದರು"
+_mfm:
+  search: "ಹುಡುಕು"
+_sfx:
+  notification: "ಅಧಿಸೂಚನೆಗಳು"
+_widgets:
+  notifications: "ಅಧಿಸೂಚನೆಗಳು"
+  timeline: "ಸಮಯಸಾಲು"
+_cw:
+  show: "ಇನ್ನಷ್ಟು ನೋಡು"
+_profile:
+  username: "ಬಳಕೆಹೆಸರು"
+_notification:
+  youWereFollowed: "ಹಿಂಬಾಲಿಸಿದರು"
+_deck:
+  _columns:
+    notifications: "ಅಧಿಸೂಚನೆಗಳು"
+    tl: "ಸಮಯಸಾಲು"
+    mentions: "ಹೆಸರಿಸಿದ"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@ -1,633 +1,2 @@
 ---
-meta:
-  lang: "Nederlands"
-common:
-  misskey: "Deel alles met anderen die ook Misskey gebruiken."
-  intro:
-    rich-contents: "Bericht"
-    reaction: "Reactie"
-  close: "Sluiten"
-  enter-password: "Voer het wachtwoord in"
-  time:
-    unknown: "onbekend"
-    future: "toekomstig"
-    just_now: "zojuist"
-    seconds_ago: "{}s geleden"
-    minutes_ago: "{}m geleden"
-    hours_ago: "{}u geleden"
-    days_ago: "{}d geleden"
-    weeks_ago: "{}week/weken geleden"
-    months_ago: "{}maand(en) geleden"
-    years_ago: "{}jaar geleden"
-  home: "Startpagina"
-  timeline: "Tijdlijn"
-  followers: "Volgers"
-  favorites: "Deze notitie toevoegen aan favorieten"
-  permissions:
-    "write:votes": "Stemmen"
-  post-form:
-    submit: "Bericht"
-    reply: "Beantwoorden"
-    add-visible-user: "Gebruiker toevoegen"
-  weekday-short:
-    sunday: "Z"
-    monday: "M"
-    tuesday: "D"
-    wednesday: "W"
-    thursday: "D"
-    friday: "V"
-    saturday: "Z"
-  reactions:
-    like: "Leuk"
-    love: "Geweldig"
-    laugh: "Grappig"
-    hmm: "Eh...?"
-    surprise: "Wauw"
-    congrats: "Gefeliciteerd!"
-    angry: "Boos"
-    confused: "Verward"
-    pudding: "Pudding"
-  note-visibility:
-    home: "Startpagina"
-    followers: "Volgers"
-  _settings:
-    profile: "Je profiel"
-    notification: "Meldingen"
-    password: "Wachtwoord"
-    timeline: "Tijdlijn"
-  search: "Zoeken"
-  delete: "Verwijderen"
-  loading: "Bezig met laden"
-  update-available: "Er is een nieuwe versie van Misskey beschikbaar: {newer} (de huidige versie is {current}). Herlaad de pagina om de update toe te passen."
-  my-token-regenerated: "Je sleutel is gegenereerd; je wordt nu uitgelogd."
-  widgets:
-    profile: "Je profiel"
-    activity: "Activiteit"
-    trends: "Populair"
-    photo-stream: "Fotostream"
-    notifications: "Meldingen"
-    users: "Aanbevolen gebruikers"
-    server: "Serverinformatie"
-  you: "Jij"
-auth/views/form.vue:
-  cancel: "Annuleren"
-auth/views/index.vue:
-  loading: "Bezig met laden"
-common/views/components/games/reversi/reversi.vue:
-  matching:
-    cancel: "Annuleren"
-common/views/components/games/reversi/reversi.room.vue:
-  cancel: "Annuleren"
-common/views/components/connect-failed.vue:
-  title: "Verbinden met server mislukt"
-  description: "Er is een probleem met je internetverbinding, de server ligt plat of er wordt aan gewerkt. {Probeer} het later opnieuw."
-  thanks: "Bedankt voor het gebruiken van Misskey."
-  troubleshoot: "Probleemoplossing"
-common/views/components/connect-failed.troubleshooter.vue:
-  title: "Probleemoplossing"
-  network: "Netwerkverbinding"
-  checking-network: "Bezig met controleren van netwerkverbinding"
-  internet: "Internetverbinding"
-  checking-internet: "Bezig met controleren van internetverbinding"
-  server: "Serververbinding"
-  checking-server: "Bezig met controleren van serververbinding"
-  finding: "Bezig met vaststellen van probleem"
-  no-network: "Er is geen internetverbinding"
-  no-network-desc: "Zorg ervoor dat je verbonden bent met een netwerk."
-  no-internet: "Er is geen internetverbinding"
-  no-internet-desc: "Zorg ervoor dat je verbonden bent met het internet."
-  no-server: "Verbinden met Misskey-server mislukt"
-  no-server-desc: "De netwerkverbinding van je computer is goed, maar er kan geen verbinding worden gemaakt met de Misskey-server. Het kan dat de server plat ligt of dat eraan wordt gewerkt. Probeer het later opnieuw."
-  success: "Verbonden met de Misskey-server"
-  success-desc: "Het verbinden lijkt te lukken. Herlaad de pagina."
-  flush: "Cache leegmaken"
-  set-version: "Versie opgeven"
-common/views/components/theme.vue:
-  desc: "Omschrijving"
-common/views/components/messaging.vue:
-  search-user: "Gebruiker zoeken"
-  you: "Jij"
-  no-history: "Geen geschiedenis"
-  user: "Gebruiker"
-common/views/components/messaging-room.vue:
-  no-history: "Er is geen verdere geschiedenis"
-  new-message: "Nieuw bericht"
-common/views/components/messaging-room.form.vue:
-  input-message-here: "Voer hier je bericht in"
-  send: "Versturen"
-  attach-from-local: "Bestanden bijvoegen van je computer"
-  attach-from-drive: "Bestanden bijvoegen van je Drive"
-common/views/components/messaging-room.message.vue:
-  is-read: "Gelezen"
-  deleted: "Dit bericht is verwijderd"
-common/views/components/nav.vue:
-  about: "Over"
-  stats: "Statistieken"
-  status: "Status"
-  donors: "Donateurs"
-  repository: "Broncode"
-  develop: "Ontwikkelaars"
-  feedback: "Feedback"
-common/views/components/note-menu.vue:
-  favorite: "Deze notitie toevoegen aan favorieten"
-  pin: "Vastmaken aan profielpagina"
-  delete: "Verwijderen"
-  remote: "Origineel tonen"
-common/views/components/poll.vue:
-  vote-to: "Stemmen op '{}'"
-  vote-count: "{} stemmen"
-  vote: "Stemmen"
-  show-result: "Resultaten tonen"
-  voted: "Gestemd"
-common/views/components/poll-editor.vue:
-  no-only-one-choice: "Je moet twee of meer keuzes invoeren."
-  choice-n: "Keuze {}"
-  remove: "Deze keuze verwijderen"
-  add: "+ Keuze toevoegen"
-  destroy: "Deze peiling vernietigen"
-  day: "Z"
-common/views/components/reaction-picker.vue:
-  choose-reaction: "Kies een reactie"
-common/views/components/emoji-picker.vue:
-  activity: "Activiteit"
-common/views/components/signin.vue:
-  username: "Gebruikersnaam"
-  password: "Wachtwoord"
-  token: "Sleutel"
-  signing-in: "Bezig met inloggen..."
-common/views/components/signup.vue:
-  username: "Gebruikersnaam"
-  checking: "Bezig met controleren..."
-  available: "Beschikbaar"
-  unavailable: "Niet beschikbaar"
-  error: "Netwerkfout"
-  invalid-format: "Gebruik alleen letters, cijfers en -."
-  too-short: "Voer minimaal 1 teken in!"
-  too-long: "Voer maximaal 20 tekens in."
-  password: "Wachtwoord"
-  password-placeholder: "Wij raden aan meer dan 8 tekens te gebruiken."
-  weak-password: "Zwak"
-  normal-password: "'t Ken net"
-  strong-password: "Sterk"
-  retype: "Opnieuw invoeren"
-  retype-placeholder: "Wachtwoord bevestigen"
-  password-matched: "Oké"
-  password-not-matched: "Komt niet overeen"
-  recaptcha: "Verifiëren"
-  create: "Account creëren"
-  some-error: "Het creëren van een account is mislukt. Probeer het opnieuw."
-common/views/components/special-message.vue:
-  new-year: "Gelukkig nieuwjaar!"
-  christmas: "Fijne kerstdagen!"
-common/views/components/stream-indicator.vue:
-  connecting: "Bezig met verbinden"
-  reconnecting: "Bezig met herverbinden"
-  connected: "Verbonden"
-common/views/components/notification-settings.vue:
-  title: "Meldingen"
-common/views/components/github-setting.vue:
-  detail: "Details bekijken..."
-common/views/components/discord-setting.vue:
-  detail: "Details bekijken..."
-common/views/components/uploader.vue:
-  waiting: "Bezig met wachten"
-common/views/components/visibility-chooser.vue:
-  home: "Startpagina"
-  followers: "Volgers"
-common/views/components/profile-editor.vue:
-  title: "Je profiel"
-  name: "Naam"
-  avatar: "Gebruikersafbeelding"
-  banner: "Omslagfoto"
-  unable-to-process: "De operatie kan niet worden voltooid."
-  export-targets:
-    following-list: "Volgend"
-    user-lists: "Lijsten"
-  enter-password: "Voer het wachtwoord in"
-common/views/components/user-list-editor.vue:
-  users: "Gebruiker"
-  add-user: "Gebruiker toevoegen"
-common/views/components/user-lists.vue:
-  user-lists: "Lijsten"
-common/views/widgets/broadcast.vue:
-  fetching: "Bezig met ophalen"
-  no-broadcasts: "Geen uitzendingen"
-  have-a-nice-day: "Fijne dag!"
-  next: "Volgende"
-common/views/widgets/photo-stream.vue:
-  title: "Fotostream"
-  no-photos: "Geen foto's"
-common/views/widgets/posts-monitor.vue:
-  toggle: "Schakelen tussen weergaven"
-common/views/widgets/server.vue:
-  title: "Serverinformatie"
-  toggle: "Schakelen tussen weergaven"
-common/views/pages/follow.vue:
-  signed-in-as: "Ingelogd als {}"
-  follow: "Volgend"
-desktop:
-  banner: "Omslagfoto"
-  unable-to-process: "De operatie kan niet worden voltooid."
-desktop/views/components/activity.chart.vue:
-  total: "Zwart ... totaal"
-  notes: "Blauw ... notities"
-  replies: "Rood ... antwoorden"
-  renotes: "Groen ... gedeelde notities"
-desktop/views/components/activity.vue:
-  title: "Activiteit"
-  toggle: "Schakelen tussen weergaven"
-desktop/views/components/calendar.vue:
-  prev: "Vorige maand"
-  next: "Volgende maand"
-  go: "Klik om te navigeren"
-desktop/views/components/choose-file-from-drive-window.vue:
-  upload: "Bestanden uploaden van je computer"
-  cancel: "Annuleren"
-  ok: "Oké"
-  choose-prompt: "Kies een bestand"
-desktop/views/components/choose-folder-from-drive-window.vue:
-  cancel: "Annuleren"
-  ok: "Oké"
-  choose-prompt: "Kies een map"
-desktop/views/components/crop-window.vue:
-  skip: "Bijsnijden overslaan"
-  cancel: "Annuleren"
-  ok: "Oké"
-desktop/views/components/drive-window.vue:
-  used: "gebruikt"
-desktop/views/components/drive.file.vue:
-  avatar: "Gebruikersafbeelding"
-  banner: "Omslagfoto"
-  contextmenu:
-    rename: "Naam wijzigen"
-    copy-url: "URL kopiëren"
-    download: "Downloaden"
-    set-as-avatar: "Instellen als gebruikersafbeelding"
-    set-as-banner: "Instellen als omslagfoto"
-    open-in-app: "Openen in app"
-    add-app: "App toevoegen"
-    rename-file: "Bestandsnaam wijzigen"
-    input-new-file-name: "Voer een nieuwe naam in"
-    copied: "Gekopieerd"
-    copied-url-to-clipboard: "URL gekopieerd naar klembord"
-desktop/views/components/drive.folder.vue:
-  unable-to-process: "De operatie kan niet worden voltooid."
-  circular-reference-detected: "De bestemmingsmap is een submap van de map die je wilt verplaatsen."
-  unhandled-error: "Onbekende fout"
-  contextmenu:
-    move-to-this-folder: "Verplaatsen naar deze map"
-    show-in-new-window: "Openen in nieuw venster"
-    rename: "Naam wijzigen"
-    rename-folder: "Mapnaam wijzigen"
-    input-new-folder-name: "Voer een nieuwe naam in"
-desktop/views/components/drive.vue:
-  search: "Zoeken"
-  empty-draghover: "Welkom!"
-  empty-drive: "Je schijf is leeg"
-  empty-drive-description: "Je kunt ook uploaden door te klikken met de rechtermuisknop en te kiezen voor \"Bestand uploaden\" of door een bestand naar dit venster te slepen."
-  empty-folder: "Deze map is leeg"
-  unable-to-process: "De operatie kan niet worden voltooid."
-  circular-reference-detected: "De bestemmingsmap is een submap van de te verplaatsen map."
-  unhandled-error: "Onbekende fout"
-  url-upload: "Uploaden via URL"
-  url-of-file: "URL van het te uploaden bestand"
-  url-upload-requested: "Uploadverzoek"
-  may-take-time: "Het kan even duren voordat het uploaden voltooid is."
-  create-folder: "Map creëren"
-  folder-name: "Mapnaam"
-  contextmenu:
-    create-folder: "Map creëren"
-    upload: "Bestand uploaden"
-    url-upload: "Uploaden via URL"
-desktop/views/components/followers-window.vue:
-  followers: "Volgers van {}"
-desktop/views/components/followers.vue:
-  empty: "Het lijkt erop dat je geen volgers hebt."
-desktop/views/components/following-window.vue:
-  following: "Volgend {}"
-desktop/views/components/following.vue:
-  empty: "Je volgt niemand."
-desktop/views/components/game-window.vue:
-  game: "Othello"
-desktop/views/components/home.vue:
-  done: "Versturen"
-  add-widget: "Widget toevoegen:"
-  add: "Toevoegen"
-desktop/views/input-dialog.vue:
-  cancel: "Annuleren"
-  ok: "Oké"
-desktop/views/components/note-detail.vue:
-  private: "(dit bericht is privé)"
-  location: "Locatie"
-  add-reaction: "Reactie"
-desktop/views/components/note.vue:
-  reply: "Beantwoorden"
-  add-reaction: "Reactie"
-  private: "(dit bericht is privé)"
-desktop/views/components/notes.vue:
-  error: "Laden mislukt."
-  retry: "Opnieuw proberen"
-desktop/views/components/notifications.vue:
-  empty: "Geen meldingen"
-desktop/views/components/post-form.vue:
-  posted: "Geplaatst!"
-  replied: "Beantwoord!"
-  reposted: "Hergeplaatst!"
-  note-failed: "Noteren mislukt"
-  reply-failed: "Beantwoorden mislukt"
-  renote-failed: "Renote mislukt"
-desktop/views/components/post-form-window.vue:
-  note: "Nieuwe notitie"
-  reply: "Beantwoorden"
-  attaches: "{} media bijgevoegd"
-  uploading-media: "Bezig met uploaden van media {}"
-desktop/views/components/progress-dialog.vue:
-  waiting: "Bezig met wachten"
-desktop/views/components/renote-form.vue:
-  quote: "Citeren..."
-  cancel: "Annuleren"
-  reposting: "Bezig met herplaatsen..."
-  success: "Hergeplaatst!"
-  failure: "Renote mislukt"
-desktop/views/components/renote-form-window.vue:
-  title: "Weet je zeker dat je deze notitie wilt renoten?"
-desktop/views/components/settings.2fa.vue:
-  intro: "Als je verificatie in twee stappen instelt, dan heb je niet alleen een wachtwoord nodig bij het inloggen, maar ook een geregistreerd fysiek apparaat (zoals je smartphone). Dit verhoogt de veiligheid. "
-  detail: "Details bekijken..."
-  url: "https://www.google.com/landing/2step/"
-  caution: "Als je geen toegang meer hebt tot je apparaat, dan kun je niet meer verbinden met Misskey!"
-  register: "Apparaat registreren"
-  already-registered: "Er is al een apparaat geregistreerd"
-  unregister: "Uitschakelen"
-  unregistered: "Authenticatie in twee stappen is uitgeschakeld."
-  enter-password: "Voer het wachtwoord in"
-  authenticator: "Installeer eerst Google Authenticator op je apparaat:"
-  howtoinstall: "Hoe installeer ik dit?"
-  token: "Sleutel"
-  scan: "Scan daarna de QR-code:"
-  done: "Voer de op je apparaat getoonde sleutel in:"
-  submit: "Versturen"
-  success: "Instellen voltooid!"
-  failed: "Instellen mislukt. Zorg ervoor dat de sleutel juist is."
-  info: "Vanaf nu moet je ook de op je apparaat getoonde sleutel tonen bij het inloggen op Misskey."
-common/views/components/api-settings.vue:
-  enter-password: "Voer het wachtwoord in"
-  console:
-    parameter: "Parameters"
-    send: "Versturen"
-common/views/components/drive-settings.vue:
-  in-use: "gebruikt"
-  stats: "Statistieken"
-  default-upload-folder-name: "Map(pen)"
-desktop/views/components/sub-note-content.vue:
-  private: "(dit bericht is privé)"
-  poll: "Peilingen"
-desktop/views/components/settings.tags.vue:
-  add: "Toevoegen"
-desktop/views/components/timeline.vue:
-  home: "Startpagina"
-  local: "Lokaal"
-  global: "Algemeen"
-  list: "Lijsten"
-desktop/views/components/ui.header.account.vue:
-  profile: "Je profiel"
-  lists: "Lijsten"
-desktop/views/components/ui.header.nav.vue:
-  game: "Othello spelen"
-desktop/views/components/ui.header.notifications.vue:
-  title: "Meldingen"
-desktop/views/components/ui.header.post.vue:
-  post: "Nieuw bericht opstellen"
-desktop/views/components/ui.header.search.vue:
-  placeholder: "Zoeken"
-desktop/views/components/user-preview.vue:
-  notes: "Berichten"
-  following: "Volgend"
-  followers: "Volgers"
-desktop/views/components/users-list.vue:
-  all: "Alle"
-  iknow: "die ik ken"
-  fetching: "Bezig met laden…"
-desktop/views/components/users-list-item.vue:
-  followed: "Volgt jou"
-desktop/views/components/window.vue:
-  popout: "Uitvouwen"
-  close: "Sluiten"
-admin/views/index.vue:
-  users: "Gebruiker"
-admin/views/dashboard.vue:
-  notes: "Bericht"
-admin/views/abuse.vue:
-  remove-report: "Verwijderen"
-admin/views/charts.vue:
-  notes: "Bericht"
-  users: "Gebruiker"
-admin/views/drive.vue:
-  origin:
-    local: "Lokaal"
-  delete: "Verwijderen"
-admin/views/users.vue:
-  username: "Gebruikersnaam"
-  users:
-    title: "Gebruiker"
-    state:
-      all: "Alle"
-    origin:
-      local: "Lokaal"
-admin/views/emoji.vue:
-  add-emoji:
-    add: "Toevoegen"
-  emojis:
-    remove: "Verwijderen"
-admin/views/announcements.vue:
-  remove: "Verwijderen"
-  add: "Toevoegen"
-admin/views/federation.vue:
-  notes: "Bericht"
-  users: "Gebruiker"
-  followers: "Volgers"
-  status: "Status"
-  states:
-    all: "Alle"
-desktop/views/pages/welcome.vue:
-  timeline: "Tijdlijn"
-desktop/views/pages/note.vue:
-  prev: "Vorige notitie"
-  next: "Volgende notitie"
-desktop/views/pages/selectdrive.vue:
-  title: "Bestand(en) kiezen"
-  ok: "Oké"
-  cancel: "Annuleren"
-  upload: "Bestanden uploaden van je PC"
-desktop/views/pages/user-list.users.vue:
-  users: "Gebruiker"
-  add-user: "Gebruiker toevoegen"
-  username: "Gebruikersnaam"
-desktop/views/pages/user/user.followers-you-know.vue:
-  title: "Volgers die je kent"
-  loading: "Bezig met laden"
-  no-users: "Geen gebruikers"
-desktop/views/pages/user/user.friends.vue:
-  title: "Frequent beantwoord"
-  loading: "Bezig met laden"
-  no-users: "Geen gebruikers"
-desktop/views/pages/user/user.photos.vue:
-  title: "Foto's"
-  loading: "Bezig met laden"
-  no-photos: "Geen foto's"
-desktop/views/pages/user/user.header.vue:
-  posts: "Bericht"
-  following: "Volgend"
-  followers: "Volgers"
-  month: "M"
-  day: "Z"
-  follows-you: "Volgt jou"
-desktop/views/pages/user/user.timeline.vue:
-  default: "Berichten"
-  with-replies: "Berichten en antwoorden"
-  with-media: "Media"
-desktop/views/widgets/notifications.vue:
-  title: "Meldingen"
-desktop/views/widgets/polls.vue:
-  title: "Peilingen"
-  refresh: "Anderen tonen"
-  nothing: "Niks"
-desktop/views/widgets/post-form.vue:
-  title: "Bericht"
-  note: "Bericht"
-desktop/views/widgets/profile.vue:
-  update-banner: "Klik om je omslagfoto te wijzigen"
-  update-avatar: "Klik om je gebruikersafbeelding te wijzigen"
-desktop/views/widgets/trends.vue:
-  title: "Populair"
-  refresh: "Anderen tonen"
-  nothing: "Niks"
-desktop/views/widgets/users.vue:
-  title: "Aanbevolen gebruikers"
-  refresh: "Anderen tonen"
-  no-one: "Niemand"
-mobile/views/components/drive.vue:
-  used: "gebruikt"
-  folder-count: "Map(pen)"
-  count-separator: ", "
-  file-count: "Bestand(en)"
-  nothing-in-drive: "Niks"
-  folder-is-empty: "Deze map is leeg"
-  folder-name: "Mapnaam"
-  url-prompt: "URL van het te uploaden bestand"
-mobile/views/components/drive-file-chooser.vue:
-  select-file: "Kies een bestand"
-mobile/views/components/drive-folder-chooser.vue:
-  select-folder: "Kies een map"
-mobile/views/components/drive.file-detail.vue:
-  download: "Downloaden"
-  rename: "Naam wijzigen"
-  move: "Verplaatsen"
-  hash: "Hash (md5)"
-common/views/components/follow-button.vue:
-  follow: "Volgend"
-mobile/views/components/note.vue:
-  private: "(dit bericht is privé)"
-  location: "Locatie"
-mobile/views/components/note-detail.vue:
-  reply: "Beantwoorden"
-  reaction: "Reactie"
-  private: "(dit bericht is privé)"
-  location: "Locatie"
-mobile/views/components/notifications.vue:
-  empty: "Geen meldingen"
-mobile/views/components/sub-note-content.vue:
-  private: "(dit bericht is privé)"
-  media-count: "{} media"
-  poll: "Peiling"
-mobile/views/components/ui.nav.vue:
-  timeline: "Tijdlijn"
-  notifications: "Meldingen"
-  search: "Zoeken"
-  user-lists: "Lijsten"
-  game: "Othello spelen"
-  about: "Over Misskey"
-mobile/views/pages/drive.vue:
-  contextmenu:
-    upload: "Bestand uploaden"
-    create-folder: "Map creëren"
-mobile/views/pages/home.vue:
-  home: "Startpagina"
-  local: "Lokaal"
-  global: "Algemeen"
-mobile/views/pages/widgets.vue:
-  add-widget: "Toevoegen"
-mobile/views/pages/widgets/activity.vue:
-  activity: "Activiteit"
-mobile/views/pages/note.vue:
-  title: "Bericht"
-  prev: "Vorige notitie"
-  next: "Volgende notitie"
-mobile/views/pages/games/reversi.vue:
-  reversi: "Othello"
-mobile/views/pages/search.vue:
-  search: "Zoeken"
-mobile/views/pages/selectdrive.vue:
-  select-file: "Kies een bestand"
-mobile/views/pages/settings.vue:
-  signed-in-as: "Ingelogd als {}"
-mobile/views/pages/user.vue:
-  follows-you: "Volgt jou"
-  following: "Volgend"
-  followers: "Volgers"
-  notes: "Berichten"
-  overview: "Overzicht"
-  timeline: "Tijdlijn"
-  media: "Media"
-mobile/views/pages/user/home.vue:
-  recent-notes: "Recente notities"
-  images: "Afbeeldingen"
-  activity: "Activiteit"
-  keywords: "Sleutelwoorden"
-  domains: "Domeinnamen"
-  frequently-replied-users: "Frequent beantwoord"
-  followers-you-know: "Volgers die je kent"
-  last-used-at: "Laatst actief"
-mobile/views/pages/user/home.photos.vue:
-  no-photos: "Geen foto's"
-deck:
-  home: "Startpagina"
-  local: "Lokaal"
-  global: "Algemeen"
-  notifications: "Meldingen"
-  list: "Lijsten"
-  rename: "Naam wijzigen"
-deck/deck.user-column.vue:
-  follows-you: "Volgt jou"
-  posts: "Bericht"
-  following: "Volgend"
-  followers: "Volgers"
-  images: "Afbeeldingen"
-  activity: "Activiteit"
-  timeline: "Tijdlijn"
-docs:
-  edit-this-page-on-github: "Heb je een fout ontdekt of wil je bijdragen aan de documentatie? "
-  edit-this-page-on-github-link: "Bewerk deze pagina op GitHub!"
-pages:
-  pin-this-page: "Vastmaken aan profielpagina"
-  like: "Leuk"
-  blocks:
-    image: "Afbeeldingen"
-  script:
-    categories:
-      list: "Lijsten"
-    blocks:
-      _join:
-        arg1: "Lijsten"
-      _randomPick:
-        arg1: "Lijsten"
-      _dailyRandomPick:
-        arg1: "Lijsten"
-      _seedRandomPick:
-        arg2: "Lijsten"
-      _pick:
-        arg1: "Lijsten"
-      _listLen:
-        arg1: "Lijsten"
-    types:
-      array: "Lijsten"
+_lang_: "Nederlands"
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@ -1,516 +1,2 @@
 ---
-meta:
-  lang: "Norsk Bokmål"
-common:
-  misskey: "En ⭐ av fediverse"
-  about-title: "En ⭐ av fediverse"
-  about: "Takk for at du fant Misskey. Misskey er en <b>desentralisert mikroblogging platform</b> født på jorden. Siden den eksisterer sammen med Fediverset (Et univers hvor forskjellige sosiale media-plattformer blir organisert), så blir den gjensidig tilknyttet med andre sosiale media-plattformer. Hvorfor ikke ta en pause fra kjas og mas fra storbyen og hoppe inn i en ny type internett?"
-  intro:
-    title: "Hva er Misskey?"
-    features: "Funksjoner"
-    rich-contents: "Innlegg"
-    drive: "Disk"
-  close: "Lukk"
-  got-it: "Skjønner!"
-  notification:
-    file-uploaded: "Filen ble lastet opp!"
-    message-from: "Melding fra {}:"
-    reversi-invited: "Invitert til et spill"
-    reversi-invited-by: "Invitert av {}:"
-    notified-by: "Invitert av {}:"
-    reply-from: "Svar fra {}:"
-    quoted-by: "Sitert av {}:"
-  time:
-    unknown: "ukjent"
-    future: "fremtidig"
-    just_now: "akkurat nå"
-    seconds_ago: "{} sekunder siden"
-    minutes_ago: "{} minutter siden"
-    hours_ago: "{} t siden"
-    days_ago: "{} d siden"
-    weeks_ago: "{} uke(r) siden"
-    months_ago: "{} måned(er) siden"
-    years_ago: "{} år siden"
-  month-and-day: "{day}/{month}"
-  trash: "Papirkurv"
-  drive: "Disk"
-  home: "Hjem"
-  followers: "Følgere"
-  favorites: "Merket som favoritt"
-  permissions:
-    "write:votes": "Stem"
-  post-form:
-    submit: "Innlegg"
-    reply: "Svar"
-    error: "Feil"
-  weekday-short:
-    sunday: "S"
-    monday: "M"
-    tuesday: "T"
-    wednesday: "O"
-    thursday: "T"
-    friday: "F"
-    saturday: "L"
-  weekday:
-    sunday: "Søndag"
-    monday: "Mandag"
-    tuesday: "Tirsdag"
-    wednesday: "Onsdag"
-    thursday: "Torsdag"
-    friday: "Fredag"
-    saturday: "Lørdag"
-  reactions:
-    like: "Lik"
-    love: "Elsk"
-    laugh: "Le"
-    hmm: "Hmm…?"
-    surprise: "Wow"
-    congrats: "Gratulerer!"
-    angry: "Sint"
-    confused: "Forvirret"
-    rip: "RIP"
-    pudding: "Pudding"
-  note-visibility:
-    public: "Offentlig"
-    home: "Hjem"
-    followers: "Følgere"
-    specified: "Direkte"
-  _settings:
-    notification: "Notifikasjon"
-    password: "Passord"
-    save: "Lagre"
-  search: "Søk"
-  delete: "Slett"
-  loading: "Laster inn..."
-  update-available: "En ny versjon av Misskey er nå tilgjengelig ({newer}, nåværende versjon er {current}). Last inn siden igjen for at oppdateringen skal tre i kraft."
-  my-token-regenerated: "Ditt synbol har blitt generert. Du vil nå bli utlogget."
-  reversi:
-    black: "Sort"
-    white: "Hvit"
-    total: "Totalt"
-  widgets:
-    calendar: "Kalender"
-    memo: "Notis"
-    trends: "Populært nå"
-    version: "Versjon"
-    notifications: "Notifikasjon"
-    tips: "Tips"
-  you: "Du"
-auth/views/form.vue:
-  cancel: "Avbryt"
-auth/views/index.vue:
-  loading: "Laster inn..."
-common/views/components/games/reversi/reversi.vue:
-  matching:
-    cancel: "Avbryt"
-common/views/components/games/reversi/reversi.game.vue:
-  surrender: "Gi opp"
-common/views/components/games/reversi/reversi.index.vue:
-  invite: "Inviter"
-  rule: "Slik spiller du"
-  mode-invite: "Inviter"
-  game-state:
-    ended: "Ferdig"
-    playing: "Pågår"
-common/views/components/games/reversi/reversi.room.vue:
-  random: "Tilfeldig"
-  black-is: "Sort er {}"
-  rules: "Regler"
-  waiting-for-both: "Venter på deg"
-  cancel: "Avbryt"
-  ready: "Klar"
-  cancel-ready: "Avbryt \"Klar\""
-common/views/components/connect-failed.vue:
-  title: "Kunne ikke koble til tjeneren."
-  description: "Det er enten et problem med internettilknytningen din, eller så har tjeneren blitt tatt ned for vedlikehold. {Prøv igjen} senere."
-common/views/components/media-banner.vue:
-  sensitive: "Sensitivt innhold"
-common/views/components/theme.vue:
-  text-color: "Tekstfarge"
-  base-theme-dark: "Mørk"
-  theme-name: "Tema navn"
-  author: "Forfatter"
-  desc: "Beskrivelse"
-common/views/components/cw-button.vue:
-  hide: "Skjul"
-common/views/components/messaging.vue:
-  you: "Du"
-  user: "Bruker"
-common/views/components/messaging-room.form.vue:
-  send: "Send"
-common/views/components/messaging-room.message.vue:
-  is-read: "Lest"
-common/views/components/nav.vue:
-  stats: "Statistikk"
-  status: "Status"
-  wiki: "Wiki"
-  donors: "Donatorer"
-  repository: "Kodelager"
-  develop: "Utviklere"
-common/views/components/note-menu.vue:
-  detail: "Detaljer"
-  favorite: "Merket som favoritt"
-  pin: "Fest til profilen din"
-  delete: "Slett"
-common/views/components/poll.vue:
-  vote-count: "{} stemmer"
-  vote: "Stem"
-  show-result: "Vis resultater"
-  voted: "Stemt"
-common/views/components/poll-editor.vue:
-  choice-n: "Valg {}"
-  day: "S"
-common/views/components/signin.vue:
-  username: "Brukernavn"
-  password: "Passord"
-  token: "Token"
-  or: "Eller"
-common/views/components/signup.vue:
-  username: "Brukernavn"
-  error: "Nettverksfeil"
-  password: "Passord"
-  retype: "Gjenta"
-  recaptcha: "Captcha"
-common/views/components/stream-indicator.vue:
-  connecting: "Tilkobler"
-  reconnecting: "Kobler til på nytt"
-  connected: "Tilkoblet"
-common/views/components/notification-settings.vue:
-  title: "Notifikasjon"
-common/views/components/github-setting.vue:
-  detail: "Detaljer..."
-common/views/components/discord-setting.vue:
-  detail: "Detaljer..."
-common/views/components/uploader.vue:
-  waiting: "Venter"
-common/views/components/visibility-chooser.vue:
-  public: "Offentlig"
-  home: "Hjem"
-  followers: "Følgere"
-  specified: "Direkte"
-common/views/components/profile-editor.vue:
-  name: "Navn"
-  avatar: "Avatar"
-  banner: "Banner"
-  save: "Lagre"
-  export-targets:
-    following-list: "Følger"
-    user-lists: "Lister"
-common/views/components/user-list-editor.vue:
-  users: "Bruker"
-common/views/components/user-group-editor.vue:
-  invite: "Inviter"
-common/views/components/user-lists.vue:
-  user-lists: "Lister"
-  list-name: "Liste navn"
-common/views/components/user-groups.vue:
-  invites: "Inviter"
-common/views/widgets/broadcast.vue:
-  fetching: "Henter"
-  next: "Neste"
-common/views/widgets/calendar.vue:
-  year: "År {}"
-  month: "Måned {}"
-  day: "Dag {}"
-  today: "I dag:"
-  this-month: "Denne måneden:"
-  this-year: "Dette året:"
-common/views/widgets/memo.vue:
-  title: "Notis"
-  save: "Lagre"
-common/views/pages/follow.vue:
-  follow: "Følg"
-desktop:
-  banner: "Banner"
-  avatar: "Avatar"
-desktop/views/components/calendar.vue:
-  prev: "Forrige måned"
-  next: "Neste måned"
-desktop/views/components/choose-file-from-drive-window.vue:
-  cancel: "Avbryt"
-  ok: "Ok"
-desktop/views/components/choose-folder-from-drive-window.vue:
-  cancel: "Avbryt"
-  ok: "Ok"
-desktop/views/components/crop-window.vue:
-  cancel: "Avbryt"
-  ok: "Ok"
-desktop/views/components/drive-window.vue:
-  used: "brukt"
-desktop/views/components/drive.file.vue:
-  avatar: "Avatar"
-  banner: "Banner"
-  nsfw: "NSFW"
-  contextmenu:
-    rename: "Endre navn"
-    copied: "Kopiert"
-desktop/views/components/drive.folder.vue:
-  contextmenu:
-    rename: "Endre navn"
-desktop/views/components/drive.vue:
-  search: "Søk"
-desktop/views/components/media-video.vue:
-  sensitive: "Innholdet er NSFW"
-desktop/views/components/game-window.vue:
-  game: "Reversi"
-desktop/views/components/home.vue:
-  done: "Fullført"
-  add: "Legg til"
-desktop/views/input-dialog.vue:
-  cancel: "Avbryt"
-  ok: "Ok"
-desktop/views/components/note-detail.vue:
-  location: "Lokasjon"
-desktop/views/components/note.vue:
-  reply: "Svar"
-  detail: "Detaljer"
-desktop/views/components/notes.vue:
-  retry: "Prøv på nytt"
-desktop/views/components/post-form-window.vue:
-  note: "Nytt innlegg"
-  reply: "Svar"
-desktop/views/components/progress-dialog.vue:
-  waiting: "Venter"
-desktop/views/components/renote-form.vue:
-  cancel: "Avbryt"
-desktop/views/components/settings.2fa.vue:
-  detail: "Detaljer..."
-  unregister: "Avregistrer"
-  token: "Token"
-  submit: "Send"
-common/views/components/media-image.vue:
-  sensitive: "Innholdet er NSFW"
-common/views/components/api-settings.vue:
-  console:
-    parameter: "Parametere"
-    send: "Send"
-common/views/components/drive-settings.vue:
-  in-use: "brukt"
-  stats: "Statistikk"
-  default-upload-folder-name: "Mappe(r)"
-common/views/components/mute-and-block.vue:
-  save: "Lagre"
-desktop/views/components/settings.tags.vue:
-  add: "Legg til"
-  save: "Lagre"
-desktop/views/components/timeline.vue:
-  home: "Hjem"
-  local: "Lokalt"
-  global: "Globalt"
-  list: "Lister"
-  list-name: "Liste navn"
-desktop/views/components/ui.header.vue:
-  adjective: "-san"
-desktop/views/components/ui.header.account.vue:
-  lists: "Lister"
-  admin: "Admin"
-desktop/views/components/ui.header.nav.vue:
-  game: "Spill"
-desktop/views/components/ui.header.notifications.vue:
-  title: "Notifikasjon"
-desktop/views/components/ui.header.post.vue:
-  post: "Skriv nytt innlegg"
-desktop/views/components/ui.header.search.vue:
-  placeholder: "Søk"
-desktop/views/components/user-preview.vue:
-  notes: "Innlegg"
-  following: "Følger"
-  followers: "Følgere"
-desktop/views/components/users-list.vue:
-  all: "Alle"
-  iknow: "Du kjenner"
-desktop/views/components/window.vue:
-  close: "Lukk"
-admin/views/index.vue:
-  users: "Bruker"
-  announcements: "Kunngjøringer"
-admin/views/dashboard.vue:
-  notes: "Innlegg"
-  drive: "Disk"
-admin/views/logs.vue:
-  levels:
-    info: "Informasjon"
-    error: "Feil"
-admin/views/abuse.vue:
-  details: "Detaljer"
-  remove-report: "Slett"
-admin/views/instance.vue:
-  invite: "Inviter"
-  save: "Lagre"
-admin/views/charts.vue:
-  notes: "Innlegg"
-  users: "Bruker"
-  drive: "Disk"
-admin/views/drive.vue:
-  origin:
-    local: "Lokalt"
-  delete: "Slett"
-admin/views/users.vue:
-  username: "Brukernavn"
-  users:
-    title: "Bruker"
-    state:
-      all: "Alle"
-    origin:
-      local: "Lokalt"
-admin/views/moderators.vue:
-  logs:
-    info: "Informasjon"
-admin/views/emoji.vue:
-  add-emoji:
-    add: "Legg til"
-  emojis:
-    remove: "Slett"
-admin/views/announcements.vue:
-  announcements: "Kunngjøringer"
-  save: "Lagre"
-  remove: "Slett"
-  add: "Legg til"
-admin/views/federation.vue:
-  notes: "Innlegg"
-  users: "Bruker"
-  followers: "Følgere"
-  status: "Status"
-  states:
-    all: "Alle"
-  save: "Lagre"
-desktop/views/pages/welcome.vue:
-  announcements: "Kunngjøringer"
-  info: "Informasjon"
-desktop/views/pages/note.vue:
-  prev: "Forrige innlegg"
-  next: "Neste innlegg"
-desktop/views/pages/selectdrive.vue:
-  ok: "Ok"
-  cancel: "Avbryt"
-desktop/views/pages/user-list.users.vue:
-  users: "Bruker"
-  username: "Brukernavn"
-desktop/views/pages/user/user.followers-you-know.vue:
-  loading: "Laster inn"
-desktop/views/pages/user/user.friends.vue:
-  loading: "Laster inn"
-desktop/views/pages/user/user.photos.vue:
-  title: "Bilder"
-  loading: "Laster inn"
-desktop/views/pages/user/user.header.vue:
-  posts: "Innlegg"
-  following: "Følger"
-  followers: "Følgere"
-  month: "M"
-  day: "S"
-desktop/views/pages/user/user.timeline.vue:
-  default: "Innlegg"
-  with-replies: "Innlegg og svar"
-  with-media: "Media"
-desktop/views/widgets/notifications.vue:
-  title: "Notifikasjon"
-desktop/views/widgets/polls.vue:
-  refresh: "Oppdater"
-desktop/views/widgets/post-form.vue:
-  title: "Innlegg"
-  note: "Innlegg"
-desktop/views/widgets/trends.vue:
-  title: "Populært nå"
-  refresh: "Oppdater"
-desktop/views/widgets/users.vue:
-  refresh: "Oppdater"
-  no-one: "Ingen"
-mobile/views/components/drive.vue:
-  used: "brukt"
-  folder-count: "Mappe(r)"
-  count-separator: ","
-  file-count: "Fil(er)"
-mobile/views/components/drive.file.vue:
-  nsfw: "NSFW"
-mobile/views/components/drive.file-detail.vue:
-  rename: "Endre navn"
-  move: "Flytt"
-  exif: "EXIF"
-  nsfw: "NSFW"
-mobile/views/components/media-video.vue:
-  sensitive: "Innholdet er NSFW"
-common/views/components/follow-button.vue:
-  follow: "Følger"
-mobile/views/components/note.vue:
-  location: "Lokasjon"
-mobile/views/components/note-detail.vue:
-  reply: "Svar"
-  location: "Lokasjon"
-mobile/views/components/note-preview.vue:
-  admin: "admin"
-  bot: "bot"
-  cat: "katt"
-mobile/views/components/note-sub.vue:
-  admin: "admin"
-  bot: "bot"
-  cat: "katt"
-mobile/views/components/ui.header.vue:
-  adjective: "Mr."
-mobile/views/components/ui.nav.vue:
-  notifications: "Notifikasjon"
-  search: "Søk"
-  user-lists: "Lister"
-  game: "Spill"
-  admin: "Admin"
-mobile/views/pages/home.vue:
-  home: "Hjem"
-  local: "Lokalt"
-  global: "Globalt"
-mobile/views/pages/widgets.vue:
-  add-widget: "Legg til"
-mobile/views/pages/note.vue:
-  title: "Innlegg"
-  prev: "Forrige innlegg"
-  next: "Neste innlegg"
-mobile/views/pages/games/reversi.vue:
-  reversi: "Reversi"
-mobile/views/pages/search.vue:
-  search: "Søk"
-mobile/views/pages/user.vue:
-  following: "Følger"
-  followers: "Følgere"
-  notes: "Innlegg"
-  overview: "Oversikt"
-  media: "Media"
-mobile/views/pages/user/home.vue:
-  recent-notes: "Nylige innlegg"
-  images: "Bilder"
-  keywords: "Nøkkelord"
-deck:
-  home: "Hjem"
-  local: "Lokalt"
-  global: "Globalt"
-  notifications: "Notifikasjon"
-  list: "Lister"
-  rename: "Endre navn"
-deck/deck.user-column.vue:
-  posts: "Innlegg"
-  following: "Følger"
-  followers: "Følgere"
-  images: "Bilder"
-pages:
-  pin-this-page: "Fest til profilen din"
-  like: "Lik"
-  blocks:
-    image: "Bilder"
-  script:
-    categories:
-      random: "Tilfeldig"
-      list: "Lister"
-    blocks:
-      _join:
-        arg1: "Lister"
-      random: "Tilfeldig"
-      _randomPick:
-        arg1: "Lister"
-      _dailyRandomPick:
-        arg1: "Lister"
-      _seedRandomPick:
-        arg2: "Lister"
-      _pick:
-        arg1: "Lister"
-      _listLen:
-        arg1: "Lister"
-    types:
-      array: "Lister"
+_lang_: "Norsk Bokmål"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@ -1,284 +1,31 @@
 ---
-meta:
-  lang: "Português"
-common:
-  misskey: "Uma ⭐ do fediverso"
-  about-title: "Uma ⭐ do fediverso."
-  about: "Obrigado por encontrar Misskey. Uma <b>plataforma descentralizada de microblog</b> nascida na Terra. Já que ela existe no Fediverso (um universo onde várias plataformas de mídia social são organizadas), ela é ligada com outras plataformas.Por que você não tira uma folga do agito e confusão da cidade, e mergulha em uma nova internet?"
-  intro:
-    title: "O que é Misskey?"
-    about: "Misskey é um <b>serviço de microblog descentralizado</b>. Personalização sofisticada da interface, variedade de reações a posts, armazenamento de arquivos grátis com gerenciamento integrado e outras funções avançadas estão disponíveis. Um sistema em rede chamado \"Fediverso\" permite que nos comuniquemos com usuários em outras redes sociais. Se você postar algo, por exemplo, seu post não será mandado apenas para o Misskey, mas também para o Mastodon. Apenas imagine que o planeta está enviando ondas de rádio para outros planetas para se comunicar."
-    features: "Recursos"
-    rich-contents: "Post"
-    rich-contents-desc: "Apenas poste suas ideias, temas do momento e qualquer coisa que você queira compartilhar. Você pode querer decorar suas palavras, anexar suas imagens favoritas, enviar arquivos, inclusive vídeos ou criar uma enquete. Essas são as coisas que você pode fazer em Misskey."
-    reaction: "Reações"
-  adblock:
-    detected: "Por favor, desative o bloqueador de anúncios."
-    warning: "Alguns recursos podem não estar disponíveis ou apresentar mal funcionamento se o bloqueio de anúncios estiver ativado. <strong>Misskey não está usando anúncios</strong>"
-  application-authorization: "Aplicativos autorizados"
-  close: "Fechar"
-  do-not-copy-paste: "Por favor, não digite ou copie o código aqui. A conta pode ser comprometida."
-  got-it: "Entendi!"
-  customization-tips:
-    title: "Dicas de personalização"
-    gotit: "Entendi!"
-  notification:
-    file-uploaded: "Arquivo enviado!"
-    message-from: "Mensagem de {}:"
-    reversi-invited: "Convidado a jogar"
-    reversi-invited-by: "Convidado por {}:"
-    notified-by: "Notificado por {}:"
-    reply-from: "Resposta de {}:"
-    quoted-by: "Citado por {}:"
-  time:
-    unknown: "Desconhecido"
-    future: "futuro"
-    just_now: "agora"
-    seconds_ago: "{} sec atrás"
-    minutes_ago: "{} min atrás"
-    hours_ago: "{} h atrás"
-    days_ago: "{} d atrás"
-    weeks_ago: "{} sem atrás"
-    months_ago: "{} m atrás"
-    years_ago: "{} ano(s) atrás"
-  month-and-day: "{day}/{month}"
-  trash: "Lixo"
-  timeline: "Linha do tempo"
-  followers: "Seguidores"
-  post-form:
-    enter-username: "Digite o nome de usuário."
-    username-prompt: "Digite o nome de usuário."
-  weekday-short:
-    sunday: "Dom"
-    monday: "Seg"
-    tuesday: "Ter"
-    wednesday: "Qua"
-    thursday: "Qui"
-    friday: "Sex"
-    saturday: "Seb"
-  weekday:
-    sunday: "domingo"
-    monday: "segunda"
-    tuesday: "terça"
-    wednesday: "quarta"
-    thursday: "quinta"
-    friday: "sexta"
-    saturday: "sábado"
-  reactions:
-    like: "Curtir"
-    love: "Amei"
-    laugh: "Riso"
-    hmm: "Hmm...?"
-    surprise: "Uau"
-    congrats: "Parabéns!"
-    angry: "Raiva"
-    confused: "Confuso"
-    rip: "RIP"
-    pudding: "Pudim"
-  note-visibility:
-    followers: "Seguidores"
-  note-placeholders:
-    a: "O que está fazendo?"
-    b: "O que está acontecendo?"
-    c: "No que está pensando?"
-    d: "Quer postar algo?"
-    e: "Escreva aqui"
-    f: "Esperando você escrever."
-  _settings:
-    timeline: "Linha do tempo"
-  search: "Buscar"
-  delete: "Apagar"
-  loading: "Carregando"
-  update-available-title: "Atualização disponível"
-  update-available: "Uma nova versão de Misskey está disponível ({newer}). A versão atual é {current}. Recarregue a página para atualizar."
-  my-token-regenerated: "Seu token foi recriado, portanto você foi deslogado."
-  enter-username: "Digite o nome de usuário."
-  reversi:
-    drawn: "Empatado"
-    my-turn: "Seu turno"
-    opponent-turn: "Turno do oponente"
-    black: "Pretas"
-    white: "Brancas"
-    total: "Total"
-  widgets:
-    analog-clock: "Relógio analógico"
-    profile: "Perfil"
-    calendar: "Calendário"
-    timemachine: "Calendário (máquina do tempo)"
-    activity: "Atividade"
-    rss: "Leitor de RSS"
-    memo: "Nota adesiva"
-    trends: "Tendências"
-    posts-monitor: "Gráfico de publicações"
-    version: "Versão"
-    notifications: "Notificações"
-    users: "Usuário sugeridos"
-    polls: "Enquetes"
-    post-form: "Formulário de publicação"
-    server: "Informações do servidor"
-    nav: "Navegação"
-    tips: "Dicas"
-    hashtags: "Hashtags"
-  you: "Você"
-auth/views/form.vue:
-  permission-ask: "Este aplicativo precisa das seguintes permissões:"
-  cancel: "Cancelar"
-  accept: "Permitir acesso"
-auth/views/index.vue:
-  loading: "Carregando"
-  already-authorized: "Este aplicativo já foi autorizado"
-  allowed: "Aplicativos com acesso autorizado"
-  callback-url: "Voltando ao aplicativo"
-  please-go-back: "Por favor, volte ao aplicativo."
-  error: "A sessão não existe."
-  sign-in: "Por favor, entre."
-common/views/components/games/reversi/reversi.index.vue:
-  invite: "Convidar"
-  rule: "Como jogar"
-  mode-invite: "Convidar"
-  mode-invite-desc: "Convidar um usuário para jogar"
-  invitations: "Você foi convidado!"
-  my-games: "Meu jogo"
-  all-games: "Todos os jogos"
-  enter-username: "Digite o nome de usuário."
-  game-state:
-    ended: "Terminado"
-common/views/components/games/reversi/reversi.room.vue:
-  rules: "Regras"
-  cancel: "Cancelar"
-common/views/components/connect-failed.troubleshooter.vue:
-  flush: "Limpar o cache"
-common/views/components/theme.vue:
-  desc: "Descrição"
-common/views/components/cw-button.vue:
-  poll: "Enquetes"
-common/views/components/messaging.vue:
-  you: "Você"
-common/views/components/note-menu.vue:
-  delete: "Apagar"
-common/views/components/poll-editor.vue:
-  day: "Dom"
-common/views/components/visibility-chooser.vue:
-  followers: "Seguidores"
-common/views/components/profile-editor.vue:
-  name: "Nome"
-  export-targets:
-    following-list: "Seguindo"
-common/views/components/user-group-editor.vue:
-  invite: "Convidar"
-common/views/components/user-groups.vue:
-  invites: "Convidar"
-common/views/widgets/posts-monitor.vue:
-  title: "Gráfico de publicações"
-common/views/widgets/memo.vue:
-  title: "Nota adesiva"
-common/views/pages/follow.vue:
-  follow: "Seguindo"
-desktop/views/components/choose-file-from-drive-window.vue:
-  upload: "Envie arquivos do seu dispositivo"
-  ok: "OK"
-desktop/views/components/choose-folder-from-drive-window.vue:
-  ok: "OK"
-desktop/views/components/crop-window.vue:
-  ok: "OK"
-desktop/views/input-dialog.vue:
-  ok: "OK"
-common/views/components/api-settings.vue:
-  console:
-    parameter: "Parâmetros"
-desktop/views/components/sub-note-content.vue:
-  poll: "Enquetes"
-desktop/views/components/user-preview.vue:
-  following: "Seguindo"
-  followers: "Seguidores"
-desktop/views/components/users-list-item.vue:
-  followed: "Te segue"
-admin/views/abuse.vue:
-  remove-report: "Apagar"
-admin/views/instance.vue:
-  invite: "Convidar"
-admin/views/drive.vue:
-  delete: "Apagar"
-admin/views/emoji.vue:
-  emojis:
-    remove: "Apagar"
-admin/views/announcements.vue:
-  remove: "Apagar"
-admin/views/federation.vue:
-  followers: "Seguidores"
-desktop/views/pages/welcome.vue:
-  timeline: "Timeline"
-  powered-by-misskey: "Desenvolvido por <b>Misskey</b>."
-desktop/views/pages/drive.vue:
-  title: "Drive Misskey"
-desktop/views/pages/note.vue:
-  prev: "Nota anterior"
-  next: "Próxima nota"
-desktop/views/pages/selectdrive.vue:
-  title: "Selecione um arquivo"
-  ok: "OK"
-  cancel: "Cancelar"
-  upload: "Envie arquivos do seu dispositivo"
-desktop/views/pages/search.vue:
-  not-available: "A pesquisa está desligada nas configurações desta instância."
-desktop/views/pages/user/user.followers-you-know.vue:
-  loading: "Carregando"
-desktop/views/pages/user/user.friends.vue:
-  loading: "Carregando"
-desktop/views/pages/user/user.photos.vue:
-  loading: "Carregando"
-desktop/views/pages/user/user.header.vue:
-  following: "Seguindo"
-  followers: "Seguidores"
-  month: "Seg"
-  day: "Dom"
-  follows-you: "Te segue"
-desktop/views/pages/user/user.timeline.vue:
-  with-media: "Mídia"
-desktop/views/widgets/polls.vue:
-  title: "Enquetes"
-common/views/components/follow-button.vue:
-  follow: "Seguindo"
-mobile/views/components/sub-note-content.vue:
-  poll: "Enquetes"
-mobile/views/components/ui.nav.vue:
-  timeline: "Linha do tempo"
-mobile/views/pages/widgets.vue:
-  customization-tips: "Dicas de personalização"
-mobile/views/pages/note.vue:
-  prev: "Nota anterior"
-  next: "Próxima nota"
-mobile/views/pages/search.vue:
+_lang_: "Português"
+monthAndDay: "{day}/{month}"
+search: "Pesquisar"
+notifications: "Notificações"
+username: "Nome de usuário"
+password: "Senha"
+ok: "OK"
+cancel: "Cancelar"
+enterUsername: "Digite o nome de usuário"
+renotedBy: "Repostado por {user}"
+settings: "Configurações"
+basicSettings: "Configurações básicas"
+otherSettings: "Outras configurações"
+profile: "Perfil"
+timeline: "Timeline"
+smtpUser: "Nome de usuário"
+smtpPass: "Senha"
+_mfm:
  search: "Pesquisar"
-mobile/views/pages/user.vue:
-  follows-you: "Te segue"
-  following: "Seguindo"
-  followers: "Seguidores"
-  notes: "Posts"
-  timeline: "Linha do tempo"
-  media: "Mídia"
-mobile/views/pages/user/home.vue:
-  recent-notes: "Notas recentes"
-  images: "Imagens"
-  activity: "Atividade"
-  keywords: "Palavras chave"
-  domains: "Domínios"
-  followers-you-know: "Seguidores que você conhece"
-  last-used-at: "Ativo pela última vez"
-mobile/views/pages/user/home.photos.vue:
-  no-photos: "Sem fotos"
-deck/deck.user-column.vue:
-  follows-you: "Te segue"
-  following: "Seguindo"
-  followers: "Seguidores"
-  images: "Imagens"
-  timeline: "Linha do tempo"
-docs:
-  edit-this-page-on-github-link: "Edite esta página no GitHub!"
-dev/views/index.vue:
-  manage-apps: "Gerenciar aplicativos"
-pages:
-  like: "Curtir"
-  blocks:
-    image: "Imagens"
-    post: "Formulário de publicação"
+_sfx:
+  notification: "Notificações"
+_widgets:
+  notifications: "Notificações"
+  timeline: "Timeline"
+_profile:
+  username: "Nome de usuário"
+_deck:
+  _columns:
+    notifications: "Notificações"
+    tl: "Timeline"
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@ -0,0 +1 @@
+---
--- a/locales/ug-CN.yml
+++ b/locales/ug-CN.yml
@ -0,0 +1,5 @@
+---
+_lang_: "ياپونچە"
+search: "ئىزدەش"
+_mfm:
+  search: "ئىزدەش"
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
--- a/migration/1563757595828-UsedUsername.ts
+++ b/migration/1563757595828-UsedUsername.ts
@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class UsedUsername1563757595828 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "used_username" ("username" character varying(128) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, CONSTRAINT "PK_78fd79d2d24c6ac2f4cc9a31a5d" PRIMARY KEY ("username"))`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`DROP TABLE "used_username"`);
+    }
+
+}
--- a/migration/1565634203341-room.ts
+++ b/migration/1565634203341-room.ts
@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class room1565634203341 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "room" jsonb NOT NULL DEFAULT '{}'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "room"`);
+    }
+
+}
--- a/migration/1571220798684-CustomEmojiCategory.ts
+++ b/migration/1571220798684-CustomEmojiCategory.ts
@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class CustomEmojiCategory1571220798684 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "emoji" ADD "category" character varying(128)`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "emoji" DROP COLUMN "category"`, undefined);
+    }
+
+}
--- a/migration/1572760203493-nodeinfo.ts
+++ b/migration/1572760203493-nodeinfo.ts
@ -0,0 +1,29 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class nodeinfo1572760203493 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "system"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "softwareName" character varying(64) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "softwareVersion" character varying(64) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "openRegistrations" boolean DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "name" character varying(256) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "description" character varying(4096) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "maintainerName" character varying(128) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "maintainerEmail" character varying(256) DEFAULT null`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "infoUpdatedAt" TIMESTAMP WITH TIME ZONE`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "infoUpdatedAt"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "maintainerEmail"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "maintainerName"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "description"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "name"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "openRegistrations"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "softwareVersion"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "softwareName"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "system" character varying(64)`, undefined);
+    }
+
+}
--- a/migration/1576269851876-TalkFederationId.ts
+++ b/migration/1576269851876-TalkFederationId.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class TalkFederationId1576269851876 implements MigrationInterface {
+    name = 'TalkFederationId1576269851876'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "messaging_message" ADD "uri" character varying(512)`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "messaging_message" DROP COLUMN "uri"`, undefined);
+    }
+
+}
--- a/migration/1576869585998-ProxyRemoteFiles.ts
+++ b/migration/1576869585998-ProxyRemoteFiles.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class ProxyRemoteFiles1576869585998 implements MigrationInterface {
+    name = 'ProxyRemoteFiles1576869585998'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "proxyRemoteFiles" boolean NOT NULL DEFAULT false`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "proxyRemoteFiles"`, undefined);
+    }
+
+}
--- a/migration/1579267006611-v12.ts
+++ b/migration/1579267006611-v12.ts
@ -0,0 +1,34 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v121579267006611 implements MigrationInterface {
+    name = 'v121579267006611'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "announcement" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "text" character varying(8192) NOT NULL, "title" character varying(256) NOT NULL, "imageUrl" character varying(1024), CONSTRAINT "PK_e0ef0550174fd1099a308fd18a0" PRIMARY KEY ("id"))`, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_118ec703e596086fc4515acb39" ON "announcement" ("createdAt") `, undefined);
+        await queryRunner.query(`CREATE TABLE "announcement_read" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "announcementId" character varying(32) NOT NULL, CONSTRAINT "PK_4b90ad1f42681d97b2683890c5e" PRIMARY KEY ("id"))`, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_8288151386172b8109f7239ab2" ON "announcement_read" ("userId") `, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_603a7b1e7aa0533c6c88e9bfaf" ON "announcement_read" ("announcementId") `, undefined);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_924fa71815cfa3941d003702a0" ON "announcement_read" ("userId", "announcementId") `, undefined);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isVerified"`, undefined);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "announcements"`, undefined);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableEmojiReaction"`, undefined);
+        await queryRunner.query(`ALTER TABLE "announcement_read" ADD CONSTRAINT "FK_8288151386172b8109f7239ab28" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+        await queryRunner.query(`ALTER TABLE "announcement_read" ADD CONSTRAINT "FK_603a7b1e7aa0533c6c88e9bfafe" FOREIGN KEY ("announcementId") REFERENCES "announcement"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "announcement_read" DROP CONSTRAINT "FK_603a7b1e7aa0533c6c88e9bfafe"`, undefined);
+        await queryRunner.query(`ALTER TABLE "announcement_read" DROP CONSTRAINT "FK_8288151386172b8109f7239ab28"`, undefined);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "enableEmojiReaction" boolean NOT NULL DEFAULT true`, undefined);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "announcements" jsonb NOT NULL DEFAULT '[]'`, undefined);
+        await queryRunner.query(`ALTER TABLE "user" ADD "isVerified" boolean NOT NULL DEFAULT false`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_924fa71815cfa3941d003702a0"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_603a7b1e7aa0533c6c88e9bfaf"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_8288151386172b8109f7239ab2"`, undefined);
+        await queryRunner.query(`DROP TABLE "announcement_read"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_118ec703e596086fc4515acb39"`, undefined);
+        await queryRunner.query(`DROP TABLE "announcement"`, undefined);
+    }
+
+}
--- a/migration/1579270193251-v12-2.ts
+++ b/migration/1579270193251-v12-2.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v1221579270193251 implements MigrationInterface {
+    name = 'v1221579270193251'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "announcement_read" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "announcement_read" DROP COLUMN "createdAt"`, undefined);
+    }
+
+}
--- a/migration/1579282808087-v12-3.ts
+++ b/migration/1579282808087-v12-3.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v1231579282808087 implements MigrationInterface {
+    name = 'v1231579282808087'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "announcement" ADD "updatedAt" TIMESTAMP WITH TIME ZONE`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "announcement" DROP COLUMN "updatedAt"`, undefined);
+    }
+
+}
--- a/migration/1579544426412-v12-4.ts
+++ b/migration/1579544426412-v12-4.ts
@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v1241579544426412 implements MigrationInterface {
+    name = 'v1241579544426412'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "notification" ADD "followRequestId" character varying(32)`, undefined);
+        await queryRunner.query(`ALTER TABLE "notification" ADD CONSTRAINT "FK_bd7fab507621e635b32cd31892c" FOREIGN KEY ("followRequestId") REFERENCES "follow_request"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "notification" DROP CONSTRAINT "FK_bd7fab507621e635b32cd31892c"`, undefined);
+        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "followRequestId"`, undefined);
+    }
+
+}
--- a/migration/1579977526288-v12-5.ts
+++ b/migration/1579977526288-v12-5.ts
@ -0,0 +1,54 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v1251579977526288 implements MigrationInterface {
+    name = 'v1251579977526288'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "clip" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "isPublic" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_f0685dac8d4dd056d7255670b75" PRIMARY KEY ("id"))`, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_2b5ec6c574d6802c94c80313fb" ON "clip" ("userId") `, undefined);
+        await queryRunner.query(`CREATE TABLE "clip_note" ("id" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "clipId" character varying(32) NOT NULL, CONSTRAINT "PK_e94cda2f40a99b57e032a1a738b" PRIMARY KEY ("id"))`, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_a012eaf5c87c65da1deb5fdbfa" ON "clip_note" ("noteId") `, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_ebe99317bbbe9968a0c6f579ad" ON "clip_note" ("clipId") `, undefined);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_6fc0ec357d55a18646262fdfff" ON "clip_note" ("noteId", "clipId") `, undefined);
+        await queryRunner.query(`CREATE TYPE "antenna_src_enum" AS ENUM('home', 'all', 'list')`, undefined);
+        await queryRunner.query(`CREATE TABLE "antenna" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "name" character varying(128) NOT NULL, "src" "antenna_src_enum" NOT NULL, "userListId" character varying(32), "keywords" jsonb NOT NULL DEFAULT '[]', "withFile" boolean NOT NULL, "expression" character varying(2048), "notify" boolean NOT NULL, "hasNewNote" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_c170b99775e1dccca947c9f2d5f" PRIMARY KEY ("id"))`, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_6446c571a0e8d0f05f01c78909" ON "antenna" ("userId") `, undefined);
+        await queryRunner.query(`CREATE TABLE "antenna_note" ("id" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "antennaId" character varying(32) NOT NULL, CONSTRAINT "PK_fb28d94d0989a3872df19fd6ef8" PRIMARY KEY ("id"))`, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_bd0397be22147e17210940e125" ON "antenna_note" ("noteId") `, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_0d775946662d2575dfd2068a5f" ON "antenna_note" ("antennaId") `, undefined);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_335a0bf3f904406f9ef3dd51c2" ON "antenna_note" ("noteId", "antennaId") `, undefined);
+        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "geo"`, undefined);
+        await queryRunner.query(`ALTER TABLE "clip" ADD CONSTRAINT "FK_2b5ec6c574d6802c94c80313fb2" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+        await queryRunner.query(`ALTER TABLE "clip_note" ADD CONSTRAINT "FK_a012eaf5c87c65da1deb5fdbfa3" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+        await queryRunner.query(`ALTER TABLE "clip_note" ADD CONSTRAINT "FK_ebe99317bbbe9968a0c6f579adf" FOREIGN KEY ("clipId") REFERENCES "clip"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna" ADD CONSTRAINT "FK_6446c571a0e8d0f05f01c789096" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna" ADD CONSTRAINT "FK_709d7d32053d0dd7620f678eeb9" FOREIGN KEY ("userListId") REFERENCES "user_list"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna_note" ADD CONSTRAINT "FK_bd0397be22147e17210940e125b" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna_note" ADD CONSTRAINT "FK_0d775946662d2575dfd2068a5f5" FOREIGN KEY ("antennaId") REFERENCES "antenna"("id") ON DELETE CASCADE ON UPDATE NO ACTION`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "antenna_note" DROP CONSTRAINT "FK_0d775946662d2575dfd2068a5f5"`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna_note" DROP CONSTRAINT "FK_bd0397be22147e17210940e125b"`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna" DROP CONSTRAINT "FK_709d7d32053d0dd7620f678eeb9"`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna" DROP CONSTRAINT "FK_6446c571a0e8d0f05f01c789096"`, undefined);
+        await queryRunner.query(`ALTER TABLE "clip_note" DROP CONSTRAINT "FK_ebe99317bbbe9968a0c6f579adf"`, undefined);
+        await queryRunner.query(`ALTER TABLE "clip_note" DROP CONSTRAINT "FK_a012eaf5c87c65da1deb5fdbfa3"`, undefined);
+        await queryRunner.query(`ALTER TABLE "clip" DROP CONSTRAINT "FK_2b5ec6c574d6802c94c80313fb2"`, undefined);
+        await queryRunner.query(`ALTER TABLE "note" ADD "geo" jsonb`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_335a0bf3f904406f9ef3dd51c2"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_0d775946662d2575dfd2068a5f"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_bd0397be22147e17210940e125"`, undefined);
+        await queryRunner.query(`DROP TABLE "antenna_note"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_6446c571a0e8d0f05f01c78909"`, undefined);
+        await queryRunner.query(`DROP TABLE "antenna"`, undefined);
+        await queryRunner.query(`DROP TYPE "antenna_src_enum"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_6fc0ec357d55a18646262fdfff"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_ebe99317bbbe9968a0c6f579ad"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_a012eaf5c87c65da1deb5fdbfa"`, undefined);
+        await queryRunner.query(`DROP TABLE "clip_note"`, undefined);
+        await queryRunner.query(`DROP INDEX "IDX_2b5ec6c574d6802c94c80313fb"`, undefined);
+        await queryRunner.query(`DROP TABLE "clip"`, undefined);
+    }
+
+}
--- a/migration/1579993013959-v12-6.ts
+++ b/migration/1579993013959-v12-6.ts
@ -0,0 +1,18 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v1261579993013959 implements MigrationInterface {
+    name = 'v1261579993013959'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "hasNewNote"`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna_note" ADD "read" boolean NOT NULL DEFAULT false`, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_9937ea48d7ae97ffb4f3f063a4" ON "antenna_note" ("read") `, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`DROP INDEX "IDX_9937ea48d7ae97ffb4f3f063a4"`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna_note" DROP COLUMN "read"`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna" ADD "hasNewNote" boolean NOT NULL DEFAULT false`, undefined);
+    }
+
+}
--- a/migration/1580069531114-v12-7.ts
+++ b/migration/1580069531114-v12-7.ts
@ -0,0 +1,24 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v1271580069531114 implements MigrationInterface {
+    name = 'v1271580069531114'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "antenna" ADD "users" character varying(1024) array NOT NULL DEFAULT '{}'::varchar[]`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna" ADD "caseSensitive" boolean NOT NULL DEFAULT false`, undefined);
+        await queryRunner.query(`ALTER TYPE "public"."antenna_src_enum" RENAME TO "antenna_src_enum_old"`, undefined);
+        await queryRunner.query(`CREATE TYPE "antenna_src_enum" AS ENUM('home', 'all', 'users', 'list')`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum" USING "src"::"text"::"antenna_src_enum"`, undefined);
+        await queryRunner.query(`DROP TYPE "antenna_src_enum_old"`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TYPE "antenna_src_enum_old" AS ENUM('home', 'all', 'list')`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna" ALTER COLUMN "src" TYPE "antenna_src_enum_old" USING "src"::"text"::"antenna_src_enum_old"`, undefined);
+        await queryRunner.query(`DROP TYPE "antenna_src_enum"`, undefined);
+        await queryRunner.query(`ALTER TYPE "antenna_src_enum_old" RENAME TO  "antenna_src_enum"`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "caseSensitive"`, undefined);
+        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "users"`, undefined);
+    }
+
+}
--- a/migration/1580148575182-v12-8.ts
+++ b/migration/1580148575182-v12-8.ts
@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v1281580148575182 implements MigrationInterface {
+    name = 'v1281580148575182'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "note" DROP CONSTRAINT "FK_ec5c201576192ba8904c345c5cc"`, undefined);
+        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "appId"`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "note" ADD "appId" character varying(32)`, undefined);
+        await queryRunner.query(`ALTER TABLE "note" ADD CONSTRAINT "FK_ec5c201576192ba8904c345c5cc" FOREIGN KEY ("appId") REFERENCES "app"("id") ON DELETE SET NULL ON UPDATE NO ACTION`, undefined);
+    }
+
+}
--- a/migration/1580154400017-v12-9.ts
+++ b/migration/1580154400017-v12-9.ts
@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v1291580154400017 implements MigrationInterface {
+    name = 'v1291580154400017'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "antenna" ADD "withReplies" boolean NOT NULL DEFAULT false`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "withReplies"`, undefined);
+    }
+
+}
--- a/migration/1580276619901-v12-10.ts
+++ b/migration/1580276619901-v12-10.ts
@ -0,0 +1,19 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v12101580276619901 implements MigrationInterface {
+    name = 'v12101580276619901'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+				await queryRunner.query(`TRUNCATE TABLE "notification"`, undefined);
+        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "type"`, undefined);
+        await queryRunner.query(`CREATE TYPE "notification_type_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted')`, undefined);
+        await queryRunner.query(`ALTER TABLE "notification" ADD "type" "notification_type_enum" NOT NULL`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "type"`, undefined);
+        await queryRunner.query(`DROP TYPE "notification_type_enum"`, undefined);
+        await queryRunner.query(`ALTER TABLE "notification" ADD "type" character varying(32) NOT NULL`, undefined);
+    }
+
+}
--- a/migration/1580331224276-v12-11.ts
+++ b/migration/1580331224276-v12-11.ts
@ -0,0 +1,18 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v12111580331224276 implements MigrationInterface {
+    name = 'v12111580331224276'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "isMarkedAsClosed"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "isSuspended" boolean NOT NULL DEFAULT false`, undefined);
+        await queryRunner.query(`CREATE INDEX "IDX_34500da2e38ac393f7bb6b299c" ON "instance" ("isSuspended") `, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`DROP INDEX "IDX_34500da2e38ac393f7bb6b299c"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "isSuspended"`, undefined);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "isMarkedAsClosed" boolean NOT NULL DEFAULT false`, undefined);
+    }
+
+}
--- a/migration/1580508795118-v12-12.ts
+++ b/migration/1580508795118-v12-12.ts
@ -0,0 +1,46 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class v12121580508795118 implements MigrationInterface {
+    name = 'v12121580508795118'
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "twitter"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "twitterAccessToken"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "twitterAccessTokenSecret"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "twitterUserId"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "twitterScreenName"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "github"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubAccessToken"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubId"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "githubLogin"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discord"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordAccessToken"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordRefreshToken"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordExpiresDate"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordId"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordUsername"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "discordDiscriminator"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "integrations" jsonb NOT NULL DEFAULT '{}'`, undefined);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "integrations"`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordDiscriminator" character varying(64) DEFAULT NULL`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordUsername" character varying(64) DEFAULT NULL`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordId" character varying(64) DEFAULT NULL`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordExpiresDate" character varying(64)`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordRefreshToken" character varying(64) DEFAULT NULL`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discordAccessToken" character varying(64) DEFAULT NULL`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "discord" boolean NOT NULL DEFAULT false`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "githubLogin" character varying(64) DEFAULT NULL`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "githubId" character varying(64)`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "githubAccessToken" character varying(64) DEFAULT NULL`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "github" boolean NOT NULL DEFAULT false`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "twitterScreenName" character varying(64) DEFAULT NULL`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "twitterUserId" character varying(64) DEFAULT NULL`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "twitterAccessTokenSecret" character varying(64) DEFAULT NULL`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "twitterAccessToken" character varying(64) DEFAULT NULL`, undefined);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "twitter" boolean NOT NULL DEFAULT false`, undefined);
+    }
+
+}
--- a/Show More
+++ b/Show More