10.55.0

Add zh-CN
New Crowdin translations (#3255 )
2018-11-18 12:00:07 +09:00 · 2018-11-18 11:59:26 +09:00 · 2018-11-18 10:56:51 +09:00 · 2018-11-18 01:10:57 +09:00 · 2018-11-17 20:57:23 +09:00 · 2018-11-17 18:21:05 +09:00
248 changed files with 5611 additions and 3362 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -117,8 +117,7 @@ jobs:
                command: |
                  if [ "$DOCKERHUB_USERNAME$DOCKERHUB_PASSWORD" ]
                   then
-                    curl -LSs 'https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64' > jq
+                    apk update && apk add jq
                    chmod +x 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
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,6 +11,9 @@ Please use [Crowdin](https://crowdin.com/project/misskey) for localization.
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 ## Internationalization (i18n)
 Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n).
 ## Documentation
 * Documents for contributors are located in `/docs`.
 * Documents for instance admins are located in `/docs`.
--- a/3
+++ b/3
@@ -1,8 +1,7 @@
-FROM alpine:3.8 AS base
+FROM node:11-alpine AS base
 ENV NODE_ENV=production
 RUN apk add --no-cache nodejs nodejs-npm zlib
 RUN npm i -g npm@latest
 WORKDIR /misskey
--- a/docs/docker.en.md
+++ b/docs/docker.en.md
@@ -13,7 +13,7 @@ This guide describes how to install and setup Misskey with Docker.
 2. `cd misskey` Move to misskey directory.
 3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag.
-*2.* Make configuration files
+*2.* Configure Misskey
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
 2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` Copy the `.config/mongo_initdb_example.js` and rename it to `mongo_initdb.js`.
@@ -31,12 +31,12 @@ Build misskey with the following:
 *5.* That is it.
 ----------------------------------------------------------------
-Well done! Now, you have an environment that run to Misskey.
+Well done! Now you have an environment to run Misskey.
 ### Launch normally
 Just `docker-compose up -d`. GLHF!
-### Way to Update to latest version of your Misskey
+### How to update your Misskey server to the latest version
 1. `git fetch`
 2. `git stash`
 3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
@@ -45,9 +45,9 @@ Just `docker-compose up -d`. GLHF!
 6. Check [ChangeLog](../CHANGELOG.md) for migration information
 7. `docker-compose stop && docker-compose up -d`
-### Way to execute cli command:
+### How to execute [cli commands](manage.en.md):
 `docker-compose run --rm web node cli/mark-admin @example`
 ----------------------------------------------------------------
-If you have any questions or troubles, feel free to contact us!
+If you have any questions or trouble, feel free to contact us!
--- a/docs/setup.en.md
+++ b/docs/setup.en.md
@@ -10,7 +10,7 @@ This guide describes how to install and setup Misskey.
 *1.* Create Misskey user
 ----------------------------------------------------------------
-Running misskey on root is not a good idea so we create a user for that.
+Running misskey as root is not a good idea so we create a user for that.
 In debian for exemple :
 ```
@@ -32,7 +32,7 @@ Please install and setup these softwares:
 *3.* Setup MongoDB
 ----------------------------------------------------------------
-In root :
+As root:
 1. `mongo` Go to the mongo shell
 2. `use misskey` Use the misskey database
 3. `db.users.save( {dummy:"dummy"} )` Write dummy data to initialize the db.
@@ -47,17 +47,17 @@ In root :
 4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest)
 5. `npm install` Install misskey dependencies.
-*(optional)* Generating VAPID keys
+*(optional)* Generate VAPID keys
 ----------------------------------------------------------------
 If you want to enable ServiceWorker, you need to generate VAPID keys:
-Unless you have set your global node_modules location elsewhere, you need to run this in root.
+Unless you have set your global node_modules location elsewhere, you need to run this as root.
 ``` shell
 npm install web-push -g
 web-push generate-vapid-keys
 ```
-*5.* Make configuration file
+*5.* Configure Misskey
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
 2. Edit `default.yml`
@@ -69,7 +69,7 @@ Build misskey with the following:
 `npm run build`
-If you're on Debian, you will need to install the `build-essential` package.
+If you're on Debian, you will need to install the `build-essential`, `python` package.
 If you're still encountering errors about some modules, use node-gyp:
@@ -114,7 +114,7 @@ WantedBy=multi-user.target
 You can check if the service is running with `systemctl status misskey`.
-### Way to Update to latest version of your Misskey
+### How to update your Misskey server to the latest version
 1. `git fetch`
 2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
 3. `npm install`
--- a/docs/setup.fr.md
+++ b/docs/setup.fr.md
@@ -0,0 +1,126 @@
 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)
 ----------------------------------------------------------------
 *1.* Création de l'utilisateur Misskey
 ----------------------------------------------------------------
 Lancer misskey en tant qu'utilisateur est une mauvaise idée, nous avons besoin de créer un utilisateur dédié.
 Sur Debian, à titre d'exemple :
 ```
 adduser --disabled-password --disabled-login misskey
 ```
 *2.* Installation des dépendances
 ----------------------------------------------------------------
 Installez les paquets suivants :
 #### Dépendences :package:
 * **[Node.js](https://nodejs.org/en/)** >= 10.0.0
 * **[MongoDB](https://www.mongodb.com/)** >= 3.6
 ##### Optionnels
 * [Redis](https://redis.io/)
  * Redis est optionnel mais nous vous recommandons vivement de l'installer
 * [Elasticsearch](https://www.elastic.co/) - requis pour pouvoir activer la fonctionnalité de recherche
 *3.* Paramètrage de MongoDB
 ----------------------------------------------------------------
 En mode root :
 1. `mongo` Accédez au shell de mango
 2. `use misskey` Utilisez la base de données misskey
 3. `db.users.save( {dummy:"dummy"} )` Write dummy data to initialize the db.
 4. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` Créez l'utilisateur misskey.
 5. `exit` Vous avez terminé !
 *4.* Installation de Misskey
 ----------------------------------------------------------------
 1. `su - misskey` Basculez vers l'utilisateur misskey.
 2. `git clone -b master git://github.com/syuilo/misskey.git` Clonez la branche master du dépôt misskey.
 3. `cd misskey` Accédez au dossier misskey.
 4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Télécharge la [version la plus récente](https://github.com/syuilo/misskey/releases/latest)
 5. `npm install` Installez les dépendances de misskey.
 *(optionnel)* Génération des clés VAPID
 ----------------------------------------------------------------
 Si vous désirez activer ServiceWorker, vous devez générer les clés VAPID :
 Unless you have set your global node_modules location elsewhere, vous devez lancer ceci en mode root.
 ``` shell
 npm install web-push -g
 web-push generate-vapid-keys
 ```
 *5.* Création du fichier de configuration
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copiez le fichier `.config/example.yml` et renommez-le `default.yml`.
 2. Editez le fichier `default.yml`
 *6.* Construction de Misskey
 ----------------------------------------------------------------
 Construisez Misskey comme ceci :
 `npm run build`
 Si vous êtes sous Debian, vous serez amené à installer les paquets `build-essential`, `python`.
 Si vous rencontrez des erreurs concernant certains modules, utilisez node-gyp:
 1. `npm install -g node-gyp`
 2. `node-gyp configure`
 3. `node-gyp build`
 4. `npm run build`
 *7.* C'est tout.
 ----------------------------------------------------------------
 Excellent ! Maintenant, vous avez un environnement prêt pour lancer Misskey
 ### Lancement conventionnel
 Lancez tout simplement `npm start`. Bonne chance et amusez-vous bien !
 ### Démarrage avec systemd
 1. Créez une service systemd sur : `/etc/systemd/system/misskey.service`
 2. Editez-le puis copiez et coller ceci dans le fichier :
 ```
 [Unit]
 Description=Misskey daemon
 [Service]
 Type=simple
 User=misskey
 ExecStart=/usr/bin/npm start
 WorkingDirectory=/home/misskey/misskey
 TimeoutSec=60
 StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=misskey
 Restart=always
 [Install]
 WantedBy=multi-user.target
 ```
 3. `systemctl daemon-reload ; systemctl enable misskey` Redémarre systemd et active le service misskey.
 4. `systemctl start misskey` Démarre le service misskey.
 Vous pouvez vérifier si le service a démarré en utilisant la commande `systemctl status misskey`.
 ### Méthode de mise à jour vers la plus récente version de Misskey
 1. `git fetch`
 2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
 3. `npm install`
 4. `npm run build`
 5. Consultez [ChangeLog](../CHANGELOG.md) pour les information de migration.
 ----------------------------------------------------------------
 Si vous rencontrez des difficultés ou avez d'autres questions, n'hésitez pas à nous contacter !
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -5,6 +5,7 @@
 import * as gulp from 'gulp';
 import * as gutil from 'gulp-util';
 import * as ts from 'gulp-typescript';
 const yaml = require('gulp-yaml');
 const sourcemaps = require('gulp-sourcemaps');
 import tslint from 'gulp-tslint';
 const cssnano = require('gulp-cssnano');
@@ -39,6 +40,7 @@ gulp.task('build', [
 	'build:ts',
 	'build:copy',
 	'build:client',
 	'locales',
 	'doc'
 ]);
@@ -57,16 +59,7 @@ gulp.task('build:copy:views', () =>
 	gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views'))
 );
-// 互換性のため
+gulp.task('build:copy', ['build:copy:views'], () =>
 gulp.task('build:copy:lang', () =>
 	gulp.src(['./built/client/assets/*.*-*.js'])
 		.pipe(rename(path => {
 			path.basename = path.basename.replace(/\-(.*)$/, '');
 		}))
 		.pipe(gulp.dest('./built/client/assets/'))
 );
 gulp.task('build:copy', ['build:copy:views', 'build:copy:lang'], () =>
 	gulp.src([
 		'./build/Release/crypto_key.node',
 		'./src/const.json',
@@ -201,6 +194,12 @@ gulp.task('build:client:pug', [
 			.pipe(gulp.dest('./built/client/app/'))
 );
 gulp.task('locales', () =>
 	gulp.src('./locales/*.yml')
 		.pipe(yaml({ schema: 'DEFAULT_SAFE_SCHEMA' }))
 		.pipe(gulp.dest('./built/client/assets/locales/'))
 );
 gulp.task('doc', () =>
 	gulp.src('./src/docs/**/*.styl')
 		.pipe(stylus())
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -90,6 +90,9 @@ common:
    specified: "ダイレクト"
    specified-desc: "指定したユーザーにのみ公開"
    private: "非公開"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "今どうしてる？"
    b: "何かありましたか？"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "ユーザー名"
  password: "パスワード"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "または"
  signin-with-twitter: "Twitterでログイン"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
  invitation-code: "招待コード"
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "再接続する"
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
  follow-processing: "フォロー処理中"
  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
  recent-tags: "最近"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "クリックでタグ付け"
  visibility: "公開範囲"
  geolocation-alert: "お使いの端末は位置情報に対応していません"
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "引用する..."
  cancel: "キャンセル"
  renote: "Renote"
  renote-home: "Renote (Home)"
  reposting: "しています..."
  success: "Renoteしました！"
  failure: "Renoteに失敗しました"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
  apps: "アプリ"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "セキュリティ"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "マップの自動展開"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしているユーザーはいません"
  no-blocked-users: "ブロックしているユーザーはいません"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワードを変更する"
  enter-current-password: "現在のパスワードを入力してください"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -946,7 +975,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "フォロー"
  followers: "フォロワー"
  is-bot: "このアカウントはBotです"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1160,7 +1199,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "Misskey Update"
  version: "バージョン:"
  latest-version: "最新のバージョン:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -90,6 +90,9 @@ common:
    specified: "Direkt"
    specified-desc: "Nur für bestimmte Benutzer posten"
    private: "Privat"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "Was machst du gerade?"
    b: "Was ist so passiert?"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "Diese Abstimmung löschen"
 common/views/components/reaction-picker.vue:
  choose-reaction: "Wähle eine Reaktion aus"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "Benutzername"
  password: "Passwort"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "Oder"
  signin-with-twitter: "Twitterでログイン"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
  invitation-code: "招待コード"
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "再接続する"
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "Warten"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "Direkt"
  specified-desc: "Poste nur für bestimmte Benutzer"
  private: "Privat"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
  following: "Folge ich"
  follow: "Folgen"
  request-pending: "Ausstehend"
  follow-processing: "フォロー処理中"
  follow-request: "Follower-Anfragen"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "Eine Abstimmung erstellen"
  text-remain: "{} Zeichen verbleibend"
  recent-tags: "最近"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "クリックでタグ付け"
  visibility: "Sichtbarkeit"
  geolocation-alert: "お使いの端末は位置情報に対応していません"
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "Zitieren..."
  cancel: "Abbrechen"
  renote: "Anmerkung"
  renote-home: "Renote (Home)"
  reposting: "Weitersagen..."
  success: "Weitergesagt!"
  failure: "Weitersagen fehlgeschlagen"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "Profil"
  notification: "Mitteilungen"
  apps: "In App öffnen"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "Sicherheit"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "Karte anzeigen"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしているユーザーはいません"
  no-blocked-users: "ブロックしているユーザーはいません"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワードを変更する"
  enter-current-password: "現在のパスワードを入力してください"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -946,7 +975,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "フォロー"
  followers: "フォロワー"
  is-bot: "このアカウントはBotです"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1160,7 +1199,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "Misskey Update"
  version: "バージョン:"
  latest-version: "Neuste Version:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -16,7 +16,7 @@ common:
    reaction-desc: "Easiest way to tell your emotions. Misskey allows you to add various type of reactions to other’s post. The emotional experience on Misskey will never be on other SNSs which only able to push “likes”."
    ui: "Interface"
    ui-desc: "No UI fits for everyone. Therefore, Misskey has a highly customizable UI for your taste. Make your original home by editing, adjusting layouts of timeline and placing selectable widgets you can easily customize."
-    drive: "Misskey Drive"
+    drive: "Drive"
    drive-desc: "Wanna post a picture you have already uploaded? Wish to organize, name and create a folder for your uploaded files? Misskey Drive is the best solution for you. Very easy to share your files online."
    outro: "Check further Misskey-unique features on your eyes! Feeling like this is not for you, try other instances as Misskey is a decentralized SNS so that you can easily find your mates. Then, GLHF!"
  adblock:
@@ -90,6 +90,9 @@ common:
    specified: "Direct"
    specified-desc: "Post to specified users only"
    private: "Private"
    local-public: "Local (Public)"
    local-home: "Local (Home)"
    local-followers: "Local (Followers)"
  note-placeholders:
    a: "What are you doing?"
    b: "What's happening?"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "Discard the poll"
 common/views/components/reaction-picker.vue:
  choose-reaction: "Send a reaction"
 common/views/components/emoji-picker.vue:
  custom-emoji: "Custom Emoji"
  people: "People"
  animals-and-nature: "Animals & Nature"
  food-and-drink: "Food & drink"
  activity: "Activity"
  travel-and-places: "Travel & Places"
  objects: "Objects"
  symbols: "Symbols"
  flags: "Flags"
 common/views/components/signin.vue:
  username: "Username"
  password: "Password"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "Or"
  signin-with-twitter: "Log in with Twitter"
  signin-with-github: "Log in with GitHub"
  signin-with-discord: "Login with Discord"
  login-failed: "Log in failed. Make sure you have entered your correct username and password."
 common/views/components/signup.vue:
  invitation-code: "Invitation code"
@@ -396,7 +410,14 @@ common/views/components/github-setting.vue:
  connected-to: "You are connected to this GitHub account"
  detail: "More..."
  reconnect: "Reconnect"
-  connect: "Connect to GitHub"
+  connect: "Link your GitHub account"
  disconnect: "Disconnect"
 common/views/components/discord-setting.vue:
  description: "Once you connect your Discord account to your Misskey account, you will be able to see information about your Discord account on your profile, and you will be able to sign-in using Discord."
  connected-to: "You are connected to this Discord account"
  detail: "Details…"
  reconnect: "Reconnect"
  connect: "Link your Discord account"
  disconnect: "Disconnect"
 common/views/components/uploader.vue:
  waiting: "Waiting"
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "Direct"
  specified-desc: "Post to specified users only"
  private: "Private"
  local-public: "Local (Public)"
  local-public-desc: "Do not publish to remote"
  local-home: "Local (Home)"
  local-followers: "Local (Followers)"
 common/views/components/trends.vue:
  count: "{} users mentioned"
  empty: "No popular hashtag trends"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "The content is NSFW"
  click-to-show: "Click to show"
 desktop/views/components/follow-button.vue:
  following: "Following"
  follow: "Follow"
  request-pending: "Pending follow request"
  follow-processing: "Processing follow"
  follow-request: "Follow request"
 desktop/views/components/followers-window.vue:
  followers: "{}'s followers"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "Create a poll"
  text-remain: "{} characters remaining"
  recent-tags: "Recent"
  local-only-message: "This post will only be published locally"
  click-to-tagging: "Click to tagging"
  visibility: "Visibility"
  geolocation-alert: "Your device does not provide location services."
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "Quote..."
  cancel: "Cancel"
  renote: "Repost"
  renote-home: "Renote (Home)"
  reposting: "Reposting..."
  success: "Reposted!"
  failure: "Failed to Repost"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "Profile"
  notification: "Notification"
  apps: "Apps"
  tags: "Hashtags"
  mute-and-block: "Mute / Block"
  blocking: "Blocking"
  security: "Security"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "Show renoted posts of mine in timelines"
  show-local-renotes: "Show renoted local posts in timelines"
  show-maps: "Display a map to show the location"
  remain-deleted-note: "Continue to show deleted posts"
  deck-column-align: "Deck column alignment"
  deck-column-align-center: "Center"
  deck-column-align-left: "Left"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "Blocking"
  no-muted-users: "No muted users"
  no-blocked-users: "No blocked users"
  word-mute: "Word mute"
  muted-words: "Muted keywords"
  muted-words-description: "Separating with spaces results in AND specifications, and delimiting with line breaks results in OR specifications"
  save: "Save"
 common/views/components/password-settings.vue:
  reset: "Change password"
  enter-current-password: "Enter the current password"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "Dashboard"
  instance: "Instance"
  emoji: "Emoji"
  moderators: "Moderators"
  users: "Users"
-  update: "Update"
+  federation: "Federation"
  announcements: "Announcements"
  hashtags: "Hashtags"
  back-to-misskey: "Back to Misskey"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "Instance"
  instance-name: "Instance name"
  instance-description: "Instance description"
  host: "Host"
  banner-url: "Banner image URL"
  languages: "Language of this instance"
  languages-desc: "You can add more than one, separated by spaces."
@@ -946,15 +975,20 @@ admin/views/instance.vue:
  github-integration-info: "The callback URL is set on /api/gh/cb."
  enable-github-integration: "Enable connection to GitHub"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Setting of Discord Integration"
  discord-integration-info: "The callback URL is set on /api/dc/cb."
  enable-discord-integration: "Enable Discord connection"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "Proxy account"
  proxy-account-info: "Proxy account can follow a remote user to deliver activities if no one in this instance follow him or her. When you add a remote user who is followed by nobody in this instance to your list, in order to get his or her data, proxy account follow him or her instead of your following."
  proxy-account-username: "Proxy account user name"
  proxy-account-username-desc: "Specify the user name of the account that is used as a proxy."
  proxy-account-warn: "You must make an account having this username before this action."
  max-note-text-length: "Maximum numbers of post characters"
-  disable-registration: "Stop user registration"
+  disable-registration: "Disable new user registration"
-  disable-local-timeline: "Make Local Timeline disabled"
+  disable-local-timeline: "Disable the Local Timeline"
  invite: "Invite"
  save: "Save"
  saved: "Saved"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "User account unverification settings"
  unverify: "Unverify account"
  unverified: "The account is now being unverified"
 admin/views/moderators.vue:
  add-moderator:
    title: "Register Moderator"
    add: "Register"
    added: "Registered a Moderator."
 admin/views/emoji.vue:
  add-emoji:
    title: "Add emoji"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "Following"
  followers: "Followers"
  is-bot: "This account is a Bot"
-  years-old: " years old"
+  years-old: "{age} years old"
  year: "/"
  month: "/"
  day: "-"
@@ -1160,11 +1199,11 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "The content is NSFW"
  click-to-show: "Click to show"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
  following: "Following"
  follow: "Follow"
-  request-pending: "Pending follow request"
+  request-pending: "Pending"
-  follow-processing: "Processing follow"
+  follow-processing: "Processing"
  follow-request: "Follow request"
 mobile/views/components/friends-maker.vue:
  title: "Let's follow them"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "Connect to your GitHub account"
  github-reconnect: "Reconnect"
  github-disconnect: "Disconnect"
  discord: "Discord Integration"
  discord-connect: "Connect to your Discord account"
  discord-reconnect: "Reconnect"
  discord-disconnect: "Disconnect"
  update: "Misskey Update"
  version: "Current version:"
  latest-version: "Latest version:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "Unmute"
  block: "Block"
  unblock: "Unblock"
  years-old: "{age} years old"
 mobile/views/pages/user/home.vue:
  recent-notes: "Recent notes"
  images: "Images"
@@ -1391,7 +1435,7 @@ deck:
 deck/deck.tl-column.vue:
  is-media-only: "Only media posts"
  is-media-view: "Media view"
-  edit: "Option"
+  edit: "Options"
 deck/deck.user-column.vue:
  posts: "Posts"
  following: "Following"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -90,6 +90,9 @@ common:
    specified: "ダイレクト"
    specified-desc: "指定したユーザーにのみ公開"
    private: "非公開"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "¿Qué haces?"
    b: "¿Qué está pasando?"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "Cancelar la encuesta"
 common/views/components/reaction-picker.vue:
  choose-reaction: "Escoge una reacción"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "Usuario"
  password: "Contraseña"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "O"
  signin-with-twitter: "Ingresar con Twitter"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "Autenticación fallida. Asegúrate de haber usado el nombre de usuario y contraseña correctos."
 common/views/components/signup.vue:
  invitation-code: "Código de invitación"
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "再接続する"
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "Un momento"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "Directo"
  specified-desc: "Publica solo para los seguidores que quieras"
  private: "Privada"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "Este contenido no es apropiado para ver en el trabajo"
  click-to-show: "Click para mostrar"
 desktop/views/components/follow-button.vue:
  following: "Siguiendo"
  follow: "Sigue"
  request-pending: "Pendiente de aprobación"
  follow-processing: "フォロー処理中"
  follow-request: "Solicitud de seguir"
 desktop/views/components/followers-window.vue:
  followers: "{} seguidores"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "Crea una encuesta"
  text-remain: "quedan {} caracteres"
  recent-tags: "Reciente"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "Click para etiquetar"
  visibility: "Visibilidad"
  geolocation-alert: "Tu dispositivo no tiene soporte de geolocalización."
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "Cita..."
  cancel: "Cancelar"
  renote: "Volver a publicar"
  renote-home: "Renote (Home)"
  reposting: "Publicando de nuevo..."
  success: "¡Publicado!"
  failure: "La publicación ha fallado"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "Perfil"
  notification: "Notificación"
  apps: "Aplicaciones"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "Seguridad"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "マップの自動展開"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしているユーザーはいません"
  no-blocked-users: "ブロックしているユーザーはいません"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワードを変更する"
  enter-current-password: "現在のパスワードを入力してください"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -946,7 +975,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "フォロー"
  followers: "フォロワー"
  is-bot: "このアカウントはBotです"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1160,7 +1199,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "Misskey Update"
  version: "バージョン:"
  latest-version: "最新のバージョン:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -4,8 +4,8 @@ meta:
  divider: ""
 common:
  misskey: "Une ⭐ du fédiverse"
-  about-title: "Une ⭐ du fédivers."
+  about-title: "Une ⭐ du fédiverse."
-  about: "Merci d’avoir choisis Misskey. Misskey est une <b>plateforme de micro-blogging distribuée</b> née sur Terre et fait partie du Fédiverse (un univers composé de diverses plateformes de réseaux sociaux organisées), elle est connectée mutuellement avec d’autres plateformes de réseaux sociaux. Désirez-vous prendre une pause, un court instant, loin de l’agitation de la ville et plonger dans un Internet d’un nouveau genre ?"
+  about: "Merci d’avoir choisis Misskey. Misskey est une <b>plateforme de microblogage distribuée</b> née sur Terre et fait partie du Fédiverse (un univers composé de diverses plateformes de réseaux sociaux organisées), elle est connectée mutuellement avec d’autres plateformes de réseaux sociaux. Désirez-vous prendre une pause, un court instant, loin de l’agitation de la ville et plonger dans un Internet d’un nouveau genre ?"
  intro:
    title: "C’est quoi Misskey ?"
    about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。"
@@ -21,12 +21,12 @@ common:
    outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
  adblock:
    detected: "Veuillez désactiver votre bloqueur de publicités"
-    warning: "<strong>Misskey n'utilise pas de publicités</strong>, mais quelques options peuvent être non disponibles ou fonctionneraient mal si un bloqueur de publicités est activé."
+    warning: "<strong>Misskey n’utilise pas de publicités</strong>, mais quelques options peuvent être non disponibles ou fonctionneraient mal si un bloqueur de publicités est activé."
-  application-authorization: "Permissions de l'application"
+  application-authorization: "Autorisations de l’application"
  close: "Fermer"
  do-not-copy-paste: "Veuillez ne pas entrer ou coller le code ici. Le compte peut être compromis."
  load-more: "Charger plus"
-  got-it: "J'ai compris !"
+  got-it: "J’ai compris !"
  customization-tips:
    title: "Conseils de personnalisation"
    paragraph: "<p>ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。</p><p>一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。</p><p>ウィジェットを削除するには、ヘッダーの<strong>「ゴミ箱」</strong>と書かれたエリアにウィジェットをドラッグ&ドロップします。</p><p>カスタマイズを終了するには、右上の「完了」をクリックします。</p>"
@@ -44,8 +44,8 @@ common:
    future: "à l’instant"
    just_now: "à l'instant"
    seconds_ago: "Il y a {} seconde·s"
-    minutes_ago: "Il y a {} minute·s"
+    minutes_ago: "Il y a {} min"
-    hours_ago: "Il y a {} heure·s"
+    hours_ago: "Il y a {} h"
    days_ago: "Il y a {} jours"
    weeks_ago: "Il y a {} semaines·s"
    months_ago: "Il y a {} mois"
@@ -71,7 +71,7 @@ common:
    friday: "Vendredi"
    saturday: "Samedi"
  reactions:
-    like: "J'aime"
+    like: "Bien"
    love: "Adore"
    laugh: "Rire"
    hmm: "Hmm … ?"
@@ -85,11 +85,14 @@ common:
    public: "Public"
    home: "Principal"
    home-desc: "Publier sur le fil principal uniquement"
-    followers: "Abonnés·es"
+    followers: "Abonné·e·s"
-    followers-desc: "Publier à vos abonnés·es uniquement"
+    followers-desc: "Publier à vos abonné·e·s uniquement"
    specified: "Direct"
    specified-desc: "Publier uniquement aux utilisateurs·rices mentionnés·es"
    private: "Privé"
    local-public: "Local (Public)"
    local-home: "Accueil (local uniquement)"
    local-followers: "Local (Abonnés)"
  note-placeholders:
    a: "Que faites-vous maintenant ?"
    b: "Quoi de neuf ?"
@@ -99,7 +102,7 @@ common:
    f: "En attente de vos écrits"
  search: "Recherche"
  delete: "Supprimer"
-  loading: "Chargement"
+  loading: "Chargement en cours …"
  ok: "OK"
  update-available-title: "Mise à jour disponible"
  update-available: "Une nouvelle version de Misskey est disponible ({newer}, version actuelle: {current}). Veuillez recharger la page pour appliquer la mise à jour."
@@ -117,9 +120,9 @@ common:
  this-setting-is-this-device-only: "Uniquement sur cet appareil"
  use-os-default-emojis: "Utiliser les émojis standards du système"
  do-not-use-in-production: 'Il s’agit d’une version de développement. Ne pas utiliser dans un environnement de production.'
-  is-remote-user: "Ces informations utilisateur ont été copiées."
+  is-remote-user: "Ces informations appartiennent à un·e utilisateur·rice distant·e."
-  is-remote-post: "Ceci est une publication distante"
+  is-remote-post: "Ceci est une publication distante."
-  view-on-remote: "Consulter le profil complet"
+  view-on-remote: " Consulter le profil complet"
  error:
    title: 'Une erreur est survenue'
    retry: 'Réessayer'
@@ -128,12 +131,12 @@ common:
    my-turn: "C’est votre tour"
    opponent-turn: "Tour de l’adversaire"
    turn-of: "Tour de {name}"
-    past-turn-of: "{name}のターン"
+    past-turn-of: "Tour de {name}"
    won: "{name} a gagné"
    black: "Noirs"
    white: "Blancs"
    total: "Total"
-    this-turn: "{count}ターン目"
+    this-turn: "Tour {count}"
  widgets:
    analog-clock: "Horloge analogique"
    profile: "Profil"
@@ -151,22 +154,22 @@ common:
    notifications: "Notifications"
    users: "Utilisateur·rice·s"
    polls: "Sondages"
-    post-form: "Formulaire de publication"
+    post-form: "Champs de publication"
    server: "Info sur le serveur"
    donation: "Dons"
    nav: "Navigation"
    tips: "Conseils"
    hashtags: "Hashtags"
  dev: "Échec lors de la création de l’application. Veuillez réessayer."
-  ai-chan-kawaii: "Ai-Chan est mignone !"
+  ai-chan-kawaii: "Ai-Chan est mignonne !"
 auth/views/form.vue:
-  share-access: "<i>{name}</i>があなたのアカウントにアクセスすることを許可しますか？"
+  share-access: "Désirez-vous autoriser <i>{name}</i> à avoir accès à votre compte ?"
  permission-ask: "Cette application nécessite les autorisations suivantes :"
-  account-read: "Afficher les informations du compte :"
+  account-read: "Afficher les informations du compte."
-  account-write: "Modifications des informations du compte :"
+  account-write: "Modifications des informations du compte."
  note-write: "Publier."
  like-write: "Réagir aux publications."
-  following-write: "S'abonner et se désabonner."
+  following-write: "Suivre des comptes et se désabonner."
  drive-read: "Lire votre Drive"
  drive-write: "Téléverser/supprimer des fichiers dans votre Drive."
  notification-read: "Lire vos notifications."
@@ -175,13 +178,13 @@ auth/views/form.vue:
  accept: "Autoriser l’accès"
 auth/views/index.vue:
  loading: "Chargement en cours"
-  denied: "L'autorisation de l'application a été refusée."
+  denied: "L’autorisation de l’application a été refusée."
  denied-paragraph: "Cette application ne va pas accéder à votre compte."
-  already-authorized: "Cette application est déjà autorisée"
+  already-authorized: "Cette application est déjà autorisée."
  allowed: "Permissions autorisées de l’application."
-  callback-url: "Retour vers l'application"
+  callback-url: "Retour vers l’application."
  please-go-back: "Veillez retourner à l'application."
-  error: "La session n'existe pas."
+  error: "La session n’existe pas."
  sign-in: "Veuillez vous connecter"
 common/views/components/games/reversi/reversi.vue:
  matching:
@@ -229,7 +232,7 @@ common/views/components/games/reversi/reversi.room.vue:
 common/views/components/connect-failed.vue:
  title: "Échec de connexion au serveur"
  description: "Il se peut qu’il y est un problème avec votre connexion internet, ou le serveur est hors-ligne ou en maintenance. Veuillez {réessayer} plus tard."
-  thanks: "On vous remercie d'utiliser Misskey."
+  thanks: "On vous remercie d’avoir choisi d’utiliser Misskey."
  troubleshoot: "Dépanner"
 common/views/components/connect-failed.troubleshooter.vue:
  title: "Dépannage"
@@ -254,8 +257,8 @@ common/views/components/media-banner.vue:
  sensitive: "Contenu sensible"
  click-to-show: "Cliquer pour afficher"
 common/views/components/theme.vue:
-  light-theme: "Thème durant le mode clair"
+  light-theme: "Thème en mode jour"
-  dark-theme: "Thème durant le mode sombre"
+  dark-theme: "Thème en mode nuit"
  light-themes: "Thème clair"
  dark-themes: "Thème sombre"
  install-a-theme: "Installer un thème"
@@ -297,7 +300,7 @@ common/views/components/messaging.vue:
  no-history: "Pas d'historique"
 common/views/components/messaging-room.vue:
  empty: "Pas de conversations"
-  no-history: "Il n'y a pas plus d'historique"
+  no-history: "Aucun historique"
  resize-form: "Faites glisser pour redimensionner"
  new-message: "Nouveau message"
  only-one-file-attached: "Un seul fichier peut être joint au message"
@@ -344,16 +347,27 @@ common/views/components/poll-editor.vue:
  destroy: "Annuler ce sondage"
 common/views/components/reaction-picker.vue:
  choose-reaction: "Choisissez votre réaction"
 common/views/components/emoji-picker.vue:
  custom-emoji: "Émoji personnalisé"
  people: "Personnes"
  animals-and-nature: "Animaux et nature"
  food-and-drink: "Nourriture et boisson"
  activity: "Activités"
  travel-and-places: "Lieux et voyages"
  objects: "Objets"
  symbols: "Symboles"
  flags: "Drapeaux"
 common/views/components/signin.vue:
  username: "Nom d'utilisateur·rice"
  password: "Mot de passe"
-  token: "Token"
+  token: "Jeton"
  signing-in: "Connexion…"
  signin: "Se connecter"
  or: "Ou"
  signin-with-twitter: "Se connecter via Twitter"
  signin-with-github: "Se connecter avec GitHub"
-  login-failed: "Échec d'authentification. Veuillez vérifier que votre nom d'utilisateur et mot de passe sont corrects."
+  signin-with-discord: "Se connecter avec Discord"
  login-failed: "Échec d’authentification. Veuillez vérifier que votre nom d’utilisateur et mot de passe sont corrects."
 common/views/components/signup.vue:
  invitation-code: "Code d’invitation"
  invitation-info: "Si vous n’avez pas de code d’invitation, contactez un·e <a href=\"{}\">administrateur·rice</a>."
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "Reconnecter"
  connect: "Se connecter avec GitHub"
  disconnect: "Déconnecter"
 common/views/components/discord-setting.vue:
  description: "Si vous liez votre compte Discord à votre compte Misskey, vous serez en mesure de voir votre compte Twitter s'afficher sur votre profil, vous aurez aussi la possibilité de vous connecter à Misskey en utilisant votre compte Discord."
  connected-to: "Vous êtes connecté à votre compte Discord"
  detail: "Détails …"
  reconnect: "Reconnecter"
  connect: "Lier votre compte Discord"
  disconnect: "Déconnecter"
 common/views/components/uploader.vue:
  waiting: "Veuillez patienter"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "Direct"
  specified-desc: "Publier uniquement aux utilisateurs·rices mentionné·e·s"
  private: "Privé"
  local-public: "Local (Public)"
  local-public-desc: "リモートへは公開しない"
  local-home: "Accueil (local uniquement)"
  local-followers: "Local (Abonnés)"
 common/views/components/trends.vue:
  count: "{} utilisateurs·rices mentionnés·es"
  empty: "Aucune tendance"
@@ -438,9 +463,9 @@ common/views/widgets/broadcast.vue:
  next: "Suivant"
 common/views/widgets/calendar.vue:
  year: "Année {}"
-  month: "{},"
+  month: "Mois {}"
-  day: "Jour {}"
+  day: "{}"
-  today: "Aujourd'hui :"
+  today: "Aujourd’hui :"
  this-month: "Ce mois-ci :"
  this-year: "Cette année :"
 common/views/widgets/donation.vue:
@@ -483,26 +508,26 @@ common/views/widgets/tips.vue:
  tips-line19: "Plusieurs fenêtres peuvent être détachées en dehors du navigateur."
  tips-line20: "Pourcentage sur le widget calendrier qui indique le pourcentage de temps passé"
  tips-line21: "Vous pouvez aussi utiliser l'API pour développer des Bots."
-  tips-line23: "Mayu est mignone avec ses sourcils."
+  tips-line23: "Mayu est mignonne avec ses sourcils."
-  tips-line24: "Misskey a vu le jour en 2014"
+  tips-line24: "Misskey est fonctionnel depuis 2014"
-  tips-line25: "対応ブラウザではMisskeyを開いていなくても通知を受け取れます"
+  tips-line25: "Vous pouvez recevoir les notifications de Misskey dans un navigateur web compatible"
 common/views/pages/follow.vue:
  signed-in-as: "Connecté·e en tant que {}"
  following: "Suit"
  follow: "Suivre"
-  request-pending: "Demande d'abonnement en attente"
+  request-pending: "Demande d’abonnement en attente"
-  follow-processing: "En cours d’abonnement"
+  follow-processing: "Demande en attente"
-  follow-request: "Demande d'abonnement"
+  follow-request: "Demande d’abonnement"
 desktop:
  banner-crop-title: "Découpez la partie qui apparaitra comme bannière"
  banner: "Bannière"
  uploading-banner: "Téléversement d'une nouvelle bannière"
-  banner-updated: "La bannière est mise à jour"
+  banner-updated: "Mise à jour de la bannière avec succès"
  choose-banner: "Choisir une bannière"
  avatar-crop-title: "Découpez la partie qui apparaitra comme avatar"
  avatar: "Avatar"
  uploading-avatar: "Téléversement du nouvel avatar"
-  avatar-updated: "L'avatar est mis à jour"
+  avatar-updated: "Mise à jour de l’avatar avec succès"
  choose-avatar: "Choisir un avatar"
  invalid-filetype: "Ce format de fichier n’est pas pris en charge"
 desktop/views/components/activity.chart.vue:
@@ -514,12 +539,12 @@ desktop/views/components/activity.vue:
  title: "Activité"
  toggle: "Afficher les vues"
 desktop/views/components/calendar.vue:
-  title: "{year} / {month}"
+  title: "{month} / {year}"
-  prev: "Mois dernier"
+  prev: "Mois précédent"
-  next: "Mois prochain"
+  next: "Mois suivant"
  go: "Cliquez pour naviguer"
 desktop/views/components/choose-file-from-drive-window.vue:
-  chosen-files: "{count}ファイル選択中"
+  chosen-files: "{count} fichier·s sélectionné·s"
  upload: "Téléverser des fichiers à partir de votre ordinateur"
  cancel: "Annuler"
  ok: "OK"
@@ -542,7 +567,7 @@ desktop/views/components/drive.file.vue:
    rename: "Renommer"
    mark-as-sensitive: "Marquer comme sensible"
    unmark-as-sensitive: "Ne pas marquer comme sensible"
-    copy-url: "Copier l'URL"
+    copy-url: "Copier l’URL"
    download: "Télécharger"
    else-files: "Autres..."
    set-as-avatar: "Utiliser en tant qu'avatar"
@@ -588,22 +613,16 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "Le contenu est NSFW"
  click-to-show: "Cliquer pour afficher"
 desktop/views/components/follow-button.vue:
  following: "Abonné·e"
  follow: "Suivre"
  request-pending: "En attente d'approbation"
  follow-processing: "Continuer l’abonnement"
  follow-request: "Demande d'abonnement"
 desktop/views/components/followers-window.vue:
  followers: "{} abonné·e·s"
 desktop/views/components/followers.vue:
-  empty: "Il semble que vous n'avez pas encore d'abonné·e·s."
+  empty: "Il semble que vous n’avez pas encore d’abonné·e·s."
 desktop/views/components/following-window.vue:
  following: "Suit {}"
 desktop/views/components/following.vue:
  empty: "Vous ne suivez aucun compte."
 desktop/views/components/friends-maker.vue:
-  title: "Utilisateurs recommandés :"
+  title: "Utilisateurs·rices recommandé·e·s :"
  empty: "Impossible de trouver des utilisateurs·trices à recommander."
  fetching: "Chargement"
  refresh: "Plus"
@@ -640,7 +659,7 @@ desktop/views/components/notes.vue:
  error: "Échec du chargement."
  retry: "Réessayer"
 desktop/views/components/notifications.vue:
-  empty: "Pas de notifications"
+  empty: "Aucune de notification !"
 desktop/views/components/post-form.vue:
  add-visible-user: "+Ajouter un utilisateur"
  attach-location-information: "Attacher des informations de localisation"
@@ -654,7 +673,7 @@ desktop/views/components/post-form.vue:
  replied: "Répondu !"
  reposted: "Reposté !"
  note-failed: "La note à échoué"
-  reply-failed: "La réponse à échoué"
+  reply-failed: "La réponse a échoué"
  renote-failed: "Échec lors de la republication"
  posting: "Publication …"
  attach-media-from-local: "Joindre un média depuis votre appareil"
@@ -662,8 +681,9 @@ desktop/views/components/post-form.vue:
  attach-cancel: "Annuler le fichier attaché"
  insert-a-kao: "v('ω')v"
  create-poll: "Créer un sondage"
-  text-remain: "{} charactères restants"
+  text-remain: "{} caractères restants"
  recent-tags: "Récent"
  local-only-message: "Ce message sera publié uniquement sur le fil local"
  click-to-tagging: "Cliquer pour tagguer"
  visibility: "Visibilité"
  geolocation-alert: "Votre appareil ne prend pas en charge les services de localisation"
@@ -681,20 +701,22 @@ desktop/views/components/renote-form.vue:
  quote: "Citer..."
  cancel: "Annuler"
  renote: "Republier"
  renote-home: "Renote (Home)"
  reposting: "Republication en cours …"
  success: "Republié !"
  failure: "La renote a échoué"
 desktop/views/components/renote-form-window.vue:
  title: "Êtes vous sûr de vouloir renote cette note?"
 desktop/views/pages/user-following-or-followers.vue:
-  following: "{user}のフォロー"
+  following: "{user} suit"
-  followers: "{user}のフォロワー"
+  followers: "Abonné·e·s de {user}"
 desktop/views/components/settings-window.vue:
  settings: "Paramètres"
 desktop/views/components/settings.vue:
  profile: "Profil"
  notification: "Notification"
  apps: "Applications"
  tags: "Hashtags"
  mute-and-block: "Silencé·e·s / Bloqué·e·s"
  blocking: "En cours de blocage"
  security: "Sécurité"
@@ -702,7 +724,7 @@ desktop/views/components/settings.vue:
  password: "Mot de Passe"
  2fa: "Vérification en deux étapes"
  other: "Autres"
-  license: "License"
+  license: "Licence"
  theme: "Thèmes"
  behaviour: "Comportement"
  fetch-on-scroll: "Chargement lors du défilement"
@@ -717,7 +739,7 @@ desktop/views/components/settings.vue:
  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
  deck-nav: "デッキ内ナビゲーション"
  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
-  deck-default: "デッキをデフォルトのUIにする"
+  deck-default: "Utiliser le Deck comme IU par défaut"
  display: "Affichage et design"
  customize: "Personnaliser l'Accueil"
  wallpaper: "Arrière plan"
@@ -737,7 +759,8 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "Afficher mes republications dans les fils"
  show-local-renotes: "Afficher les partages locaux sur les fils"
  show-maps: "Afficher la carte"
-  deck-column-align: "デッキのカラムの位置"
+  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "Alignement des colonnes du Deck"
  deck-column-align-center: "Centrer"
  deck-column-align-left: "À gauche"
  sound: "Son"
@@ -757,19 +780,19 @@ desktop/views/components/settings.vue:
  cache-cleared: "Cache nettoyé"
  cache-cleared-desc: "Veuillez recharger la page."
  auto-watch: "Montre automatique"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
+  auto-watch-desc: "Recevez automatiquement les notifications de publications, réponses et réactions."
  about: "À propose de Misskey"
  operator: "L'admin de cette instance"
  update: "Mise à jour de Misskey"
  version: "Version :"
  latest-version: "Dernière version :"
-  update-checking: "Recherche de mises à jour"
+  update-checking: "Vérification des mises à jour en cours …"
  do-update: "Rechercher des mises à jour"
  update-settings: "Paramètres avancés"
  prevent-update: "Reporter les mises à jour (non recommandé)"
  prevent-update-desc: "この設定をオンにしてもアップデートが反映される場合があります。この設定はこのデバイスのみ有効です。"
  no-updates: "Aucune mise à jour disponible"
-  no-updates-desc: "Votre Misskey est à jour."
+  no-updates-desc: "Votre client Misskey est à jour."
  update-available: "Nouvelle version disponible !"
  update-available-desc: "Les mises à jour seront appliquées une fois la page est rechargée."
  advanced-settings: "Réglages avancés"
@@ -788,23 +811,23 @@ desktop/views/components/settings.2fa.vue:
  intro: "Si vous configurez la vérication en deux étapes vous aurez non seulement besoin de votre mot de passe mais aussi un appareil déjà pré-enregistré(tel que votre smartphone) ce qui ameliora grandement la sécurité de votre compte."
  detail: "Voir les détails..."
  url: "https://www.google.com/landing/2step/"
-  caution: "Activer la vérification en deux étapes vient aussi avec des contraintes, si vous perdez votre appareil ou ne pouvez tout simplement plus y accèder vous ne serez plus en mesure de vous connecter à Misskey."
+  caution: "Activer la vérification en deux étapes vient aussi avec des contraintes, si vous perdez votre appareil ou ne pouvez tout simplement plus y accéder vous ne serez plus en mesure de vous connecter à Misskey."
  register: "Enregistrer un appareil"
  already-registered: "Cette étape à déjà été complétée"
  unregister: "Désactiver"
-  unregistered: "La vérication en deux étapes a été desactivée"
+  unregistered: "L'authentification à deux facteurs a été désactivée."
  enter-password: "Entrez un mot de passe"
-  authenticator: "Tout d'abord vous devez installer Google Authenticator sur votre appareil"
+  authenticator: "Vous devez au préalable installer Google Authenticator sur votre appareil :"
  howtoinstall: "Comment installer"
  scan: "Ensuite scannez le QR code afficher sur votre écran:"
  done: "Veuillez entrer le token qui s'affiche sur votre appareil:"
  submit: "Envoyer"
-  success: "L'operation a été complétée avec succès!"
+  success: "Sauvegarde des paramètres avec succès !"
-  failed: "L'operation a échoué. Veuillez vous assurer que le token a été entrer correctement."
+  failed: "L’opération a échoué. Veuillez vous assurer que le jeton a été saisi correctement."
-  info: "À partir de maintenant, à chaque fois que vous vous connecter entrez votre mot de passe ainsi que le token généré sur votre appareil."
+  info: "À partir de maintenant, à chaque fois que vous vous connectez entrez votre mot de passe ainsi que le jeton généré sur votre appareil."
 common/views/components/api-settings.vue:
  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
-  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
+  caution: "Merci de ne pas introduire ce jeton dans aucune application ou le divulguer à quiconque. Ceci risque de compromettre votre compte."
  regeneration-of-token: "Si votre jeton est compromis, vous pouvez le régénérer."
  regenerate-token: "Régénérer le jeton"
  token: "Jeton :"
@@ -813,7 +836,7 @@ common/views/components/api-settings.vue:
    title: 'Console API'
    endpoint: 'Point de terminaison'
    parameter: 'Paramètres'
-    credential-info: "「i」パラメータは自動で付与されます。"
+    credential-info: "Le paramètre \"i\" est requis dans la console."
    send: 'Envoyer'
    sending: 'Envoi en cours'
    response: 'Résultat'
@@ -824,11 +847,15 @@ common/views/components/drive-settings.vue:
  in-use: "utilisé"
  stats: "Statistiques"
 common/views/components/mute-and-block.vue:
-  mute-and-block: "Silencer / Bloquer"
+  mute-and-block: "Silencés / Bloqués"
  mute: "Mettre en sourdine"
  block: "En cours blocage"
  no-muted-users: "Aucun utilisateur·rice n’est mis·e en sourdine"
  no-blocked-users: "Aucun utilisateur·rice n’est bloqué·e"
  word-mute: "Filtre de mots"
  muted-words: "Mots masqués"
  muted-words-description: "Description des mots mis en sourdine"
  save: "Enregistrer"
 common/views/components/password-settings.vue:
  reset: "Modifier le mot de passe"
  enter-current-password: "Entrez votre mot de passe actuel"
@@ -870,7 +897,7 @@ desktop/views/components/ui.header.account.vue:
  dark: "Fall in dark"
 desktop/views/components/ui.header.nav.vue:
  home: "Accueil"
-  deck: "デッキ"
+  deck: "Deck"
  game: "Jeux"
 desktop/views/components/ui.header.notifications.vue:
  title: "Notifications"
@@ -880,7 +907,7 @@ desktop/views/components/ui.header.search.vue:
  placeholder: "Chercher"
 desktop/views/components/received-follow-requests-window.vue:
  title: "Demandes de suivi"
-  accept: "Approuver"
+  accept: "Accepter"
  reject: "Refuser"
 desktop/views/components/user-lists-window.vue:
  title: "Listes de l'utilisateur"
@@ -897,14 +924,15 @@ desktop/views/components/users-list.vue:
 desktop/views/components/users-list-item.vue:
  followed: "vous suit"
 desktop/views/components/window.vue:
-  popout: "ポップアウト"
+  popout: "Fenêtre contextuelle"
  close: "Fermer"
 admin/views/index.vue:
  dashboard: "Tableau de bord"
  instance: "Instance"
-  emoji: "Emoji"
+  emoji: "Émoji"
  moderators: "Modérateurs"
  users: "Utilisateur·rice·s"
-  update: "Mise à jour"
+  federation: "Fédération"
  announcements: "Annonces"
  hashtags: "Hashtags"
  back-to-misskey: "Retour vers Misskey"
@@ -920,41 +948,47 @@ admin/views/instance.vue:
  instance: "Instance"
  instance-name: "Nom de l’instance"
  instance-description: "Description de l’instance"
  host: "Hôte"
  banner-url: "Url de l’image de la bannière"
-  languages: "インスタンスの対象言語"
+  languages: "Langue de l’instance"
-  languages-desc: "スペースで区切って複数設定できます。"
+  languages-desc: "Vous pouvez en définir plus d’une, séparées par des espaces."
  maintainer-config: "Informations de l’administrateur"
  maintainer-name: "Nom de l’administrateur"
  maintainer-email: "Contact administratif"
  drive-config: "Paramètres du lecteur"
  cache-remote-files: "Mettre en cache des fichiers distants"
  cache-remote-files-desc: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクするようになります。そのためサーバーのストレージを節約できますが、プライバシー設定で直リンクを無効にしているユーザーにはファイルが見えなくなったり、サムネイルが生成されないので通信量が増加します。通常はこの設定をオンにしておくことをおすすめします。"
-  local-drive-capacity-mb: "ローカルユーザーひとりあたりのドライブ容量"
+  local-drive-capacity-mb: "Volume du lecteur par utilisateur"
-  remote-drive-capacity-mb: "リモートユーザーひとりあたりのドライブ容量"
+  remote-drive-capacity-mb: "Volume du lecteur par utilisateur distant"
  mb: "en mégaoctets"
  recaptcha-config: "Paramètres de reCAPTCHA"
-  recaptcha-info: "reCAPTCHAを有効にする場合、reCAPTCHAトークンを取得する必要があります。https://www.google.com/recaptcha/intro/ にアクセスしてトークンを取得してください。"
+  recaptcha-info: "Si activé, un jeton reCAPTCHA est requis. Vous pouvez en obtenir un sur https://www.google.com/recaptcha/intro/"
  enable-recaptcha: "Activation de reCAPTCHA"
  recaptcha-site-key: "Clé reCAPTCHA du site"
  recaptcha-secret-key: "Clé secrète reCAPTCHA"
  twitter-integration-config: "Paramètres de connexion à Twitter"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "L’URL callback est définit sur /api/tw/cb"
  enable-twitter-integration: "Activer la connection à Twitter"
  twitter-integration-consumer-key: "Clé du consommateur"
  twitter-integration-consumer-secret: "Secret du consommateur"
-  github-integration-config: "GitHub連携の設定"
+  github-integration-config: "Paramètres d’authentification GitHub"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "L’URL callback est définit sur /api/gh/cb"
  enable-github-integration: "Activer l’authentification avec Github"
  github-integration-client-id: "ID client"
  github-integration-client-secret: "Secret client"
  discord-integration-config: "Paramètres d’authentification Discord"
  discord-integration-info: "L’URL callback est définit sur /api/dc/cb"
  enable-discord-integration: "Activer l’authentification avec Discord"
  discord-integration-client-id: "ID client"
  discord-integration-client-secret: "Secret client"
  proxy-account-config: "Compte proxy"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "Nom d’utilisateur du compte proxy"
  proxy-account-username-desc: "Spécifiez le nom d’utilisateur du compte utilisé comme proxy."
-  proxy-account-warn: "アカウントは自動で作られないため、そのユーザー名のアカウントを予め作成しておく必要があります。"
+  proxy-account-warn: "Avant d’entamer cette action, vous devez au préalable avoir créé un compte avec ce nom d’utilisateur."
  max-note-text-length: "Nombre maximal de caractères pour les messages"
  disable-registration: "Désactiver les inscriptions"
-  disable-local-timeline: "Désactiver l’heure locale"
+  disable-local-timeline: "Désactiver le fil local"
  invite: "Inviter"
  save: "Sauvegarder"
  saved: "Enregistré"
@@ -970,9 +1004,9 @@ admin/views/charts.vue:
  charts:
    federation-instances: "Nombre d’instances : augmentation/diminution"
    federation-instances-total: "Nombre total d’instances"
-    notes: "投稿の増減 (統合)"
+    notes: "Nombre de publications : augmentation/diminution (combinés)"
-    local-notes: "投稿の増減 (ローカル)"
+    local-notes: "Nombre des publications : augmentation/diminution (Local)"
-    remote-notes: "投稿の増減 (リモート)"
+    remote-notes: "Nombre de publications : augmentation/diminution (distants)"
    notes-total: "Total des publications"
    users: "Nombre d’utilisateur·rice·s : augmentation/diminution"
    users-total: "Nombre total des utilisateur·rice·s"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "Ôter la vérification du compte"
  unverified: "Ce compte n'est plus vérifié"
 admin/views/moderators.vue:
  add-moderator:
    title: "Ajout d’un modérateur"
    add: "Ajouter"
    added: "Ajouté en tant que modérateur"
 admin/views/emoji.vue:
  add-emoji:
    title: "Ajouter un émoji"
@@ -1024,7 +1063,7 @@ admin/views/announcements.vue:
  text: "Contenu"
  saved: "Sauvegardé"
  _remove:
-    are-you-sure: "「$1」を削除しますか？"
+    are-you-sure: "Supprimer « %1$s » ?"
    removed: "Supprimé"
 admin/views/hashtags.vue:
  hided-tags: "Tags cachés"
@@ -1054,23 +1093,23 @@ desktop/views/pages/selectdrive.vue:
  upload: "Téléverser des fichiers à partir de votre ordinateur"
 desktop/views/pages/search.vue:
  not-available: "La fonction de recherche est désactivée dans les paramètres de l’instance."
-  not-found: "「{q}」に関する投稿は見つかりませんでした。"
+  not-found: "Aucune publication trouvée pour « {q} »."
 desktop/views/pages/share.vue:
  share-with: "Partager avec {name}"
 desktop/views/pages/tag.vue:
-  no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。"
+  no-posts-found: "Aucune publication contenant « {q} » n’a été trouvée."
 desktop/views/pages/user-list.users.vue:
-  users: "Utilisateurs"
+  users: "Utilisateurs·rices"
  add-user: "Ajouter un utilisateur"
  username: "Nom d'utilisateur"
 desktop/views/pages/user/user.followers-you-know.vue:
  title: "Abonné·e·s que vous connaissez"
  loading: "Chargement en cours"
-  no-users: "Pas d'utilisateurs"
+  no-users: "Aucun abonné connu"
 desktop/views/pages/user/user.friends.vue:
  title: "Mentions fréquentes"
  loading: "Chargement en cours"
-  no-users: "Pas d'utilisateurs"
+  no-users: "Aucune mention fréquente"
 desktop/views/pages/user/user.photos.vue:
  title: "Photos"
  loading: "Chargement en cours"
@@ -1078,8 +1117,8 @@ desktop/views/pages/user/user.photos.vue:
 desktop/views/pages/user/user.profile.vue:
  follows-you: "Vous suit"
  stalk: "Traquer"
-  stalking: "ストーキングしています"
+  stalking: "Entrain de poursuivre"
-  unstalk: "ストーク解除"
+  unstalk: "Cesser la poursuite"
  mute: "Mettre en sourdine"
  muted: "Muting"
  unmute: "Enlever la sourdine"
@@ -1093,10 +1132,10 @@ desktop/views/pages/user/user.header.vue:
  following: "Suit"
  followers: "Abonné·e·s"
  is-bot: "Ce compte est un Bot"
-  years-old: "ans d’âge"
+  years-old: "{age} ans"
-  year: "Année"
+  year: "/"
  month: "/"
-  day: "-"
+  day: "/"
 desktop/views/pages/user/user.timeline.vue:
  default: "Publications"
  with-replies: "Publications et réponses"
@@ -1122,14 +1161,14 @@ desktop/views/widgets/trends.vue:
  refresh: "Afficher d'autres"
  nothing: "Rien"
 desktop/views/widgets/users.vue:
-  title: "Utilisateurs"
+  title: "Utilisateurs·rices"
  refresh: "Afficher d'autres"
  no-one: "Personne"
 mobile/views/components/drive.vue:
  used: "utilisé"
-  folder-count: "Dossier(s)"
+  folder-count: "Dossier·s"
  count-separator: ", "
-  file-count: "Fichiers(s)"
+  file-count: "Fichier·s"
  nothing-in-drive: "Rien"
  folder-is-empty: "Ce dossier est vide"
  prompt: "Que veux-tu faire ? (Entrez un nombre): <1 → Télécharger le fichier | 2 → Télécharger le fichier avec l'URL | 3 → Créer le dossier | 4 → Modifier le nom du dossier | 5 → Déplacer ce dossier | 6 → Supprimer ce dossier >"
@@ -1138,7 +1177,7 @@ mobile/views/components/drive.vue:
  root-rename-alert: "L'emplacement actuel est la racine, pas le dossier, vous ne pouvez donc pas le renommer. Veuillez vous déplacer dans le dossier dont vous souhaitez modifier le nom."
  root-move-alert: "L'emplacement actuel est la racine, ce n'est pas un dossier et il ne peut pas être déplacé. Veuillez vous déplacer dans le dossier que vous souhaitez déplacer."
  url-prompt: "URL du fichier que vous souhaitez téléverser"
-  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+  uploading: "Envoi demandé. Le téléversement pourrait prendre un certain temps avant de s'achever."
 mobile/views/components/drive-file-chooser.vue:
  select-file: "Choisissez un fichier"
 mobile/views/components/drive-folder-chooser.vue:
@@ -1160,14 +1199,14 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "Le contenu est NSFW"
  click-to-show: "Cliquer pour afficher"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
  following: "Abonné·e"
-  follow: "Suivre"
+  follow: " Suivre"
-  request-pending: "En attente d'approbation"
+  request-pending: "Demande en attente"
  follow-processing: "En cours d’abonnement"
-  follow-request: "Demande d'abonnement"
+  follow-request: "Demande d’abonnement"
 mobile/views/components/friends-maker.vue:
-  title: "Abonnez-vous aux utilisateurs"
+  title: "Abonnez-vous à"
  empty: "Impossible de trouver des utilisateurs·trices à recommander."
  fetching: "Chargement"
  refresh: "Voir plus"
@@ -1193,7 +1232,7 @@ mobile/views/components/note-sub.vue:
  bot: "bot"
  cat: "chat"
 mobile/views/components/notifications.vue:
-  empty: "Pas de notifications"
+  empty: "Aucune de notification !"
 mobile/views/components/post-form.vue:
  add-visible-user: "Ajouter un utilisateur"
  submit: "Publier"
@@ -1218,7 +1257,7 @@ mobile/views/components/ui.header.vue:
 mobile/views/components/ui.nav.vue:
  timeline: "Fil d'actualité"
  notifications: "Notifications"
-  follow-requests: "Demandes d'abonnement"
+  follow-requests: "Demandes d’abonnement"
  search: "Rechercher"
  favorites: "Favoris"
  user-lists: "Listes"
@@ -1227,7 +1266,7 @@ mobile/views/components/ui.nav.vue:
  darkmode: "Mode nuit"
  settings: "Réglages"
  admin: "Admin"
-  about: "À propose de Misskey"
+  about: "À propos de Misskey"
 mobile/views/components/user-timeline.vue:
  no-notes: "Cette utilisateur semble n'avoir rien poster pour le moment"
  no-notes-with-media: "Aucune notes avec des médias"
@@ -1244,7 +1283,7 @@ mobile/views/pages/signup.vue:
 mobile/views/pages/followers.vue:
  followers-of: "Abonné·e·s de {name}"
 mobile/views/pages/following.vue:
-  following-of: "{name}のフォロー"
+  following-of: "Abonné·e·s de {name}"
 mobile/views/pages/home.vue:
  home: "Accueil"
  local: "Local"
@@ -1253,7 +1292,7 @@ mobile/views/pages/home.vue:
  mentions: "Mentions"
  messages: "Messages"
 mobile/views/pages/tag.vue:
-  no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。"
+  no-posts-found: "Aucune publication ayant pour hashtag « {q} » n’a été trouvée."
 mobile/views/pages/welcome.vue:
  signup: "S'enregistrer"
 mobile/views/pages/widgets.vue:
@@ -1266,21 +1305,21 @@ mobile/views/pages/widgets/activity.vue:
 mobile/views/pages/share.vue:
  share-with: "Partager avec {name}"
 mobile/views/pages/received-follow-requests.vue:
-  title: "Demandes d'abonnement"
+  title: "Demandes d’abonnement"
-  accept: "Approuver"
+  accept: "Accepter"
  reject: "Refuser"
 mobile/views/pages/note.vue:
  title: "Post"
-  prev: "Note précedante"
+  prev: "Note précédente"
  next: "Note suivante"
 mobile/views/pages/notifications.vue:
  notifications: "Notifications"
-  read-all: "Êtes vous sûr de vouloir marqués toutes les notifications non-lus en tant que lus?"
+  read-all: "Êtes-vous sûr de vouloir marquer l’ensemble des notifications comme étant lues ?"
 mobile/views/pages/games/reversi.vue:
  reversi: "Reversi"
 mobile/views/pages/search.vue:
  search: "Chercher"
-  not-found: "「{q}」に関する投稿は見つかりませんでした。"
+  not-found: "Aucune publication trouvée pour « {q} »."
 mobile/views/pages/selectdrive.vue:
  select-file: "Choisissez un fichier"
 mobile/views/pages/settings.vue:
@@ -1289,7 +1328,7 @@ mobile/views/pages/settings.vue:
  lang-tip: "Le rechargement de la page est requis afin d'appliquer les modifications."
  recommended: "Recommandé"
  auto: "Automatique"
-  specify-language: "Spécifier la langue"
+  specify-language: "Sélectionnez votre langue"
  design: "Affichage et design"
  dark-mode: "Mode nuit"
  i-am-under-limited-internet: "J'ai un accès Internet limité"
@@ -1297,7 +1336,7 @@ mobile/views/pages/settings.vue:
  contrasted-acct: "Nom d’utilisateur contrasté"
  timeline: "Fil d'actualité"
  show-reply-target: "Afficher les réponses"
-  show-my-renotes: "Afficher mes republications"
+  show-my-renotes: "Afficher mes partages"
  show-renoted-my-notes: "Afficher mes publications partagées"
  show-local-renotes: "Afficher les publications partagées localement"
  post-style: "Style de la publication"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "Se connecter à votre compte GitHub"
  github-reconnect: "Reconnecter"
  github-disconnect: "Déconnecter"
  discord: "Intégration avec Discord"
  discord-connect: "Connecter votre compte Discord"
  discord-reconnect: "Reconnecter"
  discord-disconnect: "Déconnecter"
  update: "Mise à jour de Misskey"
  version: "Version :"
  latest-version: "Dernière version :"
@@ -1345,25 +1388,26 @@ mobile/views/pages/user.vue:
  notes: "Notes"
  overview: "Aperçu"
  timeline: "Fil d'actualité"
-  media: "Media"
+  media: "Média"
  is-suspended: "This account has been suspended."
  mute: "Mettre en sourdine"
  unmute: "Enlever la sourdine"
  block: "Bloquer"
  unblock: "Débloquer"
  years-old: "{age} ans"
 mobile/views/pages/user/home.vue:
  recent-notes: "Notes récentes"
  images: "Images"
  activity: "Activité"
  keywords: "Mot clés"
  domains: "Domaines"
-  frequently-replied-users: "Utilisateurs qui interagissent souvent"
+  frequently-replied-users: "Utilisateurs·rices mentionné·e·s souvent"
  followers-you-know: "Abonné·e·s que vous connaissez"
  last-used-at: "Dernière connexion il y a"
 mobile/views/pages/user/home.followers-you-know.vue:
-  no-users: "Pas d'utilisateurs"
+  no-users: "Aucun utilisateur·rice connu·e"
 mobile/views/pages/user/home.friends.vue:
-  no-users: "Pass d'utilisateurs"
+  no-users: "Aucun utilisateur·rice connu·e"
 mobile/views/pages/user/home.notes.vue:
  no-notes: "Pas de notes"
 mobile/views/pages/user/home.photos.vue:
@@ -1391,7 +1435,7 @@ deck:
 deck/deck.tl-column.vue:
  is-media-only: "Les publications médias uniquement"
  is-media-view: "Vue média"
-  edit: "オプション"
+  edit: "Option"
 deck/deck.user-column.vue:
  posts: "Notes"
  following: "Suit"
@@ -1438,7 +1482,7 @@ dev/views/new-app.vue:
  app-desc: "Brève description introductive à votre application."
  app-desc-ex: "p. ex) Misskey pour iOS"
  callback-url: "L’Url de callback (facultatif)"
-  callback-url-desc: "ユーザーが認証フォームで認証した際にリダイレクトするURLを設定できます。"
+  callback-url-desc: "Vous pouvez définir l’URL de redirection lorsque l’utilisateur s’est authentifié via formulaire d’authentification."
  authority: "Autorisations "
  authority-desc: "Sont accessibles via l’API, uniquement les fonctionnalités demandées ici."
  authority-warning: "アプリ作成後も変更できますが、新たな権限を付与する場合、その時点で関連付けられているユーザーキーはすべて無効になります。"
--- a/locales/index.js
+++ b/locales/index.js
@@ -5,7 +5,7 @@
 const fs = require('fs');
 const yaml = require('js-yaml');
-const langs = ['de-DE', 'en-US', 'fr-FR', 'ja-JP', 'ja-KS', 'pl-PL', 'es-ES', 'nl-NL'];
+const langs = ['de-DE', 'en-US', 'fr-FR', 'ja-JP', 'ja-KS', 'pl-PL', 'es-ES', 'nl-NL', 'zh-CN'];
 const loadLocale = lang => yaml.safeLoad(fs.readFileSync(`${__dirname}/${lang}.yml`, 'utf-8'));
 const locales = langs.map(lang => ({ [lang]: loadLocale(lang) }));
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -1,10 +1,10 @@
 ---
 meta:
-  lang: "日本語"
+  lang: "In Italiano"
  divider: ""
 common:
-  misskey: "A ⭐ of fediverse"
+  misskey: "A ⭐ of the fediverse"
-  about-title: "A ⭐ of fediverse."
+  about-title: "A ⭐ of the fediverse."
  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
  intro:
    title: "Misskeyって？"
@@ -90,6 +90,9 @@ common:
    specified: "ダイレクト"
    specified-desc: "指定したユーザーにのみ公開"
    private: "非公開"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "今どうしてる？"
    b: "何かありましたか？"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "ユーザー名"
  password: "パスワード"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "または"
  signin-with-twitter: "Twitterでログイン"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
  invitation-code: "招待コード"
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "再接続する"
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
  follow-processing: "フォロー処理中"
  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
  recent-tags: "最近"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "クリックでタグ付け"
  visibility: "公開範囲"
  geolocation-alert: "お使いの端末は位置情報に対応していません"
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "引用する..."
  cancel: "キャンセル"
  renote: "Renote"
  renote-home: "Renote (Home)"
  reposting: "しています..."
  success: "Renoteしました！"
  failure: "Renoteに失敗しました"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
  apps: "アプリ"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "セキュリティ"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "マップの自動展開"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしているユーザーはいません"
  no-blocked-users: "ブロックしているユーザーはいません"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワードを変更する"
  enter-current-password: "現在のパスワードを入力してください"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -946,7 +975,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "フォロー"
  followers: "フォロワー"
  is-bot: "このアカウントはBotです"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1160,7 +1199,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "Misskey Update"
  version: "バージョン:"
  latest-version: "最新のバージョン:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -96,6 +96,9 @@ common:
    specified: "ダイレクト"
    specified-desc: "指定したユーザーにのみ公開"
    private: "非公開"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "今どうしてる？"
@@ -379,6 +382,17 @@ common/views/components/poll-editor.vue:
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "ユーザー名"
  password: "パスワード"
@@ -388,6 +402,7 @@ common/views/components/signin.vue:
  or: "または"
  signin-with-twitter: "Twitterでログイン"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
@@ -439,6 +454,14 @@ common/views/components/github-setting.vue:
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
@@ -451,6 +474,10 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
@@ -657,13 +684,6 @@ desktop/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
  follow-processing: "フォロー処理中"
  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
@@ -748,6 +768,7 @@ desktop/views/components/post-form.vue:
  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
  recent-tags: "最近"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "クリックでタグ付け"
  visibility: "公開範囲"
  geolocation-alert: "お使いの端末は位置情報に対応していません"
@@ -768,6 +789,7 @@ desktop/views/components/renote-form.vue:
  quote: "引用する..."
  cancel: "キャンセル"
  renote: "Renote"
  renote-home: "Renote (Home)"
  reposting: "しています..."
  success: "Renoteしました！"
  failure: "Renoteに失敗しました"
@@ -786,6 +808,7 @@ desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
  apps: "アプリ"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "セキュリティ"
@@ -830,6 +853,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "マップの自動展開"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
@@ -935,6 +959,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしているユーザーはいません"
  no-blocked-users: "ブロックしているユーザーはいません"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワードを変更する"
@@ -1026,8 +1054,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -1045,6 +1074,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -1071,7 +1101,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -1124,6 +1159,12 @@ admin/views/users.vue:
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1237,7 +1278,7 @@ desktop/views/pages/user/user.header.vue:
  following: "フォロー"
  followers: "フォロワー"
  is-bot: "このアカウントはBotです"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1320,7 +1361,7 @@ mobile/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
@@ -1514,6 +1555,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "Misskey Update"
  version: "バージョン:"
  latest-version: "最新のバージョン:"
@@ -1543,6 +1588,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -90,6 +90,9 @@ common:
    specified: "ダイレクト"
    specified-desc: "今から言うユーザー以外に見せんとってや"
    private: "非公開"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "今なにしてん？"
    b: "何かあったんか？"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "アンケートをほかそ"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクション、どれにするんや？"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "ユーザー名"
  password: "パスワード"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "それか"
  signin-with-twitter: "Twitterでサインイン"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "なんかログインできんかったわ。ユーザー名とパスワードとかを確認してや。"
 common/views/components/signup.vue:
  invitation-code: "招待コード"
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "再接続する"
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待っとる"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "今から言うユーザー以外に見せんとってや"
  private: "非公開"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "流行は自分で作るんや"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "ちょっと見せられへんわ"
  click-to-show: "クリックして見せるで"
 desktop/views/components/follow-button.vue:
  following: "フォローしとる"
  follow: "フォロー"
  request-pending: "フォローの許し待っとる"
  follow-processing: "今フォロー処理やっとる‥"
  follow-request: "フォロー許してくれや！言うてみる"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
  recent-tags: "最近のタグ"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "クリックでタグ付け"
  visibility: "公開範囲"
  geolocation-alert: "あんさんのつことる端末は位置情報に対応しとらんみたいやわ、知らんけど。"
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "取ってくる……"
  cancel: "やめとくわ"
  renote: "Renote"
  renote-home: "Renote (Home)"
  reposting: "やっとります..."
  success: "Renoteしたで！"
  failure: "Renoteでけへん"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
  apps: "アプリ"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "セキュリティ"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "わしのRenoteもタイムライン載せてくれや"
  show-local-renotes: "ローカル投稿のRenoteも見たいんや"
  show-maps: "地図勝手にバァーって開いてくれ"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "真ん中"
  deck-column-align-left: "左"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしとるユーザーはおらんで"
  no-blocked-users: "ブロックしとるユーザーはおらんで"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワード変える"
  enter-current-password: "今のパスワードを入れてや"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "知っといてや"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -946,7 +975,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "フォロー"
  followers: "フォロワー"
  is-bot: "このアカウントはBotや"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1160,12 +1199,12 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "ちょっと見せられへんわ"
  click-to-show: "押してみ、見せたるわ"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
-  following: "フォローしとる"
+  following: "フォロー中"
  follow: "フォロー"
-  request-pending: "フォローの許し待っとる"
+  request-pending: "フォロー許可待ち"
-  follow-processing: "今フォロー処理やっとる‥"
+  follow-processing: "フォロー処理中"
-  follow-request: "フォロー許してくれや！言うてみる"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
  title: "おもろそうやな"
  empty: "おすすめのユーザーはおらん。"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "あんたのMisskeyいつのや？"
  version: "バージョン:"
  latest-version: "いっちゃん新しいやつ:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロックやめたる"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近儲かりまっか？"
  images: "画像"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -90,6 +90,9 @@ common:
    specified: "다이렉트"
    specified-desc: "지정한 사용자에게만 공개"
    private: "비공개"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "지금 어떻게하고있어?"
    b: "뭔가 있었습니까?"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "ユーザー名"
  password: "パスワード"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "または"
  signin-with-twitter: "Twitterでログイン"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
  invitation-code: "招待コード"
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "再接続する"
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
  follow-processing: "フォロー処理中"
  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
  recent-tags: "最近"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "クリックでタグ付け"
  visibility: "公開範囲"
  geolocation-alert: "お使いの端末は位置情報に対応していません"
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "引用する..."
  cancel: "キャンセル"
  renote: "Renote"
  renote-home: "Renote (Home)"
  reposting: "しています..."
  success: "Renoteしました！"
  failure: "Renoteに失敗しました"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
  apps: "アプリ"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "セキュリティ"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "マップの自動展開"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしているユーザーはいません"
  no-blocked-users: "ブロックしているユーザーはいません"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワードを変更する"
  enter-current-password: "現在のパスワードを入力してください"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -946,7 +975,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "フォロー"
  followers: "フォロワー"
  is-bot: "このアカウントはBotです"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1160,7 +1199,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "Misskey Update"
  version: "バージョン:"
  latest-version: "最新のバージョン:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -90,6 +90,9 @@ common:
    specified: "ダイレクト"
    specified-desc: "指定したユーザーにのみ公開"
    private: "非公開"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "今どうしてる？"
    b: "何かありましたか？"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "Deze peiling vernietigen"
 common/views/components/reaction-picker.vue:
  choose-reaction: "Kies een reactie"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "Gebruikersnaam"
  password: "Wachtwoord"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "または"
  signin-with-twitter: "Twitterでログイン"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
  invitation-code: "招待コード"
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "再接続する"
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "Bezig met wachten"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "Volgen"
  request-pending: "フォロー許可待ち"
  follow-processing: "フォロー処理中"
  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "Volgers van {}"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "Peiling creëren"
  text-remain: "{} resterende tekens"
  recent-tags: "最近"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "クリックでタグ付け"
  visibility: "公開範囲"
  geolocation-alert: "お使いの端末は位置情報に対応していません"
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "Citeren..."
  cancel: "Annuleren"
  renote: "Renote"
  renote-home: "Renote (Home)"
  reposting: "Bezig met herplaatsen..."
  success: "Hergeplaatst!"
  failure: "Renote mislukt"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "Profiel"
  notification: "Melding"
  apps: "Apps"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "Beveiliging"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "Mijn gerenote bericht tonen op de tijdlijn"
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "Kaart tonen"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしているユーザーはいません"
  no-blocked-users: "ブロックしているユーザーはいません"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワードを変更する"
  enter-current-password: "現在のパスワードを入力してください"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -946,7 +975,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "フォロー"
  followers: "フォロワー"
  is-bot: "このアカウントはBotです"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1160,9 +1199,9 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
  following: "フォロー中"
-  follow: "Volgen"
+  follow: "フォロー"
  request-pending: "フォロー許可待ち"
  follow-processing: "フォロー処理中"
  follow-request: "フォロー申請"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "Misskey-update"
  version: "Huidige versie:"
  latest-version: "Nieuwste versie:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "Recente notities"
  images: "Afbeeldingen"
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@@ -1,6 +1,6 @@
 ---
 meta:
-  lang: "norsk"
+  lang: "Norsk Bokmål"
  divider: ""
 common:
  misskey: "En ⭐ av fediverse"
@@ -90,6 +90,9 @@ common:
    specified: "ダイレクト"
    specified-desc: "指定したユーザーにのみ公開"
    private: "Privat"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "今どうしてる？"
    b: "何かありましたか？"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "Brukernavn"
  password: "Passord"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "Eller"
  signin-with-twitter: "Twitterでログイン"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
  invitation-code: "招待コード"
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "再接続する"
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "Venter"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "Direkte"
  specified-desc: "指定したユーザーにのみ公開"
  private: "Privat"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "Innholdet er NSFW"
  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
  following: "Følger"
  follow: "Følg"
  request-pending: "フォロー許可待ち"
  follow-processing: "フォロー処理中"
  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
  recent-tags: "Nylig"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "クリックでタグ付け"
  visibility: "Synlighet"
  geolocation-alert: "お使いの端末は位置情報に対応していません"
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "引用する..."
  cancel: "Avbryt"
  renote: "Renote"
  renote-home: "Renote (Home)"
  reposting: "しています..."
  success: "Renoteしました！"
  failure: "Renoteに失敗しました"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "Notifikasjon"
  apps: "Apper"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "セキュリティ"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "マップの自動展開"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしているユーザーはいません"
  no-blocked-users: "ブロックしているユーザーはいません"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワードを変更する"
  enter-current-password: "現在のパスワードを入力してください"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -946,7 +975,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "Følger"
  followers: "フォロワー"
  is-bot: "このアカウントはBotです"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1160,9 +1199,9 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "Innholdet er NSFW"
  click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
-  following: "Følger"
+  following: "フォロー中"
-  follow: "Følg"
+  follow: "フォロー"
  request-pending: "フォロー許可待ち"
  follow-processing: "フォロー処理中"
  follow-request: "フォロー申請"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "Misskey Update"
  version: "バージョン:"
  latest-version: "最新のバージョン:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "Nylige innlegg"
  images: "Bilder"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -90,6 +90,9 @@ common:
    specified: "ダイレクト"
    specified-desc: "指定したユーザーにのみ公開"
    private: "非公開"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "Co robisz?"
    b: "Co się wydarzyło?"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "Usuń tę ankietę"
 common/views/components/reaction-picker.vue:
  choose-reaction: "Wybierz reakcję"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "Nazwa użytkownika"
  password: "Hasło"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "または"
  signin-with-twitter: "Zaloguj się za pomocą Twittera"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
  invitation-code: "招待コード"
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "再接続する"
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "Oczekiwanie"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "Bezpośredni"
  specified-desc: "Tylko dla określonych użytkowników"
  private: "Prywatny"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "To jest zawartość NSFW"
  click-to-show: "Naciśnij aby wyświetlić"
 desktop/views/components/follow-button.vue:
  following: "Śledzisz"
  follow: "Śledź"
  request-pending: "Oczekiwanie na pozwolenie"
  follow-processing: "フォロー処理中"
  follow-request: "Poproś o śledzenie"
 desktop/views/components/followers-window.vue:
  followers: "Śledzący"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "Utwórz ankietę"
  text-remain: "pozostałe znaki: {}"
  recent-tags: "Ostatnie"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "Naciśnij aby oznaczyć"
  visibility: "Widoczność"
  geolocation-alert: "Twoje urządzenie nie obsługuje geolokalizacji."
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "Cytuj…"
  cancel: "Anuluj"
  renote: "Udostępnij"
  renote-home: "Renote (Home)"
  reposting: "Udostępnianie…"
  success: "Udostępniono!"
  failure: "Nie udało się udostępnić"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "Profil"
  notification: "Powiadomienia"
  apps: "Aplikacje"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "Bezpieczeństwo"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "Automatycznie pokazuj mapę"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしているユーザーはいません"
  no-blocked-users: "ブロックしているユーザーはいません"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワードを変更する"
  enter-current-password: "現在のパスワードを入力してください"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -946,7 +975,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "Śledzeni"
  followers: "Śledzący"
  is-bot: "To konto jest botem"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1160,12 +1199,12 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "To jest zawartość NSFW"
  click-to-show: "Naciśnij aby wyświetlić"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
-  following: "Śledzisz"
+  following: "フォロー中"
-  follow: "Śledź"
+  follow: "フォロー"
-  request-pending: "Oczekiwanie na pozwolenie"
+  request-pending: "フォロー許可待ち"
  follow-processing: "フォロー処理中"
-  follow-request: "Poproś o śledzenie"
+  follow-request: "フォロー申請"
 mobile/views/components/friends-maker.vue:
  title: "Zacznij śledzić ludzi takich jak Ty"
  empty: "Nie znaleziono podobnych użytkowników."
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "Aktualizacja Misskey"
  version: "Wersja:"
  latest-version: "Najnowsza wersja:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "Ostatnie wpisy"
  images: "Zdjęcia"
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -90,6 +90,9 @@ common:
    specified: "ダイレクト"
    specified-desc: "指定したユーザーにのみ公開"
    private: "非公開"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "O que está fazendo?"
    b: "O que está acontecendo?"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "ユーザー名"
  password: "パスワード"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "または"
  signin-with-twitter: "Twitterでログイン"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
  invitation-code: "招待コード"
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "再接続する"
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
  follow-processing: "フォロー処理中"
  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
  recent-tags: "最近"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "クリックでタグ付け"
  visibility: "公開範囲"
  geolocation-alert: "お使いの端末は位置情報に対応していません"
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "引用する..."
  cancel: "キャンセル"
  renote: "Renote"
  renote-home: "Renote (Home)"
  reposting: "しています..."
  success: "Renoteしました！"
  failure: "Renoteに失敗しました"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
  apps: "アプリ"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "セキュリティ"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "マップの自動展開"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしているユーザーはいません"
  no-blocked-users: "ブロックしているユーザーはいません"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワードを変更する"
  enter-current-password: "現在のパスワードを入力してください"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -946,7 +975,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "フォロー"
  followers: "フォロワー"
  is-bot: "このアカウントはBotです"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1160,7 +1199,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "Atualizar Misskey"
  version: "Versão atual;"
  latest-version: "Última versão:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "Notas recentes"
  images: "Imagens"
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -90,6 +90,9 @@ common:
    specified: "ダイレクト"
    specified-desc: "指定したユーザーにのみ公開"
    private: "非公開"
    local-public: "公開 (ローカルのみ)"
    local-home: "ホーム (ローカルのみ)"
    local-followers: "フォロワー (ローカルのみ)"
  note-placeholders:
    a: "今どうしてる？"
    b: "何かありましたか？"
@@ -344,6 +347,16 @@ common/views/components/poll-editor.vue:
  destroy: "アンケートを破棄"
 common/views/components/reaction-picker.vue:
  choose-reaction: "リアクションを選択"
 common/views/components/emoji-picker.vue:
  custom-emoji: "カスタム絵文字"
  people: "人"
  animals-and-nature: "動物&自然"
  food-and-drink: "食べ物&飲み物"
  activity: "アクティビティ"
  travel-and-places: "場所"
  objects: "物"
  symbols: "記号"
  flags: "旗"
 common/views/components/signin.vue:
  username: "ユーザー名"
  password: "パスワード"
@@ -353,6 +366,7 @@ common/views/components/signin.vue:
  or: "または"
  signin-with-twitter: "Twitterでログイン"
  signin-with-github: "GitHubでログイン"
  signin-with-discord: "Discordでログイン"
  login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
  invitation-code: "招待コード"
@@ -398,6 +412,13 @@ common/views/components/github-setting.vue:
  reconnect: "再接続する"
  connect: "GitHubと接続する"
  disconnect: "切断する"
 common/views/components/discord-setting.vue:
  description: "お使いのDiscordアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでDiscordアカウント情報が表示されるようになったり、Discordを用いた便利なサインインを利用できるようになります。"
  connected-to: "次のDiscordアカウントに接続されています"
  detail: "詳細..."
  reconnect: "再接続する"
  connect: "Discordと接続する"
  disconnect: "切断する"
 common/views/components/uploader.vue:
  waiting: "待機中"
 common/views/components/visibility-chooser.vue:
@@ -409,6 +430,10 @@ common/views/components/visibility-chooser.vue:
  specified: "ダイレクト"
  specified-desc: "指定したユーザーにのみ公開"
  private: "非公開"
  local-public: "公開 (ローカルのみ)"
  local-public-desc: "リモートへは公開しない"
  local-home: "ホーム (ローカルのみ)"
  local-followers: "フォロワー (ローカルのみ)"
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
@@ -588,12 +613,6 @@ desktop/views/components/media-image.vue:
 desktop/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
 desktop/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
  follow-processing: "フォロー処理中"
  follow-request: "フォロー申請"
 desktop/views/components/followers-window.vue:
  followers: "{} のフォロワー"
 desktop/views/components/followers.vue:
@@ -664,6 +683,7 @@ desktop/views/components/post-form.vue:
  create-poll: "アンケートを作成"
  text-remain: "残り{}文字"
  recent-tags: "最近"
  local-only-message: "この投稿はローカルにのみ公開されます"
  click-to-tagging: "クリックでタグ付け"
  visibility: "公開範囲"
  geolocation-alert: "お使いの端末は位置情報に対応していません"
@@ -681,6 +701,7 @@ desktop/views/components/renote-form.vue:
  quote: "引用する..."
  cancel: "キャンセル"
  renote: "Renote"
  renote-home: "Renote (Home)"
  reposting: "しています..."
  success: "Renoteしました！"
  failure: "Renoteに失敗しました"
@@ -695,6 +716,7 @@ desktop/views/components/settings.vue:
  profile: "プロフィール"
  notification: "通知"
  apps: "アプリ"
  tags: "ハッシュタグ"
  mute-and-block: "ミュート/ブロック"
  blocking: "ブロック"
  security: "セキュリティ"
@@ -737,6 +759,7 @@ desktop/views/components/settings.vue:
  show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "マップの自動展開"
  remain-deleted-note: "削除された投稿を表示し続ける"
  deck-column-align: "デッキのカラムの位置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
@@ -829,6 +852,10 @@ common/views/components/mute-and-block.vue:
  block: "ブロック"
  no-muted-users: "ミュートしているユーザーはいません"
  no-blocked-users: "ブロックしているユーザーはいません"
  word-mute: "ワードミュート"
  muted-words: "ミュートされたキーワード"
  muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
  save: "保存"
 common/views/components/password-settings.vue:
  reset: "パスワードを変更する"
  enter-current-password: "現在のパスワードを入力してください"
@@ -903,8 +930,9 @@ admin/views/index.vue:
  dashboard: "ダッシュボード"
  instance: "インスタンス"
  emoji: "カスタム絵文字"
  moderators: "モデレーター"
  users: "ユーザー"
-  update: "更新"
+  federation: "連合"
  announcements: "お知らせ"
  hashtags: "ハッシュタグ"
  back-to-misskey: "Misskeyに戻る"
@@ -920,6 +948,7 @@ admin/views/instance.vue:
  instance: "インスタンス"
  instance-name: "インスタンス名"
  instance-description: "インスタンスの紹介"
  host: "ホスト"
  banner-url: "バナー画像URL"
  languages: "インスタンスの対象言語"
  languages-desc: "スペースで区切って複数設定できます。"
@@ -946,7 +975,12 @@ admin/views/instance.vue:
  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
  enable-github-integration: "GitHub連携を有効にする"
  github-integration-client-id: "Client ID"
-  github-integration-client-secret: "Client secret"
+  github-integration-client-secret: "Client Secret"
  discord-integration-config: "Discord連携の設定"
  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
  enable-discord-integration: "Discord連携を有効にする"
  discord-integration-client-id: "Client ID"
  discord-integration-client-secret: "Client Secret"
  proxy-account-config: "プロキシアカウントの設定"
  proxy-account-info: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
  proxy-account-username: "プロキシアカウントのユーザー名"
@@ -996,6 +1030,11 @@ admin/views/users.vue:
  unverify-user: "ユーザーの公式アカウント解除"
  unverify: "公式アカウントを解除する"
  unverified: "公式アカウントを解除しました"
 admin/views/moderators.vue:
  add-moderator:
    title: "モデレーターの登録"
    add: "登録"
    added: "モデレーターを登録しました"
 admin/views/emoji.vue:
  add-emoji:
    title: "絵文字の登録"
@@ -1093,7 +1132,7 @@ desktop/views/pages/user/user.header.vue:
  following: "フォロー"
  followers: "フォロワー"
  is-bot: "このアカウントはBotです"
-  years-old: "歳"
+  years-old: "{age}歳"
  year: "年"
  month: "月"
  day: "日"
@@ -1160,7 +1199,7 @@ mobile/views/components/media-image.vue:
 mobile/views/components/media-video.vue:
  sensitive: "閲覧注意"
  click-to-show: "クリックして表示"
-mobile/views/components/follow-button.vue:
+common/views/components/follow-button.vue:
  following: "フォロー中"
  follow: "フォロー"
  request-pending: "フォロー許可待ち"
@@ -1323,6 +1362,10 @@ mobile/views/pages/settings.vue:
  github-connect: "GitHubアカウントに接続する"
  github-reconnect: "再接続する"
  github-disconnect: "切断する"
  discord: "Discord連携"
  discord-connect: "Discordアカウントに接続する"
  discord-reconnect: "再接続する"
  discord-disconnect: "切断する"
  update: "Misskey Update"
  version: "バージョン:"
  latest-version: "最新のバージョン:"
@@ -1351,6 +1394,7 @@ mobile/views/pages/user.vue:
  unmute: "ミュート解除"
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.46.2",
+	"version": "10.55.0",
-	"clientVersion": "1.0.11698",
+	"clientVersion": "2.0.11909",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -46,6 +46,7 @@
 		"@types/is-root": "1.0.0",
 		"@types/is-url": "1.2.28",
 		"@types/js-yaml": "3.11.2",
 		"@types/katex": "0.5.0",
 		"@types/koa": "2.0.46",
 		"@types/koa-bodyparser": "5.0.1",
 		"@types/koa-compress": "2.0.8",
@@ -60,7 +61,7 @@
 		"@types/minio": "7.0.1",
 		"@types/mkdirp": "0.5.2",
 		"@types/mocha": "5.2.5",
-		"@types/mongodb": "3.1.12",
+		"@types/mongodb": "3.1.14",
 		"@types/ms": "0.7.30",
 		"@types/node": "10.12.2",
 		"@types/oauth": "0.9.1",
@@ -75,13 +76,12 @@
 		"@types/seedrandom": "2.4.27",
 		"@types/sharp": "0.21.0",
 		"@types/showdown": "1.7.5",
 		"@types/single-line-log": "1.1.0",
 		"@types/speakeasy": "2.0.3",
 		"@types/systeminformation": "3.23.0",
 		"@types/tinycolor2": "1.4.1",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.4",
-		"@types/webpack": "4.4.17",
+		"@types/webpack": "4.4.19",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
@@ -100,6 +100,7 @@
 		"commander": "2.19.0",
 		"crc-32": "1.2.0",
 		"css-loader": "1.0.1",
 		"cssnano": "4.1.7",
 		"dateformat": "3.0.3",
 		"debug": "4.1.0",
 		"deep-equal": "1.0.1",
@@ -129,6 +130,7 @@
 		"gulp-typescript": "4.0.2",
 		"gulp-uglify": "3.0.1",
 		"gulp-util": "3.0.8",
 		"gulp-yaml": "2.0.2",
 		"hard-source-webpack-plugin": "0.12.0",
 		"html-minifier": "3.5.21",
 		"http-signature": "1.2.0",
@@ -139,6 +141,7 @@
 		"jsdom": "13.0.0",
 		"json5": "2.1.0",
 		"json5-loader": "1.0.1",
 		"katex": "0.10.0",
 		"koa": "2.6.1",
 		"koa-bodyparser": "4.2.1",
 		"koa-compress": "3.0.0",
@@ -152,13 +155,12 @@
 		"koa-slow": "2.1.0",
 		"koa-views": "6.1.4",
 		"loader-utils": "1.1.0",
 		"mecab-async": "0.1.2",
 		"merge-options": "1.0.1",
 		"minio": "7.0.1",
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",
 		"moji": "0.5.1",
-		"mongodb": "3.1.8",
+		"moment": "2.22.2",
 		"mongodb": "3.1.9",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nan": "2.11.1",
@@ -169,12 +171,14 @@
 		"os-utils": "0.0.14",
 		"parse5": "5.1.0",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
 		"progress-bar-webpack-plugin": "1.11.0",
 		"promise-limit": "2.7.0",
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
 		"punycode": "2.1.1",
 		"qrcode": "1.3.2",
 		"randomcolor": "0.5.3",
 		"ratelimiter": "3.2.0",
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "4.1.10",
@@ -185,12 +189,10 @@
 		"rimraf": "2.6.2",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
 		"sass-loader": "7.1.0",
 		"seedrandom": "2.4.4",
 		"sharp": "0.21.0",
-		"showdown": "1.8.7",
+		"showdown": "1.9.0",
 		"showdown-highlightjs-extension": "0.1.2",
 		"single-line-log": "1.1.2",
 		"speakeasy": "2.0.0",
 		"stringz": "1.0.0",
 		"style-loader": "0.23.1",
@@ -199,6 +201,7 @@
 		"summaly": "2.2.0",
 		"systeminformation": "3.47.0",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "1.1.0",
 		"textarea-caret": "3.1.0",
 		"tinycolor2": "1.4.1",
 		"tmp": "0.0.33",
@@ -206,7 +209,7 @@
 		"ts-node": "7.0.1",
 		"tslint": "5.10.0",
 		"typescript": "3.1.6",
-		"typescript-eslint-parser": "20.1.1",
+		"typescript-eslint-parser": "21.0.0",
 		"uglify-es": "3.3.9",
 		"url-loader": "1.1.2",
 		"uuid": "3.3.2",
@@ -218,10 +221,10 @@
 		"vue-i18n": "8.3.1",
 		"vue-js-modal": "1.3.26",
 		"vue-loader": "15.4.2",
 		"vue-marquee-text-component": "1.1.0",
 		"vue-router": "3.0.1",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.1",
+		"vue-svg-inline-loader": "1.2.2",
 		"vue-sweetalert2": "1.5.7",
 		"vue-template-compiler": "2.5.17",
 		"vuedraggable": "2.16.0",
 		"vuewordcloud": "18.7.11",
--- a/src/chart/index.ts
+++ b/src/chart/index.ts
@@ -2,12 +2,15 @@
 * チャートエンジン
 */
 import * as moment from 'moment';
 const nestedProperty = require('nested-property');
 import autobind from 'autobind-decorator';
 import * as mongo from 'mongodb';
 import db from '../db/mongodb';
 import { ICollection } from 'monk';
 const utc = moment.utc;
 export type Obj = { [key: string]: any };
 export type Partial<T> = {
@@ -87,12 +90,12 @@ export default abstract class Chart<T> {
 	@autobind
 	private getCurrentDate(): [number, number, number, number] {
-		const now = new Date();
+		const now = moment().utc();
-		const y = now.getFullYear();
+		const y = now.year();
-		const m = now.getMonth();
+		const m = now.month();
-		const d = now.getDate();
+		const d = now.date();
-		const h = now.getHours();
+		const h = now.hour();
 		return [y, m, d, h];
 	}
@@ -114,15 +117,15 @@ export default abstract class Chart<T> {
 		const [y, m, d, h] = this.getCurrentDate();
 		const current =
-			span == 'day' ? new Date(y, m, d) :
+			span == 'day' ? utc([y, m, d]) :
-			span == 'hour' ? new Date(y, m, d, h) :
+			span == 'hour' ? utc([y, m, d, h]) :
 			null;
 		// 現在(今日または今のHour)のログ
 		const currentLog = await this.collection.findOne({
 			group: group,
 			span: span,
-			date: current
+			date: current.toDate()
 		});
 		// ログがあればそれを返して終了
@@ -158,7 +161,7 @@ export default abstract class Chart<T> {
 			log = await this.collection.insert({
 				group: group,
 				span: span,
-				date: current,
+				date: current.toDate(),
 				data: data
 			});
 		} catch (e) {
@@ -225,8 +228,8 @@ export default abstract class Chart<T> {
 		const [y, m, d, h] = this.getCurrentDate();
 		const gt =
-			span == 'day' ? new Date(y, m, d - range) :
+			span == 'day' ? utc([y, m, d]).subtract(range, 'days') :
-			span == 'hour' ? new Date(y, m, d, h - range) :
+			span == 'hour' ? utc([y, m, d, h]).subtract(range, 'hours') :
 			null;
 		// ログ取得
@@ -234,7 +237,7 @@ export default abstract class Chart<T> {
 			group: group,
 			span: span,
 			date: {
-				$gt: gt
+				$gte: gt.toDate()
 			}
 		}, {
 			sort: {
@@ -264,22 +267,45 @@ export default abstract class Chart<T> {
 			if (recentLog) {
 				logs = [recentLog];
 			}
 		// 要求された範囲の最も古い箇所に位置するログが存在しなかったら
 		} else if (!utc(logs[logs.length - 1].date).isSame(gt)) {
 			// 要求された範囲の最も古い箇所時点での最も新しいログを持ってきて末尾に追加する
 			// (隙間埋めできないため)
 			const outdatedLog = await this.collection.findOne({
 				group: group,
 				span: span,
 				date: {
 					$lt: gt.toDate()
 				}
 			}, {
 				sort: {
 					date: -1
 				},
 				fields: {
 					_id: 0
 				}
 			});
 			if (outdatedLog) {
 				logs.push(outdatedLog);
 			}
 		}
 		// 整形
 		for (let i = (range - 1); i >= 0; i--) {
 			const current =
-				span == 'day' ? new Date(y, m, d - i) :
+				span == 'day' ? utc([y, m, d]).subtract(i, 'days') :
-				span == 'hour' ? new Date(y, m, d, h - i) :
+				span == 'hour' ? utc([y, m, d, h]).subtract(i, 'hours') :
 				null;
-			const log = logs.find(l => l.date.getTime() == current.getTime());
+			const log = logs.find(l => utc(l.date).isSame(current));
 			if (log) {
 				promisedChart.unshift(Promise.resolve(log.data));
 			} else {
 				// 隙間埋め
-				const latest = logs.find(l => l.date.getTime() < current.getTime());
+				const latest = logs.find(l => utc(l.date).isBefore(current));
 				promisedChart.unshift(this.getTemplate(false, latest ? latest.data : null));
 			}
 		}
--- a/src/client/app/admin/views/announcements.vue
+++ b/src/client/app/admin/views/announcements.vue
@@ -41,22 +41,22 @@ export default Vue.extend({
 	methods: {
 		add() {
-			this.announcements.push({
+			this.announcements.unshift({
 				title: '',
 				text: ''
 			});
 		},
 		remove(i) {
-			this.$swal({
+			this.$root.alert({
 				type: 'warning',
 				text: this.$t('_remove.are-you-sure').replace('$1', this.announcements.find((_, j) => j == i).title),
 				showCancelButton: true
 			}).then(res => {
-				if (!res.value) return;
+				if (!res) return;
 				this.announcements = this.announcements.filter((_, j) => j !== i);
 				this.save(true);
-				this.$swal({
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('_remove.removed')
 				});
@@ -68,13 +68,13 @@ export default Vue.extend({
 				broadcasts: this.announcements
 			}).then(() => {
 				if (!silent) {
-					this.$swal({
+					this.$root.alert({
 						type: 'success',
 						text: this.$t('saved')
 					});
 				}
 			}).catch(e => {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: e
 				});
--- a/src/client/app/admin/views/ap-log.vue
+++ b/src/client/app/admin/views/ap-log.vue
@@ -3,17 +3,17 @@
 	<table>
 		<thead>
 			<tr>
-				<th><fa icon="exchange-alt"/> In/Out</th>
+				<th><fa :icon="faExchangeAlt"/> In/Out</th>
 				<th><fa :icon="faBolt"/> Activity</th>
 				<th><fa icon="server"/> Host</th>
 				<th><fa icon="bolt"/> Activity</th>
 				<th><fa icon="user"/> Actor</th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr v-for="log in logs" :key="log.id">
 				<td :class="log.direction">{{ log.direction == 'in' ? '<' : '>' }} {{ log.direction }}</td>
 				<td>{{ log.host }}</td>
 				<td>{{ log.activity }}</td>
 				<td>{{ log.host }}</td>
 				<td>@{{ log.actor }}</td>
 			</tr>
 		</tbody>
@@ -23,12 +23,14 @@
 <script lang="ts">
 import Vue from 'vue';
 import { faBolt, faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
 export default Vue.extend({
 	data() {
 		return {
 			logs: [],
-			connection: null
+			connection: null,
 			faBolt, faExchangeAlt
 		};
 	},
--- a/src/client/app/admin/views/dashboard.vue
+++ b/src/client/app/admin/views/dashboard.vue
@@ -8,13 +8,19 @@
 		<p>{{ $t('@.ai-chan-kawaii') }}</p>
 	</header>
 	<marquee-text v-if="instances.length > 0" class="instances" :repeat="10" :duration="60">
 		<span v-for="instance in instances" class="instance">
 			<b :style="{ background: instance.bg }">{{ instance.host }}</b>{{ instance.notesCount | number }} / {{ instance.usersCount | number }}
 		</span>
 	</marquee-text>
 	<div v-if="stats" class="stats">
 		<div>
 			<div>
 				<div><fa icon="user"/></div>
 				<div>
 					<span>{{ $t('accounts') }}</span>
-					<b class="primary">{{ stats.originalUsersCount | number }}</b>
+					<b>{{ stats.originalUsersCount | number }}</b>
 				</div>
 			</div>
 			<div>
@@ -27,7 +33,7 @@
 				<div><fa icon="pencil-alt"/></div>
 				<div>
 					<span>{{ $t('notes') }}</span>
-					<b class="primary">{{ stats.originalNotesCount | number }}</b>
+					<b>{{ stats.originalNotesCount | number }}</b>
 				</div>
 			</div>
 			<div>
@@ -37,7 +43,7 @@
 		</div>
 		<div>
 			<div>
-				<div><fa icon="database"/></div>
+				<div><fa :icon="faDatabase"/></div>
 				<div>
 					<span>{{ $t('drive') }}</span>
 					<b>{{ stats.driveUsageLocal | bytes }}</b>
@@ -83,42 +89,68 @@ import i18n from '../../i18n';
 import XCpuMemory from "./cpu-memory.vue";
 import XCharts from "./charts.vue";
 import XApLog from "./ap-log.vue";
 import { faDatabase } from '@fortawesome/free-solid-svg-icons';
 import MarqueeText from 'vue-marquee-text-component';
 import randomColor from 'randomcolor';
 export default Vue.extend({
 	i18n: i18n('admin/views/dashboard.vue'),
 	components: {
 		XCpuMemory,
 		XCharts,
-		XApLog
+		XApLog,
 		MarqueeText
 	},
 	data() {
 		return {
 			stats: null,
 			connection: null,
-			meta: null
+			meta: null,
 			instances: [],
 			clock: null,
 			faDatabase
 		};
 	},
 	created() {
 		this.connection = this.$root.stream.useSharedConnection('serverStats');
 		this.updateStats();
 		this.clock = setInterval(this.updateStats, 1000);
 		this.$root.getMeta().then(meta => {
 			this.meta = meta;
 		});
-		this.$root.api('stats').then(stats => {
+		this.$root.api('instances', {
-			this.stats = stats;
+			sort: '+notes'
 		}).then(instances => {
 			instances.forEach(i => {
 				i.bg = randomColor({
 					seed: i.host,
 					luminosity: 'dark'
 				});
 			});
 			this.instances = instances;
 		});
 	},
 	beforeDestroy() {
 		this.connection.dispose();
 		clearInterval(this.clock);
 	},
 	methods: {
 		setChartSrc(src) {
 			this.$refs.charts.setSrc(src);
 		},
 		updateStats() {
 			this.$root.api('stats', {}, false, true).then(stats => {
 				this.stats = stats;
 			});
 		}
 	}
 });
@@ -133,7 +165,6 @@ export default Vue.extend({
 	> header
 		display flex
 		margin-bottom 16px
 		padding-bottom 16px
 		border-bottom solid 1px var(--adminDashboardHeaderBorder)
 		color var(--adminDashboardHeaderFg)
@@ -158,6 +189,20 @@ export default Vue.extend({
 				margin-left auto
 				margin-right 0
 	> .instances
 		padding 16px
 		color var(--adminDashboardHeaderFg)
 		font-size 13px
 		>>> .instance
 			margin 0 10px
 			> b
 				padding 2px 6px
 				margin-right 4px
 				border-radius 4px
 				color #fff
 	> .stats
 		display flex
 		justify-content space-between
@@ -198,9 +243,6 @@ export default Vue.extend({
 					> b
 						display block
 						&.primary
 							color var(--primary)
 			> div:last-child
 				display flex
 				padding 6px 16px
--- a/src/client/app/admin/views/emoji.vue
+++ b/src/client/app/admin/views/emoji.vue
@@ -23,7 +23,7 @@
 	</ui-card>
 	<ui-card>
-		<div slot="title"><fa :icon="['far', 'grin']"/> {{ $t('emojis.title') }}</div>
+		<div slot="title"><fa :icon="faGrin"/> {{ $t('emojis.title') }}</div>
 		<section v-for="emoji in emojis">
 			<img :src="emoji.url" :alt="emoji.name" style="width: 64px;"/>
 			<ui-horizon-group inputs>
@@ -50,6 +50,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
 import { faGrin } from '@fortawesome/free-regular-svg-icons';
 export default Vue.extend({
 	i18n: i18n('admin/views/emoji.vue'),
@@ -58,7 +59,8 @@ export default Vue.extend({
 			name: '',
 			url: '',
 			aliases: '',
-			emojis: []
+			emojis: [],
 			faGrin
 		};
 	},
@@ -73,13 +75,13 @@ export default Vue.extend({
 				url: this.url,
 				aliases: this.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
-				this.$swal({
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('add-emoji.added')
 				});
 				this.fetchEmojis();
 			}).catch(e => {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: e
 				});
@@ -101,12 +103,12 @@ export default Vue.extend({
 				url: emoji.url,
 				aliases: emoji.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
-				this.$swal({
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('updated')
 				});
 			}).catch(e => {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: e
 				});
@@ -114,23 +116,23 @@ export default Vue.extend({
 		},
 		removeEmoji(emoji) {
-			this.$swal({
+			this.$root.alert({
 				type: 'warning',
 				text: this.$t('remove-emoji.are-you-sure').replace('$1', emoji.name),
 				showCancelButton: true
 			}).then(res => {
-				if (!res.value) return;
+				if (!res) return;
 				this.$root.api('admin/emoji/remove', {
 					id: emoji.id
 				}).then(() => {
-					this.$swal({
+					this.$root.alert({
 						type: 'success',
 						text: this.$t('remove-emoji.removed')
 					});
 					this.fetchEmojis();
 				}).catch(e => {
-					this.$swal({
+					this.$root.alert({
 						type: 'error',
 						text: e
 					});
--- a/src/client/app/admin/views/index.vue
+++ b/src/client/app/admin/views/index.vue
@@ -20,30 +20,34 @@
 		<ul>
 			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</li>
 			<li @click="nav('instance')" :class="{ active: page == 'instance' }"><fa icon="cog" fixed-width/>{{ $t('instance') }}</li>
 			<li @click="nav('moderators')" :class="{ active: page == 'moderators' }"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</li>
 			<li @click="nav('users')" :class="{ active: page == 'users' }"><fa icon="users" fixed-width/>{{ $t('users') }}</li>
-			<li @click="nav('emoji')" :class="{ active: page == 'emoji' }"><fa :icon="['far', 'grin']" fixed-width/>{{ $t('emoji') }}</li>
+			<!-- <li @click="nav('federation')" :class="{ active: page == 'federation' }"><fa :icon="faShareAlt" fixed-width/>{{ $t('federation') }}</li> -->
 			<li @click="nav('emoji')" :class="{ active: page == 'emoji' }"><fa :icon="faGrin" fixed-width/>{{ $t('emoji') }}</li>
 			<li @click="nav('announcements')" :class="{ active: page == 'announcements' }"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</li>
 			<li @click="nav('hashtags')" :class="{ active: page == 'hashtags' }"><fa icon="hashtag" fixed-width/>{{ $t('hashtags') }}</li>
 			<!-- <li @click="nav('drive')" :class="{ active: page == 'drive' }"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</li> -->
 			<!-- <li @click="nav('update')" :class="{ active: page == 'update' }">{{ $t('update') }}</li> -->
 		</ul>
 		<div class="back-to-misskey">
-			<a href="/"><fa icon="arrow-left"/> {{ $t('back-to-misskey') }}</a>
+			<a href="/"><fa :icon="faArrowLeft"/> {{ $t('back-to-misskey') }}</a>
 		</div>
 		<div class="version">
 			<small>Misskey {{ version }}</small>
 		</div>
 	</nav>
 	<main>
-		<div v-if="page == 'dashboard'"><x-dashboard/></div>
+		<div class="page">
-		<div v-if="page == 'instance'"><x-instance/></div>
+			<div v-if="page == 'dashboard'"><x-dashboard/></div>
-		<div v-if="page == 'users'"><x-users/></div>
+			<div v-if="page == 'instance'"><x-instance/></div>
-		<div v-if="page == 'emoji'"><x-emoji/></div>
+			<div v-if="page == 'moderators'"><x-moderators/></div>
-		<div v-if="page == 'announcements'"><x-announcements/></div>
+			<div v-if="page == 'users'"><x-users/></div>
-		<div v-if="page == 'hashtags'"><x-hashtags/></div>
+			<div v-if="page == 'emoji'"><x-emoji/></div>
-		<div v-if="page == 'drive'"></div>
+			<div v-if="page == 'announcements'"><x-announcements/></div>
-		<div v-if="page == 'update'"></div>
+			<div v-if="page == 'hashtags'"><x-hashtags/></div>
 			<div v-if="page == 'drive'"></div>
 			<div v-if="page == 'update'"></div>
 		</div>
 	</main>
 </div>
 </template>
@@ -54,10 +58,13 @@ import i18n from '../../i18n';
 import { version } from '../../config';
 import XDashboard from "./dashboard.vue";
 import XInstance from "./instance.vue";
 import XModerators from "./moderators.vue";
 import XEmoji from "./emoji.vue";
 import XAnnouncements from "./announcements.vue";
 import XHashtags from "./hashtags.vue";
 import XUsers from "./users.vue";
 import { faHeadset, faArrowLeft, faShareAlt } from '@fortawesome/free-solid-svg-icons';
 import { faGrin } from '@fortawesome/free-regular-svg-icons';
 // Detect the user agent
 const ua = navigator.userAgent.toLowerCase();
@@ -68,6 +75,7 @@ export default Vue.extend({
 	components: {
 		XDashboard,
 		XInstance,
 		XModerators,
 		XEmoji,
 		XAnnouncements,
 		XHashtags,
@@ -81,7 +89,11 @@ export default Vue.extend({
 			page: 'dashboard',
 			version,
 			isMobile,
-			navOpend: !isMobile
+			navOpend: !isMobile,
 			faGrin,
 			faArrowLeft,
 			faHeadset,
 			faShareAlt
 		};
 	},
 	methods: {
@@ -92,7 +104,7 @@ export default Vue.extend({
 });
 </script>
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mk-admin
 	$headerHeight = 48px
@@ -253,7 +265,9 @@ export default Vue.extend({
 	> main
 		width 100%
 		padding 0 0 0 250px
-		max-width 1300px
+
 		> .page
 			max-width 1150px
 	&.isMobile
 		> main
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@@ -3,13 +3,14 @@
 	<ui-card>
 		<div slot="title"><fa icon="cog"/> {{ $t('instance') }}</div>
 		<section class="fit-top fit-bottom">
 			<ui-input :value="host" readonly>{{ $t('host') }}</ui-input>
 			<ui-input v-model="name">{{ $t('instance-name') }}</ui-input>
 			<ui-textarea v-model="description">{{ $t('instance-description') }}</ui-textarea>
 			<ui-input v-model="bannerUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('banner-url') }}</ui-input>
 			<ui-input v-model="languages"><i slot="icon"><fa icon="language"/></i>{{ $t('languages') }}<span slot="desc">{{ $t('languages-desc') }}</span></ui-input>
 		</section>
 		<section class="fit-bottom">
-			<header><fa icon="headset"/> {{ $t('maintainer-config') }}</header>
+			<header><fa :icon="faHeadset"/> {{ $t('maintainer-config') }}</header>
 			<ui-input v-model="maintainerName">{{ $t('maintainer-name') }}</ui-input>
 			<ui-input v-model="maintainerEmail" type="email"><i slot="icon"><fa :icon="['far', 'envelope']"/></i>{{ $t('maintainer-email') }}</ui-input>
 		</section>
@@ -23,14 +24,14 @@
 			<ui-input v-model="remoteDriveCapacityMb" type="number" :disabled="!cacheRemoteFiles">{{ $t('remote-drive-capacity-mb') }}<span slot="suffix">MB</span><span slot="desc">{{ $t('mb') }}</span></ui-input>
 		</section>
 		<section class="fit-bottom">
-			<header><fa icon="shield-alt"/> {{ $t('recaptcha-config') }}</header>
+			<header><fa :icon="faShieldAlt"/> {{ $t('recaptcha-config') }}</header>
 			<ui-switch v-model="enableRecaptcha">{{ $t('enable-recaptcha') }}</ui-switch>
 			<ui-info>{{ $t('recaptcha-info') }}</ui-info>
 			<ui-input v-model="recaptchaSiteKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>{{ $t('recaptcha-site-key') }}</ui-input>
 			<ui-input v-model="recaptchaSecretKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>{{ $t('recaptcha-secret-key') }}</ui-input>
 		</section>
 		<section>
-			<header><fa icon="ghost"/> {{ $t('proxy-account-config') }}</header>
+			<header><fa :icon="faGhost"/> {{ $t('proxy-account-config') }}</header>
 			<ui-info>{{ $t('proxy-account-info') }}</ui-info>
 			<ui-input v-model="proxyAccount"><span slot="prefix">@</span>{{ $t('proxy-account-username') }}<span slot="desc">{{ $t('proxy-account-username-desc') }}</span></ui-input>
 			<ui-info warn>{{ $t('proxy-account-warn') }}</ui-info>
@@ -75,17 +76,33 @@
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
 		</section>
 	</ui-card>
 	<ui-card>
 		<div slot="title"><fa :icon="['fab', 'discord']"/> {{ $t('discord-integration-config') }}</div>
 		<section>
 			<ui-switch v-model="enableDiscordIntegration">{{ $t('enable-discord-integration') }}</ui-switch>
 			<ui-info>{{ $t('discord-integration-info') }}</ui-info>
 			<ui-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-id') }}</ui-input>
 			<ui-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-secret') }}</ui-input>
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
 import { host } from '../../config';
 import { toUnicode } from 'punycode';
 import { faHeadset, faShieldAlt, faGhost } from '@fortawesome/free-solid-svg-icons';
 export default Vue.extend({
 	i18n: i18n('admin/views/instance.vue'),
 	data() {
 		return {
 			host: toUnicode(host),
 			maintainerName: null,
 			maintainerEmail: null,
 			disableRegistration: false,
@@ -107,8 +124,12 @@ export default Vue.extend({
 			enableGithubIntegration: false,
 			githubClientId: null,
 			githubClientSecret: null,
 			enableDiscordIntegration: false,
 			discordClientId: null,
 			discordClientSecret: null,
 			proxyAccount: null,
 			inviteCode: null,
 			faHeadset, faShieldAlt, faGhost
 		};
 	},
@@ -134,6 +155,9 @@ export default Vue.extend({
 			this.enableGithubIntegration = meta.enableGithubIntegration;
 			this.githubClientId = meta.githubClientId;
 			this.githubClientSecret = meta.githubClientSecret;
 			this.enableDiscordIntegration = meta.enableDiscordIntegration;
 			this.discordClientId = meta.discordClientId;
 			this.discordClientSecret = meta.discordClientSecret;
 		});
 	},
@@ -142,7 +166,7 @@ export default Vue.extend({
 			this.$root.api('admin/invite').then(x => {
 				this.inviteCode = x.code;
 			}).catch(e => {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: e
 				});
@@ -173,13 +197,16 @@ export default Vue.extend({
 				enableGithubIntegration: this.enableGithubIntegration,
 				githubClientId: this.githubClientId,
 				githubClientSecret: this.githubClientSecret,
 				enableDiscordIntegration: this.enableDiscordIntegration,
 				discordClientId: this.discordClientId,
 				discordClientSecret: this.discordClientSecret
 			}).then(() => {
-				this.$swal({
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('saved')
 				});
 			}).catch(e => {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: e
 				});
--- a/src/client/app/admin/views/moderators.vue
+++ b/src/client/app/admin/views/moderators.vue
@@ -0,0 +1,61 @@
 <template>
 <div class="jnhmugbb">
 	<ui-card>
 		<div slot="title"><fa icon="plus"/> {{ $t('add-moderator.title') }}</div>
 		<section class="fit-top">
 			<ui-input v-model="username" type="text">
 				<span slot="prefix">@</span>
 			</ui-input>
 			<ui-button @click="add" :disabled="adding">{{ $t('add-moderator.add') }}</ui-button>
 		</section>
 	</ui-card>
 </div>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
 import parseAcct from "../../../../misc/acct/parse";
 export default Vue.extend({
 	i18n: i18n('admin/views/moderators.vue'),
 	data() {
 		return {
 			username: '',
 			adding: false
 		};
 	},
 	methods: {
 		async add() {
 			this.adding = true;
 			const process = async () => {
 				const user = await this.$root.api('users/show', parseAcct(this.username));
 				await this.$root.api('admin/moderators/add', { userId: user.id });
 				this.$root.alert({
 					type: 'success',
 					text: this.$t('add-moderator.added')
 				});
 			};
 			await process().catch(e => {
 				this.$root.alert({
 					type: 'error',
 					text: e.toString()
 				});
 			});
 			this.adding = false;
 		},
 	}
 });
 </script>
 <style lang="stylus" scoped>
 .jnhmugbb
 	@media (min-width 500px)
 		padding 16px
 </style>
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@@ -49,6 +49,7 @@ import parseAcct from "../../../../misc/acct/parse";
 export default Vue.extend({
 	i18n: i18n('admin/views/users.vue'),
 	data() {
 		return {
 			verifyUsername: null,
@@ -67,13 +68,19 @@ export default Vue.extend({
 			this.verifying = true;
 			const process = async () => {
-				const user = await this.$root.os.api('users/show', parseAcct(this.verifyUsername));
+				const user = await this.$root.api('users/show', parseAcct(this.verifyUsername));
-				await this.$root.os.api('admin/verify-user', { userId: user.id });
+				await this.$root.api('admin/verify-user', { userId: user.id });
-				//this.$root.os.apis.dialog({ text: this.$t('verified') });
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('verified')
 				});
 			};
 			await process().catch(e => {
-				//this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.alert({
 					type: 'error',
 					text: e.toString()
 				});
 			});
 			this.verifying = false;
@@ -83,13 +90,19 @@ export default Vue.extend({
 			this.unverifying = true;
 			const process = async () => {
-				const user = await this.$root.os.api('users/show', parseAcct(this.unverifyUsername));
+				const user = await this.$root.api('users/show', parseAcct(this.unverifyUsername));
-				await this.$root.os.api('admin/unverify-user', { userId: user.id });
+				await this.$root.api('admin/unverify-user', { userId: user.id });
-				//this.$root.os.apis.dialog({ text: this.$t('unverified') });
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('unverified')
 				});
 			};
 			await process().catch(e => {
-				//this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.alert({
 					type: 'error',
 					text: e.toString()
 				});
 			});
 			this.unverifying = false;
@@ -99,13 +112,19 @@ export default Vue.extend({
 			this.suspending = true;
 			const process = async () => {
-				const user = await this.$root.os.api('users/show', parseAcct(this.suspendUsername));
+				const user = await this.$root.api('users/show', parseAcct(this.suspendUsername));
-				await this.$root.os.api('admin/suspend-user', { userId: user.id });
+				await this.$root.api('admin/suspend-user', { userId: user.id });
-				//this.$root.os.apis.dialog({ text: this.$t('suspended') });
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('suspended')
 				});
 			};
 			await process().catch(e => {
-				//this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.alert({
 					type: 'error',
 					text: e.toString()
 				});
 			});
 			this.suspending = false;
@@ -115,13 +134,19 @@ export default Vue.extend({
 			this.unsuspending = true;
 			const process = async () => {
-				const user = await this.$root.os.api('users/show', parseAcct(this.unsuspendUsername));
+				const user = await this.$root.api('users/show', parseAcct(this.unsuspendUsername));
-				await this.$root.os.api('admin/unsuspend-user', { userId: user.id });
+				await this.$root.api('admin/unsuspend-user', { userId: user.id });
-				//this.$root.os.apis.dialog({ text: this.$t('unsuspended') });
+				this.$root.alert({
 					type: 'success',
 					text: this.$t('unsuspended')
 				});
 			};
 			await process().catch(e => {
-				//this.$root.os.apis.dialog({ text: `Failed: ${e}` });
+				this.$root.alert({
 					type: 'error',
 					text: e.toString()
 				});
 			});
 			this.unsuspending = false;
--- a/src/client/app/app.styl
+++ b/src/client/app/app.styl
@@ -123,29 +123,3 @@ pre
 [data-icon]
 	display inline-block
 .swal2-container
 	z-index 10000 !important
 	&.swal2-shown
 		background-color rgba(0, 0, 0, 0.5) !important
 .swal2-popup
 	background var(--face) !important
 .swal2-content
 	color var(--text) !important
 .swal2-confirm
 	background-color var(--primary) !important
 	border-left-color var(--primary) !important
 	border-right-color var(--primary) !important
 	color var(--primaryForeground) !important
 	&:hover
 		background-image none !important
 		background-color var(--primaryDarken5) !important
 	&:active
 		background-image none !important
 		background-color var(--primaryDarken5) !important
--- a/src/client/app/auth/script.ts
+++ b/src/client/app/auth/script.ts
@@ -9,14 +9,11 @@ import './style.styl';
 import init from '../init';
 import Index from './views/index.vue';
 import * as config from '../config';
 /**
 * init
 */
 init(launch => {
 	document.title = `${config.name} | %i18n:common.application-authorization%`;
 	// Init router
 	const router = new VueRouter({
 		mode: 'history',
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -3,15 +3,9 @@
 * (ENTRY POINT)
 */
 /**
 * ドメインに基づいて適切なスクリプトを読み込みます。
 * ユーザーの言語およびモバイル端末か否かも考慮します。
 * webpackは介さないためrequireやimportは使えません。
 */
 'use strict';
-(function() {
+(async function() {
 	// キャッシュ削除要求があれば従う
 	if (localStorage.getItem('shouldFlush') == 'true') {
 		refresh();
@@ -49,6 +43,9 @@
 	if (`${url.pathname}/`.startsWith('/admin/')) app = 'admin';
 	//#endregion
 	// Script version
 	const ver = localStorage.getItem('v') || VERSION;
 	//#region Detect the user language
 	let lang = null;
@@ -67,8 +64,21 @@
 		langs.includes(settings.device.lang)) {
 		lang = settings.device.lang;
 	}
 	window.lang = lang;
 	//#endregion
 	let locale = localStorage.getItem('locale');
 	const localeKey = localStorage.getItem('localeKey');
 	if (locale == null || localeKey != `${ver}.${lang}`) {
 		const locale = await fetch(`/assets/locales/${lang}.json?ver=${ver}`)
 			.then(response => response.json());
 			localStorage.setItem('locale', JSON.stringify(locale));
 			localStorage.setItem('localeKey', `${ver}.${lang}`);
 	}
 	// Detect the user agent
 	const ua = navigator.userAgent.toLowerCase();
 	const isMobile = /mobile|iphone|ipad|android/.test(ua);
@@ -94,9 +104,6 @@
 		app = isMobile ? 'mobile' : 'desktop';
 	}
 	// Script version
 	const ver = localStorage.getItem('v') || VERSION;
 	// Get salt query
 	const salt = localStorage.getItem('salt')
 		? `?salt=${localStorage.getItem('salt')}`
@@ -106,7 +113,7 @@
 	// Note: 'async' make it possible to load the script asyncly.
 	//       'defer' make it possible to run the script when the dom loaded.
 	const script = document.createElement('script');
-	script.setAttribute('src', `/assets/${app}.${ver}.${lang}.js${salt}`);
+	script.setAttribute('src', `/assets/${app}.${ver}.js${salt}`);
 	script.setAttribute('async', 'true');
 	script.setAttribute('defer', 'true');
 	head.appendChild(script);
@@ -142,6 +149,8 @@
 	function refresh() {
 		localStorage.setItem('shouldFlush', 'false');
 		localStorage.removeItem('locale');
 		// Random
 		localStorage.setItem('salt', Math.random().toString().substr(2, 8));
--- a/src/client/app/common/define-widget.ts
+++ b/src/client/app/common/define-widget.ts
@@ -66,7 +66,7 @@ export default function<T extends object>(data: {
 				this.bakeProps();
-				(this as any).api('i/update_widget', {
+				this.$root.api('i/update_widget', {
 					id: this.id,
 					data: this.props
 				});
--- a/src/client/app/common/scripts/check-for-update.ts
+++ b/src/client/app/common/scripts/check-for-update.ts
@@ -22,9 +22,9 @@ export default async function($root: any, force = false, silent = false) {
 		}
 		if (!silent) {
-			$root.$dialog({
+			$root.alert({
-				title: '%i18n:common.update-available-title%',
+				title: $root.$t('@.update-available-title'),
-				text: '%i18n:common.update-available%'.replace('{newer}', newer).replace('{current}', current)
+				text: $root.$t('@.update-available', { newer, current })
 			});
 		}
--- a/src/client/app/common/scripts/fuck-ad-block.ts
+++ b/src/client/app/common/scripts/fuck-ad-block.ts
@@ -4,12 +4,9 @@ export default ($root: any) => {
 	require('fuckadblock');
 	function adBlockDetected() {
-		$root.$dialog({
+		$root.alert({
-			title: '%fa:exclamation-triangle%%i18n:common.adblock.detected%',
+			title: $root.$t('@.adblock.detected'),
-			text: '%i18n:common.adblock.warning%',
+			text: $root.$t('@.adblock.warning')
 			actins: [{
 				text: 'OK'
 			}]
 		});
 	}
--- a/src/client/app/common/scripts/get-md5.ts
+++ b/src/client/app/common/scripts/get-md5.ts
@@ -1,8 +1,10 @@
-const crypto = require('crypto');
+// スクリプトサイズがデカい
 //const crypto = require('crypto');
 export default (data: ArrayBuffer) => {
-  const buf = new Buffer(data);
+	//const buf = new Buffer(data);
-  const hash = crypto.createHash("md5");
+	//const hash = crypto.createHash("md5");
-  hash.update(buf);
+	//hash.update(buf);
-  return hash.digest("hex");
+	//return hash.digest("hex");
-};
+	return '';
 };
--- a/src/client/app/common/scripts/note-mixin.ts
+++ b/src/client/app/common/scripts/note-mixin.ts
@@ -1,8 +1,8 @@
 import parse from '../../../../mfm/parse';
-import { sum } from '../../../../prelude/array';
+import { sum, unique } from '../../../../prelude/array';
 import shouldMuteNote from './should-mute-note';
 import MkNoteMenu from '../views/components/note-menu.vue';
 import MkReactionPicker from '../views/components/reaction-picker.vue';
 import Ok from '../views/components/ok.vue';
 function focus(el, fn) {
 	const target = fn(el);
@@ -22,7 +22,8 @@ type Opts = {
 export default (opts: Opts = {}) => ({
 	data() {
 		return {
-			showContent: false
+			showContent: false,
 			hideThisNote: false
 		};
 	},
@@ -77,15 +78,19 @@ export default (opts: Opts = {}) => ({
 		urls(): string[] {
 			if (this.appearNote.text) {
 				const ast = parse(this.appearNote.text);
-				return ast
+				return unique(ast
 					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
-					.map(t => t.url);
+					.map(t => t.url));
 			} else {
 				return null;
 			}
 		}
 	},
 	created() {
 		this.hideThisNote = shouldMuteNote(this.$store.state.i, this.$store.state.settings, this.appearNote);
 	},
 	methods: {
 		reply(viaKeyboard = false) {
 			this.$root.$post({
@@ -136,7 +141,10 @@ export default (opts: Opts = {}) => ({
 			this.$root.api('notes/favorites/create', {
 				noteId: this.appearNote.id
 			}).then(() => {
-				this.$root.new(Ok);
+				this.$root.alert({
 					type: 'success',
 					splash: true
 				});
 			});
 		},
--- a/src/client/app/common/scripts/should-mute-note.ts
+++ b/src/client/app/common/scripts/should-mute-note.ts
@@ -0,0 +1,28 @@
 export default function(me, settings, note) {
 	const isMyNote = note.userId == me.id;
 	const isPureRenote = note.renoteId != null && note.text == null && note.fileIds.length == 0 && note.poll == null;
 	if (settings.showMyRenotes === false) {
 		if (isMyNote && isPureRenote) {
 			return true;
 		}
 	}
 	if (settings.showRenotedMyNotes === false) {
 		if (isPureRenote && (note.renote.userId == me.id)) {
 			return true;
 		}
 	}
 	if (settings.showLocalRenotes === false) {
 		if (isPureRenote && (note.renote.user.host == null)) {
 			return true;
 		}
 	}
 	if (!isMyNote && note.text && settings.mutedWords.some(q => !q.some(word => !note.text.includes(word)))) {
 		return true;
 	}
 	return false;
 }
--- a/src/client/app/common/views/components/acct.vue
+++ b/src/client/app/common/views/components/acct.vue
@@ -8,11 +8,12 @@
 <script lang="ts">
 import Vue from 'vue';
 import { host } from '../../../config';
 import { toUnicode } from 'punycode';
 export default Vue.extend({
 	props: ['user', 'detail'],
 	data() {
 		return {
-			host
+			host: toUnicode(host)
 		};
 	}
 });
--- a/src/client/app/common/views/components/alert.vue
+++ b/src/client/app/common/views/components/alert.vue
@@ -0,0 +1,197 @@
 <template>
 <div class="felqjxyj" :class="{ splash }">
 	<div class="bg" ref="bg" @click="onBgClick"></div>
 	<div class="main" ref="main">
 		<div class="icon" :class="type"><fa :icon="icon"/></div>
 		<header v-if="title" v-html="title"></header>
 		<div class="body" v-if="text" v-html="text"></div>
 		<ui-horizon-group no-grow class="buttons" v-if="!splash">
 			<ui-button @click="ok" primary autofocus>OK</ui-button>
 			<ui-button @click="cancel" v-if="showCancelButton">Cancel</ui-button>
 		</ui-horizon-group>
 	</div>
 </div>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 import * as anime from 'animejs';
 import { faTimesCircle, faQuestionCircle } from '@fortawesome/free-regular-svg-icons';
 export default Vue.extend({
 	props: {
 		type: {
 			type: String,
 			required: false,
 			default: 'info'
 		},
 		title: {
 			type: String,
 			required: false
 		},
 		text: {
 			type: String,
 			required: false
 		},
 		showCancelButton: {
 			type: Boolean,
 			default: false
 		},
 		splash: {
 			type: Boolean,
 			default: false
 		}
 	},
 	computed: {
 		icon(): any {
 			switch (this.type) {
 				case 'success': return 'check';
 				case 'error': return faTimesCircle;
 				case 'warning': return 'exclamation-triangle';
 				case 'info': return 'info-circle';
 				case 'question': return faQuestionCircle;
 			}
 		}
 	},
 	mounted() {
 		this.$nextTick(() => {
 			(this.$refs.bg as any).style.pointerEvents = 'auto';
 			anime({
 				targets: this.$refs.bg,
 				opacity: 1,
 				duration: 100,
 				easing: 'linear'
 			});
 			anime({
 				targets: this.$refs.main,
 				opacity: 1,
 				scale: [1.2, 1],
 				duration: 300,
 				easing: [0, 0.5, 0.5, 1]
 			});
 			if (this.splash) {
 				setTimeout(() => {
 					this.close();
 				}, 1000);
 			}
 		});
 	},
 	methods: {
 		ok() {
 			this.$emit('ok');
 			this.close();
 		},
 		cancel() {
 			this.$emit('cancel');
 			this.close();
 		},
 		close() {
 			(this.$refs.bg as any).style.pointerEvents = 'none';
 			anime({
 				targets: this.$refs.bg,
 				opacity: 0,
 				duration: 300,
 				easing: 'linear'
 			});
 			(this.$refs.main as any).style.pointerEvents = 'none';
 			anime({
 				targets: this.$refs.main,
 				opacity: 0,
 				scale: 0.8,
 				duration: 300,
 				easing: [0, 0.5, 0.5, 1],
 				complete: () => this.destroyDom()
 			});
 		},
 		onBgClick() {
 			this.cancel();
 		}
 	}
 });
 </script>
 <style lang="stylus" scoped>
 .felqjxyj
 	display flex
 	align-items center
 	justify-content center
 	position fixed
 	z-index 30000
 	top 0
 	left 0
 	width 100%
 	height 100%
 	&.splash
 		&, *
 			pointer-events none !important
 		> .main
 			min-width 0
 			width initial
 	> .bg
 		display block
 		position fixed
 		top 0
 		left 0
 		width 100%
 		height 100%
 		background rgba(#000, 0.7)
 		opacity 0
 		pointer-events none
 	> .main
 		display block
 		position fixed
 		margin auto
 		padding 32px
 		min-width 320px
 		max-width 480px
 		width calc(100% - 32px)
 		text-align center
 		background var(--face)
 		border-radius 8px
 		color var(--faceText)
 		opacity 0
 		> .icon
 			font-size 32px
 			&.success
 				color #37ec92
 			&.error
 				color #ec4137
 			&.warning
 				color #ecb637
 			> *
 				display block
 				margin 0 auto
 		> header
 			margin 16px 0 8px 0
 			font-weight bold
 			font-size 20px
 			& + .body
 				margin-top 8px
 		> .body
 			margin 16px 0
 		> .buttons
 			margin-top 16px
 </style>
--- a/src/client/app/common/views/components/discord-setting.vue
+++ b/src/client/app/common/views/components/discord-setting.vue
@@ -0,0 +1,64 @@
 <template>
 <div class="mk-discord-setting">
 	<p>{{ $t('description') }}</p>
 	<p class="account" v-if="$store.state.i.discord" :title="`Discord ID: ${$store.state.i.discord.id}`">{{ $t('connected-to') }}: <a :href="`https://discordapp.com/users/${$store.state.i.discord.id}`" target="_blank">@{{ $store.state.i.discord.username }}#{{ $store.state.i.discord.discriminator }}</a></p>
 	<p>
 		<a :href="`${apiUrl}/connect/discord`" target="_blank" @click.prevent="connect">{{ $store.state.i.discord ? this.$t('reconnect') : this.$t('connect') }}</a>
 		<span v-if="$store.state.i.discord"> or </span>
 		<a :href="`${apiUrl}/disconnect/discord`" target="_blank" v-if="$store.state.i.discord" @click.prevent="disconnect">{{ $t('disconnect') }}</a>
 	</p>
 	<p class="id" v-if="$store.state.i.discord">Discord ID: {{ $store.state.i.discord.id }}</p>
 </div>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import { apiUrl } from '../../../config';
 export default Vue.extend({
 	i18n: i18n('common/views/components/discord-setting.vue'),
 	data() {
 		return {
 			form: null,
 			apiUrl
 		};
 	},
 	mounted() {
 		this.$watch('$store.state.i', () => {
 			if (this.$store.state.i.discord && this.form)
 				this.form.close();
 		}, {
 			deep: true
 		});
 	},
 	methods: {
 		connect() {
 			this.form = window.open(apiUrl + '/connect/discord',
 				'discord_connect_window',
 				'height=570, width=520');
 		},
 		disconnect() {
 			window.open(apiUrl + '/disconnect/discord',
 				'discord_disconnect_window',
 				'height=570, width=520');
 		}
 	}
 });
 </script>
 <style lang="stylus" scoped>
 .mk-discord-setting
 	.account
 		border solid 1px #e1e8ed
 		border-radius 4px
 		padding 16px
 		a
 			font-weight bold
 			color inherit
 	.id
 		color #8899a6
 </style>
--- a/src/client/app/common/views/components/emoji-picker.vue
+++ b/src/client/app/common/views/components/emoji-picker.vue
@@ -0,0 +1,202 @@
 <template>
 <div class="prlncendiewqqkrevzeruhndoakghvtx">
 	<header>
 		<button v-for="category in categories"
 			:title="category.text"
 			@click="go(category.ref)"
 			:class="{ active: category.isActive }"
 		>
 			<fa :icon="category.icon" fixed-width/>
 		</button>
 	</header>
 	<div class="emojis" ref="emojis" @scroll.passive="onScroll">
 		<section v-for="category in categories" :ref="category.ref">
 			<header><fa :icon="category.icon" fixed-width/> {{ category.text }}</header>
 			<div v-if="category.name">
 				<button v-for="emoji in Object.entries(lib).filter(([k, v]) => v.category === category.name)"
 					:title="emoji[0]"
 					@click="chosen(emoji[1].char)"
 				>
 					<mk-emoji :emoji="emoji[1].char"/>
 				</button>
 			</div>
 			<div v-else>
 				<button v-for="emoji in customEmojis"
 					:title="emoji.name"
 					@click="chosen(`:${emoji.name}:`)"
 				>
 					<img :src="emoji.url" :alt="emoji.name"/>
 				</button>
 			</div>
 		</section>
 	</div>
 </div>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import { lib } from 'emojilib';
 import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice } from '@fortawesome/free-solid-svg-icons';
 import { faHeart, faFlag } from '@fortawesome/free-regular-svg-icons';
 export default Vue.extend({
 	i18n: i18n('common/views/components/emoji-picker.vue'),
 	data() {
 		return {
 			lib,
 			customEmojis: [],
 			categories: [{
 				ref: 'customEmojiSection',
 				text: this.$t('custom-emoji'),
 				icon: faAsterisk,
 				isActive: true
 			}, {
 				name: 'people',
 				ref: 'peopleSection',
 				text: this.$t('people'),
 				icon: ['far', 'laugh'],
 				isActive: false
 			}, {
 				name: 'animals_and_nature',
 				ref: 'animalsAndNatureSection',
 				text: this.$t('animals-and-nature'),
 				icon: faLeaf,
 				isActive: false
 			}, {
 				name: 'food_and_drink',
 				ref: 'foodAndDrinkSection',
 				text: this.$t('food-and-drink'),
 				icon: faUtensils,
 				isActive: false
 			}, {
 				name: 'activity',
 				ref: 'activitySection',
 				text: this.$t('activity'),
 				icon: faFutbol,
 				isActive: false
 			}, {
 				name: 'travel_and_places',
 				ref: 'travelAndPlacesSection',
 				text: this.$t('travel-and-places'),
 				icon: faCity,
 				isActive: false
 			}, {
 				name: 'objects',
 				ref: 'objectsSection',
 				text: this.$t('objects'),
 				icon: faDice,
 				isActive: false
 			}, {
 				name: 'symbols',
 				ref: 'symbolsSection',
 				text: this.$t('symbols'),
 				icon: faHeart,
 				isActive: false
 			}, {
 				name: 'flags',
 				ref: 'flagsSection',
 				text: this.$t('flags'),
 				icon: faFlag,
 				isActive: false
 			}]
 		}
 	},
 	created() {
 		this.customEmojis = (this.$root.getMetaSync() || { emojis: [] }).emojis || [];
 	},
 	methods: {
 		go(ref) {
 			this.$refs.emojis.scrollTop = this.$refs[ref][0].offsetTop;
 		},
 		onScroll(e) {
 			const section = this.categories.forEach(x => {
 				const top = e.target.scrollTop;
 				const el = this.$refs[x.ref][0];
 				x.isActive = el.offsetTop <= top && el.offsetTop + el.offsetHeight > top;
 			});
 		},
 		chosen(emoji) {
 			this.$emit('chosen', emoji);
 		}
 	}
 });
 </script>
 <style lang="stylus" scoped>
 .prlncendiewqqkrevzeruhndoakghvtx
 	width 350px
 	background var(--face)
 	> header
 		display flex
 		> button
 			flex 1
 			padding 10px 0
 			font-size 16px
 			color var(--text)
 			transition color 0.2s ease
 			&:hover
 				color var(--textHighlighted)
 				transition color 0s
 			&.active
 				color var(--primary)
 				transition color 0s
 	> .emojis
 		height 300px
 		overflow-y auto
 		overflow-x hidden
 		> section
 			> header
 				position sticky
 				top 0
 				left 0
 				z-index 1
 				padding 8px
 				background var(--faceHeader)
 				color var(--text)
 				font-size 12px
 			> div
 				display grid
 				grid-template-columns 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr
 				gap 4px
 				padding 8px
 				> button
 					padding 0
 					width 100%
 					&:before
 						content ''
 						display block
 						width 1px
 						height 0
 						padding-bottom 100%
 					&:hover
 						> *
 							transform scale(1.2)
 							transition transform 0s
 					> *
 						position absolute
 						top 0
 						left 0
 						width 100%
 						height 100%
 						font-size 28px
 						transition transform 0.2s ease
 						pointer-events none
 </style>
--- a/src/client/app/common/views/components/emoji.vue
+++ b/src/client/app/common/views/components/emoji.vue
@@ -7,7 +7,8 @@
 <script lang="ts">
 import Vue from 'vue';
-import { lib } from 'emojilib';
+// スクリプトサイズがデカい
 //import { lib } from 'emojilib';
 export default Vue.extend({
 	props: {
@@ -21,7 +22,7 @@ export default Vue.extend({
 		},
 		customEmojis: {
 			required: false,
-			default: []
+			default: () => []
 		}
 	},
@@ -50,10 +51,10 @@ export default Vue.extend({
 				this.customEmoji = customEmoji;
 				this.url = customEmoji.url;
 			} else {
-				const emoji = lib[this.name];
+				//const emoji = lib[this.name];
-				if (emoji) {
+				//if (emoji) {
-					this.char = emoji.char;
+				//	this.char = emoji.char;
-				}
+				//}
 			}
 		} else {
 			this.char = this.emoji;
--- a/src/client/app/common/views/components/follow-button.vue
+++ b/src/client/app/common/views/components/follow-button.vue
@@ -0,0 +1,184 @@
 <template>
 <button class="wfliddvnhxvyusikowhxozkyxyenqxqr"
 	:class="{ wait, block, mini, active: isFollowing || hasPendingFollowRequestFromYou }"
 	@click="onClick"
 	:disabled="wait"
 >
 	<template v-if="!wait">
 		<fa :icon="iconAndText[0]"/> <template v-if="!mini">{{ iconAndText[1] }}</template>
 	</template>
 	<template v-else><fa icon="spinner" pulse fixed-width/></template>
 </button>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
 export default Vue.extend({
 	i18n: i18n('common/views/components/follow-button.vue'),
 	props: {
 		user: {
 			type: Object,
 			required: true
 		},
 		block: {
 			type: Boolean,
 			required: false,
 			default: false
 		},
 		mini: {
 			type: Boolean,
 			required: false,
 			default: false
 		}
 	},
 	data() {
 		return {
 			isFollowing: this.user.isFollowing,
 			hasPendingFollowRequestFromYou: this.user.hasPendingFollowRequestFromYou,
 			wait: false,
 			connection: null
 		};
 	},
 	computed: {
 		iconAndText(): any[] {
 			return (
 				(this.hasPendingFollowRequestFromYou && this.user.isLocked) ? ['hourglass-half', this.$t('request-pending')] :
 				(this.hasPendingFollowRequestFromYou && !this.user.isLocked) ? ['hourglass-start', this.$t('follow-processing')] :
 				(this.isFollowing) ? ['minus', this.$t('following')] :
 				(!this.isFollowing && this.user.isLocked) ? ['plus', this.$t('follow-request')] :
 				(!this.isFollowing && !this.user.isLocked) ? ['plus', this.$t('follow')] :
 				[]
 			);
 		}
 	},
 	mounted() {
 		this.connection = this.$root.stream.useSharedConnection('main');
 		this.connection.on('follow', this.onFollowChange);
 		this.connection.on('unfollow', this.onFollowChange);
 	},
 	beforeDestroy() {
 		this.connection.dispose();
 	},
 	methods: {
 		onFollowChange(user) {
 			if (user.id == this.user.id) {
 				this.isFollowing = user.isFollowing;
 				this.hasPendingFollowRequestFromYou = user.hasPendingFollowRequestFromYou;
 			}
 		},
 		async onClick() {
 			this.wait = true;
 			try {
 				if (this.isFollowing) {
 					await this.$root.api('following/delete', {
 						userId: this.user.id
 					});
 				} else {
 					if (this.hasPendingFollowRequestFromYou) {
 						await this.$root.api('following/requests/cancel', {
 							userId: this.user.id
 						});
 					} else if (this.user.isLocked) {
 						await this.$root.api('following/create', {
 							userId: this.user.id
 						});
 						this.hasPendingFollowRequestFromYou = true;
 					} else {
 						await this.$root.api('following/create', {
 							userId: this.user.id
 						});
 						this.hasPendingFollowRequestFromYou = true;
 					}
 				}
 			} catch (e) {
 				console.error(e);
 			} finally {
 				this.wait = false;
 			}
 		}
 	}
 });
 </script>
 <style lang="stylus" scoped>
 .wfliddvnhxvyusikowhxozkyxyenqxqr
 	display block
 	user-select none
 	cursor pointer
 	padding 0 16px
 	margin 0
 	min-width 100px
 	line-height 36px
 	font-size 14px
 	font-weight bold
 	color var(--primary)
 	background transparent
 	outline none
 	border solid 1px var(--primary)
 	border-radius 36px
 	&.mini
 		padding 0
 		min-width 0
 		width 32px
 		height 32px
 		font-size 16px
 		border-radius 4px
 		line-height 32px
 		&:focus
 			&:after
 				border-radius 8px
 	&.block
 		width 100%
 	&:focus
 		&:after
 			content ""
 			pointer-events none
 			position absolute
 			top -5px
 			right -5px
 			bottom -5px
 			left -5px
 			border 2px solid var(--primaryAlpha03)
 			border-radius 36px
 	&:hover
 		background var(--primaryAlpha01)
 	&:active
 		background var(--primaryAlpha02)
 	&.active
 		color var(--primaryForeground)
 		background var(--primary)
 		&:hover
 			background var(--primaryLighten10)
 			border-color var(--primaryLighten10)
 		&:active
 			background var(--primaryDarken10)
 			border-color var(--primaryDarken10)
 	&.wait
 		cursor wait !important
 		opacity 0.7
 	*
 		pointer-events none
 </style>
--- a/src/client/app/common/views/components/formula-core.vue
+++ b/src/client/app/common/views/components/formula-core.vue
@@ -0,0 +1,26 @@
 <template>
 <span v-html="compiledFormula"></span>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 import * as katex from 'katex';
 export default Vue.extend({
 	props: {
 		formula: {
 			type: String,
 			required: true
 		}
 	},
 	computed: {
 		compiledFormula(): any {
 			return katex.renderToString(this.formula);
 		}
 	}
 });
 </script>
 <style>
@import "../../../../../../node_modules/katex/dist/katex.min.css";
 </style>
--- a/src/client/app/common/views/components/formula.vue
+++ b/src/client/app/common/views/components/formula.vue
@@ -0,0 +1,20 @@
 <template>
 <x-formula :formula="formula"/>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 export default Vue.extend({
 	components: {
 		XFormula: () => import('./formula-core.vue').then(m => m.default)
 	},
 	props: {
 		formula: {
 			type: String,
 			required: true
 		}
 	}
 });
 </script>
--- a/src/client/app/common/views/components/github-setting.vue
+++ b/src/client/app/common/views/components/github-setting.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="mk-github-setting">
-	<p>{{ $t('description') }}<a :href="`${docsUrl}/link-to-github`" target="_blank">{{ $t('detail') }}</a></p>
+	<p>{{ $t('description') }}</p>
 	<p class="account" v-if="$store.state.i.github" :title="`GitHub ID: ${$store.state.i.github.id}`">{{ $t('connected-to') }}: <a :href="`https://github.com/${$store.state.i.github.login}`" target="_blank">@{{ $store.state.i.github.login }}</a></p>
 	<p>
 		<a :href="`${apiUrl}/connect/github`" target="_blank" @click.prevent="connect">{{ $store.state.i.github ? this.$t('reconnect') : this.$t('connect') }}</a>
@@ -14,15 +14,14 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { apiUrl, docsUrl } from '../../../config';
+import { apiUrl } from '../../../config';
 export default Vue.extend({
 	i18n: i18n('common/views/components/github-setting.vue'),
 	data() {
 		return {
 			form: null,
-			apiUrl,
+			apiUrl
 			docsUrl
 		};
 	},
 	mounted() {
--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@@ -1,13 +1,8 @@
 import Vue from 'vue';
-import muteAndBlock from './mute-and-block.vue';
+import followButton from './follow-button.vue';
 import error from './error.vue';
 import apiSettings from './api-settings.vue';
 import passwordSettings from './password-settings.vue';
 import driveSettings from './drive-settings.vue';
 import profileEditor from './profile-editor.vue';
 import noteSkeleton from './note-skeleton.vue';
 import theme from './theme.vue';
 import instance from './instance.vue';
 import cwButton from './cw-button.vue';
 import tagCloud from './tag-cloud.vue';
@@ -27,16 +22,11 @@ import pollEditor from './poll-editor.vue';
 import reactionIcon from './reaction-icon.vue';
 import reactionsViewer from './reactions-viewer.vue';
 import time from './time.vue';
 import timer from './timer.vue';
 import mediaList from './media-list.vue';
 import uploader from './uploader.vue';
 import streamIndicator from './stream-indicator.vue';
 import ellipsis from './ellipsis.vue';
 import messaging from './messaging.vue';
 import messagingRoom from './messaging-room.vue';
 import urlPreview from './url-preview.vue';
 import twitterSetting from './twitter-setting.vue';
 import githubSetting from './github-setting.vue';
 import fileTypeIcon from './file-type-icon.vue';
 import emoji from './emoji.vue';
 import welcomeTimeline from './welcome-timeline.vue';
@@ -53,14 +43,9 @@ import uiInfo from './ui/info.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';
-Vue.component('mk-mute-and-block', muteAndBlock);
+Vue.component('mk-follow-button', followButton);
 Vue.component('mk-error', error);
 Vue.component('mk-api-settings', apiSettings);
 Vue.component('mk-password-settings', passwordSettings);
 Vue.component('mk-drive-settings', driveSettings);
 Vue.component('mk-profile-editor', profileEditor);
 Vue.component('mk-note-skeleton', noteSkeleton);
 Vue.component('mk-theme', theme);
 Vue.component('mk-instance', instance);
 Vue.component('mk-cw-button', cwButton);
 Vue.component('mk-tag-cloud', tagCloud);
@@ -80,16 +65,11 @@ Vue.component('mk-poll-editor', pollEditor);
 Vue.component('mk-reaction-icon', reactionIcon);
 Vue.component('mk-reactions-viewer', reactionsViewer);
 Vue.component('mk-time', time);
 Vue.component('mk-timer', timer);
 Vue.component('mk-media-list', mediaList);
 Vue.component('mk-uploader', uploader);
 Vue.component('mk-stream-indicator', streamIndicator);
 Vue.component('mk-ellipsis', ellipsis);
 Vue.component('mk-messaging', messaging);
 Vue.component('mk-messaging-room', messagingRoom);
 Vue.component('mk-url-preview', urlPreview);
 Vue.component('mk-twitter-setting', twitterSetting);
 Vue.component('mk-github-setting', githubSetting);
 Vue.component('mk-file-type-icon', fileTypeIcon);
 Vue.component('mk-emoji', emoji);
 Vue.component('mk-welcome-timeline', welcomeTimeline);
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@@ -34,6 +34,7 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import parse from '../../../../../mfm/parse';
 import { unique } from '../../../../../prelude/array';
 export default Vue.extend({
 	i18n: i18n('common/views/components/messaging-room.message.vue'),
@@ -49,9 +50,9 @@ export default Vue.extend({
 		urls(): string[] {
 			if (this.message.text) {
 				const ast = parse(this.message.text);
-				return ast
+				return unique(ast
 					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
-					.map(t => t.url);
+					.map(t => t.url));
 			} else {
 				return null;
 			}
--- a/src/client/app/common/views/components/messaging-room.vue
+++ b/src/client/app/common/views/components/messaging-room.vue
@@ -8,7 +8,7 @@
 		<p class="empty" v-if="!init && messages.length == 0"><fa icon="info-circle"/>{{ $t('empty') }}</p>
 		<p class="no-history" v-if="!init && messages.length > 0 && !existMoreMessages"><fa icon="flag"/>{{ $t('no-history') }}</p>
 		<button class="more" :class="{ fetching: fetchingMoreMessages }" v-if="existMoreMessages" @click="fetchMoreMessages" :disabled="fetchingMoreMessages">
-			<template v-if="fetchingMoreMessages"><fa icon="spinner .pulse" fixed-width/></template>{{ fetchingMoreMessages ? $t('@.loading') : $t('@.load-more') }}
+			<template v-if="fetchingMoreMessages"><fa icon="spinner" pulse fixed-width/></template>{{ fetchingMoreMessages ? $t('@.loading') : $t('@.load-more') }}
 		</button>
 		<template v-for="(message, i) in _messages">
 			<x-message :message="message" :key="message.id"/>
@@ -20,7 +20,7 @@
 	<footer>
 		<transition name="fade">
 			<div class="new-message" v-show="showIndicator">
-				<button @click="onIndicatorClick"><i><fa icon="arrow-circle-down"/></i>{{ $t('new-message') }}</button>
+				<button @click="onIndicatorClick"><i><fa :icon="faArrowCircleDown"/></i>{{ $t('new-message') }}</button>
 			</div>
 		</transition>
 		<x-form :user="user" ref="form"/>
@@ -34,6 +34,7 @@ import i18n from '../../../i18n';
 import XMessage from './messaging-room.message.vue';
 import XForm from './messaging-room.form.vue';
 import { url } from '../../../config';
 import { faArrowCircleDown } from '@fortawesome/free-solid-svg-icons';
 export default Vue.extend({
 	i18n: i18n('common/views/components/messaging-room.vue'),
@@ -52,7 +53,8 @@ export default Vue.extend({
 			existMoreMessages: false,
 			connection: null,
 			showIndicator: false,
-			timer: null
+			timer: null,
 			faArrowCircleDown
 		};
 	},
--- a/src/client/app/common/views/components/messaging.vue
+++ b/src/client/app/common/views/components/messaging.vue
@@ -45,7 +45,7 @@
 		</template>
 	</div>
 	<p class="no-history" v-if="!fetching && messages.length == 0">{{ $t('no-history') }}</p>
-	<p class="fetching" v-if="fetching"><fa icon="spinner .pulse" fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
+	<p class="fetching" v-if="fetching"><fa icon="spinner" pulse fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
 </div>
 </template>
--- a/src/client/app/common/views/components/misskey-flavored-markdown.ts
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.ts
@@ -3,8 +3,9 @@ import { length } from 'stringz';
 import parse from '../../../../../mfm/parse';
 import getAcct from '../../../../../misc/acct/render';
 import MkUrl from './url.vue';
 import MkGoogle from './google.vue';
 import { concat } from '../../../../../prelude/array';
 import MkFormula from './formula.vue';
 import MkGoogle from './google.vue';
 export default Vue.component('misskey-flavored-markdown', {
 	props: {
@@ -199,7 +200,17 @@ export default Vue.component('misskey-flavored-markdown', {
 					})];
 				}
 				case 'math': {
 					//const MkFormula = () => import('./formula.vue').then(m => m.default);
 					return [createElement(MkFormula, {
 						props: {
 							formula: token.formula
 						}
 					})];
 				}
 				case 'search': {
 					//const MkGoogle = () => import('./google.vue').then(m => m.default);
 					return [createElement(MkGoogle, {
 						props: {
 							q: token.query
--- a/src/client/app/common/views/components/mute-and-block.vue
+++ b/src/client/app/common/views/components/mute-and-block.vue
@@ -21,6 +21,14 @@
 			</div>
 		</div>
 	</section>
 	<section>
 		<header>{{ $t('word-mute') }}</header>
 		<ui-textarea v-model="mutedWords">
 			{{ $t('muted-words') }}<span slot="desc">{{ $t('muted-words-description') }}</span>
 		</ui-textarea>
 		<ui-button @click="save">{{ $t('save') }}</ui-button>
 	</section>
 </ui-card>
 </template>
@@ -30,16 +38,27 @@ import i18n from '../../../i18n';
 export default Vue.extend({
 	i18n: i18n('common/views/components/mute-and-block.vue'),
 	data() {
 		return {
 			muteFetching: true,
 			blockFetching: true,
 			mute: [],
-			block: []
+			block: [],
 			mutedWords: ''
 		};
 	},
 	computed: {
 		_mutedWords: {
 			get() { return this.$store.state.settings.mutedWords; },
 			set(value) { this.$store.dispatch('settings/set', { key: 'mutedWords', value }); }
 		},
 	},
 	mounted() {
 		this.mutedWords = this._mutedWords.map(words => words.join(' ')).join('\n');
 		this.$root.api('mute/list').then(mute => {
 			this.mute = mute.map(x => x.mutee);
 			this.muteFetching = false;
@@ -49,6 +68,12 @@ export default Vue.extend({
 			this.block = blocking.map(x => x.blockee);
 			this.blockFetching = false;
 		});
 	},
 	methods: {
 		save() {
 			this._mutedWords = this.mutedWords.split('\n').map(line => line.split(' '));
 		}
 	}
 });
 </script>
--- a/src/client/app/common/views/components/note-header.vue
+++ b/src/client/app/common/views/components/note-header.vue
@@ -14,11 +14,12 @@
 			<mk-time :time="note.createdAt"/>
 		</router-link>
 		<span class="visibility" v-if="note.visibility != 'public'">
-			<template v-if="note.visibility == 'home'"><fa icon="home"/></template>
+			<fa v-if="note.visibility == 'home'" icon="home"/>
-			<template v-if="note.visibility == 'followers'"><fa icon="unlock"/></template>
+			<fa v-if="note.visibility == 'followers'" icon="unlock"/>
-			<template v-if="note.visibility == 'specified'"><fa icon="envelope"/></template>
+			<fa v-if="note.visibility == 'specified'" icon="envelope"/>
-			<template v-if="note.visibility == 'private'"><fa icon="lock"/></template>
+			<fa v-if="note.visibility == 'private'" icon="lock"/>
 		</span>
 		<span class="localOnly" v-if="note.localOnly == true"><fa icon="heart"/></span>
 	</div>
 </header>
 </template>
@@ -115,4 +116,7 @@ export default Vue.extend({
 		> .visibility
 			margin-left 8px
 		> .localOnly
 			margin-left 4px
 </style>
--- a/src/client/app/common/views/components/note-menu.vue
+++ b/src/client/app/common/views/components/note-menu.vue
@@ -9,7 +9,6 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 import { url } from '../../../config';
 import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
 import Ok from './ok.vue';
 import { concat, intersperse } from '../../../../../prelude/array';
 export default Vue.extend({
@@ -56,7 +55,7 @@ export default Vue.extend({
 							}
 					] : []
 				], [
-					this.note.userId == this.$store.state.i.id || this.$store.state.i.isAdmin ? [{
+					this.note.userId == this.$store.state.i.id || this.$store.state.i.isAdmin || this.$store.state.i.isModerator ? [{
 						icon: ['far', 'trash-alt'],
 						text: this.$t('delete'),
 						action: this.del
@@ -79,7 +78,10 @@ export default Vue.extend({
 			this.$root.api('i/pin', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.new(Ok);
+				this.$root.alert({
 					type: 'success',
 					splash: true
 				});
 				this.destroyDom();
 			});
 		},
@@ -93,11 +95,18 @@ export default Vue.extend({
 		},
 		del() {
-			if (!window.confirm(this.$t('delete-confirm'))) return;
+			this.$root.alert({
-			this.$root.api('notes/delete', {
+				type: 'warning',
-				noteId: this.note.id
+				text: this.$t('delete-confirm'),
-			}).then(() => {
+				showCancelButton: true
-				this.destroyDom();
+			}).then(res => {
 				if (!res) return;
 				this.$root.api('notes/delete', {
 					noteId: this.note.id
 				}).then(() => {
 					this.destroyDom();
 				});
 			});
 		},
@@ -105,7 +114,10 @@ export default Vue.extend({
 			this.$root.api('notes/favorites/create', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.new(Ok);
+				this.$root.alert({
 					type: 'success',
 					splash: true
 				});
 				this.destroyDom();
 			});
 		},
@@ -114,7 +126,10 @@ export default Vue.extend({
 			this.$root.api('notes/favorites/delete', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.new(Ok);
+				this.$root.alert({
 					type: 'success',
 					splash: true
 				});
 				this.destroyDom();
 			});
 		},
--- a/src/client/app/common/views/components/ok.vue
+++ b/src/client/app/common/views/components/ok.vue
@@ -1,175 +0,0 @@
 <template>
 <div class="yvbkymdqeusiqucuuloahhiqflzinufs">
 	<div class="bg" ref="bg"></div>
 	<div class="body" ref="body">
 		<div class="icon">
 			<div class="circle left"></div>
 			<span class="check tip"></span>
 			<span class="check long"></span>
 			<div class="ring"></div>
 			<div class="fix"></div>
 			<div class="circle right"></div>
 		</div>
 	</div>
 </div>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 import * as anime from 'animejs';
 export default Vue.extend({
 	mounted() {
 		this.$nextTick(() => {
 			anime({
 				targets: this.$refs.bg,
 				opacity: 1,
 				duration: 300,
 				easing: 'linear'
 			});
 			anime({
 				targets: this.$refs.body,
 				opacity: 1,
 				scale: [1.2, 1],
 				duration: 300,
 				easing: [0, 0.5, 0.5, 1]
 			});
 		});
 		setTimeout(() => {
 			anime({
 				targets: this.$refs.bg,
 				opacity: 0,
 				duration: 300,
 				easing: 'linear'
 			});
 			anime({
 				targets: this.$refs.body,
 				opacity: 0,
 				scale: 0.8,
 				duration: 300,
 				easing: [0.5, 0, 1, 0.5],
 				complete: () => this.destroyDom()
 			});
 		}, 1250);
 	}
 });
 </script>
 <style lang="stylus" scoped>
 .yvbkymdqeusiqucuuloahhiqflzinufs
 	pointer-events none
 	> .bg
 		display block
 		position fixed
 		z-index 10000
 		top 0
 		left 0
 		width 100%
 		height 100%
 		background rgba(#000, 0.7)
 		opacity 0
 	> .body
 		position fixed
 		z-index 10000
 		top 0
 		right 0
 		left 0
 		bottom 0
 		margin auto
 		width 150px
 		height 150px
 		background var(--face)
 		border-radius 8px
 		opacity 0
 		> .icon
 			display flex
 			justify-content center
 			position absolute
 			top 0
 			right 0
 			left 0
 			bottom 0
 			width 5em
 			height 5em
 			margin auto
 			border .25em solid transparent
 			border-radius 50%
 			line-height 5em
 			cursor default
 			box-sizing content-box
 			user-select none
 			zoom normal
 			border-color #a5dc86
 			> .circle
 				position absolute
 				width 3.75em
 				height 7.5em
 				transform rotate(45deg)
 				border-radius 50%
 				background var(--face)
 				&.left
 					top -.4375em
 					left -2.0635em
 					transform rotate(-45deg)
 					transform-origin 3.75em 3.75em
 					border-radius 7.5em 0 0 7.5em
 				&.right
 					top -.6875em
 					left 1.875em
 					transform rotate(-45deg)
 					transform-origin 0 3.75em
 					border-radius 0 7.5em 7.5em 0
 					animation swal2-rotate-success-circular-line 4.25s ease-in
 			> .check
 				display block
 				position absolute
 				height .3125em
 				border-radius .125em
 				background-color #a5dc86
 				z-index 2
 				&.tip
 					top 2.875em
 					left .875em
 					width 1.5625em
 					transform rotate(45deg)
 					animation swal2-animate-success-line-tip .75s
 				&.long
 					top 2.375em
 					right .5em
 					width 2.9375em
 					transform rotate(-45deg)
 					animation swal2-animate-success-line-long .75s
 			> .fix
 				position absolute
 				top .5em
 				left 1.625em
 				width .4375em
 				height 5.625em
 				transform rotate(-45deg)
 				z-index 1
 				background var(--face)
 			> .ring
 				position absolute
 				top -.25em
 				left -.25em
 				width 100%
 				height 100%
 				border .25em solid rgba(165,220,134,.3)
 				border-radius 50%
 				z-index 2
 				box-sizing content-box
 </style>
--- a/src/client/app/common/views/components/password-settings.vue
+++ b/src/client/app/common/views/components/password-settings.vue
@@ -25,12 +25,9 @@ export default Vue.extend({
 						type: 'password'
 					}).then(newPassword2 => {
 						if (newPassword !== newPassword2) {
-							this.$dialog({
+							this.$root.alert({
 								title: null,
-								text: this.$t('not-match'),
+								text: this.$t('not-match')
 								actions: [{
 									text: 'OK'
 								}]
 							});
 							return;
 						}
--- a/src/client/app/common/views/components/profile-editor.vue
+++ b/src/client/app/common/views/components/profile-editor.vue
@@ -73,12 +73,13 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import { apiUrl, host } from '../../../config';
 import { toUnicode } from 'punycode';
 export default Vue.extend({
 	i18n: i18n('common/views/components/profile-editor.vue'),
 	data() {
 		return {
-			host,
+			host: toUnicode(host),
 			name: null,
 			username: null,
 			location: null,
@@ -192,7 +193,7 @@ export default Vue.extend({
 				this.$store.state.i.bannerUrl = i.bannerUrl;
 				if (notify) {
-					this.$swal({
+					this.$root.alert({
 						type: 'success',
 						text: this.$t('saved')
 					});
@@ -222,6 +223,5 @@ export default Vue.extend({
 			width 72px
 			height 72px
 			margin auto
 			box-shadow 0 0 16px rgba(0, 0, 0, 0.5)
 </style>
--- a/src/client/app/common/views/components/signin.vue
+++ b/src/client/app/common/views/components/signin.vue
@@ -12,8 +12,9 @@
 	</ui-input>
 	<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required styl="fill"/>
 	<ui-button type="submit" :disabled="signing">{{ signing ? $t('signing-in') : $t('signin') }}</ui-button>
-	<p style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`">{{ $t('signin-with-twitter') }}</a></p>
+	<p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`">{{ $t('signin-with-twitter') }}</a></p>
-	<p style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`">{{ $t('signin-with-github') }}</a></p>
+	<p v-if="meta && meta.enableGithubIntegration"  style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`">{{ $t('signin-with-github') }}</a></p>
 	<p v-if="meta && meta.enableDiscordIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/discord`">{{ $t('signin-with-discord') /* TODO: Make these layouts better */ }}</a></p>
 </form>
 </template>
@@ -21,6 +22,7 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import { apiUrl, host } from '../../../config';
 import { toUnicode } from 'punycode';
 export default Vue.extend({
 	i18n: i18n('common/views/components/signin.vue'),
@@ -39,9 +41,15 @@ export default Vue.extend({
 			password: '',
 			token: '',
 			apiUrl,
-			host
+			host: toUnicode(host),
 			meta: null
 		};
 	},
 	created() {
 		this.$root.getMeta().then(meta => {
 			this.meta = meta;
 		});
 	},
 	methods: {
 		onUsernameChange() {
 			this.$root.api('users/show', {
--- a/src/client/app/common/views/components/signup.vue
+++ b/src/client/app/common/views/components/signup.vue
@@ -10,7 +10,7 @@
 			<span>{{ $t('username') }}</span>
 			<span slot="prefix">@</span>
 			<span slot="suffix">@{{ host }}</span>
-			<p slot="desc" v-if="usernameState == 'wait'" style="color:#999"><fa icon="spinner .pulse" fixed-width/> {{ $t('checking') }}</p>
+			<p slot="desc" v-if="usernameState == 'wait'" style="color:#999"><fa icon="spinner" pulse fixed-width/> {{ $t('checking') }}</p>
 			<p slot="desc" v-if="usernameState == 'ok'" style="color:#3CB7B5"><fa icon="check" fixed-width/> {{ $t('available') }}</p>
 			<p slot="desc" v-if="usernameState == 'unavailable'" style="color:#FF1161"><fa icon="exclamation-triangle" fixed-width/> {{ $t('unavailable') }}</p>
 			<p slot="desc" v-if="usernameState == 'error'" style="color:#FF1161"><fa icon="exclamation-triangle" fixed-width/> {{ $t('error') }}</p>
@@ -46,12 +46,13 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 const getPasswordStrength = require('syuilo-password-strength');
 import { host, url } from '../../../config';
 import { toUnicode } from 'punycode';
 export default Vue.extend({
 	i18n: i18n('common/views/components/signup.vue'),
 	data() {
 		return {
-			host,
+			host: toUnicode(host),
 			username: '',
 			password: '',
 			retypedPassword: '',
--- a/src/client/app/common/views/components/stream-indicator.vue
+++ b/src/client/app/common/views/components/stream-indicator.vue
@@ -1,11 +1,11 @@
 <template>
 <div class="mk-stream-indicator">
 	<p v-if="stream.state == 'initializing'">
-		<fa icon="spinner .pulse"/>
+		<fa icon="spinner" pulse/>
 		<span>{{ $t('connecting') }}<mk-ellipsis/></span>
 	</p>
 	<p v-if="stream.state == 'reconnecting'">
-		<fa icon="spinner .pulse"/>
+		<fa icon="spinner" pulse/>
 		<span>{{ $t('reconnecting') }}<mk-ellipsis/></span>
 	</p>
 	<p v-if="stream.state == 'connected'">
--- a/src/client/app/common/views/components/tag-cloud.vue
+++ b/src/client/app/common/views/components/tag-cloud.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="jtivnzhfwquxpsfidertopbmwmchmnmo">
-	<p class="fetching" v-if="fetching"><fa icon="spinner .pulse" fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
+	<p class="fetching" v-if="fetching"><fa icon="spinner" pulse fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
 	<p class="empty" v-else-if="tags.length == 0"><fa icon="exclamation-circle"/>{{ $t('empty') }}</p>
 	<div v-else>
 		<vue-word-cloud
--- a/src/client/app/common/views/components/theme.vue
+++ b/src/client/app/common/views/components/theme.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="nicnklzforebnpfgasiypmpdaaglujqm">
 	<label>
-		<span>{{ $t('light-theme') }}</span>
+		<span><fa :icon="faSun"/> {{ $t('light-theme') }}</span>
 		<ui-select v-model="light" :placeholder="$t('light-theme')">
 			<optgroup :label="$t('light-themes')">
 				<option v-for="x in lightThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
@@ -13,7 +13,7 @@
 	</label>
 	<label>
-		<span>{{ $t('dark-theme') }}</span>
+		<span><fa :icon="faMoon"/> {{ $t('dark-theme') }}</span>
 		<ui-select v-model="dark" :placeholder="$t('dark-theme')">
 			<optgroup :label="$t('dark-themes')">
 				<option v-for="x in darkThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
@@ -104,6 +104,7 @@ import { Chrome } from 'vue-color';
 import * as uuid from 'uuid';
 import * as tinycolor from 'tinycolor2';
 import * as JSON5 from 'json5';
 import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons';
 // 後方互換性のため
 function convertOldThemedefinition(t) {
@@ -135,7 +136,8 @@ export default Vue.extend({
 			myThemeDesc: '',
 			myThemePrimary: lightTheme.vars.primary,
 			myThemeSecondary: lightTheme.vars.secondary,
-			myThemeText: lightTheme.vars.text
+			myThemeText: lightTheme.vars.text,
 			faMoon, faSun
 		};
 	},
@@ -221,7 +223,7 @@ export default Vue.extend({
 			try {
 				theme = JSON5.parse(code);
 			} catch (e) {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: this.$t('invalid-theme')
 				});
@@ -234,7 +236,7 @@ export default Vue.extend({
 			}
 			if (theme.id == null) {
-				this.$swal({
+				this.$root.alert({
 					type: 'error',
 					text: this.$t('invalid-theme')
 				});
@@ -242,7 +244,7 @@ export default Vue.extend({
 			}
 			if (this.$store.state.device.themes.some(t => t.id == theme.id)) {
-				this.$swal({
+				this.$root.alert({
 					type: 'info',
 					text: this.$t('already-installed')
 				});
@@ -254,7 +256,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});
-			this.$swal({
+			this.$root.alert({
 				type: 'success',
 				text: this.$t('installed').replace('{}', theme.name)
 			});
@@ -267,7 +269,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});
-			this.$swal({
+			this.$root.alert({
 				type: 'info',
 				text: this.$t('uninstalled').replace('{}', theme.name)
 			});
@@ -304,7 +306,7 @@ export default Vue.extend({
 			const theme = this.myTheme;
 			if (theme.name == null || theme.name.trim() == '') {
-				this.$swal({
+				this.$root.alert({
 					type: 'warning',
 					text: this.$t('theme-name-required')
 				});
@@ -318,7 +320,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});
-			this.$swal({
+			this.$root.alert({
 				type: 'success',
 				text: this.$t('saved')
 			});
--- a/src/client/app/common/views/components/time.vue
+++ b/src/client/app/common/views/components/time.vue
@@ -53,8 +53,8 @@ export default Vue.extend({
 				ago >= 3600     ? this.$t('@.time.hours_ago')  .replace('{}', (~~(ago / 3600)).toString()) :
 				ago >= 60       ? this.$t('@.time.minutes_ago').replace('{}', (~~(ago / 60)).toString()) :
 				ago >= 10       ? this.$t('@.time.seconds_ago').replace('{}', (~~(ago % 60)).toString()) :
-				ago >= 0        ? this.$t('@.time.just_now') :
+				ago >= -1       ? this.$t('@.time.just_now') :
-				ago <  0        ? this.$t('@.time.future') :
+				ago <  -1       ? this.$t('@.time.future') :
 				this.$t('@.time.unknown'));
 		}
 	},
--- a/src/client/app/common/views/components/timer.vue
+++ b/src/client/app/common/views/components/timer.vue
@@ -1,49 +0,0 @@
 <template>
 <time class="mk-time">
 	{{ hh }}:{{ mm }}:{{ ss }}
 </time>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 export default Vue.extend({
 	props: {
 		time: {
 			type: [Date, String],
 			required: true
 		}
 	},
 	data() {
 		return {
 			tickId: null,
 			hh: null,
 			mm: null,
 			ss: null
 		};
 	},
 	computed: {
 		_time(): Date {
 			return typeof this.time == 'string' ? new Date(this.time) : this.time;
 		}
 	},
 	created() {
 		this.tick();
 		this.tickId = setInterval(this.tick, 1000);
 	},
 	destroyed() {
 		clearInterval(this.tickId);
 	},
 	methods: {
 		tick() {
 			const now = new Date().getTime();
 			const start = this._time.getTime();
 			const ago = Math.floor((now - start) / 1000);
 			this.hh = Math.floor(ago / (60 * 60)).toString().padStart(2, '0');
 			this.mm = Math.floor(ago / 60).toString().padStart(2, '0');
 			this.ss = (ago % 60).toString().padStart(2, '0');
 		}
 	}
 });
 </script>
--- a/src/client/app/common/views/components/trends.vue
+++ b/src/client/app/common/views/components/trends.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="csqvmxybqbycalfhkxvyfrgbrdalkaoc">
-	<p class="fetching" v-if="fetching"><fa icon="spinner .pulse" fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
+	<p class="fetching" v-if="fetching"><fa icon="spinner" pulse fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
 	<p class="empty" v-else-if="stats.length == 0"><fa icon="exclamation-circle"/>{{ $t('empty') }}</p>
 	<!-- トランジションを有効にするとなぜかメモリリークする -->
 	<transition-group v-else tag="div" name="chart">
--- a/src/client/app/common/views/components/twitter-setting.vue
+++ b/src/client/app/common/views/components/twitter-setting.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="mk-twitter-setting">
-	<p>{{ $t('description') }}<a :href="`${docsUrl}/link-to-twitter`" target="_blank">{{ $t('detail') }}</a></p>
+	<p>{{ $t('description') }}</p>
 	<p class="account" v-if="$store.state.i.twitter" :title="`Twitter ID: ${$store.state.i.twitter.userId}`">{{ $t('connected-to') }}: <a :href="`https://twitter.com/${$store.state.i.twitter.screenName}`" target="_blank">@{{ $store.state.i.twitter.screenName }}</a></p>
 	<p>
 		<a :href="`${apiUrl}/connect/twitter`" target="_blank" @click.prevent="connect">{{ $store.state.i.twitter ? this.$t('reconnect') : this.$t('connect') }}</a>
@@ -14,15 +14,14 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { apiUrl, docsUrl } from '../../../config';
+import { apiUrl } from '../../../config';
 export default Vue.extend({
 	i18n: i18n('common/views/components/twitter-setting.vue'),
 	data() {
 		return {
 			form: null,
-			apiUrl,
+			apiUrl
 			docsUrl
 		};
 	},
 	mounted() {
--- a/src/client/app/common/views/components/ui/button.vue
+++ b/src/client/app/common/views/components/ui/button.vue
@@ -38,12 +38,24 @@ export default Vue.extend({
 			type: Boolean,
 			required: false,
 			default: false
-		}
+		},
 		autofocus: {
 			type: Boolean,
 			required: false,
 			default: false
 		},
 	},
 	data() {
 		return {
 			styl: 'fill'
 		};
 	},
 	mounted() {
 		if (this.autofocus) {
 			this.$nextTick(() => {
 				this.$el.focus();
 			});
 		}
 	}
 });
 </script>
@@ -57,6 +69,7 @@ export default Vue.extend({
 	text-align center
 	font-weight normal
 	font-size 16px
 	line-height 24px
 	border none
 	border-radius 6px
 	outline none
@@ -85,6 +98,7 @@ export default Vue.extend({
 	&.inline
 		display inline-block
 		width auto
 		min-width 100px
 	&.primary
 		font-weight bold
--- a/src/client/app/common/views/components/ui/horizon-group.vue
+++ b/src/client/app/common/views/components/ui/horizon-group.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="pfzekjfwkwvadvlujpdnnxfggqgqjoze" :class="{ inputs }">
+<div class="vnxwkwuf" :class="{ inputs, noGrow }">
 	<slot></slot>
 </div>
 </template>
@@ -15,21 +15,27 @@ export default Vue.extend({
 			type: Boolean,
 			required: false,
 			default: false
 		},
 		noGrow: {
 			type: Boolean,
 			required: false,
 			default: false
 		}
 	}
 });
 </script>
 <style lang="stylus" scoped>
-.pfzekjfwkwvadvlujpdnnxfggqgqjoze
+.vnxwkwuf
 	display flex
 	&.inputs
 		margin 32px 0
-	> *
+	&:not(.noGrow)
-		flex 1
+		display flex
-		&:not(:last-child)
+		> *
-			margin-right 16px
+			flex 1
 	> *:not(:last-child)
 		margin-right 16px
 </style>
--- a/src/client/app/common/views/components/ui/textarea.vue
+++ b/src/client/app/common/views/components/ui/textarea.vue
@@ -141,6 +141,7 @@ root(fill)
 	> .desc
 		margin 6px 0
 		font-size 13px
 		opacity 0.7
 		*
 			margin 0
--- a/src/client/app/common/views/components/uploader.vue
+++ b/src/client/app/common/views/components/uploader.vue
@@ -3,7 +3,7 @@
 	<ol v-if="uploads.length > 0">
 		<li v-for="ctx in uploads" :key="ctx.id">
 			<div class="img" :style="{ backgroundImage: `url(${ ctx.img })` }"></div>
-			<p class="name"><fa icon="spinner .pulse"/>{{ ctx.name }}</p>
+			<p class="name"><fa icon="spinner" pulse/>{{ ctx.name }}</p>
 			<p class="status">
 				<span class="initing" v-if="ctx.progress == undefined">{{ $t('waiting') }}<mk-ellipsis/></span>
 				<span class="kb" v-if="ctx.progress != undefined">{{ String(Math.floor(ctx.progress.value / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }}<i>KB</i> / {{ String(Math.floor(ctx.progress.max / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }}<i>KB</i></span>
@@ -57,17 +57,11 @@ export default Vue.extend({
 						return;
 					}
 					// Upload if the file didn't exist yet
 					const buf = new Uint8Array(e.target.result);
 					let bin = '';
 					// We use for-of loop instead of apply() to avoid RangeError
 					// SEE: https://stackoverflow.com/questions/9267899/arraybuffer-to-base64-encoded-string
 					for (const byte of buf) bin += String.fromCharCode(byte);
 					const ctx = {
 						id: id,
 						name: file.name || 'untitled',
 						progress: undefined,
-						img: 'data:*/*;base64,' + btoa(bin)
+						img: window.URL.createObjectURL(file)
 					};
 					this.uploads.push(ctx);
--- a/src/client/app/common/views/components/visibility-chooser.vue
+++ b/src/client/app/common/views/components/visibility-chooser.vue
@@ -35,6 +35,25 @@
 				<span>{{ $t('private') }}</span>
 			</div>
 		</div>
 		<div @click="choose('local-public')" :class="{ active: v == 'local-public' }">
 			<div><fa icon="globe"/></div>
 			<div>
 				<span>{{ $t('local-public') }}</span>
 				<span>{{ $t('local-public-desc') }}</span>
 			</div>
 		</div>
 		<div @click="choose('local-home')" :class="{ active: v == 'local-home' }">
 			<div><fa icon="home"/></div>
 			<div>
 				<span>{{ $t('local-home') }}</span>
 			</div>
 		</div>
 		<div @click="choose('local-followers')" :class="{ active: v == 'local-followers' }">
 			<div><fa icon="unlock"/></div>
 			<div>
 				<span>{{ $t('local-followers') }}</span>
 			</div>
 		</div>
 	</div>
 </div>
 </template>
--- a/src/client/app/common/views/directives/autocomplete.ts
+++ b/src/client/app/common/views/directives/autocomplete.ts
@@ -1,5 +1,4 @@
 import * as getCaretCoordinates from 'textarea-caret';
 import MkAutocomplete from '../components/autocomplete.vue';
 import { toASCII } from 'punycode';
 export default {
@@ -123,7 +122,7 @@ class Autocomplete {
 	/**
 	 * サジェストを提示します。
 	 */
-	private open(type, q) {
+	private async open(type, q) {
 		if (type != this.currentType) {
 			this.close();
 		}
@@ -143,6 +142,8 @@ class Autocomplete {
 			this.suggestion.y = y;
 			this.suggestion.q = q;
 		} else {
 			const MkAutocomplete = await import('../components/autocomplete.vue').then(m => m.default);
 			// サジェスト要素作成
 			this.suggestion = new MkAutocomplete({
 				parent: this.vm,
--- a/src/client/app/common/views/pages/follow.vue
+++ b/src/client/app/common/views/pages/follow.vue
@@ -25,7 +25,7 @@
 			<template v-else-if="!user.isFollowing && user.isLocked"><fa icon="plus"/> {{ $t('follow-request') }}</template>
 			<template v-else-if="!user.isFollowing && !user.isLocked"><fa icon="plus"/> {{ $t('follow') }}</template>
 		</template>
-		<template v-else><fa icon="spinner .pulse" fixed-width/></template>
+		<template v-else><fa icon="spinner" pulse fixed-width/></template>
 	</button>
 </div>
 </template>
--- a/src/client/app/common/views/widgets/photo-stream.vue
+++ b/src/client/app/common/views/widgets/photo-stream.vue
@@ -3,9 +3,15 @@
 	<mk-widget-container :show-header="props.design == 0" :naked="props.design == 2">
 		<template slot="header"><fa icon="camera"/>{{ $t('title') }}</template>
-		<p :class="$style.fetching" v-if="fetching"><fa icon="spinner .pulse" fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
+		<p :class="$style.fetching" v-if="fetching"><fa icon="spinner" pulse fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
 		<div :class="$style.stream" v-if="!fetching && images.length > 0">
-			<div v-for="image in images" :class="$style.img" :style="`background-image: url(${image.thumbnailUrl || image.url})`"></div>
+			<div v-for="image in images"
 				:class="$style.img"
 				:style="`background-image: url(${image.thumbnailUrl || image.url})`"
 				draggable="true"
 				@dragstart="onDragstart(image, $event)"
 				@dragend="onDragend"
 			></div>
 		</div>
 		<p :class="$style.empty" v-if="!fetching && images.length == 0">{{ $t('no-photos') }}</p>
 	</mk-widget-container>
@@ -31,6 +37,7 @@ export default define({
 			connection: null
 		};
 	},
 	mounted() {
 		this.connection = this.$root.stream.useSharedConnection('main');
@@ -44,9 +51,11 @@ export default define({
 			this.fetching = false;
 		});
 	},
 	beforeDestroy() {
 		this.connection.dispose();
 	},
 	methods: {
 		onDriveFileCreated(file) {
 			if (/^image\/.+$/.test(file.type)) {
@@ -54,6 +63,7 @@ export default define({
 				if (this.images.length > 9) this.images.pop();
 			}
 		},
 		func() {
 			if (this.props.design == 2) {
 				this.props.design = 0;
@@ -62,7 +72,16 @@ export default define({
 			}
 			this.save();
-		}
+		},
 		onDragstart(file, e) {
 			e.dataTransfer.effectAllowed = 'move';
 			e.dataTransfer.setData('mk_drive_file', JSON.stringify(file));
 		},
 		onDragend(e) {
 			this.browser.isDragSource = false;
 		},
 	}
 });
 </script>
--- a/src/client/app/common/views/widgets/rss.vue
+++ b/src/client/app/common/views/widgets/rss.vue
@@ -5,7 +5,7 @@
 		<button slot="func" title="設定" @click="setting"><fa icon="cog"/></button>
 		<div class="mkw-rss--body" :data-mobile="platform == 'mobile'">
-			<p class="fetching" v-if="fetching"><fa icon="spinner .pulse" fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
+			<p class="fetching" v-if="fetching"><fa icon="spinner" pulse fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
 			<div class="feed" v-else>
 				<a v-for="item in items" :href="item.link" target="_blank">{{ item.title }}</a>
 			</div>
--- a/src/client/app/common/views/widgets/server.info.vue
+++ b/src/client/app/common/views/widgets/server.info.vue
@@ -3,6 +3,7 @@
 	<p>Maintainer: <b><a :href="'mailto:' + meta.maintainer.email" target="_blank">{{ meta.maintainer.name }}</a></b></p>
 	<p>Machine: {{ meta.machine }}</p>
 	<p>Node: {{ meta.node }}</p>
 	<p>Version: {{ meta.version }} </p>
 </div>
 </template>
--- a/src/client/app/common/views/widgets/server.memory.vue
+++ b/src/client/app/common/views/widgets/server.memory.vue
@@ -2,7 +2,7 @@
 <div class="memory">
 	<x-pie class="pie" :value="usage"/>
 	<div>
-		<p><fa icon="flask"/>Memory</p>
+		<p><fa icon="memory"/>Memory</p>
 		<p>Total: {{ total | bytes(1) }}</p>
 		<p>Used: {{ used | bytes(1) }}</p>
 		<p>Free: {{ free | bytes(1) }}</p>
--- a/src/client/app/common/views/widgets/server.vue
+++ b/src/client/app/common/views/widgets/server.vue
@@ -4,7 +4,7 @@
 		<template slot="header"><fa icon="server"/>{{ $t('title') }}</template>
 		<button slot="func" @click="toggle" :title="$t('toggle')"><fa icon="sort"/></button>
-		<p :class="$style.fetching" v-if="fetching"><fa icon="spinner .pulse" fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
+		<p :class="$style.fetching" v-if="fetching"><fa icon="spinner" pulse fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
 		<template v-if="!fetching">
 			<x-cpu-memory v-show="props.view == 0" :connection="connection"/>
 			<x-cpu v-show="props.view == 1" :connection="connection" :meta="meta"/>
--- a/src/client/app/config.ts
+++ b/src/client/app/config.ts
@@ -1,6 +1,4 @@
-declare const _LANG_: string;
+declare const _LANGS_: string[];
 declare const _LANGS_: string;
 declare const _LOCALE_: { [key: string]: any };
 declare const _THEME_COLOR_: string;
 declare const _COPYRIGHT_: string;
 declare const _VERSION_: string;
@@ -15,9 +13,9 @@ export const hostname = address.hostname;
 export const url = address.origin;
 export const apiUrl = url + '/api';
 export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://') + '/streaming';
-export const lang = _LANG_;
+export const lang = window.lang;
 export const langs = _LANGS_;
-export const locale = _LOCALE_;
+export const locale = JSON.parse(localStorage.getItem('locale'));
 export const themeColor = _THEME_COLOR_;
 export const copyright = _COPYRIGHT_;
 export const version = _VERSION_;
--- a/src/client/app/desktop/api/update-avatar.ts
+++ b/src/client/app/desktop/api/update-avatar.ts
@@ -8,12 +8,9 @@ export default ($root: any) => {
 		const regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$');
 		if (!regex.test(file.name) ) {
-			$root.$dialog({
+			$root.alert({
 				title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
-				text: null,
+				text: null
 				actions: [{
 					text: '%i18n:common.got-it%'
 				}]
 			});
 			return reject('invalid-filetype');
 		}
@@ -90,12 +87,9 @@ export default ($root: any) => {
 				value: i.avatarUrl
 			});
-			$root.$dialog({
+			$root.alert({
 				title: '%fa:info-circle% %i18n:desktop.avatar-updated%',
-				text: null,
+				text: null
 				actions: [{
 					text: '%i18n:common.got-it%'
 				}]
 			});
 			return i;
--- a/src/client/app/desktop/api/update-banner.ts
+++ b/src/client/app/desktop/api/update-banner.ts
@@ -10,10 +10,7 @@ export default ($root: any) => {
 		if (!regex.test(file.name) ) {
 			$root.dialog({
 				title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
-				text: null,
+				text: null
 				actions: [{
 					text: '%i18n:common.got-it%'
 				}]
 			});
 			return reject('invalid-filetype');
 		}
@@ -90,12 +87,9 @@ export default ($root: any) => {
 				value: i.bannerUrl
 			});
-			$root.$dialog({
+			$root.alert({
 				title: '%fa:info-circle% %i18n:desktop.banner-updated%',
-				text: null,
+				text: null
 				actions: [{
 					text: '%i18n:common.got-it%'
 				}]
 			});
 			return i;
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -34,7 +34,6 @@ import PostFormWindow from './views/components/post-form-window.vue';
 import RenoteFormWindow from './views/components/renote-form-window.vue';
 import MkChooseFileFromDriveWindow from './views/components/choose-file-from-drive-window.vue';
 import MkChooseFolderFromDriveWindow from './views/components/choose-folder-from-drive-window.vue';
 import Dialog from './views/components/dialog.vue';
 import InputDialog from './views/components/input-dialog.vue';
 import Notification from './views/components/ui-notification.vue';
@@ -114,21 +113,6 @@ init(async (launch) => {
 				});
 			},
 			$dialog(opts) {
 				return new Promise<string>((res, rej) => {
 					const o = opts || {};
 					const d = this.$root.new(Dialog, {
 						title: o.title,
 						text: o.text,
 						modal: o.modal,
 						buttons: o.actions
 					});
 					d.$once('clicked', id => {
 						res(id);
 					});
 				});
 			},
 			$input(opts) {
 				return new Promise<string>((res, rej) => {
 					const o = opts || {};
--- a/src/client/app/desktop/views/components/activity.vue
+++ b/src/client/app/desktop/views/components/activity.vue
@@ -4,7 +4,7 @@
 		<template slot="header"><fa icon="chart-bar"/>{{ $t('title') }}</template>
 		<button slot="func" :title="$t('toggle')" @click="toggle"><fa icon="sort"/></button>
-		<p :class="$style.fetching" v-if="fetching"><fa icon="spinner .pulse" fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
+		<p :class="$style.fetching" v-if="fetching"><fa icon="spinner" pulse fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
 		<template v-else>
 			<x-calendar v-show="view == 0" :data="[].concat(activity)"/>
 			<x-chart v-show="view == 1" :data="[].concat(activity)"/>
--- a/src/client/app/desktop/views/components/choose-file-from-drive-window.vue
+++ b/src/client/app/desktop/views/components/choose-file-from-drive-window.vue
@@ -5,7 +5,7 @@
 		<span :class="$style.count" v-if="multiple && files.length > 0">({{ $t('chosen-files', { count: files.length }) }})</span>
 	</span>
-	<mk-drive
+	<x-drive
 		ref="browser"
 		:class="$style.browser"
 		:multiple="multiple"
@@ -25,6 +25,9 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 export default Vue.extend({
 	i18n: i18n('desktop/views/components/choose-file-from-drive-window.vue'),
 	components: {
 		XDrive: () => import('./drive.vue').then(m => m.default),
 	},
 	props: {
 		multiple: {
 			default: false
--- a/src/client/app/desktop/views/components/choose-folder-from-drive-window.vue
+++ b/src/client/app/desktop/views/components/choose-folder-from-drive-window.vue
@@ -4,7 +4,7 @@
 		<span :class="$style.title">{{ $t('choose-prompt') }}</span>
 	</span>
-	<mk-drive
+	<x-drive
 		ref="browser"
 		:class="$style.browser"
 		:multiple="false"
@@ -21,6 +21,9 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 export default Vue.extend({
 	i18n: i18n('desktop/views/components/choose-folder-from-drive-window.vue'),
 	components: {
 		XDrive: () => import('./drive.vue').then(m => m.default),
 	},
 	methods: {
 		ok() {
 			this.$emit('selected', (this.$refs.browser as any).folder);
--- a/src/client/app/desktop/views/components/dialog.vue
+++ b/src/client/app/desktop/views/components/dialog.vue
@@ -1,168 +0,0 @@
 <template>
 <div class="mk-dialog">
 	<div class="bg" ref="bg" @click="onBgClick"></div>
 	<div class="main" ref="main">
 		<header v-html="title" :class="$style.header"></header>
 		<div class="body" v-html="text"></div>
 		<div class="buttons">
 			<button v-for="button in buttons" @click="click(button)">{{ button.text }}</button>
 		</div>
 	</div>
 </div>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 import * as anime from 'animejs';
 export default Vue.extend({
 	props: {
 		title: {
 			type: String,
 			required: false
 		},
 		text: {
 			type: String,
 			required: true
 		},
 		buttons: {
 			type: Array,
 			default: () => {
 				return [{
 					text: 'OK'
 				}];
 			}
 		},
 		modal: {
 			type: Boolean,
 			default: false
 		}
 	},
 	mounted() {
 		this.$nextTick(() => {
 			(this.$refs.bg as any).style.pointerEvents = 'auto';
 			anime({
 				targets: this.$refs.bg,
 				opacity: 1,
 				duration: 100,
 				easing: 'linear'
 			});
 			anime({
 				targets: this.$refs.main,
 				opacity: 1,
 				scale: [1.2, 1],
 				duration: 300,
 				easing: [0, 0.5, 0.5, 1]
 			});
 		});
 	},
 	methods: {
 		click(button) {
 			this.$emit('clicked', button.id);
 			this.close();
 		},
 		close() {
 			(this.$refs.bg as any).style.pointerEvents = 'none';
 			anime({
 				targets: this.$refs.bg,
 				opacity: 0,
 				duration: 300,
 				easing: 'linear'
 			});
 			(this.$refs.main as any).style.pointerEvents = 'none';
 			anime({
 				targets: this.$refs.main,
 				opacity: 0,
 				scale: 0.8,
 				duration: 300,
 				easing: [ 0.5, -0.5, 1, 0.5 ],
 				complete: () => this.destroyDom()
 			});
 		},
 		onBgClick() {
 			if (!this.modal) {
 				this.close();
 			}
 		}
 	}
 });
 </script>
 <style lang="stylus" scoped>
 .mk-dialog
 	> .bg
 		display block
 		position fixed
 		z-index 8192
 		top 0
 		left 0
 		width 100%
 		height 100%
 		background rgba(#000, 0.7)
 		opacity 0
 		pointer-events none
 	> .main
 		display block
 		position fixed
 		z-index 8192
 		top 20%
 		left 0
 		right 0
 		margin 0 auto 0 auto
 		padding 32px 42px
 		width 480px
 		background #fff
 		opacity 0
 		> .body
 			margin 1em 0
 			color #888
 		> .buttons
 			> button
 				display inline-block
 				float right
 				margin 0
 				padding 10px 10px
 				font-size 1.1em
 				font-weight normal
 				text-decoration none
 				color #888
 				background transparent
 				outline none
 				border none
 				border-radius 0
 				cursor pointer
 				transition color 0.1s ease
 				i
 					margin 0 0.375em
 				&:hover
 					color var(--primary)
 				&:active
 					color var(--primaryDarken10)
 					transition color 0s ease
 </style>
 <style lang="stylus" module>
 .header
 	margin 1em 0
 	color var(--primary)
 	// color #43A4EC
 	font-weight bold
 	&:empty
 		display none
 	> i
 		margin-right 0.5em
 </style>
--- a/src/client/app/desktop/views/components/drive-window.vue
+++ b/src/client/app/desktop/views/components/drive-window.vue
@@ -4,7 +4,7 @@
 		<p v-if="usage" :class="$style.info"><b>{{ usage.toFixed(1) }}%</b> {{ $t('used') }}</p>
 		<span :class="$style.title"><fa icon="cloud"/>{{ $t('@.drive') }}</span>
 	</template>
-	<mk-drive :class="$style.browser" multiple :init-folder="folder" ref="browser"/>
+	<x-drive :class="$style.browser" multiple :init-folder="folder" ref="browser"/>
 </mk-window>
 </template>
@@ -15,6 +15,9 @@ import { url } from '../../../config';
 export default Vue.extend({
 	i18n: i18n('desktop/views/components/drive-window.vue'),
 	components: {
 		XDrive: () => import('./drive.vue').then(m => m.default),
 	},
 	props: ['folder'],
 	data() {
 		return {
--- a/src/client/app/desktop/views/components/drive.file.vue
+++ b/src/client/app/desktop/views/components/drive.file.vue
@@ -170,12 +170,9 @@ export default Vue.extend({
 		copyUrl() {
 			copyToClipboard(this.file.url);
-			this.$dialog({
+			this.$root.alert({
 				title: this.$t('contextmenu.copied'),
-				text: this.$t('contextmenu.copied-url-to-clipboard'),
+				text: this.$t('contextmenu.copied-url-to-clipboard')
 				actions: [{
 					text: this.$t('@.ok')
 				}]
 			});
 		},
--- a/src/client/app/desktop/views/components/drive.folder.vue
+++ b/src/client/app/desktop/views/components/drive.folder.vue
@@ -155,12 +155,9 @@ export default Vue.extend({
 				}).catch(err => {
 					switch (err) {
 						case 'detected-circular-definition':
-							this.$dialog({
+							this.$root.alert({
 								title: this.$t('unable-to-process'),
-								text: this.$t('circular-reference-detected'),
+								text: this.$t('circular-reference-detected')
 								actions: [{
 									text: this.$t('@.ok')
 								}]
 							});
 							break;
 						default:
--- a/src/client/app/desktop/views/components/drive.vue
+++ b/src/client/app/desktop/views/components/drive.vue
@@ -313,16 +313,13 @@ export default Vue.extend({
 				}).catch(err => {
 					switch (err) {
 						case 'detected-circular-definition':
-							this.$dialog({
+							this.$root.alert({
 								title: this.$t('unable-to-process'),
-								text: this.$t('circular-reference-detected'),
+								text: this.$t('circular-reference-detected')
 								actions: [{
 									text: this.$t('@.ok')
 								}]
 							});
 							break;
 						default:
-							alert(`%i18n:@unhandled-error% ${err}`);
+							alert(this.$t('unhandled-error'));
 					}
 				});
 			}
@@ -343,12 +340,9 @@ export default Vue.extend({
 					folderId: this.folder ? this.folder.id : undefined
 				});
-				this.$dialog({
+				this.$root.alert({
 					title: this.$t('url-upload-requested'),
-					text: this.$t('may-take-time'),
+					text: this.$t('may-take-time')
 					actions: [{
 						text: this.$t('@.ok')
 					}]
 				});
 			});
 		},
--- a/src/client/app/desktop/views/components/emoji-picker-dialog.vue
+++ b/src/client/app/desktop/views/components/emoji-picker-dialog.vue
@@ -0,0 +1,84 @@
 <template>
 <div class="gcafiosrssbtbnbzqupfmglvzgiaipyv">
 	<x-picker @chosen="chosen"/>
 </div>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 import contains from '../../../common/scripts/contains';
 export default Vue.extend({
 	components: {
 		XPicker: () => import('../../../common/views/components/emoji-picker.vue').then(m => m.default)
 	},
 	props: {
 		x: {
 			type: Number,
 			required: true
 		},
 		y: {
 			type: Number,
 			required: true
 		}
 	},
 	mounted() {
 		this.$nextTick(() => {
 			const width = this.$el.offsetWidth;
 			const height = this.$el.offsetHeight;
 			let x = this.x;
 			let y = this.y;
 			if (x + width - window.pageXOffset > window.innerWidth) {
 				x = window.innerWidth - width + window.pageXOffset;
 			}
 			if (y + height - window.pageYOffset > window.innerHeight) {
 				y = window.innerHeight - height + window.pageYOffset;
 			}
 			this.$el.style.left = x + 'px';
 			this.$el.style.top = y + 'px';
 			Array.from(document.querySelectorAll('body *')).forEach(el => {
 				el.addEventListener('mousedown', this.onMousedown);
 			});
 		});
 	},
 	methods: {
 		onMousedown(e) {
 			e.preventDefault();
 			if (!contains(this.$el, e.target) && (this.$el != e.target)) this.close();
 			return false;
 		},
 		chosen(emoji) {
 			this.$emit('chosen', emoji);
 			this.close();
 		},
 		close() {
 			Array.from(document.querySelectorAll('body *')).forEach(el => {
 				el.removeEventListener('mousedown', this.onMousedown);
 			});
 			this.$emit('closed');
 			this.destroyDom();
 		}
 	}
 });
 </script>
 <style lang="stylus" scoped>
 .gcafiosrssbtbnbzqupfmglvzgiaipyv
 	position fixed
 	top 0
 	left 0
 	z-index 3000
 	box-shadow 0 2px 12px 0 rgba(0, 0, 0, 0.3)
 </style>
--- a/src/client/app/desktop/views/components/follow-button.vue
+++ b/src/client/app/desktop/views/components/follow-button.vue
@@ -1,157 +0,0 @@
 <template>
 <button class="mk-follow-button"
 	:class="{ wait, active: u.isFollowing || u.hasPendingFollowRequestFromYou, big: size == 'big' }"
 	@click="onClick"
 	:disabled="wait"
 >
 	<template v-if="!wait">
 		<template v-if="u.hasPendingFollowRequestFromYou && u.isLocked"><fa icon="hourglass-half"/><template v-if="size == 'big'"> {{ $t('request-pending') }}</template></template>
 		<template v-else-if="u.hasPendingFollowRequestFromYou && !u.isLocked"><fa icon="hourglass-start"/><template v-if="size == 'big'"> {{ $t('follow-processing') }}</template></template>
 		<template v-else-if="u.isFollowing"><fa icon="minus"/><template v-if="size == 'big'"> {{ $t('following') }}</template></template>
 		<template v-else-if="!u.isFollowing && u.isLocked"><fa icon="plus"/><template v-if="size == 'big'"> {{ $t('follow-request') }}</template></template>
 		<template v-else-if="!u.isFollowing && !u.isLocked"><fa icon="plus"/><template v-if="size == 'big'"> {{ $t('follow') }}</template></template>
 	</template>
 	<template v-else><fa icon="spinner .pulse" fixed-width/></template>
 </button>
 </template>
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
 export default Vue.extend({
 	i18n: i18n('desktop/views/components/follow-button.vue'),
 	props: {
 		user: {
 			type: Object,
 			required: true
 		},
 		size: {
 			type: String,
 			default: 'compact'
 		}
 	},
 	data() {
 		return {
 			u: this.user,
 			wait: false,
 			connection: null
 		};
 	},
 	mounted() {
 		this.connection = this.$root.stream.useSharedConnection('main');
 		this.connection.on('follow', this.onFollowChange);
 		this.connection.on('unfollow', this.onFollowChange);
 	},
 	beforeDestroy() {
 		this.connection.dispose();
 	},
 	methods: {
 		onFollowChange(user) {
 			if (user.id == this.u.id) {
 				this.u.isFollowing = user.isFollowing;
 				this.u.hasPendingFollowRequestFromYou = user.hasPendingFollowRequestFromYou;
 				this.$forceUpdate();
 			}
 		},
 		async onClick() {
 			this.wait = true;
 			try {
 				if (this.u.isFollowing) {
 					this.u = await this.$root.api('following/delete', {
 						userId: this.u.id
 					});
 				} else {
 					if (this.u.hasPendingFollowRequestFromYou) {
 						this.u = await this.$root.api('following/requests/cancel', {
 							userId: this.u.id
 						});
 					} else if (this.u.isLocked) {
 						this.u = await this.$root.api('following/create', {
 							userId: this.u.id
 						});
 					} else {
 						this.u = await this.$root.api('following/create', {
 							userId: this.user.id
 						});
 					}
 				}
 			} catch (e) {
 				console.error(e);
 			} finally {
 				this.wait = false;
 			}
 		}
 	}
 });
 </script>
 <style lang="stylus" scoped>
 .mk-follow-button
 	display block
 	cursor pointer
 	padding 0
 	margin 0
 	width 32px
 	height 32px
 	font-size 1em
 	outline none
 	border-radius 4px
 	*
 		pointer-events none
 	&:focus
 		&:after
 			content ""
 			pointer-events none
 			position absolute
 			top -5px
 			right -5px
 			bottom -5px
 			left -5px
 			border 2px solid var(--primaryAlpha03)
 			border-radius 8px
 	&:not(.active)
 		color var(--primary)
 		border solid 1px var(--primary)
 		&:hover
 			background var(--primaryAlpha03)
 		&:active
 			background var(--primaryAlpha05)
 	&.active
 		color var(--primaryForeground)
 		background var(--primary)
 		border solid 1px var(--primary)
 		&:not(:disabled)
 			font-weight bold
 		&:hover:not(:disabled)
 			background var(--primaryLighten5)
 			border-color var(--primaryLighten5)
 		&:active:not(:disabled)
 			background var(--primaryDarken5)
 			border-color var(--primaryDarken5)
 	&.wait
 		cursor wait !important
 		opacity 0.7
 	&.big
 		width 100%
 		height 38px
 		line-height 38px
 </style>
--- a/src/client/app/desktop/views/components/friends-maker.vue
+++ b/src/client/app/desktop/views/components/friends-maker.vue
@@ -11,7 +11,7 @@
 		</div>
 	</div>
 	<p class="empty" v-if="!fetching && users.length == 0">{{ $t('empty') }}</p>
-	<p class="fetching" v-if="fetching"><fa icon="spinner .pulse" fixed-width/>{{ $t('fetching') }}<mk-ellipsis/></p>
+	<p class="fetching" v-if="fetching"><fa icon="spinner" pulse fixed-width/>{{ $t('fetching') }}<mk-ellipsis/></p>
 	<a class="refresh" @click="refresh">{{ $t('refresh') }}</a>
 	<button class="close" @click="destroyDom()" :title="$t('title')"><fa icon="times"/></button>
 </div>
--- a/src/client/app/desktop/views/components/game-window.vue
+++ b/src/client/app/desktop/views/components/game-window.vue
@@ -13,7 +13,7 @@ import { url } from '../../../config';
 export default Vue.extend({
 	i18n: i18n('desktop/views/components/game-window.vue'),
 	components: {
-		XReversi: () => import('../../../common/views/components/games/reversi/reversi.vue')
+		XReversi: () => import('../../../common/views/components/games/reversi/reversi.vue').then(m => m.default)
 	},
 	data() {
 		return {
--- a/src/client/app/desktop/views/components/home.vue
+++ b/src/client/app/desktop/views/components/home.vue
@@ -186,12 +186,9 @@ export default Vue.extend({
 	methods: {
 		hint() {
-			this.$dialog({
+			this.$root.alert({
 				title: this.$t('@.customization-tips.title'),
-				text: this.$t('@.customization-tips.paragraph'),
+				text: this.$t('@.customization-tips.paragraph')
 				actions: [{
 					text: this.$t('@.customization-tips.gotit')
 				}]
 			});
 		},
--- a/Show More
+++ b/Show More