9.4.0

This reverts commit 6e04549a9b.

.autogen/autogen.sh

@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+# __MISSKEY_BEARER_TOKEN=
+# __MISSKEY_CAMPAIGN_ID=
+# __MISSKEY_GITHUB_TOKEN=
+# __MISSKEY_HEAD=acid-chicken:patch-autogen
+# __MISSKEY_REPO=syuilo/misskey
+# __MISSKEY_BRANCH=develop
+test "$(curl -LSs -w '\n' -- "https://api.github.com/repos/$REPO/pulls?access_token=$__MISSKEY_GITHUB_TOKEN" | jq -r '.[].head.label' | grep $__MISSKEY_HEAD)" && exit 1
+cd "$(dirname $0)/.." && \
+touch null.cache && \
+rm *.cache && \
+git checkout $__MISSKEY_BRANCH && \
+git pull origin $__MISSKEY_BRANCH && \
+git pull upstream $__MISSKEY_BRANCH && \
+git stash && \
+git rebase -f upstream/$__MISSKEY_BRANCH && \
+git branch patch-autogen && \
+git checkout patch-autogen && \
+git reset --hard HEAD || \
+exit 1
+touch patreon.md.cache && \
+rm patreon.md.cache && \
+echo '<!-- PATREON_START -->' > patreon.md.cache && \
+url="https://www.patreon.com/api/oauth2/v2/campaigns/$__MISSKEY_CAMPAIGN_ID/members?include=currently_entitled_tiers,user&fields%5Btier%5D=title&fields%5Buser%5D=full_name,thumb_url,url,hide_pledges"
+while :
+ do
+  touch patreon.raw.cache && \
+  rm patreon.raw.cache && \
+  curl -LSs -w '\n' -H "Authorization: Bearer $__MISSKEY_BEARER_TOKEN" -- $url > patreon.raw.cache && \
+  touch patreon.cache && \
+  rm patreon.cache && \
+  cat patreon.raw.cache | \
+  jq -r '(.data|map(select(.relationships.currently_entitled_tiers.data[]))|map(.relationships.user.data.id))as$data|.included|map(select(.attributes.hide_pledges==false))|map(select(.id as$id|$data|contains([$id])))|map(.attributes|[.full_name,.thumb_url,.url]|@tsv)|.[]|@text' >> patreon.cache && \
+  echo '<table><tr>' >> patreon.md.cache && \
+  cat patreon.cache | \
+  awk -F'\t' '{print $2,$1}' | \
+  sed -e 's/ /\\" alt=\\"/' | \
+  xargs -I% echo '<td><img src="%"></td>' >> patreon.md.cache && \
+  echo '</tr><tr>' >> patreon.md.cache && \
+  cat patreon.cache | \
+  awk -F'\t' '{print $3,$1}' | \
+  sed -e 's/ /\\">/' | \
+  xargs -I% echo '<td><a href="%</a></td>' >> patreon.md.cache && \
+  echo '</tr></table>' >> patreon.md.cache || \
+  exit 1
+  new_url="$(cat patreon.raw.cache | jq -r '.links.next')"
+  test "$new_url" = 'null' && \
+  break || \
+  URL="$url"
+done
+ignore= && \
+echo -e "\n**Last updated:** $(date -uR | sed 's/\+0000/UTC/')\n<!-- PATREON_END -->" >> patreon.md.cache && \
+touch README.md && \
+touch .autogen/README.md && \
+rm .autogen/README.md && \
+mv README.md .autogen/README.md && \
+cat .autogen/README.md | while IFS= read line;
+ do
+  if [[ -z "$ignore" ]]
+   then
+    if [[ "$line" = '<!-- PATREON_START -->' ]]
+     then
+      ignore='PATREON_INSIDE'
+     else
+      echo "$line" >> README.md
+    fi
+   else
+    if [[ "$LINE" = '<!-- PATREON_END -->' ]]
+     then
+      ignore=
+      cat patreon.md.cache >> README.md
+    fi
+  fi
+done
+cat patreon.md.cache
+touch null.cache && \
+rm *.cache && \
+diff .autogen/README.md README.md > diff.cache
+cat diff.cache && \
+test 4 -lt $(cat diff.cache | wc -l) && \
+git add README.md && \
+git commit -m 'Update README.md [AUTOGEN]' && \
+git push -f origin patch-autogen && \
+curl -LSs -w '\n' -X POST -d '{"title":"[AUTOMATED] Update README.md","body":"*This pull request was created by a tool.*","head":"'$__MISSKEY_HEAD'","base":"'$__MISSKEY_BRANCH'"}' -- "https://api.github.com/repos/$__MISSKEY_REPO/pulls?access_token=$__MISSKEY_GITHUB_TOKEN"
+git stash
+git checkout $__MISSKEY_BRANCH
+git branch -D patch-autogen

.config/example.yml

@@ -1,57 +1,161 @@
-# サーバーのメンテナ情報
+name: example-instance-name # Name of your instance
+description: example-description # Description of your instance
+
 maintainer:
-  # メンテナの名前
-  name:
+  name: example-maitainer-name # Your name
+  url: http://example.com/ # Your contact (http or mailto)
+  repository_url: https://github.com/syuilo/misskey # Repository URL
+  feedback_url: https://github.com/syuilo/misskey/issues # Feedback URL (e.g. github issue)
 
-  # メンテナの連絡先(URLかmailto形式のURL)
-  url:
 
-# (Misskeyを動かす)URL
-url:
+# Final accessible URL seen by a user.
+url: https://example.tld/
 
-# 待受ポート
-port:
 
-# TLSの設定(利用しない場合は省略してください)
-https:
-  # 証明書のパス...
-  key:
-  cert:
+### Port and TLS settings ######################################
+#
+# Misskey supports two deployment options for public.
+#
+
+# Option 1: With Reverse Proxy
+#
+#                 +----- https://example.tld/ ------------+
+#   +------+      |+-------------+      +----------------+|
+#   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+#   +------+      |+-------------+      +----------------+|
+#                 +---------------------------------------+
+#
+#   You need to setup reverse proxy. (eg. Nginx)
+#   You do not define 'https' section.
+
+# Option 2: Standalone
+#
+#                 +- https://example.tld/ -+
+#   +------+      |   +---------------+    |
+#   | User | ---> |   | Misskey (443) |    |
+#   +------+      |   +---------------+    |
+#                 +------------------------+
+#
+#   You need to run Misskey as root.
+#   You need to set Certificate in 'https' section.
+
+# To use option 1, uncomment below line.
+# port: 3000    # A port that your Misskey server should listen.
+
+# To use option 2, uncomment below lines.
+# port: 443
+#
+# https:
+#   # path for certification
+#   key: /etc/letsencrypt/live/example.tld/privkey.pem
+#   cert: /etc/letsencrypt/live/example.tld/fullchain.pem
+
+################################################################
+
 
-# MongoDBの設定
 mongodb:
   host: localhost
   port: 27017
   db: misskey
-  user:
-  pass:
+  user: example-misskey-user
+  pass: example-misskey-pass
 
-# Redisの設定
 redis:
   host: localhost
   port: 6379
-  pass:
+  pass: example-pass
 
-# reCAPTCHAの設定
-recaptcha:
-  site_key:
-  secret_key:
+# Drive capacity of a local user (MB)
+localDriveCapacityMb: 256
 
-# ServiceWrokerの設定
-sw:
-  # VAPIDの公開鍵
-  public_key:
+# Drive capacity of a remote user (MB)
+remoteDriveCapacityMb: 8
 
-  # VAPIDの秘密鍵
-  private_key:
+# If enabled:
+#  Server will not cache remote files (Using direct link instead).
+#  You can save your storage.
+#
+#  NOTE:
+#  * Users cannot see remote images when they turn off "Show media from a remote server" setting.
+#  * Since thumbnails are not provided, traffic increases.
+preventCacheRemoteFiles: false
 
-# Google Maps API
-google_maps_api_key:
+drive:
+  storage: 'db'
 
-# Twitterインテグレーションの設定(利用しない場合は省略可能)
-twitter:
-  # インテグレーション用アプリのコンシューマーキー
-  consumer_key:
+  # OR
 
-  # インテグレーション用アプリのコンシューマーシークレット
-  consumer_secret:
+  # storage: 'minio'
+  # bucket:
+  # prefix:
+  # config:
+  #   endPoint:
+  #   port:
+  #   useSSL:
+  #   accessKey:
+  #   secretKey:
+
+  # S3 example
+  # storage: 'minio'
+  # bucket: bucket-name
+  # prefix: files
+  # config:
+  #   endPoint: s3-us-west-2.amazonaws.com
+  #   region: us-west-2
+  #   useSSL: true
+  #   accessKey: XXX
+  #   secretKey: YYY
+
+  # S3 example (with CDN, custom domain)
+  # storage: 'minio'
+  # bucket: drive.example.com
+  # prefix: files
+  # baseUrl: https://drive.example.com
+  # config:
+  #   endPoint: s3-us-west-2.amazonaws.com
+  #   region: us-west-2
+  #   useSSL: true
+  #   accessKey: XXX
+  #   secretKey: YYY
+
+#
+# Below settings are optional
+#
+
+# Elasticsearch
+# elasticsearch:
+#   host: localhost
+#   port: 9200
+#   pass: null
+
+# reCAPTCHA
+# recaptcha:
+#   site_key: example-site-key
+#  secret_key: example-secret-key
+
+# ServiceWorker
+# sw:
+#   # Public key of VAPID
+#   public_key: example-sw-public-key
+
+#   # Private key of VAPID
+#   private_key: example-sw-private-key
+
+# google_maps_api_key: example-google-maps-api-key
+
+# Twitter integration
+# You need to set the oauth callback url as : https://<your-misskey-instance>/api/tw/cb
+# twitter:
+#   consumer_key: example-twitter-consumer-key
+#   consumer_secret: example-twitter-consumer-secret-key
+
+# Ghost
+# Ghost account is an account used for the purpose of delegating
+# followers when putting users in the list.
+# ghost: user-id-of-your-ghost-account
+
+# Clustering
+# clusterLimit: 1
+
+# Summaly proxy
+# summalyProxy: "http://example.com"

.eslintrc

@@ -22,6 +22,7 @@
 	"globals": {
 		"ENV": true,
 		"VERSION": true,
-		"API": true
+		"API": true,
+		"LANGS": true
 	}
 }

.gitattributes

@@ -1,3 +1,5 @@
 *.svg -diff -text
 *.psd -diff -text
 *.ai -diff -text
+yarn.lock -diff -text
+package-lock.json -diff -text

.github/ISSUE_TEMPLATE

@@ -1,7 +0,0 @@
-<!--
-Misskeyへの貢献ありがとうございます。
-
-バグの報告や提案などで、可能であれば以下の情報を含めてください。
-* お使いのブラウザ
-* デスクトップ版Misskeyかモバイル版Misskeyか
--->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,22 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+---
+
+# Summary
+<!-- Tell us what the bug is -->
+
+# Expected Behavior
+<!--- Tell us what should happen -->
+
+# Actual Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+# Steps to Reproduce
+1.
+2.
+3.
+
+# Environment
+<!-- Tell us where on the platform it happens -->
+<!-- e.g. desktop or mobile version, your browser, your OS -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,11 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+---
+
+# Summary
+<!-- Tell us what the suggestion is -->
+
+# Environment
+<!-- Tell us where on the platform it related -->
+<!-- e.g. desktop or mobile version, your browser, your OS -->

.gitignore

@@ -4,9 +4,11 @@
 /node_modules
 /build
 /built
+built
 /data
+/.cache-loader
 npm-debug.log
 *.pem
 run.bat
 api-docs.json
-package-lock.json
+*.log

.npmrc

@@ -1 +1,2 @@
+save-exact = true
 package-lock = false

.travis.yml

@@ -4,10 +4,14 @@
 notifications:
   email: false
 
+branches:
+  except:
+    - l10n_master
+
 language: node_js
 
 node_js:
-  - 9.8.0
+  - 10.1.0
 
 env:
   - CXX=g++-4.8 NODE_ENV=production
@@ -18,23 +22,17 @@ addons:
       - ubuntu-toolchain-r-test
     packages:
       - g++-4.8
-      - graphicsmagick
 
 cache:
   directories:
-    # パッケージをキャッシュすると本来は動かないはずなのに動いてしまう
-    # 場合があり危険なのでキャッシュはしない:
-    #- node_modules
+    - node_modules
 
 services:
   - mongodb
   - redis-server
 
 before_script:
-  # Travisはproduction環境なので(10行目により)、
-  # npm install しただけでは devDependencies はインストールされないので、
-  # --only=dev オプションを付けてそれらもインストールされるようにする:
-  - npm install --only=dev
+  - npm install
 
   # 設定ファイルを配置
   - cp ./.travis/default.yml ./.config

.vscode/extensions.json

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

.vsls.json

@@ -0,0 +1,4 @@
+{
+	"$schema": "http://json.schemastore.org/vsls",
+	"gitignore": "exclude"
+}

CHANGELOG.md

@@ -0,0 +1,71 @@
+ChangeLog
+=========
+
+破壊的変更のみ記載。
+
+This document describes breaking changes only.
+
+9.0.0
+-----
+
+Misskey v8.64.0 を使っている方は、9.0.0に際しては特にすべきことはありません。
+Misskey v8.64.0 に満たないバージョンをお使いの方は、一旦8.64.0にアップデートして(そして起動して)から9.0.0に再度アップデートしてください。
+
+8.0.0
+-----
+
+### Migration
+
+起動する前に、`node cli/migration/8.0.0`してください。
+
+Please run `node cli/migration/8.0.0` before launch.
+
+
+7.0.0
+-----
+
+### Migration
+
+起動する前に、`node cli/migration/7.0.0`してください。
+
+Please run `node cli/migration/7.0.0` before launch.
+
+6.0.0
+-----
+
+### Migration
+
+オブジェクトストレージを使用している場合、設定ファイルの`drive.config.secure`を`drive.config.useSSL`にリネームしてください。
+
+If you use object storage, please rename `drive.config.secure` to `drive.config.useSSL` in config.
+
+5.0.0
+-----
+
+### Migration
+
+起動する前に、`node cli/migration/5.0.0`してください。
+
+Please run `node cli/migration/5.0.0` before launch.
+
+4.0.0
+-----
+
+オセロがリバーシに変更されました。
+
+Othello is rename to Reversi.
+
+### Migration
+
+MongoDBの、`othelloGames`と`othelloMatchings`コレクションをそれぞれ`reversiGames`と`reversiMatchings`にリネームしてください。
+
+Please rename `othelloGames` and `othelloMatchings` MongoDB collections to `reversiGames` and `reversiMatchings` respectively.
+
+3.0.0
+-----
+
+### Migration
+
+起動する前に、`node cli/recount-stats`してください。
+
+Please run `node cli/recount-stats` before launch.

CONTRIBUTING.md

@@ -1,27 +1,27 @@
 # Contribution guide
-:v: Misskeyへの貢献ありがとうございます。 :v:
+:v: Thanks for your contributions :v:
 
-## Issueの報告
-新機能の提案や不具合の報告は https://github.com/syuilo/misskey/issues で管理しています。
-Issueを作成する前に、既に同じIssueが作成されていないかご確認ください。
-もし既にIssueが作成されている場合は、既存のIssueにコメントをしたりリアクションをするようお願いします。
+## Issues
+Feature suggestions and bug reports are filed in https://github.com/syuilo/misskey/issues .
+Before creating a new issue, please search existing issues to avoid duplication.
+If you find the existing issue, please add your reaction or comment to the issue.
 
-## Issueの解決
-[pr-welcomeのラベルがついているIssue](https://github.com/syuilo/misskey/labels/pr-welcome)
-の解決を目的としたPull Requestを作成してくださると非常にありがたいです。
+## Internationalization (i18n)
+Please see [Translation guide](./docs/translate.en.md).
 
-## 翻訳の改善
-ソースコード中の `%i18n:id%` という形の文字列は、言語ファイルの対応するテキストに置換されます。
-言語ファイルは /locales ディレクトリに存在します。
+## Localization (l10n)
+Please use [Crowdin](https://crowdin.com/project/misskey) for localization.
 
-## ドキュメントの編集
-現在Misskeyはドキュメントが大きく不足しています。
-ドキュメントは /docs ディレクトリに存在します。
+![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
-## テストの追加
-現在Misskeyはテストが大きく不足しています。
-テストコードは /test ディレクトリに存在します。
+## Documentation
+* Documents for contributors are located in `/docs`.
+* Documents for instance admins are located in `/docs`.
+* Documents for end users are located in `src/docs`.
 
-## 自動テスト及び自動リリース
-Travis CIで行っています。
-設定ファイルは /.travis に存在します。
+## Test
+* Test codes are located in `/test`.
+
+## Continuous integration
+Misskey uses Travis for automated test.
+Configuration files are located in `/.travis`.

README.md

@@ -1,66 +1,114 @@
-<img src="https://github.com/syuilo/misskey/blob/b3f42e62af698a67c2250533c437569559f1fdf9/src/himasaku/resources/himasaku.png?raw=true" align="right" width="320px"/>
+<img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/>
 
 [![Misskey](/assets/title.png)](https://misskey.xyz/)
 ================================================================
 
 [![][travis-badge]][travis-link]
 [![][dependencies-badge]][dependencies-link]
-[![][himawari-badge]][himasaku]
-[![][sakurako-badge]][himasaku]
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Greenkeeper badge](https://badges.greenkeeper.io/syuilo/misskey.svg)](https://greenkeeper.io/)
 
-> Lead Maintainer: [syuilo][syuilo-link]
+**Sophisticated microblogging platform, evolving forever.**
 
-**[Misskey](https://misskey.xyz)** is a completely open source,
-ultimately sophisticated new type of mini-blog based SNS.
+[Misskey](https://misskey.xyz) is a decentralized microblogging platform born on Earth.
+Since it exists within the Fediverse (a universe where various social media platforms are organized),
+it is mutually linked with other social media platforms.
+Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? [Find instance!](https://joinmisskey.github.io/)
 
 <a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
 
+![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg)
+
 :sparkles: Features
 ----------------------------------------------------------------
-* Reactions
-* User lists
-* Private messages
-* Mute
-* Real time contents
-* ActivityPub compatible
 
-and more! You can touch with your own eyes at https://misskey.xyz/.
+<img src="/assets/about/post.png" align="left" height="200px"/>
 
-:package: Create your instance
+<h3 align="left">Posting</h3>
+<p align="left">
+Just post your idea, hot topics and anything you want to share. You may want to decorate your words, attach your favorite pictures, send files including movies and create a poll - those are the things you can do on Misskey!
+</p>
+
+---
+
+<img src="/assets/about/reaction.png" align="right" height="200px"/>
+
+<h3 align="right">Reactions</h3>
+<p align="right">
+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”.
+</p>
+
+---
+
+<img src="/assets/about/ui.png" align="left" height="200px"/>
+
+<h3 align="left">Interface</h3>
+<p align="left">
+No UI fits for everyone. Therefore, Misskey has a highly customizable UI for your taste. You can edit layouts of your timeline, place selectable widgets you can easily move and create your unique home as this place will be your home.
+</p>
+
+---
+
+<img src="/assets/about/drive.png" align="right" width="300px"/>
+
+<h3 align="right">Misskey Drive</h3>
+<p align="right">
+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.
+</p>
+
+---
+
+and more! You can see it with your own eyes at [misskey.xyz](https://misskey.xyz) or [other instances](https://joinmisskey.github.io/).
+
+:package: Create your own instance
 ----------------------------------------------------------------
-If you want to run your own instance of Misskey,
-please see [Setup and installation guide](./docs/setup.en.md).
+Please see [Setup and installation guide](./docs/setup.en.md).
 
-:wrench: Contribute
+:wrench: Contribution
 ----------------------------------------------------------------
-**[PR](https://github.com/syuilo/misskey/pulls)s welcome!**
-
-If you want to translate Misskey, please see [Translation guide](./docs/translate.en.md).
+Please see [Contribution guide](./CONTRIBUTING.md).
 
 :heart: Backers & Sponsors
 ----------------------------------------------------------------
-[![Backers][backers-image]][support-url]
-[![Sponsors][sponsors-image]][support-url]
+<!-- PATREON_START -->
+<table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=Yd60FK_SWfQO56SeiJpy1tDHOnCV4xdEywQe8gn5_Wo%3D" alt="negao"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13099460/43cecdbaa63a40d79bf50a96b9910b9d/1?token-time=2145916800&token-hash=d6P5MWHHsCMxUuBAEPAoVc5wLUR19mIhqAq7Ma9h9rI%3D" alt="ne_moni"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/2?token-time=2145916800&token-hash=mgPdX9TqZxEg4TTPuc477dxhIgYk9246qafjWZEqZ7g%3D" alt="Melilot"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12999811/5f349fafcce44dd1824a8b1ebbec4564/2?token-time=2145916800&token-hash=rwZ8qvbm_kpA4ib3kc07tVKupXeySpY5ATQFGxfL9v0%3D" alt="Xeltica"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/3384329/8b713330cb27404ea6e9fac50ff96efe/1?token-time=2145916800&token-hash=0eu4-m1gTWA9PhptVZt6rdKcusqcD7RB87rJT23VVFI%3D" alt="べすれい"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=GgJ_NmUB6_nnRNLVGUWjV-WX91On7BOu59LKncYV9fE%3D" alt="gutfuckllc"></td>
+<td><img src="https://c8.patreon.com/2/100/12718187" alt="Peter G."></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=zwSu01tOtn5xTUucDZHuPsCxF2HBEMVs9ROJKTlEV_o%3D" alt="nemu"></td>
+</tr><tr>
+<td><a href="https://www.patreon.com/negao">negao</a></td>
+<td><a href="https://www.patreon.com/user?u=13099460">ne_moni</a></td>
+<td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
+<td><a href="https://www.patreon.com/AxellaMC">Xeltica</a></td>
+<td><a href="https://www.patreon.com/user?u=3384329">べすれい</a></td>
+<td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
+<td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
+<td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
+</tr></table>
+<table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/2?token-time=2145916800&token-hash=zElv7ZcPL3viGsXbNG_KWiKrbV0vvw1gk0panx8DJoo%3D" alt="Naoki Kosaka"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=UERBN4OyP7Nh5XwwdDg0N0IE5cD6_qUQMO81Z5Wizso%3D" alt="Hiratake"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=S1zP0QyLU52Dqq6dtc9qNYyWfW86XrYHiR4NMbeOrnA%3D" alt="dansup"></td>
+<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D" alt="Takashi Shibuya"></td>
+</tr><tr>
+<td><a href="https://www.patreon.com/user?u=5881381">Naoki Kosaka</a></td>
+<td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
+<td><a href="https://www.patreon.com/dansup">dansup</a></td>
+<td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
+</tr></table>
 
-:mortar_board: Notable contributors
-----------------------------------------------------------------
-| ![syuilo][syuilo-icon] | ![Morisawa Aya][ayamorisawa-icon] | ![otofune][otofune-icon] | ![akihikodaki][akihikodaki-icon] | ![tamaina][tamaina-icon] | ![rinsuki][rinsuki-icon] |
-|:-:|:-:|:-:|:-:|:-:|:-:|
-| [syuilo][syuilo-link]<br>Owner | [Aya Morisawa][ayamorisawa-link]<br>Collaborator | [otofune][otofune-link]<br>Collaborator | [akihikodaki][akihikodaki-link] | [tamaina][tamaina-link] | [rinsuki][rinsuki-link] |
-
-[List of all contributors](https://github.com/syuilo/misskey/graphs/contributors)
-
-### :earth_americas: Translators
-| ![][mirro-san-icon] | ![][Conan-kun-icon] | ![][m4sk1n-icon] |
-|:-:|:-:|:-:|
-| [Mirro][mirro-san-link]<br>English, French | [Asriel][Conan-kun-link]<br>English, French | [Marcin Mikołajczak][m4sk1n-link]<br>Polish |
+**Last updated:** Tue, 02 Oct 2018 09:25:07 UTC
+<!-- PATREON_END -->
 
 :four_leaf_clover: Copyright
 ----------------------------------------------------------------
 > Copyright (c) 2014-2018 syuilo
 
-Misskey is an open-source software licensed under [GNU AGPLv3](LICENSE).
+Misskey is an open-source software licensed under the [GNU AGPLv3](LICENSE).
 
 [![][agpl-3.0-badge]][AGPL-3.0]
 
@@ -70,9 +118,6 @@ Misskey is an open-source software licensed under [GNU AGPLv3](LICENSE).
 [travis-badge]:       http://img.shields.io/travis/syuilo/misskey/master.svg?style=flat-square
 [dependencies-link]:  https://david-dm.org/syuilo/misskey
 [dependencies-badge]: https://img.shields.io/david/syuilo/misskey.svg?style=flat-square
-[himasaku]:           https://himasaku.net
-[himawari-badge]:     https://img.shields.io/badge/%E5%8F%A4%E8%B0%B7-%E5%90%91%E6%97%A5%E8%91%B5-1684c5.svg?style=flat-square
-[sakurako-badge]:     https://img.shields.io/badge/%E5%A4%A7%E5%AE%A4-%E6%AB%BB%E5%AD%90-efb02a.svg?style=flat-square
 
 [backer-url]: #backers
 [backer-badge]: https://opencollective.com/misskey/backers/badge.svg
@@ -82,23 +127,5 @@ Misskey is an open-source software licensed under [GNU AGPLv3](LICENSE).
 [sponsors-image]: https://opencollective.com/misskey/sponsors.svg
 [support-url]: https://opencollective.com/misskey#support
 
-<!-- Contributors Info -->
 [syuilo-link]:      https://syuilo.com
 [syuilo-icon]:      https://avatars2.githubusercontent.com/u/4439005?v=3&s=70
-[ayamorisawa-link]: https://github.com/ayamorisawa
-[ayamorisawa-icon]: https://avatars0.githubusercontent.com/u/10798641?v=3&s=70
-[otofune-link]:     https://github.com/otofune
-[otofune-icon]:     https://avatars0.githubusercontent.com/u/15062473?v=3&s=70
-[akihikodaki-link]: https://github.com/akihikodaki
-[akihikodaki-icon]: https://avatars2.githubusercontent.com/u/17036990?s=70&v=4
-[rinsuki-link]:     https://github.com/rinsuki
-[rinsuki-icon]:     https://avatars0.githubusercontent.com/u/6533808?s=70&v=4
-[tamaina-link]:     https://github.com/tamaina
-[tamaina-icon]:     https://avatars1.githubusercontent.com/u/7973572?s=70&v=4
-
-[mirro-san-link]:   https://github.com/mirro-san
-[mirro-san-icon]:   https://avatars1.githubusercontent.com/u/17948612?s=70&v=4
-[Conan-kun-link]:   https://github.com/Conan-kun
-[Conan-kun-icon]:   https://avatars3.githubusercontent.com/u/30003708?s=70&v=4
-[m4sk1n-link]:      https://github.com/m4sk1n
-[m4sk1n-icon]:      https://avatars3.githubusercontent.com/u/21127288?s=70&v=4

cli/clean-cached-remote-files.js

@@ -1,101 +0,0 @@
-const chalk = require('chalk');
-const log = require('single-line-log').stdout;
-const sequential = require('promise-sequential');
-const { default: DriveFile, DriveFileChunk } = require('../built/models/drive-file');
-const { default: DriveFileThumbnail, DriveFileThumbnailChunk } = require('../built/models/drive-file-thumbnail');
-const { default: User } = require('../built/models/user');
-
-const q = {
-	'metadata._user.host': {
-		$ne: null
-	}
-};
-
-async function main() {
-	const promiseGens = [];
-
-	const count = await DriveFile.count(q);
-
-	let prev;
-
-	for (let i = 0; i < count; i++) {
-		promiseGens.push(() => {
-			const promise = new Promise(async (res, rej) => {
-				const file = await DriveFile.findOne(prev ? Object.assign({
-					_id: { $lt: prev._id }
-				}, q) : q, {
-					sort: {
-						_id: -1
-					}
-				});
-
-				prev = file;
-
-				function skip() {
-					res([i, file, false]);
-				}
-
-				if (file == null) return skip();
-
-				log(chalk`{gray ${i}} scanning {bold ${file._id}} ${file.filename} ...`);
-
-				const attachingUsersCount = await User.count({
-					$or: [{
-						avatarId: file._id
-					}, {
-						bannerId: file._id
-					}]
-				}, { limit: 1 });
-				if (attachingUsersCount !== 0) return skip();
-
-				Promise.all([
-					// チャンクをすべて削除
-					DriveFileChunk.remove({
-						files_id: file._id
-					}),
-
-					DriveFile.update({ _id: file._id }, {
-						$set: {
-							'metadata.deletedAt': new Date(),
-							'metadata.isExpired': true
-						}
-					})
-				]).then(async () => {
-					res([i, file, true]);
-
-					//#region サムネイルもあれば削除
-					const thumbnail = await DriveFileThumbnail.findOne({
-						'metadata.originalId': file._id
-					});
-
-					if (thumbnail) {
-						DriveFileThumbnailChunk.remove({
-							files_id: thumbnail._id
-						});
-
-						DriveFileThumbnail.remove({ _id: thumbnail._id });
-					}
-					//#endregion
-				});
-			});
-
-			promise.then(([i, file, deleted]) => {
-				if (deleted) {
-					log(chalk`{gray ${i}} {red deleted: {bold ${file._id}} ${file.filename}}`);
-				} else {
-					log(chalk`{gray ${i}} {green skipped: {bold ${file._id}} ${file.filename}}`);
-				}
-				log.clear();
-				console.log();
-			});
-
-			return promise;
-		});
-	}
-
-	return await sequential(promiseGens);
-}
-
-main().then(() => {
-	console.log('ALL DONE');
-}).catch(console.error);

cli/clean-unused-drive-files.js

@@ -1,80 +0,0 @@
-const chalk = require('chalk');
-const log = require('single-line-log').stdout;
-const sequential = require('promise-sequential');
-const { default: DriveFile, deleteDriveFile } = require('../built/models/drive-file');
-const { default: Note } = require('../built/models/note');
-const { default: MessagingMessage } = require('../built/models/messaging-message');
-const { default: User } = require('../built/models/user');
-
-async function main() {
-	const promiseGens = [];
-
-	const count = await DriveFile.count({});
-
-	let prev;
-
-	for (let i = 0; i < count; i++) {
-		promiseGens.push(() => {
-			const promise = new Promise(async (res, rej) => {
-				const file = await DriveFile.findOne(prev ? {
-					_id: { $lt: prev._id }
-				} : {}, {
-					sort: {
-						_id: -1
-					}
-				});
-
-				prev = file;
-
-				function skip() {
-					res([i, file, false]);
-				}
-
-				if (file == null) return skip();
-
-				log(chalk`{gray ${i}} scanning {bold ${file._id}} ${file.filename} ...`);
-
-				const attachingUsersCount = await User.count({
-					$or: [{
-						avatarId: file._id
-					}, {
-						bannerId: file._id
-					}]
-				}, { limit: 1 });
-				if (attachingUsersCount !== 0) return skip();
-
-				const attachingNotesCount = await Note.count({
-					mediaIds: file._id
-				}, { limit: 1 });
-				if (attachingNotesCount !== 0) return skip();
-
-				const attachingMessagesCount = await MessagingMessage.count({
-					fileId: file._id
-				}, { limit: 1 });
-				if (attachingMessagesCount !== 0) return skip();
-
-				deleteDriveFile(file).then(() => {
-					res([i, file, true]);
-				}).catch(rej);
-			});
-
-			promise.then(([i, file, deleted]) => {
-				if (deleted) {
-					log(chalk`{gray ${i}} {red deleted: {bold ${file._id}} ${file.filename}}`);
-				} else {
-					log(chalk`{gray ${i}} {green skipped: {bold ${file._id}} ${file.filename}}`);
-				}
-				log.clear();
-				console.log();
-			});
-
-			return promise;
-		});
-	}
-
-	return await sequential(promiseGens);
-}
-
-main().then(() => {
-	console.log('done');
-}).catch(console.error);

cli/delete-invalid-users.js

@@ -1,40 +0,0 @@
-const { default: User, deleteUser } = require('../built/models/user');
-const { default: zip } = require('@prezzemolo/zip')
-
-const migrate = async (user) => {
-	try {
-		await deleteUser(user._id);
-		return true;
-	} catch (e) {
-		return false;
-	}
-}
-
-async function main() {
-	const count = await User.count({
-		uri: /#/
-	});
-
-	const dop = 1
-	const idop = ((count - (count % dop)) / dop) + 1
-
-	return zip(
-		1,
-		async (time) => {
-			console.log(`${time} / ${idop}`)
-			const doc = await User.find({
-				uri: /#/
-			}, {
-				limit: dop, skip: time * dop
-			})
-			return Promise.all(doc.map(migrate))
-		},
-		idop
-	).then(a => {
-		const rv = []
-		a.forEach(e => rv.push(...e))
-		return rv
-	})
-}
-
-main().then(console.dir).catch(console.error)

cli/init.js

@@ -1,164 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const yaml = require('js-yaml');
-const inquirer = require('inquirer');
-const chalk = require('chalk');
-
-const configDirPath = `${__dirname}/../.config`;
-const configPath = `${configDirPath}/default.yml`;
-
-const form = [{
-	type: 'input',
-	name: 'maintainerName',
-	message: 'Your name:'
-}, {
-	type: 'input',
-	name: 'maintainerUrl',
-	message: 'Your home page URL or your mailto URL:'
-}, {
-	type: 'input',
-	name: 'url',
-	message: 'URL you want to run Misskey:'
-}, {
-	type: 'input',
-	name: 'port',
-	message: 'Listen port (e.g. 443):'
-}, {
-	type: 'confirm',
-	name: 'https',
-	message: 'Use TLS?',
-	default: false
-}, {
-	type: 'input',
-	name: 'https_key',
-	message: 'Path of tls key:',
-	when: ctx => ctx.https
-}, {
-	type: 'input',
-	name: 'https_cert',
-	message: 'Path of tls cert:',
-	when: ctx => ctx.https
-}, {
-	type: 'input',
-	name: 'https_ca',
-	message: 'Path of tls ca:',
-	when: ctx => ctx.https
-}, {
-	type: 'input',
-	name: 'mongo_host',
-	message: 'MongoDB\'s host:',
-	default: 'localhost'
-}, {
-	type: 'input',
-	name: 'mongo_port',
-	message: 'MongoDB\'s port:',
-	default: '27017'
-}, {
-	type: 'input',
-	name: 'mongo_db',
-	message: 'MongoDB\'s db:',
-	default: 'misskey'
-}, {
-	type: 'input',
-	name: 'mongo_user',
-	message: 'MongoDB\'s user:'
-}, {
-	type: 'password',
-	name: 'mongo_pass',
-	message: 'MongoDB\'s password:'
-}, {
-	type: 'input',
-	name: 'redis_host',
-	message: 'Redis\'s host:',
-	default: 'localhost'
-}, {
-	type: 'input',
-	name: 'redis_port',
-	message: 'Redis\'s port:',
-	default: '6379'
-}, {
-	type: 'password',
-	name: 'redis_pass',
-	message: 'Redis\'s password:'
-}, {
-	type: 'confirm',
-	name: 'elasticsearch',
-	message: 'Use Elasticsearch?',
-	default: false
-}, {
-	type: 'input',
-	name: 'es_host',
-	message: 'Elasticsearch\'s host:',
-	default: 'localhost',
-	when: ctx => ctx.elasticsearch
-}, {
-	type: 'input',
-	name: 'es_port',
-	message: 'Elasticsearch\'s port:',
-	default: '9200',
-	when: ctx => ctx.elasticsearch
-}, {
-	type: 'password',
-	name: 'es_pass',
-	message: 'Elasticsearch\'s password:',
-	when: ctx => ctx.elasticsearch
-}, {
-	type: 'input',
-	name: 'recaptcha_site',
-	message: 'reCAPTCHA\'s site key:'
-}, {
-	type: 'input',
-	name: 'recaptcha_secret',
-	message: 'reCAPTCHA\'s secret key:'
-}];
-
-inquirer.prompt(form).then(as => {
-	// Mapping answers
-	const conf = {
-		maintainer: {
-			name: as['maintainerName'],
-			url: as['maintainerUrl']
-		},
-		url: as['url'],
-		port: parseInt(as['port'], 10),
-		mongodb: {
-			host: as['mongo_host'],
-			port: parseInt(as['mongo_port'], 10),
-			db: as['mongo_db'],
-			user: as['mongo_user'],
-			pass: as['mongo_pass']
-		},
-		redis: {
-			host: as['redis_host'],
-			port: parseInt(as['redis_port'], 10),
-			pass: as['redis_pass']
-		},
-		elasticsearch: {
-			enable: as['elasticsearch'],
-			host: as['es_host'] || null,
-			port: parseInt(as['es_port'], 10) || null,
-			pass: as['es_pass'] || null
-		},
-		recaptcha: {
-			site_key: as['recaptcha_site'],
-			secret_key: as['recaptcha_secret']
-		}
-	};
-
-	if (as['https']) {
-		conf.https = {
-			key: as['https_key'] || null,
-			cert: as['https_cert'] || null,
-			ca: as['https_ca'] || null
-		};
-	}
-
-	console.log(`Thanks. Writing the configuration to ${chalk.bold(path.resolve(configPath))}`);
-
-	try {
-		fs.writeFileSync(configPath, yaml.dump(conf));
-		console.log(chalk.green('Well done.'));
-	} catch (e) {
-		console.error(e);
-	}
-});

cli/mark-admin.js

@@ -0,0 +1,23 @@
+const mongo = require('mongodb');
+const User = require('../built/models/user').default;
+
+const args = process.argv.slice(2);
+
+const user = args[0];
+
+const q = user.startsWith('@') ? {
+	username: user.split('@')[1],
+	host: user.split('@')[2] || null
+} : { _id: new mongo.ObjectID(user) };
+
+console.log(`Mark as admin ${user}...`);
+
+User.update(q, {
+	$set: {
+		isAdmin: true
+	}
+}).then(() => {
+	console.log(`Done ${user}`);
+}, e => {
+	console.error(e);
+});

cli/mark-verified.js

@@ -0,0 +1,23 @@
+const mongo = require('mongodb');
+const User = require('../built/models/user').default;
+
+const args = process.argv.slice(2);
+
+const user = args[0];
+
+const q = user.startsWith('@') ? {
+	username: user.split('@')[1],
+	host: user.split('@')[2] || null
+} : { _id: new mongo.ObjectID(user) };
+
+console.log(`Mark as verfied ${user}...`);
+
+User.update(q, {
+	$set: {
+		isVerified: true
+	}
+}).then(() => {
+	console.log(`Done ${user}`);
+}, e => {
+	console.error(e);
+});

cli/migration/2.0.0.js

@@ -3,8 +3,8 @@
 const chalk = require('chalk');
 const sequential = require('promise-sequential');
 
-const { default: User } = require('../built/models/user');
-const { default: DriveFile } = require('../built/models/drive-file');
+const { default: User } = require('../../built/models/user');
+const { default: DriveFile } = require('../../built/models/drive-file');
 
 async function main() {
 	const promiseGens = [];

cli/migration/2.4.0.js

@@ -0,0 +1,71 @@
+// for Node.js interpret
+
+const chalk = require('chalk');
+const sequential = require('promise-sequential');
+
+const { default: User } = require('../../built/models/user');
+const { default: DriveFile } = require('../../built/models/drive-file');
+
+async function main() {
+	const promiseGens = [];
+
+	const count = await User.count({});
+
+	let prev;
+
+	for (let i = 0; i < count; i++) {
+		promiseGens.push(() => {
+			const promise = new Promise(async (res, rej) => {
+				const user = await User.findOne(prev ? {
+					_id: { $gt: prev._id }
+				} : {}, {
+					sort: {
+						_id: 1
+					}
+				});
+
+				prev = user;
+
+				const set = {};
+
+				if (user.avatarId != null) {
+					const file = await DriveFile.findOne({ _id: user.avatarId });
+
+					if (file && file.metadata.properties.avgColor) {
+						set.avatarColor = file.metadata.properties.avgColor;
+					}
+				}
+
+				if (user.bannerId != null) {
+					const file = await DriveFile.findOne({ _id: user.bannerId });
+
+					if (file && file.metadata.properties.avgColor) {
+						set.bannerColor = file.metadata.properties.avgColor;
+					}
+				}
+
+				if (Object.keys(set).length === 0) return res([i, user]);
+
+				User.update({
+					_id: user._id
+				}, {
+					$set: set
+				}).then(() => {
+					res([i, user]);
+				}).catch(rej);
+			});
+
+			promise.then(([i, user]) => {
+				console.log(chalk`{gray ${i}} {green done: {bold ${user._id}} @${user.username}}`);
+			});
+
+			return promise;
+		});
+	}
+
+	return await sequential(promiseGens);
+}
+
+main().then(() => {
+	console.log('ALL DONE');
+}).catch(console.error);

cli/migration/5.0.0.js

@@ -0,0 +1,9 @@
+const { default: DriveFile } = require('../../built/models/drive-file');
+
+DriveFile.update({}, {
+	$rename: {
+		'metadata.isMetaOnly': 'metadata.withoutChunks'
+	}
+}, {
+	multi: true
+});

cli/migration/7.0.0.js

@@ -0,0 +1,134 @@
+const { default: Stats } = require('../../built/models/stats');
+const { default: User } = require('../../built/models/user');
+const { default: Note } = require('../../built/models/note');
+const { default: DriveFile } = require('../../built/models/drive-file');
+
+const now = new Date();
+const y = now.getFullYear();
+const m = now.getMonth();
+const d = now.getDate();
+const today = new Date(y, m, d);
+
+async function main() {
+	const localUsersCount = await User.count({
+		host: null
+	});
+
+	const remoteUsersCount = await User.count({
+		host: { $ne: null }
+	});
+
+	const localNotesCount = await Note.count({
+		'_user.host': null
+	});
+
+	const remoteNotesCount = await Note.count({
+		'_user.host': { $ne: null }
+	});
+
+	const localDriveFilesCount = await DriveFile.count({
+		'metadata._user.host': null
+	});
+
+	const remoteDriveFilesCount = await DriveFile.count({
+		'metadata._user.host': { $ne: null }
+	});
+
+	const localDriveFilesSize = await DriveFile
+		.aggregate([{
+			$match: {
+				'metadata._user.host': null,
+				'metadata.deletedAt': { $exists: false }
+			}
+		}, {
+			$project: {
+				length: true
+			}
+		}, {
+			$group: {
+				_id: null,
+				usage: { $sum: '$length' }
+			}
+		}])
+		.then(aggregates => {
+			if (aggregates.length > 0) {
+				return aggregates[0].usage;
+			}
+			return 0;
+		});
+
+	const remoteDriveFilesSize = await DriveFile
+		.aggregate([{
+			$match: {
+				'metadata._user.host': { $ne: null },
+				'metadata.deletedAt': { $exists: false }
+			}
+		}, {
+			$project: {
+				length: true
+			}
+		}, {
+			$group: {
+				_id: null,
+				usage: { $sum: '$length' }
+			}
+		}])
+		.then(aggregates => {
+			if (aggregates.length > 0) {
+				return aggregates[0].usage;
+			}
+			return 0;
+		});
+
+	await Stats.insert({
+		date: today,
+		users: {
+			local: {
+				total: localUsersCount,
+				diff: 0
+			},
+			remote: {
+				total: remoteUsersCount,
+				diff: 0
+			}
+		},
+		notes: {
+			local: {
+				total: localNotesCount,
+				diff: 0,
+				diffs: {
+					normal: 0,
+					reply: 0,
+					renote: 0
+				}
+			},
+			remote: {
+				total: remoteNotesCount,
+				diff: 0,
+				diffs: {
+					normal: 0,
+					reply: 0,
+					renote: 0
+				}
+			}
+		},
+		drive: {
+			local: {
+				totalCount: localDriveFilesCount,
+				totalSize: localDriveFilesSize,
+				diffCount: 0,
+				diffSize: 0
+			},
+			remote: {
+				totalCount: remoteDriveFilesCount,
+				totalSize: remoteDriveFilesSize,
+				diffCount: 0,
+				diffSize: 0
+			}
+		}
+	});
+
+	console.log('done');
+}
+
+main();

cli/migration/8.0.0.js

@@ -0,0 +1,144 @@
+const { default: Stats } = require('../../built/models/stats');
+const { default: User } = require('../../built/models/user');
+const { default: Note } = require('../../built/models/note');
+const { default: DriveFile } = require('../../built/models/drive-file');
+
+const now = new Date();
+const y = now.getFullYear();
+const m = now.getMonth();
+const d = now.getDate();
+const h = now.getHours();
+const date = new Date(y, m, d, h);
+
+async function main() {
+	await Stats.update({}, {
+		$set: {
+			span: 'day'
+		}
+	}, {
+		multi: true
+	});
+
+	const localUsersCount = await User.count({
+		host: null
+	});
+
+	const remoteUsersCount = await User.count({
+		host: { $ne: null }
+	});
+
+	const localNotesCount = await Note.count({
+		'_user.host': null
+	});
+
+	const remoteNotesCount = await Note.count({
+		'_user.host': { $ne: null }
+	});
+
+	const localDriveFilesCount = await DriveFile.count({
+		'metadata._user.host': null
+	});
+
+	const remoteDriveFilesCount = await DriveFile.count({
+		'metadata._user.host': { $ne: null }
+	});
+
+	const localDriveFilesSize = await DriveFile
+		.aggregate([{
+			$match: {
+				'metadata._user.host': null,
+				'metadata.deletedAt': { $exists: false }
+			}
+		}, {
+			$project: {
+				length: true
+			}
+		}, {
+			$group: {
+				_id: null,
+				usage: { $sum: '$length' }
+			}
+		}])
+		.then(aggregates => {
+			if (aggregates.length > 0) {
+				return aggregates[0].usage;
+			}
+			return 0;
+		});
+
+	const remoteDriveFilesSize = await DriveFile
+		.aggregate([{
+			$match: {
+				'metadata._user.host': { $ne: null },
+				'metadata.deletedAt': { $exists: false }
+			}
+		}, {
+			$project: {
+				length: true
+			}
+		}, {
+			$group: {
+				_id: null,
+				usage: { $sum: '$length' }
+			}
+		}])
+		.then(aggregates => {
+			if (aggregates.length > 0) {
+				return aggregates[0].usage;
+			}
+			return 0;
+		});
+
+	await Stats.insert({
+		date: date,
+		span: 'hour',
+		users: {
+			local: {
+				total: localUsersCount,
+				diff: 0
+			},
+			remote: {
+				total: remoteUsersCount,
+				diff: 0
+			}
+		},
+		notes: {
+			local: {
+				total: localNotesCount,
+				diff: 0,
+				diffs: {
+					normal: 0,
+					reply: 0,
+					renote: 0
+				}
+			},
+			remote: {
+				total: remoteNotesCount,
+				diff: 0,
+				diffs: {
+					normal: 0,
+					reply: 0,
+					renote: 0
+				}
+			}
+		},
+		drive: {
+			local: {
+				totalCount: localDriveFilesCount,
+				totalSize: localDriveFilesSize,
+				diffCount: 0,
+				diffSize: 0
+			},
+			remote: {
+				totalCount: remoteDriveFilesCount,
+				totalSize: remoteDriveFilesSize,
+				diffCount: 0,
+				diffSize: 0
+			}
+		}
+	});
+
+	console.log('done');
+}
+
+main();

cli/recount-stats.js

@@ -0,0 +1,42 @@
+const { default: Note } = require('../built/models/note');
+const { default: Meta } = require('../built/models/meta');
+const { default: User } = require('../built/models/user');
+
+async function main() {
+	const meta = await Meta.findOne({});
+
+	const notesCount = await Note.count();
+
+	const usersCount = await User.count();
+
+	const originalNotesCount = await Note.count({
+		'_user.host': null
+	});
+
+	const originalUsersCount = await User.count({
+		host: null
+	});
+
+	const stats = {
+		notesCount,
+		usersCount,
+		originalNotesCount,
+		originalUsersCount
+	};
+
+	if (meta) {
+		await Meta.update({}, {
+			$set: {
+				stats
+			}
+		});
+	} else {
+		await Meta.insert({
+			stats
+		});
+	}
+}
+
+main().then(() => {
+	console.log('done');
+}).catch(console.error);

cli/reset-password.js

@@ -0,0 +1,29 @@
+const mongo = require('mongodb');
+const bcrypt = require('bcryptjs');
+const User = require('../built/models/user').default;
+
+const args = process.argv.slice(2);
+
+const user = args[0];
+
+const q = user.startsWith('@') ? {
+	username: user.split('@')[1],
+	host: user.split('@')[2] || null
+} : { _id: new mongo.ObjectID(user) };
+
+console.log(`Resetting password for ${user}...`);
+
+const passwd = 'yo';
+
+// Generate hash of password
+const hash = bcrypt.hashSync(passwd);
+
+User.update(q, {
+	$set: {
+		password: hash
+	}
+}).then(() => {
+	console.log(`Password of ${user} is now '${passwd}'`);
+}, e => {
+	console.error(e);
+});

cli/suspend.js

@@ -3,16 +3,21 @@ const User = require('../built/models/user').default;
 
 const args = process.argv.slice(2);
 
-const userId = new mongo.ObjectID(args[0]);
+const user = args[0];
 
-console.log(`Suspending ${userId}...`);
+const q = user.startsWith('@') ? {
+	username: user.split('@')[1],
+	host: user.split('@')[2] || null
+} : { _id: new mongo.ObjectID(user) };
 
-User.update({ _id: userId }, {
+console.log(`Suspending ${user}...`);
+
+User.update(q, {
 	$set: {
 		isSuspended: true
 	}
 }).then(() => {
-	console.log(`Suspended ${userId}`);
+	console.log(`Suspended ${user}`);
 }, e => {
 	console.error(e);
 });

cli/update-remote-user.js

@@ -0,0 +1,12 @@
+const updatePerson = require('../built/remote/activitypub/models/person').updatePerson;
+
+const args = process.argv.slice(2);
+const user = args[0];
+
+console.log(`Updating ${user}...`);
+
+updatePerson(user).then(() => {
+	console.log(`Updated ${user}`);
+}, e => {
+	console.error(e);
+});

crowdin.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /locales/ja-JP.yml
+    translation: /locales/%locale%.yml

docker/Dockerfile

@@ -1,26 +0,0 @@
-FROM base/archlinux
-
-MAINTAINER Aya Morisawa
-
-RUN rm /etc/pacman.d/mirrorlist
-RUN echo 'Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch'    >> /etc/pacman.d/mirrorlist
-RUN echo 'Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist
-
-RUN rm /etc/localtime
-RUN ln -s /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
-
-RUN pacman -Sy --noconfirm
-RUN pacman -S --noconfirm pacman
-RUN pacman-db-upgrade
-RUN pacman -S --noconfirm archlinux-keyring
-RUN pacman -Syyu --noconfirm
-RUN pacman -S --noconfirm git nodejs npm mongodb redis imagemagick
-
-COPY misskey.sh /root/misskey.sh
-RUN chmod u+x /root/misskey.sh
-
-EXPOSE 80
-EXPOSE 443
-EXPOSE 27017
-
-CMD ["/root/misskey.sh"]

docker/misskey.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-redis-server --daemonize yes
-mongod > /dev/null &
-cd /root/misskey
-npm start
-tail -f /dev/null

docs/DONATORS.md

@@ -22,8 +22,4 @@ The list of people who have sent donation for Misskey.
 
 ---
 
-If your name is missing,  please contact us!
-
-If you want to donate to Misskey, please get in touch with [@syuilo][syuilo-link].
-
-[syuilo-link]: https://syuilo.com
+If your name is missing, please contact us!

docs/README.md

@@ -0,0 +1,6 @@
+# Docs
+These docs are for contributors of Misskey or admins of instance of Misskey.
+Docs for users are located in `src/docs`.
+
+これらのドキュメントはMisskeyの開発者またはMisskeyインスタンス運営者向けです。
+利用者向けのドキュメントは`src/docs`にあります。

docs/docker.en.md

@@ -1,29 +0,0 @@
-Setup with Docker :whale:
-================================================================
-
-Ensure that the working directory is the repository root directory.
-
-To create misskey image:
-``` console
-$ sudo docker build -t misskey ./docker
-```
-
-To run misskey:
-``` console
-$ sudo docker run --rm -i -t -p $PORT:80 -v $(pwd):/root/misskey -v $DBPATH:/data/db misskey
-```
-
-where `$PORT` is the port used to access Misskey Web from host browser
-and `$DBPATH` is the path of MongoDB database on the host for data persistence.
-
-ex:
-``` console
-$ sudo docker run --rm -i -t -p 80:80 -v $(pwd):/root/misskey -v /data/db:/data/db misskey
-```
-
-If you want to run misskey in production mode, add `--env NODE_ENV=production` like this:
-``` console
-$ sudo docker run --rm -i -t -p 80:80 -v $(pwd):/root/misskey -v /data/db:/data/db --env NODE_ENV=production misskey
-```
-
-Note that `$(pwd)` is the working directory.

docs/donate.ja.md

@@ -1,26 +0,0 @@
-# Misskeyにカンパする方法
-Misskeyのサポートにご興味をお持ちいただきありがとうございます！
-Misskeyにカンパをしていただくと、貴方のお名前と好きなURLなどをMisskeyのリポジトリに刻む権利がもらえます。
-
-Misskeyにカンパして開発・運営をサポートするには、次のいくつかの方法があります:
-
-## ConoHaカードを購入する
-(本家)Misskeyは、ConoHaというVPSサービスを利用しています。ConoHaカードを購入して、
-カードに記載されているクーポンコードを syuilotan@yahoo.co.jp までお送りいただければ、
-そのクーポンをチャージしてサーバーの運営費に充てることができます。
-
-ConoHaカードについてはこちらをご覧ください: https://www.conoha.jp/conohacard/
-
-Amazonでも買えます: https://www.amazon.co.jp/dp/B01N9E3416
-
-## Amazonギフトカード
-これは間接的な方法です。
-
-## 銀行振込
-syuilotan@yahoo.co.jp までお問い合わせください。
-
-## 手渡し
-オフ会を行ったときなどに行使できる方法です。
-
-## その他
-なにかいいアイデアがあればお教えください。

docs/manage.en.md

@@ -0,0 +1,35 @@
+# Management guide
+
+## Check the status of the job queue
+coming soon
+
+## Mark as 'admin' user
+``` shell
+node cli/mark-admin (User-ID or Username)
+```
+
+## Mark as 'verified' user
+``` shell
+node cli/mark-verified (User-ID or Username)
+```
+
+## Suspend users
+``` shell
+node cli/suspend (User-ID or Username)
+```
+e.g.
+``` shell
+# Use id
+node cli/suspend 57d01a501fdf2d07be417afe
+
+# Use username
+node cli/suspend @syuilo
+
+# Use username (remote)
+node cli/suspend @syuilo@misskey.xyz
+```
+
+## Reset password
+``` shell
+node cli/reset-password (User-ID or Username)
+```

docs/manage.ja.md

@@ -1,13 +1,35 @@
 # 運営ガイド
 
 ## ジョブキューの状態を調べる
-Misskeyのディレクトリで:
+coming soon
+
+## 管理者ユーザーを設定する
 ``` shell
-node_modules/kue/bin/kue-dashboard -p 3050
+node cli/mark-admin (ユーザーID または ユーザー名)
+```
+
+## 'verified'ユーザーを設定する
+``` shell
+node cli/mark-verified (ユーザーID または ユーザー名)
 ```
-ポート3050にアクセスするとUIが表示されます
 
 ## ユーザーを凍結する
 ``` shell
-node cli/suspend (ユーザーID)
+node cli/suspend (ユーザーID または ユーザー名)
+```
+例:
+``` shell
+# ユーザーID
+node cli/suspend 57d01a501fdf2d07be417afe
+
+# ユーザー名
+node cli/suspend @syuilo
+
+# ユーザー名 (リモート)
+node cli/suspend @syuilo@misskey.xyz
+```
+
+## ユーザーのパスワードをリセットする
+``` shell
+node cli/reset-password (ユーザーID または ユーザー名)
 ```

docs/setup.en.md

@@ -8,18 +8,13 @@ This guide describes how to install and setup Misskey.
 
 ----------------------------------------------------------------
 
-*1.* reCAPTCHA tokens
+*1.* Create Misskey user
 ----------------------------------------------------------------
-Misskey requires reCAPTCHA tokens.
-Please visit https://www.google.com/recaptcha/intro/ and generate keys.
+Running misskey on root is not a good idea so we create a user for that.
+In debian for exemple :
 
-*(optional)* Generating VAPID keys
-----------------------------------------------------------------
-If you want to enable ServiceWroker, you need to generate VAPID keys:
-
-``` shell
-npm install web-push -g
-web-push generate-vapid-keys
+```
+adduser --disabled-password --disabled-login misskey
 ```
 
 *2.* Install dependencies
@@ -27,47 +22,117 @@ web-push generate-vapid-keys
 Please install and setup these softwares:
 
 #### Dependencies :package:
-* *Node.js* and *npm*
-* **[MongoDB](https://www.mongodb.com/)**
+* **[Node.js](https://nodejs.org/en/)**
+* **[MongoDB](https://www.mongodb.com/)** >= 3.6
 * **[Redis](https://redis.io/)**
-* **[ImageMagick](http://www.imagemagick.org/script/index.php)** >= 7.0
 
 ##### Optional
 * [Elasticsearch](https://www.elastic.co/) - used to provide searching feature instead of MongoDB
 
-*3.* Install Misskey
+
+*3.* Setup MongoDB
 ----------------------------------------------------------------
-1. `git clone -b master git://github.com/syuilo/misskey.git`
-2. `cd misskey`
-3. `npm install`
+In 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.
+4. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` Create the misskey user.
+5. `exit` You're done !
 
-*4.* Prepare configuration
+*4.* Install Misskey
 ----------------------------------------------------------------
-1. Copy `example.yml` of `.config` directory
-2. Rename it to `default.yml`
-3. Edit it
+1. `su - misskey` Connect to misskey user.
+2. `git clone -b master git://github.com/syuilo/misskey.git` Clone the misskey repo from master branch.
+3. `cd misskey` Navigate to misskey directory
+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.
 
----
-
-Or you can generate config file via `npm run config` command.
-
-*5.* Build Misskey
+*(optional)* reCAPTCHA tokens
 ----------------------------------------------------------------
-We need to use `node-gyp` to build the `crypto` module.
+If you want to enable reCAPTCHA, you need to generate reCAPTCHA tokens:
+Please visit https://www.google.com/recaptcha/intro/ and generate keys.
+
+*(optional)* Generating 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.
+
+``` shell
+npm install web-push -g
+web-push generate-vapid-keys
+```
+
+*(optional)* Create a twitter application
+----------------------------------------------------------------
+If you want to enable the twitter integration, you need to create a twitter app at [https://developer.twitter.com/en/apply/user](https://developer.twitter.com/en/apply/user).
+
+In the app you need to set the oauth callback url as : https://misskey-instance/api/tw/cb
+
+
+*5.* Make configuration file
+----------------------------------------------------------------
+1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
+2. Edit `default.yml`
+
+*6.* Build Misskey
+----------------------------------------------------------------
+
+Build misskey with the following:
+
+`npm run build`
+
+If you're on Debian, you will need to install the `build-essential` package.
+
+If you're still encountering errors about some modules, use node-gyp:
 
 1. `npm install -g node-gyp`
 2. `node-gyp configure`
 3. `node-gyp build`
 4. `npm run build`
 
-*6.* That is it.
+*7.* That is it.
 ----------------------------------------------------------------
 Well done! Now, you have an environment that run to Misskey.
 
-### Launch
-Just `sudo npm start`. GLHF!
+### Launch normally
+Just `npm start`. GLHF!
+
+### Launch with systemd
+
+1. Create a systemd service here: `/etc/systemd/system/misskey.service`
+2. Edit it, and paste this and save:
+
+```
+[Unit]
+Description=Misskey daemon
+
+[Service]
+Type=simple
+User=misskey
+ExecStart=/usr/bin/npm start
+WorkingDirectory=/home/misskey/misskey
+TimeoutSec=60
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=misskey
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+```
+
+3. `systemctl daemon-reload ; systemctl enable misskey` Reload systemd and enable the misskey service.
+4. `systemctl start misskey` Start the misskey service.
+
+You can check if the service is running with `systemctl status misskey`.
 
 ### Way to Update to latest version of your Misskey
-1. `git reset --hard && git pull origin master`
-2. `npm install`
-3. `npm run build`
+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. Check [ChangeLog](../CHANGELOG.md) for migration information
+
+----------------------------------------------------------------
+
+If you have any questions or troubles, feel free to contact us!

docs/setup.ja.md

@@ -8,10 +8,48 @@ Misskeyサーバーの構築にご関心をお寄せいただきありがとう
 
 ----------------------------------------------------------------
 
-*1.* reCAPTCHAトークンの用意
+*1.* Misskeyユーザーの作成
 ----------------------------------------------------------------
-MisskeyはreCAPTCHAトークンを必要とします。
-https://www.google.com/recaptcha/intro/ にアクセスしてトークンを生成してください。
+Misskeyはrootユーザーで実行しない方がよいため、代わりにユーザーを作成します。
+Debianの例:
+
+```
+adduser --disabled-password --disabled-login misskey
+```
+
+*2.* 依存関係をインストールする
+----------------------------------------------------------------
+これらのソフトウェアをインストール・設定してください:
+
+#### 依存関係 :package:
+* **[Node.js](https://nodejs.org/en/)**
+* **[MongoDB](https://www.mongodb.com/)** (3.6以上)
+* **[Redis](https://redis.io/)**
+
+##### オプション
+* [Elasticsearch](https://www.elastic.co/) - 検索機能を向上させるために用います。
+
+*3.* MongoDBの設定
+----------------------------------------------------------------
+ルートで:
+1. `mongo` mongoシェルを起動
+2. `use misskey` misskeyデータベースを使用
+3. `db.users.save( {dummy:"dummy"} )` ダミーデータを書き込みDBを初期化
+4. `db.createUser( { user: "misskey", pwd: "<password>", roles: [ { role: "readWrite", db: "misskey" } ] } )` misskeyユーザーを作成
+5. `exit` mongoシェルを終了
+
+*4.* Misskeyのインストール
+----------------------------------------------------------------
+1. `su - misskey` misskeyユーザーを使用
+2. `git clone -b master git://github.com/syuilo/misskey.git` masterブランチからMisskeyレポジトリをクローン
+3. `cd misskey` misskeyディレクトリに移動
+4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認
+5. `npm install` Misskeyの依存パッケージをインストール
+
+*(オプション)* reCAPTCHAトークン
+----------------------------------------------------------------
+reCAPTCHAを有効にする場合、reCAPTCHAトークンを取得する必要があります。
+https://www.google.com/recaptcha/intro/ にアクセスしてトークンを取得してください。
 
 *(オプション)* VAPIDキーペアの生成
 ----------------------------------------------------------------
@@ -22,48 +60,69 @@ npm install web-push -g
 web-push generate-vapid-keys
 ```
 
-*2.* 依存関係をインストールする
+*5.* 設定ファイルを作成する
 ----------------------------------------------------------------
-これらのソフトウェアをインストール・設定してください:
+1. `cp .config/example.yml .config/default.yml` `.config/example.yml`をコピーし名前を`default.yml`にする。
+2. `default.yml` を編集する。
 
-#### 依存関係 :package:
-* *Node.js* と *npm*
-* **[MongoDB](https://www.mongodb.com/)**
-* **[Redis](https://redis.io/)**
-* **[ImageMagick](http://www.imagemagick.org/script/index.php)**
-
-##### オプション
-* [Elasticsearch](https://www.elastic.co/) - 検索機能を向上させるために用います。
-
-*3.* Misskeyのインストール
+*6.* Misskeyのビルド
 ----------------------------------------------------------------
-1. `git clone -b master git://github.com/syuilo/misskey.git`
-2. `cd misskey`
-3. `npm install`
 
-*4.* 設定ファイルを用意する
-----------------------------------------------------------------
-1. `.config`ディレクトリ内の`example.yml`をコピー
-2. `default.yml`にリネーム
-3. 編集する
+次のコマンドでMisskeyをビルドしてください:
 
----
+`npm run build`
 
-または、`npm run config`コマンドを利用して、ガイドに従って情報を
-入力して設定ファイルを生成することもできます。
+Debianをお使いであれば、`build-essential`パッケージをインストールする必要があります。
 
-*5.* Misskeyのビルド
-----------------------------------------------------------------
-1. `npm run build`
+何らかのモジュールでエラーが発生する場合はnode-gypを使ってください:
+1. `npm install -g node-gyp`
+2. `node-gyp configure`
+3. `node-gyp build`
+4. `npm run build`
 
-*6.* 以上です！
+*7.* 以上です！
 ----------------------------------------------------------------
 お疲れ様でした。これでMisskeyを動かす準備は整いました。
 
-### 起動
-`sudo npm start`するだけです。GLHF!
+### 通常起動
+`npm start`するだけです。GLHF!
+
+### systemdを用いた起動
+1. systemdサービスのファイルを作成: `/etc/systemd/system/misskey.service`
+2. エディタで開き、以下のコードを貼り付けて保存:
+
+```
+[Unit]
+Description=Misskey daemon
+
+[Service]
+Type=simple
+User=misskey
+ExecStart=/usr/bin/npm start
+WorkingDirectory=/home/misskey/misskey
+TimeoutSec=60
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=misskey
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+```
+CentOSで1024以下のポートを使用してMisskeyを使用する場合は`ExecStart=/usr/bin/sudo /usr/bin/npm start`に変更する必要があります。
+
+3. `systemctl daemon-reload ; systemctl enable misskey` systemdを再読み込みしmisskeyサービスを有効化
+4. `systemctl start misskey` misskeyサービスの起動
+
+`systemctl status misskey`と入力すると、サービスの状態を調べることができます。
 
 ### Misskeyを最新バージョンにアップデートする方法:
-1. `git reset --hard && git pull origin master`
-2. `npm install`
-3. `npm run build`
+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. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する
+
+----------------------------------------------------------------
+
+なにかお困りのことがありましたらお気軽にご連絡ください。

docs/translate.en.md

@@ -1,26 +1,22 @@
-Misskey's Translation - English version
-============
-
-How to add a new language?
-----------------------
-Copy a language file to `/locales` and rename it after the language you wish to add.
+Misskey's Translation
+=====================
 
 If you find an untranslated part on Misskey:
--------------------------------
+--------------------------------------------
 
-1. Look for untranslated parts in the miskey's source code.
+1. Look for untranslated parts in the misskey's source code.
 	- For instance, if you find an untranslated part in: `src/client/app/mobile/views/pages/home.vue`.
 
 2. Replace the untranslated portion with a character string of the form `%i18n:@foo%`.
 	- In fact, `foo` should be a word that is appropriate for the situation and is easy to understand in English.
 	- For example, if the untranslated portion is the following "タイムライン" you must write: `%i18n:@timeline%`.
 
-3. Open each language file in /locales, check whether the <strong>file name (path)</strong> found in step 1 exists, if not, create it.
+3. Open the `locales/ja-JP.yml`, check whether the <strong>file name (path)</strong> found in step 1 exists, if not, create it.
 	- Do not put the beginning of the path `src/client/app/` in the locale file.
 	- For example, in this case we want to modify untranslated parts of `src/client/app/mobile/views/pages/home.vue`, so the key is `mobile/views/pages/home.vue`.
 
-4. Add the translated text property using the `foo` keyword below the path that you found or created in step 2. Make sure to type your text in quotation marks. Text should always be inside of quotes.
-	-   For example, in this case we add timeline: `timeline: "Timeline"` to `locales/en.yml`, and `timeline: "タイムライン"` to `locales/ja.yml`.
+4. Add the text property using the `foo` keyword below the path that you found or created in step 2. Make sure to type your text in quotation marks. Text should always be inside of quotes.
+	-   For example, in this case we add timeline: `timeline: "タイムライン"` to `locales/ja-JP.yml`.
 
 5. And done！
 

docs/translate.fr.md

@@ -1,12 +1,8 @@
-Traduction de Misskey - Version Française
-============
-
-Comment ajouter une nouvelle langue ?
-----------------------
-Veuillez copier un fichier de langue dans /locales puis renommez-le du nom de la langue que vous voulez ajouter et modifier.
+Traduction de Misskey
+=====================
 
 Si vous trouvez un segment non-traduit sur Misskey :
--------------------------------
+----------------------------------------------------
 
 1. Veuillez chercher des parties non-traduites dans le code source de Misskey.
 	- Par exemple, supposons que vous trouviez un segment non-traduit dans : `src/client/app/mobile/views/pages/home.vue`.
@@ -20,7 +16,7 @@ Si vous trouvez un segment non-traduit sur Misskey :
 	- Par exemple, dans ce cas de figure, nous voulons modifier le segment non-traduit de : `src/client/app/mobile/views/pages/home.vue`donc il faut juste écrire : `mobile/views/pages/home.vue` dans les fichiers linguistiques.
 
 4. Ajoutez la propriété du texte traduit grâce à la clef `foo`, en-dessous du chemin correspondant à votre modification que vous avez trouvé ou créé dans l'étape 2. À côté, veuillez indiquer entre "guillemets" la valeur de votre traduction.
-	- Par exemple, dans ce cas de figure, nous ajoutons la propriété et la traduction `timeline: "Timeline"` à `locales/fr.yml`, mais aussi la propriété et la version originale `timeline: "タイムライン"` à `locales/ja.yml`.
+	- Par exemple, dans ce cas de figure, nous ajoutons la propriété et la traduction `timeline: "Timeline"` à `locales/fr.yml`, mais aussi la propriété et la version originale `timeline: "タイムライン"` à `locales/ja-JP.yml`.
 
 5. Vous avez réussi à traduire une portion de misskey ！
 

docs/translate.ja.md

@@ -1,10 +1,6 @@
 Misskeyの翻訳
 ============
 
-新たな言語を追加するには
-----------------------
-/locales 内に既にある何らかの言語ファイルをコピーして、追加したい言語名にリネームして編集してください。
-
 Misskey内の未翻訳箇所を見つけたら
 -------------------------------
 
@@ -15,12 +11,12 @@ Misskey内の未翻訳箇所を見つけたら
 	- `foo`は実際にはその場に適したわかりやすい(英語の)名前にしてください。
 	- 例えば未翻訳箇所が「タイムライン」というテキストだった場合、`%i18n:@timeline%`のようにします。
 
-3. /locales 内にあるそれぞれの言語ファイルを開き、1.で見つけた<strong>ファイル名(パス)</strong>のキーが存在するか確認し、無ければ作成してください。
+3. `locales/ja-JP.yml`を開き、1.で見つけた<strong>ファイル名(パス)</strong>のキーが存在するか確認し、無ければ作成してください。
 	- パスの`src/client/app/`は省略してください。
 	- 例えば、今回の例では`src/client/app/mobile/views/pages/home.vue`の未翻訳箇所を修正したいので、キーは`mobile/views/pages/home.vue`になります。
 
-4. そのキーの直下に2.で置換した`foo`の部分をキーとし、翻訳後のテキストを値とするプロパティを追加します。
-	- 例えば、今回の例で言うと`locales/ja.yml`に`timeline: "タイムライン"`、`locales/en.yml`に`timeline: "Timeline"`を追加します。
+4. そのキーの直下に2.で置換した`foo`の部分をキーとし、テキストを値とするプロパティを追加します。
+	- 例えば、今回の例で言うと`locales/ja-JP.yml`に`timeline: "タイムライン"`を追加します。
 
 5. 完了です！
 

elasticsearch/README.md

@@ -1,6 +0,0 @@
-How to create indexes
-=====================
-
-``` shell
-curl -XPOST localhost:9200/misskey -d @path/to/mappings.json
-```

elasticsearch/mappings.json

@@ -1,65 +0,0 @@
-{
-	"settings": {
-		"analysis": {
-			"analyzer": {
-				"bigram": {
-					"tokenizer": "bigram_tokenizer"
-				}
-			},
-			"tokenizer": {
-				"bigram_tokenizer": {
-					"type": "nGram",
-					"min_gram": 2,
-					"max_gram": 2,
-					"token_chars": [
-						"letter",
-						"digit"
-					]
-				}
-			}
-		}
-	},
-	"mappings": {
-		"user": {
-			"properties": {
-				"username": {
-					"type": "string",
-					"index": "analyzed",
-					"analyzer": "bigram"
-				},
-				"name": {
-					"type": "string",
-					"index": "analyzed",
-					"analyzer": "bigram"
-				},
-				"bio": {
-					"type": "string",
-					"index": "analyzed",
-					"analyzer": "kuromoji"
-				}
-			}
-		},
-		"post": {
-			"properties": {
-				"text": {
-					"type": "string",
-					"index": "analyzed",
-					"analyzer": "kuromoji"
-				}
-			}
-		},
-		"drive_file": {
-			"properties": {
-				"name": {
-					"type": "string",
-					"index": "analyzed",
-					"analyzer": "kuromoji"
-				},
-				"user": {
-					"type": "string",
-					"index": "not_analyzed"
-				}
-			}
-		}
-	}
-}

gulpfile.ts

@@ -2,27 +2,26 @@
  * Gulp tasks
  */
 
-import * as fs from 'fs';
 import * as gulp from 'gulp';
 import * as gutil from 'gulp-util';
 import * as ts from 'gulp-typescript';
 const sourcemaps = require('gulp-sourcemaps');
 import tslint from 'gulp-tslint';
-import cssnano = require('gulp-cssnano');
+const cssnano = require('gulp-cssnano');
+const stylus = require('gulp-stylus');
 import * as uglifyComposer from 'gulp-uglify/composer';
 import pug = require('gulp-pug');
 import * as rimraf from 'rimraf';
 import chalk from 'chalk';
-import imagemin = require('gulp-imagemin');
+const imagemin = require('gulp-imagemin');
 import * as rename from 'gulp-rename';
 import * as mocha from 'gulp-mocha';
 import * as replace from 'gulp-replace';
 import * as htmlmin from 'gulp-htmlmin';
 const uglifyes = require('uglify-es');
 
-import { fa } from './src/build/fa';
-const client = require('./built/client/meta.json');
-import config from './src/config';
+const locales = require('./locales');
+import { fa } from './src/misc/fa';
 
 const uglify = uglifyComposer(uglifyes, console);
 
@@ -37,8 +36,6 @@ if (isDebug) {
 
 const constants = require('./src/const.json');
 
-require('./src/client/docs/gulpfile.ts');
-
 gulp.task('build', [
 	'build:ts',
 	'build:copy',
@@ -46,8 +43,6 @@ gulp.task('build', [
 	'doc'
 ]);
 
-gulp.task('rebuild', ['clean', 'build']);
-
 gulp.task('build:ts', () => {
 	const tsProject = ts.createProject('./tsconfig.json');
 
@@ -63,7 +58,16 @@ 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',
@@ -73,7 +77,7 @@ gulp.task('build:copy', ['build:copy:views'], () =>
 	]).pipe(gulp.dest('./built/'))
 );
 
-gulp.task('test', ['lint', 'mocha']);
+gulp.task('test', ['mocha']);
 
 gulp.task('lint', () =>
 	gulp.src('./src/**/*.ts')
@@ -84,19 +88,19 @@ gulp.task('lint', () =>
 );
 
 gulp.task('format', () =>
-gulp.src('./src/**/*.ts')
-	.pipe(tslint({
-		formatter: 'verbose',
-		fix: true
-	}))
-	.pipe(tslint.report())
+	gulp.src('./src/**/*.ts')
+		.pipe(tslint({
+			formatter: 'verbose',
+			fix: true
+		}))
+		.pipe(tslint.report())
 );
 
 gulp.task('mocha', () =>
-	gulp.src([])
+	gulp.src('./test/**/*.ts')
 		.pipe(mocha({
 			exit: true,
-			compilers: 'ts:ts-node/register'
+			require: 'ts-node/register'
 		} as any))
 );
 
@@ -117,16 +121,17 @@ gulp.task('build:client', [
 	'copy:client'
 ]);
 
-gulp.task('build:client:script', () =>
-	gulp.src(['./src/client/app/boot.js', './src/client/app/safe.js'])
+gulp.task('build:client:script', () => {
+	const client = require('./built/client/meta.json');
+	return gulp.src(['./src/client/app/boot.js', './src/client/app/safe.js'])
 		.pipe(replace('VERSION', JSON.stringify(client.version)))
-		.pipe(replace('API', JSON.stringify(config.api_url)))
 		.pipe(replace('ENV', JSON.stringify(env)))
+		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
 		.pipe(isProduction ? uglify({
 			toplevel: true
 		} as any) : gutil.noop())
-		.pipe(gulp.dest('./built/client/assets/')) as any
-);
+		.pipe(gulp.dest('./built/client/assets/'));
+});
 
 gulp.task('build:client:styles', () =>
 	gulp.src('./src/client/app/init.css')
@@ -160,9 +165,7 @@ gulp.task('build:client:pug', [
 			.pipe(pug({
 				locals: {
 					themeColor: constants.themeColor,
-					facss: fa.dom.css(),
-					//hljscss: fs.readFileSync('./node_modules/highlight.js/styles/default.css', 'utf8')
-					hljscss: fs.readFileSync('./src/client/assets/code-highlight.css', 'utf8')
+					facss: fa.dom.css()
 				}
 			}))
 			.pipe(htmlmin({
@@ -199,3 +202,10 @@ gulp.task('build:client:pug', [
 			}))
 			.pipe(gulp.dest('./built/client/app/'))
 );
+
+gulp.task('doc', () =>
+	gulp.src('./src/docs/**/*.styl')
+		.pipe(stylus())
+		.pipe((cssnano as any)())
+		.pipe(gulp.dest('./built/docs/assets/'))
+);

locales/README.md

@@ -0,0 +1,3 @@
+# **DO NOT edit locale files** except `ja-JP.yml`.
+
+Please see [Contribution guide](../CONTRIBUTING.md) for more information.

locales/en.yml

@@ -1,649 +0,0 @@
-common:
-  misskey: "Share everything with others using Misskey."
-
-  time:
-    unknown: "unknown"
-    future: "future"
-    just_now: "just now"
-    seconds_ago: "{}s ago"
-    minutes_ago: "{}m ago"
-    hours_ago: "{}h ago"
-    days_ago: "{}d ago"
-    weeks_ago: "{}week(s) ago"
-    months_ago: "{}month(s) ago"
-    years_ago: "{}year(s) ago"
-
-  weekday-short:
-    sunday: "S"
-    monday: "M"
-    tuesday: "T"
-    wednesday: "W"
-    thursday: "T"
-    friday: "F"
-    satruday: "S"
-
-  reactions:
-    like: "Like"
-    love: "Love"
-    laugh: "Laugh"
-    hmm: "Hmm...?"
-    surprise: "Wow"
-    congrats: "Congrats!"
-    angry: "Angry"
-    confused: "Confused"
-    pudding: "Pudding"
-
-  delete: "Delete"
-  loading: "Loading"
-  ok: "OK"
-  update-available: "A new version of Misskey is now available({newer}, current is {current}). Reload the page to apply the update."
-  my-token-regenerated: "Your token has been generated. You will now get logged out."
-
-common/views/components/connect-failed.vue:
-  title: "Unable to connect to the server"
-  description: "There is a problem either with your internet connection, or the server may be down or under maintenance. Please {try again} later."
-  thanks: "Thank you for using Misskey."
-  troubleshoot: "Troubleshoot"
-
-common/views/components/connect-failed.troubleshooter.vue:
-  title: "Troubleshooting"
-  network: "Network connection"
-  checking-network: "Checking network connection"
-  internet: "Internet connection"
-  checking-internet: "Checking internet connection"
-  server: "Server connection"
-  checking-server: "Checking server connection"
-  finding: "Finding a problem"
-  no-network: "There is no Network connection"
-  no-network-desc: "Please make sure you are connected to the Network."
-  no-internet: "There is no Internet connection"
-  no-internet-desc: "Please make sure you are connected to the Internet."
-  no-server: "Unable to connect to the server"
-  no-server-desc: "The network connection of your PC is normal, but you could not connect to Misskey's server. There is a possibility that the server is either down or under maintenance, please try again later."
-  success: "Successfully connected to Misskey's server"
-  success-desc: "It seems to be able to connect. Please reload the page."
-  flush: "Clean cache"
-  set-version: "Specify version"
-
-common/views/components/messaging.vue:
-  search-user: "Find an user"
-  you: "You"
-  no-history: "No history"
-
-common/views/components/messaging-room.vue:
-  empty: "No conversations"
-  more: "More"
-  no-history: "There is no more history"
-  resize-form: "Drag to resize"
-  new-message: "New message"
-
-common/views/components/messaging-room.form.vue:
-  input-message-here: "Enter message here"
-  send: "Send"
-  attach-from-local: "Attach files from your pc"
-  attach-from-drive: "Attach files from your Drive"
-
-common/views/components/messaging-room.message.vue:
-  is-read: "Read"
-  deleted: "This message has been deleted"
-
-common/views/components/nav.vue:
-  about: "About"
-  stats: "Stats"
-  status: "Status"
-  wiki: "Wiki"
-  donors: "Donators"
-  repository: "Repository"
-  develop: "Developers"
-  feedback: "Feedback"
-
-common/views/components/note-menu.vue:
-  favorite: "Favorite this note"
-  pin: "Pin to profile page"
-  remote: "Show on origin"
-
-common/views/components/poll.vue:
-  vote-to: "Vote for '{}'"
-  vote-count: "{} votes"
-  total-users: "{} users voted"
-  vote: "Vote"
-  show-result: "Show results"
-  voted: "Voted"
-
-common/views/components/poll-editor.vue:
-  no-only-one-choice: "You need to enter two or more choices."
-  choice-n: "Choice {}"
-  remove: "Remove this choice"
-  add: "+ Add a choice"
-  destroy: "Destroy this poll"
-
-common/views/components/reaction-picker.vue:
-  choose-reaction: "Choose a reaction"
-
-common/views/components/signin.vue:
-  username: "Username"
-  password: "Password"
-  token: "Token"
-  signing-in: "Signing in..."
-  signin: "Sign in"
-
-common/views/components/signup.vue:
-  username: "Username"
-  checking: "Checking..."
-  available: "Available"
-  unavailable: "Unavailable"
-  error: "Network error"
-  invalid-format: "Only use letters, numbers and -."
-  too-short: "Please enter at least 1 character！"
-  too-long: "Please enter up to 20 characters."
-  password: "Password"
-  password-placeholder: "We recommend more than 8 characters."
-  weak-password: "Weak"
-  normal-password: "So so"
-  strong-password: "Strong"
-  retype: "Type again"
-  retype-placeholder: "Confirm your password"
-  password-matched: "OK"
-  password-not-matched: "Doesn't match"
-  recaptcha: "Verify"
-  create: "Create an Account"
-  some-error: "Account creation failed for some reason. Please try again."
-
-common/views/components/special-message.vue:
-  new-year: "Happy New Year!"
-  christmas: "Merry Christmas!"
-
-common/views/components/stream-indicator.vue:
-  connecting: "Connecting"
-  reconnecting: "Reconnecting"
-  connected: "Connected"
-
-common/views/components/twitter-setting.vue:
-  description: "If you connect your Twitter account to your Misskey account, you will be able to see your Twitter account information on your profile and you can sign-in using Twitter."
-  connected-to: "You are connected to this Twitter account"
-  detail: "Detail..."
-  reconnect: "Reconnect"
-  connect: "Link your twitter account"
-  disconnect: "Disconnect"
-
-common/views/components/uploader.vue:
-  waiting: "Waiting"
-
-common/views/widgets/broadcast.vue:
-  fetching: "Fetching"
-  no-broadcasts: "No broadcasts"
-  have-a-nice-day: "Have a nice day!"
-  next: "Next"
-
-common/views/widgets/donation.vue:
-  title: "Donation"
-  text: "To keep Misskey up and running we spend money for our domain name, servers and so on.. We don't get any money from it, and we would really appreciate it if you could donate. If you're interested contact {}. Thank you for your contribution!"
-
-common/views/widgets/photo-stream.vue:
-  title: "Photostream"
-  no-photos: "No photos"
-
-common/views/widgets/server.vue:
-  title: "Server info"
-  toggle: "Toggle views"
-
-desktop/views/components/activity.vue:
-  title: "Activity"
-  toggle: "Toggle views"
-
-desktop/views/components/calendar.vue:
-  title: "{1} / {2}"
-  prev: "Previous month"
-  next: "Next month"
-  go: "Click to naviguate"
-
-desktop/views/components/drive-window.vue:
-  used: "used"
-  drive: "Drive"
-
-desktop/views/components/drive.file.vue:
-  avatar: "Avatar"
-  banner: "Banner"
-  contextmenu:
-    rename: "Rename"
-    copy-url: "Copy URL"
-    download: "Download"
-    else-files: "Others"
-    set-as-avatar: "Set as avatar"
-    set-as-banner: "Set as banner"
-    open-in-app: "Open in app"
-    add-app: "Add app"
-    rename-file: "Rename file"
-    input-new-file-name: "Enter new name"
-    copied: "Copied"
-    copied-url-to-clipboard: "Copied URL to clipboard"
-
-desktop/views/components/drive.folder.vue:
-  unable-to-process: "The operation could not be completed."
-  circular-reference-detected: "The destination folder is a subfolder of the folder you wish to move."
-  unhandled-error: "Unknown error"
-  contextmenu:
-    move-to-this-folder: "Move to this folder"
-    show-in-new-window: "Open in new window"
-    rename: "Rename"
-    rename-folder: "Rename folder"
-    input-new-folder-name: "Enter new name"
-
-desktop/views/components/drive.nav-folder.vue:
-  drive: "Drive"
-
-desktop/views/components/drive.vue:
-  search: "Search"
-  load-more: "Load more"
-  empty-draghover: "Drop Welcome!"
-  empty-drive: "Your drive is empty"
-  empty-drive-description: "You can also upload by right clicking and selecting \"Upload file\" or you can drag and drop a file onto the window."
-  empty-folder: "This folder is empty"
-  unable-to-process: "The operation could not be completed."
-  circular-reference-detected: "The destination folder is a subfolder of the folder you wish to move."
-  unhandled-error: "Unknown error"
-  url-upload: "Upload from a URL"
-  url-of-file: "URL of file you want to upload"
-  url-upload-requested: "Upload requested"
-  may-take-time: "It may take some time for the upload to complete."
-  create-folder: "Create a folder"
-  folder-name: "Folder name"
-  contextmenu:
-    create-folder: "Create a folder"
-    upload: "Upload a file"
-    url-upload: "Upload from a URL"
-
-desktop/views/components/messaging-window.vue:
-  title: "Messaging"
-
-desktop/views/components/notes.note.vue:
-  reposted-by: "Reposted by {}"
-  reply: "Reply"
-  renote: "Renote"
-  add-reaction: "Add a reaction"
-  detail: "Show detail"
-
-desktop/views/components/notifications.vue:
-  more: "More"
-  empty: "No notifications"
-
-desktop/views/components/post-form.vue:
-  note-placeholder: "What's happening?"
-  reply-placeholder: "Reply to this note..."
-  quote-placeholder: "Quote this note..."
-  note: "Post"
-  reply: "Reply"
-  renote: "Renote"
-  posted: "Posted!"
-  replied: "Replied!"
-  reposted: "Reposted!"
-  note-failed: "Failed to note"
-  reply-failed: "Failed to reply"
-  renote-failed: "Failed to renote"
-  posting: "Posting"
-  attach-media-from-local: "Attach media from your pc"
-  attach-media-from-drive: "Attach media from your Drive"
-  attach-cancel: "Cancel attachment"
-  insert-a-kao: "v(‘ω’)v"
-  create-poll: "Create a poll"
-  text-remain: "{} chars remaining"
-
-desktop/views/components/post-form-window.vue:
-  note: "New note"
-  reply: "Reply"
-  attaches: "{} media attached"
-  uploading-media: "Uploading {} media"
-
-desktop/views/components/renote-form.vue:
-  quote: "Quote..."
-  cancel: "Cancel"
-  renote: "Renote"
-  reposting: "Reposting..."
-  success: "Reposted!"
-  failure: "Failed to Renote"
-
-desktop/views/components/renote-form-window.vue:
-  title: "Are you sure you want to renote this note?"
-
-desktop/views/components/settings.vue:
-  profile: "Profile"
-  notification: "Notification"
-  apps: "Apps"
-  mute: "Mute"
-  drive: "Drive"
-  security: "Security"
-  password: "Password"
-  2fa: "Two-factor authentication"
-  other: "Other"
-  license: "License"
-
-desktop/views/components/settings.2fa.vue:
-  intro: "If you set up 2-step verification, you will need not only a password at sign-in but also a pre-registered physical device (such as your smartphone), which will improve security. "
-  detail: "See details..."
-  url: "https://www.google.com/landing/2step/"
-  caution: "If you lose access to your device, you won't be able to connect to Misskey anymore!"
-  register: "Register a device"
-  already-registered: "A device is already registered"
-  unregister: "Disable"
-  unregistered: "Two-step authentication has been disabled."
-  enter-password: "Enter the password"
-  authenticator: "First, you need install Google Authenticator on your device:"
-  howtoinstall: "How to install"
-  scan: "And then, scan the QR code:"
-  done: "Please enter the token displaying on your device:"
-  submit: "Submit"
-  success: "Setup completed successfully!"
-  failed: "Failed to setup. please ensure that the token is correct."
-  info: "From now on, enter the token that is displayed on your device in addition to your password when signing-in to Misskey."
-
-desktop/views/components/settings.api.vue:
-  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
-  caution: "Please do not show this token to third parties (do not enter it somewhere else other than here) otherwise your account could get compromised."
-  regeneration-of-token: "In the unlikely event that this token leaks out you can regenerate it."
-  regenerate-token: "Regenerate the token"
-  enter-password: "Please enter the password"
-
-desktop/views/components/settings.app.vue:
-  no-apps: "No authorized apps"
-
-desktop/views/components/settings.mute.vue:
-  no-users: "No muted users"
-
-desktop/views/components/settings.password.vue:
-  reset: "Change your password"
-  enter-current-password: "Enter the current password"
-  enter-new-password: "Enter the new password"
-  enter-new-password-again: "Enter the new password again"
-  not-match: "New password doesn't match"
-  changed: "Password updated successfully"
-
-desktop/views/components/settings.profile.vue:
-  avatar: "Avatar"
-  choice-avatar: "Choose an image"
-  name: "Name"
-  location: "Location"
-  description: "Description"
-  birthday: "Birthday"
-  save: "Update profile"
-
-desktop/views/components/ui.header.account.vue:
-  profile: "Your profile"
-  drive: "Drive"
-  favorites: "Favorites"
-  lists: "Lists"
-  customize: "Customize"
-  settings: "Settings"
-  signout: "Sign out"
-  dark: "Fall in dark"
-
-desktop/views/components/ui.header.nav.vue:
-  home: "Home"
-  messaging: "Messages"
-  game: "Game"
-
-desktop/views/components/ui.header.notifications.vue:
-  title: "Notifications"
-
-desktop/views/components/ui.header.post.vue:
-  post: "Compose new Post"
-
-desktop/views/components/ui.header.search.vue:
-  placeholder: "Search"
-
-desktop/views/pages/note.vue:
-  prev: "Previous note"
-  next: "Next note"
-
-desktop/views/pages/selectdrive.vue:
-  title: "Choose file(s)"
-  ok: "OK"
-  cancel: "Cancel"
-  upload: "Upload files from you PC"
-
-desktop/views/pages/user/user.followers-you-know.vue:
-  title: "Followers you know"
-  loading: "Loading"
-  no-users: "No users"
-
-desktop/views/pages/user/user.friends.vue:
-  title: "Frequently replied"
-  loading: "Loading"
-  no-users: "No users"
-
-desktop/views/pages/user/user.header.vue:
-  is-suspended: "This account has been suspended."
-  is-remote: "This user is a remote user, so the information is not accurate. "
-  view-remote: "See accurate information"
-
-desktop/views/pages/user/user.home.vue:
-  last-used-at: "Last active: "
-
-desktop/views/pages/user/user.photos.vue:
-  title: "Photos"
-  loading: "Loading"
-  no-photos: "No photos"
-
-desktop/views/pages/user/user.profile.vue:
-  follows-you: "Follows you"
-  stalk: "Stalk"
-  stalking: "Stalking"
-  unstalk: "Unstalk"
-  mute: "Mute"
-  muted: "Muting"
-  unmute: "Unmute"
-
-desktop/views/widgets/messaging.vue:
-  title: "Messaging"
-
-desktop/views/widgets/notifications.vue:
-  title: "Notifications"
-  settings: "Settings"
-
-desktop/views/widgets/polls.vue:
-  title: "Polls"
-  refresh: "Show others"
-  nothing: "Nothing"
-
-desktop/views/widgets/post-form.vue:
-  title: "Post"
-  note: "Post"
-  placeholder: "What's happening?"
-
-desktop/views/widgets/trends.vue:
-  title: "Trend"
-  refresh: "Show others"
-  nothing: "Nothing"
-
-desktop/views/widgets/users.vue:
-  title: "Recommended users"
-  refresh: "Show others"
-  no-one: "No one"
-
-desktop/views/widgets/channel.vue:
-  title: "Channel"
-  settings: "Widget settings"
-  get-started: "Please click the cog in the upper right corner to specify a channel"
-
-mobile/views/components/drive.vue:
-  drive: "Drive"
-  used: "used"
-  folder-count: "Folder(s)"
-  count-separator: ", "
-  file-count: "File(s)"
-  load-more: "Load more"
-  nothing-in-drive: "Nothing"
-  folder-is-empty: "This folder is empty"
-
-mobile/views/components/drive-file-chooser.vue:
-  select-file: "Choose a file"
-
-mobile/views/components/drive-folder-chooser.vue:
-  select-folder: "Choose a folder"
-
-mobile/views/components/drive.file-detail.vue:
-  download: "Download"
-  rename: "Rename"
-  move: "Move"
-  hash: "Hash (md5)"
-  exif: "EXIF"
-
-mobile/views/components/follow-button.vue:
-  follow: "Follow"
-  unfollow: "Unfollow"
-
-mobile/views/components/note.vue:
-  reposted-by: "Renoted by {}"
-
-mobile/views/components/note-detail.vue:
-  reply: "Reply"
-  reaction: "Reaction"
-
-mobile/views/components/notifications.vue:
-  more: "More"
-  empty: "No notifications"
-
-mobile/views/components/post-form.vue:
-  submit: "Post"
-  reply-placeholder: "Reply to this note..."
-  note-placeholder: "What's happening?"
-
-mobile/views/components/sub-note-content.vue:
-  media-count: "{} media"
-  poll: "Poll"
-
-mobile/views/components/timeline.vue:
-  empty: "No notes"
-  load-more: "More"
-
-mobile/views/components/ui.nav.vue:
-  home: "Home"
-  notifications: "Notifications"
-  messaging: "Messages"
-  drive: "Drive"
-  settings: "Settings"
-  about: "About Misskey"
-  search: "Search"
-
-mobile/views/components/user-timeline.vue:
-  no-notes: "It seems this user hasn't posted yet"
-  no-notes-with-media: "There is no notes with attached media"
-  load-more: "More"
-
-mobile/views/components/users-list.vue:
-  all: "All"
-  known: "You know"
-  load-more: "More"
-
-mobile/views/pages/drive.vue:
-  drive: "Drive"
-
-mobile/views/pages/followers.vue:
-  followers-of: "Followers of {}"
-
-mobile/views/pages/following.vue:
-  following-of: "Following of {}"
-
-mobile/views/pages/home.vue:
-  timeline: "Timeline"
-
-mobile/views/pages/messaging.vue:
-  messaging: "Messaging"
-
-mobile/views/pages/messaging-room.vue:
-  messaging: "Messaging"
-
-mobile/views/pages/note.vue:
-  title: "Post"
-  prev: "Previous note"
-  next: "Next note"
-
-mobile/views/pages/notifications.vue:
-  notifications: "Notifications"
-  read-all: "Are you sure you want to mark all unread notifications as read?"
-
-mobile/views/pages/profile-setting.vue:
-  title: "Profile settings"
-  will-be-published: "These profile settings will be updated."
-  name: "Name"
-  location: "Location"
-  description: "Description"
-  birthday: "Birthday"
-  avatar: "Avatar"
-  banner: "Banner"
-  avatar-saved: "Avatar updated successfully"
-  banner-saved: "Banner updated successfully"
-  set-avatar: "Choose an avatar"
-  set-banner: "Choose a banner"
-  save: "Save"
-  saved: "Profile updated successfully"
-
-mobile/views/pages/search.vue:
-  search: "Search"
-  empty: "No posts were found for '{}'"
-
-mobile/views/pages/selectdrive.vue:
-  select-file: "Choose a file"
-
-mobile/views/pages/settings.vue:
-  signed-in-as: "Signed in as {}"
-  profile: "Profile"
-  twitter-integration: "Twitter integration"
-  signin-history: "Sign in history"
-  settings: "Settings"
-  signout: "Sign out"
-
-mobile/views/pages/user.vue:
-  follows-you: "Follows you"
-  following: "Following"
-  followers: "Followers"
-  notes: "Posts"
-  overview: "Overview"
-  timeline: "Timeline"
-  media: "Media"
-  is-suspended: "This account has been suspended."
-  is-remote: "This user is a remote user, so the information is not accurate. "
-  view-remote: "See accurate information"
-
-mobile/views/pages/user/home.vue:
-  recent-notes: "Recent notes"
-  images: "Images"
-  activity: "Activity"
-  keywords: "Keywords"
-  domains: "Domains"
-  frequently-replied-users: "Frequently talking users"
-  followers-you-know: "Followers you know"
-  last-used-at: "Last active:"
-
-mobile/views/pages/user/home.followers-you-know.vue:
-  loading: "Loading"
-  no-users: "No users"
-
-mobile/views/pages/user/home.friends.vue:
-  loading: "Loading"
-  no-users: "No users"
-
-mobile/views/pages/user/home.notes.vue:
-  loading: "Loading"
-  no-notes: "No notes"
-
-mobile/views/pages/user/home.photos.vue:
-  loading: "Loading"
-  no-photos: "No photos"
-
-docs:
-  edit-this-page-on-github: "Did you find an error or do you want to contribute to the documentation? "
-  edit-this-page-on-github-link: "Edit this page on Github!"
-
-  api:
-    entities:
-      properties: "Properties"
-    endpoints:
-      params: "Parameters"
-      res: "Response"
-    props:
-      name: "Name"
-      type: "Type"
-      optional: "Optional"
-      description: "Description"
-      yes: "Yes"
-      no: "No"

locales/fr.yml

@@ -1,649 +0,0 @@
-common:
-  misskey: "Partagez avec les autres en utilisant Misskey"
-
-  time:
-    unknown: "inconnu"
-    future: "future"
-    just_now: "maintenant"
-    seconds_ago: "Il y a {}seconde(s)"
-    minutes_ago: "Il y a {}minute(s)"
-    hours_ago: "Il y a {}heure(s)"
-    days_ago: "Il y a {}jour(s)"
-    weeks_ago: "Il y a{}semaines(s)"
-    months_ago: "Il y a {}mois"
-    years_ago: "Il y a {}an(s)"
-
-  weekday-short:
-    sunday: "D"
-    monday: "L"
-    tuesday: "M"
-    wednesday: "M"
-    thursday: "J"
-    friday: "V"
-    satruday: "S"
-
-  reactions:
-    like: "Aime"
-    love: "Adore"
-    laugh: "Rire"
-    hmm: "Hmm...?"
-    surprise: "Wow"
-    congrats: "Félicitations!"
-    angry: "En Colère"
-    confused: "Confus"
-    pudding: "Pudding"
-
-  delete: "Supprimer"
-  loading: "Chargement"
-  ok: "OK"
-  update-available: "Une nouvelle version de Misskey est disponible({newer}, version actuelle: {current}). Recharger la page pour appliquer la mise à jour."
-  my-token-regenerated: "Votre token vient d'être généré, vous allez maintenant être déconnecté."
-
-common/views/components/connect-failed.vue:
-  title: "Impossible de se connecter au server."
-  description: "Il y a soit un problème avec votre connexion internet, soit le serveur est hors-ligne ou en maintenance. Veuillez {ressayer} plus tard."
-  thanks: "On vous remercie d'utiliser Misskey."
-  troubleshoot: "dépanner"
-
-common/views/components/connect-failed.troubleshooter.vue:
-  title: "Dépannage"
-  network: "Connexion au réseau"
-  checking-network: "Vérification de la connexion au réseau"
-  internet: "Connexion Internet"
-  checking-internet: "Vérification de la connexion internet"
-  server: "Connexion au server"
-  checking-server: "Vérification de la connexion au serveur"
-  finding: "Recherche d'un problème"
-  no-network: "Aucune connexion au réseau"
-  no-network-desc: "Veuillez vérifier que vous êtes bien connecté au réseau."
-  no-internet: "Aucune connexion internet."
-  no-internet-desc: "Veuillez vérifier que vous êtes bien connecté à internet."
-  no-server: "Impossible de se connecter au serveur"
-  no-server-desc: "Votre connexion est OK, mais il a été impossible de vous connecter au serveur de Misskey. Il y a des chances que le serveur soit hors-ligne ou en maintenance, veuillez ressayer plus tard."
-  success: "Connexion au serveur de Misskey reussie!"
-  success-desc: "La connexion au serveur a été reussie. Veuillez recharger la page."
-  flush: "キャッシュの削除"
-  set-version: "バージョン指定"
-
-common/views/components/messaging.vue:
-  search-user: "Trouver un utilisateur"
-  you: "Vous"
-  no-history: "Pas d'historique"
-
-common/views/components/messaging-room.vue:
-  empty: "Pas de conversations"
-  more: "Voir Plus"
-  no-history: "Il n'y a pas plus d'historique"
-  resize-form: "Faites glisser pour redimensionner"
-  new-message: "Nouveau message"
-
-common/views/components/messaging-room.form.vue:
-  input-message-here: "Tapez ici votre message"
-  send: "Envoyer"
-  attach-from-local: "Joindre un fichier depuis votre PC"
-  attach-from-drive: "Joindre un fichier depuis votre Drive"
-
-common/views/components/messaging-room.message.vue:
-  is-read: "Lu"
-  deleted: "Ce message a été supprimé"
-
-common/views/components/nav.vue:
-  about: "À propos"
-  stats: "Stats"
-  status: "Status"
-  wiki: "Wiki"
-  donors: "Donateurs"
-  repository: "Repo"
-  develop: "Développeurs"
-  feedback: "フィードバック"
-
-common/views/components/note-menu.vue:
-  favorite: "Favorite this note"
-  pin: "Épingler sur votre profile"
-  remote: "投稿元で見る"
-
-common/views/components/poll.vue:
-  vote-to: "Voter pour '{}'"
-  vote-count: "{} votes"
-  total-users: "{} utilisateurs ont voté"
-  vote: "Vote"
-  show-result: "Montrer les résultats"
-  voted: "Voté"
-
-common/views/components/poll-editor.vue:
-  no-only-one-choice: "Vous devez entrer au moins deux choix"
-  choice-n: "Choix {}"
-  remove: "Supprimer ce choix"
-  add: "+ Ajouter un choix"
-  destroy: "Supprimer ce sondage"
-
-common/views/components/reaction-picker.vue:
-  choose-reaction: "Choisissez votre réaction"
-
-common/views/components/signin.vue:
-  username: "Nom d'utilisateur"
-  password: "Mot de passe"
-  token: "Token"
-  signing-in: "Connexion...."
-  signin: "Se connecter"
-
-common/views/components/signup.vue:
-  username: "Nom d'utilisateur"
-  checking: "Vérification"
-  available: "Disponible"
-  unavailable: "Non disponible"
-  error: "Erreur de réseau"
-  invalid-format: "Utilisez seulement des lettres, nombres et/ou -."
-  too-short: "Veuillez taper au moins un charactère!"
-  too-long: "Veuillez entrer au maximum 20 charactères."
-  password: "Mot de Passe"
-  password-placeholder: "Nous recommendons au moins 8 charactères."
-  weak-password: "Faible"
-  normal-password: "Moyen"
-  strong-password: "Fort"
-  retype: "Retapez"
-  retype-placeholder: "Confirmez votre mot de passe"
-  password-matched: "OK"
-  password-not-matched: "Les mots de passes ne correspondent pas."
-  recaptcha: "Vérifier"
-  create: "Créer un compte"
-  some-error: "La création de compte a échoué. Veuillez ressayer."
-
-common/views/components/special-message.vue:
-  new-year: "Bonne année!"
-  christmas: "Joyeux Noël!"
-
-common/views/components/stream-indicator.vue:
-  connecting: "Connexion en cours"
-  reconnecting: "Re-connexion en cours"
-  connected: "Connecté"
-
-common/views/components/twitter-setting.vue:
-  description: "Si vous liez votre compte Twitter à votre compte Misskey, vous verrez ensuite votre compte Twitter s'afficher sur votre profile, vous aurez aussi la possibilité de vous connecter à Misskey en utilisant votre compte Twitter."
-  connected-to: "Vous êtes connecté à ce compte"
-  detail: "Detail..."
-  reconnect: "Reconnecter"
-  connect: "Lier votre compte Twitter"
-  disconnect: "Deconnecter"
-
-common/views/components/uploader.vue:
-  waiting: "En attente"
-
-common/views/widgets/broadcast.vue:
-  fetching: "Récuperation"
-  no-broadcasts: "No broadcasts"
-  have-a-nice-day: "Passez une bonne journée!"
-  next: "Suivant"
-
-common/views/widgets/donation.vue:
-  title: "Dons"
-  text: "Toutes les depences pour couvrir les frais de Misskey sortent directement de notre poche. Nous ne recevons pas d'argent, si vous pouvez nous faire dons d'argent, on vous serait eternellement reconnaissant. Si vous êtes intéressés veuilles contacter {}. Merci pour votre contribution!"
-
-common/views/widgets/photo-stream.vue:
-  title: "Flux de photo"
-  no-photos: "Pas de photos"
-
-common/views/widgets/server.vue:
-  title: "Info sur le serveur"
-  toggle: "Afficher les vues"
-
-desktop/views/components/activity.vue:
-  title: "Activitié"
-  toggle: "Afficher les vues"
-
-desktop/views/components/calendar.vue:
-  title: "{1} / {2}"
-  prev: "Mois dernier"
-  next: "Mois prochain"
-  go: "Cliquer pour naviguer"
-
-desktop/views/components/drive-window.vue:
-  used: "utilisé"
-  drive: "Drive"
-
-desktop/views/components/drive.file.vue:
-  avatar: "Avatar"
-  banner: "Bannière"
-  contextmenu:
-    rename: "Renommer"
-    copy-url: "Copier l'URL"
-    download: "Télécharger"
-    else-files: "Autres..."
-    set-as-avatar: "Utiliser en tant qu'avatar"
-    set-as-banner: "Utiliser en tant que bannière"
-    open-in-app: "Ouvrir dans l'application"
-    add-app: "Ajouter une application"
-    rename-file: "Renommer le ficher"
-    input-new-file-name: "Entrer un nouveau nom"
-    copied: "Copied"
-    copied-url-to-clipboard: "L'URL a été copié dans le presse-papier"
-
-desktop/views/components/drive.folder.vue:
-  unable-to-process: "L'opération n'a pas pu être complétée"
-  circular-reference-detected: "Le dossier de destination est un sous-dossier du dossier que vous souhaitez déplacer."
-  unhandled-error: "Erreur inconnue"
-  contextmenu:
-    move-to-this-folder: "Bouger dans ce dossier"
-    show-in-new-window: "Ouvrir dans une nouvelle fenêtre"
-    rename: "Renommer"
-    rename-folder: "Renommer le dossier"
-    input-new-folder-name: "Entrer un nouveau nom"
-
-desktop/views/components/drive.nav-folder.vue:
-  drive: "Drive"
-
-desktop/views/components/drive.vue:
-  search: "Rechercher"
-  load-more: "Afficher plus"
-  empty-draghover: "Drop Welcome!"
-  empty-drive: "Votre Drive est vide"
-  empty-drive-description: "Vous pouvez également uploader le fichier en faisant un clic droit et en choisissant 'Uploader' ou tout simplement en faisant glisser votre fichier."
-  empty-folder: "Ce dossier est vide"
-  unable-to-process: "L'opération n'a pas pu être complétée"
-  circular-reference-detected: "Le dossier de destination est un sous-dossier du dossier que vous souhaitez déplacer."
-  unhandled-error: "Erreur inconnue"
-  url-upload: "Uploader d'un URL"
-  url-of-file: "URL de l'image que vous souhaitez uploader."
-  url-upload-requested: "Upload requested"
-  may-take-time: "L'upload de votre fichier peut prendre un certain temps."
-  create-folder: "Créer un dossier"
-  folder-name: "Nom du dossier"
-  contextmenu:
-    create-folder: "Créer un dossier"
-    upload: "Uploader un fichier"
-    url-upload: "Uploader d'un URL"
-
-desktop/views/components/messaging-window.vue:
-  title: "Messagerie"
-
-desktop/views/components/notes.note.vue:
-  reposted-by: "Reposté par {}"
-  reply: "Répondre"
-  renote: "Renote"
-  add-reaction: "Ajouter votre reaction"
-  detail: "Afficher les détails"
-
-desktop/views/components/notifications.vue:
-  more: "Plus"
-  empty: "Pas de notifications"
-
-desktop/views/components/post-form.vue:
-  note-placeholder: "Qu'est-ce qui se passe?"
-  reply-placeholder: "Répondre à cette note"
-  quote-placeholder: "Citer cette note"
-  note: "Poster"
-  reply: "Répondre"
-  renote: "Renote"
-  posted: "Posté!"
-  replied: "Répondu!"
-  reposted: "Reposté!"
-  note-failed: "La note à échoué"
-  reply-failed: "La réponse à échoué"
-  renote-failed: "La renote à échoué"
-  posting: "Publication..."
-  attach-media-from-local: "Joindre un media depuis votre PC"
-  attach-media-from-drive: "Joindre un media depuis votre Drive"
-  attach-cancel: "Annuler la jointure de fichier"
-  insert-a-kao: "v(‘ω’)v"
-  create-poll: "Créer un sondage"
-  text-remain: "{} charactères restants"
-
-desktop/views/components/post-form-window.vue:
-  note: "Nouvelle note"
-  reply: "Répondre"
-  attaches: "{} media joint(s)"
-  uploading-media: "Upload du media {}"
-
-desktop/views/components/renote-form.vue:
-  quote: "Citer..."
-  cancel: "Annuler"
-  renote: "Renote"
-  reposting: "Repost en cours..."
-  success: "Reposté!"
-  failure: "La renote a échoué"
-
-desktop/views/components/renote-form-window.vue:
-  title: "Êtes vous sûr de vouloir renote cette note?"
-
-desktop/views/components/settings.vue:
-  profile: "Profil"
-  notification: "Notification"
-  apps: "Applications"
-  mute: "Mettre en sourdine"
-  drive: "Drive"
-  security: "Sécurité"
-  password: "Mot de Passe"
-  2fa: "Vérification en deux étapes"
-  other: "Autres"
-  license: "License"
-
-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."
-  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"
-  enter-password: "Entrez un mot de passe"
-  authenticator: "Tout d'abord vous devez 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!"
-  failed: "L'operation a échoué. Veuillez vous assurer que le token a été entrer 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."
-
-desktop/views/components/settings.api.vue:
-  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
-  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
-  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
-  regenerate-token: "Regenerer le token"
-  enter-password: "Veuillez entrer le mot de passe"
-
-desktop/views/components/settings.app.vue:
-  no-apps: "Aucune application authorisée"
-
-desktop/views/components/settings.mute.vue:
-  no-users: "Aucun utilisateurs mis en sourdine"
-
-desktop/views/components/settings.password.vue:
-  reset: "Changer votre mot de passe"
-  enter-current-password: "Entrez votre mot de passe actuel"
-  enter-new-password: "Entrez votre nouveau mot de passe"
-  enter-new-password-again: "Entrez à nouveau le nouveau mot de passe"
-  not-match: "Le nouveau mot de passe ne correspond pas."
-  changed: "Mot de passe modifié avec succès"
-
-desktop/views/components/settings.profile.vue:
-  avatar: "Avatar"
-  choice-avatar: "Choose an image"
-  name: "Nom"
-  location: "Localisation"
-  description: "Description"
-  birthday: "Date de naissance"
-  save: "Mettre à jour le profil"
-
-desktop/views/components/ui.header.account.vue:
-  profile: "Votre profil"
-  drive: "Drive"
-  favorites: "Favorites"
-  lists: "リスト"
-  customize: "Modifications"
-  settings: "Réglages"
-  signout: "Déconnexion"
-  dark: "Fall in dark"
-
-desktop/views/components/ui.header.nav.vue:
-  home: "Accueil"
-  messaging: "Messages"
-  game: "Jeux"
-
-desktop/views/components/ui.header.notifications.vue:
-  title: "Notifications"
-
-desktop/views/components/ui.header.post.vue:
-  post: "Composer un nouveau post"
-
-desktop/views/components/ui.header.search.vue:
-  placeholder: "Chercher"
-
-desktop/views/pages/note.vue:
-  prev: "Note précédente"
-  next: "Note suivante"
-
-desktop/views/pages/selectdrive.vue:
-  title: "Choisir fichier(s)"
-  ok: "OK"
-  cancel: "Annuler"
-  upload: "Uploader un ou plusieurs fichier(s) depuis votre PC"
-
-desktop/views/pages/user/user.followers-you-know.vue:
-  title: "Abonnés que vous connaissez"
-  loading: "Chargement en cours"
-  no-users: "Pas d'utilisateurs"
-
-desktop/views/pages/user/user.friends.vue:
-  title: "Personnes qui répondent le plus"
-  loading: "Chargement en cours"
-  no-users: "Pas d'utilisateurs"
-
-desktop/views/pages/user/user.header.vue:
-  is-suspended: "This account has been suspended."
-  is-remote: "Cet utilisateur n'est pas un utilisateur de Misskey. Certaines informations peuvent être erronées "
-  view-remote: "Voir les informations détaillées"
-
-desktop/views/pages/user/user.home.vue:
-  last-used-at: "Last used at"
-
-desktop/views/pages/user/user.photos.vue:
-  title: "Photos"
-  loading: "Chargement en cours"
-  no-photos: "Pas de photos"
-
-desktop/views/pages/user/user.profile.vue:
-  follows-you: "Vous suis"
-  stalk: "ストークする"
-  stalking: "ストーキングしています"
-  unstalk: "ストーク解除"
-  mute: "Mettre en sourdine"
-  muted: "Muting"
-  unmute: "Enlever la sourdine"
-
-desktop/views/widgets/messaging.vue:
-  title: "Messagerie"
-
-desktop/views/widgets/notifications.vue:
-  title: "Notifications"
-  settings: "Réglages"
-
-desktop/views/widgets/polls.vue:
-  title: "Sondages"
-  refresh: "Afficher d'autres"
-  nothing: "Rien"
-
-desktop/views/widgets/post-form.vue:
-  title: "Post"
-  note: "Post"
-  placeholder: "Qu'est-ce qu'il se passe?"
-
-desktop/views/widgets/trends.vue:
-  title: "Tendances"
-  refresh: "Afficher d'autres"
-  nothing: "Rien"
-
-desktop/views/widgets/users.vue:
-  title: "Utilisateurs"
-  refresh: "Afficher d'autres"
-  no-one: "Personne"
-
-desktop/views/widgets/channel.vue:
-  title: "Cannal"
-  settings: "Réglages des widgets"
-  get-started: "Veuillez cliquer sur la dent en haute à droite pour choisir un channel"
-
-mobile/views/components/drive.vue:
-  drive: "Drive"
-  used: "utilisé"
-  folder-count: "Dossier(s)"
-  count-separator: ", "
-  file-count: "Fichiers(s)"
-  load-more: "Charger plus"
-  nothing-in-drive: "Rien"
-  folder-is-empty: "Ce dossier est vide"
-
-mobile/views/components/drive-file-chooser.vue:
-  select-file: "Choisissez un fichier"
-
-mobile/views/components/drive-folder-chooser.vue:
-  select-folder: "Choisissez un dossier"
-
-mobile/views/components/drive.file-detail.vue:
-  download: "Télécharger"
-  rename: "Renommer"
-  move: "Déplacer"
-  hash: "Hash (md5)"
-  exif: "EXIF"
-
-mobile/views/components/follow-button.vue:
-  follow: "Suivre"
-  unfollow: "Ne plus suivre"
-
-mobile/views/components/note.vue:
-  reposted-by: "Renoté par {}"
-
-mobile/views/components/note-detail.vue:
-  reply: "Répondre"
-  reaction: "Réaction"
-
-mobile/views/components/notifications.vue:
-  more: "Plus"
-  empty: "Pas de notifications"
-
-mobile/views/components/post-form.vue:
-  submit: "Poster"
-  reply-placeholder: "Répondre à cette note"
-  note-placeholder: "Qu'est-ce qu'il se passe?"
-
-mobile/views/components/sub-note-content.vue:
-  media-count: "{} media"
-  poll: "Sondage"
-
-mobile/views/components/timeline.vue:
-  empty: "Pas de notes"
-  load-more: "Afficher plus"
-
-mobile/views/components/ui.nav.vue:
-  home: "Accueil"
-  notifications: "Notifications"
-  messaging: "Messages"
-  drive: "Drive"
-  settings: "Réglages"
-  about: "À propose de Misskey"
-  search: "Rechercher"
-
-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"
-  load-more: "Afficher Plus"
-
-mobile/views/components/users-list.vue:
-  all: "Tout"
-  known: "Vous connaissez"
-  load-more: "Afficher plus"
-
-mobile/views/pages/drive.vue:
-  drive: "Drive"
-
-mobile/views/pages/followers.vue:
-  followers-of: "Abonnés de {}"
-
-mobile/views/pages/following.vue:
-  following-of: "Abonnements de {}"
-
-mobile/views/pages/home.vue:
-  timeline: "Fil d'actualité"
-
-mobile/views/pages/messaging.vue:
-  messaging: "Messagerie"
-
-mobile/views/pages/messaging-room.vue:
-  messaging: "Messagerie"
-
-mobile/views/pages/note.vue:
-  title: "Post"
-  prev: "Note précedante"
-  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?"
-
-mobile/views/pages/profile-setting.vue:
-  title: "Réglages du profiles"
-  will-be-published: "Ces profiles vont être publier"
-  name: "Nom"
-  location: "Localisation"
-  description: "Description"
-  birthday: "Anniversaire"
-  avatar: "Avatar"
-  banner: "Bannière"
-  avatar-saved: "Avatar mis à jour avec succès!"
-  banner-saved: "Bannière mise à jour avec succès!"
-  set-avatar: "Choisir un avatar"
-  set-banner: "Choisir une bannière"
-  save: "Sauvegarder"
-  saved: "Profil mis à jour avec succès"
-
-mobile/views/pages/search.vue:
-  search: "Chercher"
-  empty: "Aucun message trouvé pour '{}' "
-
-mobile/views/pages/selectdrive.vue:
-  select-file: "Choisissez un fichier"
-
-mobile/views/pages/settings.vue:
-  signed-in-as: "Connecté en tant que {}"
-  profile: "Profile"
-  twitter-integration: "Twitter integration"
-  signin-history: "Historique de connexion"
-  settings: "Réglages"
-  signout: "Déconnexion"
-
-mobile/views/pages/user.vue:
-  follows-you: "vous suit"
-  following: "Abonnements"
-  followers: "Abonnés"
-  notes: "Posts"
-  overview: "Aperçu"
-  timeline: "Fil d'actualité"
-  media: "Media"
-  is-suspended: "This account has been suspended."
-  is-remote: "Cet utilisateur n'est pas un utilisateur de Misskey. Certaines informations peuvent être erronées "
-  view-remote: "Voir les informations détaillées"
-
-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"
-  followers-you-know: "Abonnés que vous connaissez"
-  last-used-at: "Dernière connexion il y a"
-
-mobile/views/pages/user/home.followers-you-know.vue:
-  loading: "Chargement"
-  no-users: "Pas d'utilisateurs"
-
-mobile/views/pages/user/home.friends.vue:
-  loading: "Chargement"
-  no-users: "Pass d'utilisateurs"
-
-mobile/views/pages/user/home.notes.vue:
-  loading: "Chargement"
-  no-notes: "Pas de notes"
-
-mobile/views/pages/user/home.photos.vue:
-  loading: "Chargement"
-  no-photos: "Pas de photos"
-
-docs:
-  edit-this-page-on-github: "Vous avez trouvé une erreur ou vous voulez contribuer à la documentation?"
-  edit-this-page-on-github-link: "Modifiez cette page sur github!"
-
-  api:
-    entities:
-      properties: "Propriétés"
-    endpoints:
-      params: "Paramètres"
-      res: "Réponse"
-    props:
-      name: "Nom"
-      type: "Type"
-      optional: "Optionel"
-      description: "Description"
-      yes: "Oui"
-      no: "Non"

locales/index.js

@@ -0,0 +1,13 @@
+/**
+ * Languages Loader
+ */
+
+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 loadLocale = lang => yaml.safeLoad(fs.readFileSync(`${__dirname}/${lang}.yml`, 'utf-8'));
+const locales = langs.map(lang => ({ [lang]: loadLocale(lang) }));
+
+module.exports = locales.reduce((a, b) => ({ ...a, ...b }));

locales/index.ts

@@ -1,25 +0,0 @@
-/**
- * Languages Loader
- */
-
-import * as fs from 'fs';
-import * as yaml from 'js-yaml';
-
-const loadLang = lang => yaml.safeLoad(
-	fs.readFileSync(`./locales/${lang}.yml`, 'utf-8'));
-
-const native = loadLang('ja');
-
-const langs = {
-	'en': loadLang('en'),
-	'fr': loadLang('fr'),
-	'ja': native,
- 'pl': loadLang('pl')
-};
-
-Object.entries(langs).map(([, locale]) => {
-	// Extend native language (Japanese)
-	locale = Object.assign({}, native, locale);
-});
-
-export default langs;

locales/ja.yml

@@ -1,649 +0,0 @@
-common:
-  misskey: "Misskeyで皆と共有しよう。"
-
-  time:
-    unknown: "なぞのじかん"
-    future: "未来"
-    just_now: "たった今"
-    seconds_ago: "{}秒前"
-    minutes_ago: "{}分前"
-    hours_ago: "{}時間前"
-    days_ago: "{}日前"
-    weeks_ago: "{}週間前"
-    months_ago: "{}ヶ月前"
-    years_ago: "{}年前"
-
-  weekday-short:
-    sunday: "日"
-    monday: "月"
-    tuesday: "火"
-    wednesday: "水"
-    thursday: "木"
-    friday: "金"
-    satruday: "土"
-
-  reactions:
-    like: "いいね"
-    love: "しゅき"
-    laugh: "笑"
-    hmm: "ふぅ～む"
-    surprise: "わお"
-    congrats: "おめでとう"
-    angry: "おこ"
-    confused: "こまこまのこまり"
-    pudding: "Pudding"
-
-  delete: "削除"
-  loading: "読み込み中"
-  ok: "わかった"
-  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
-  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
-
-common/views/components/connect-failed.vue:
-  title: "サーバーに接続できません"
-  description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
-  thanks: "いつもMisskeyをご利用いただきありがとうございます。"
-  troubleshoot: "トラブルシュート"
-
-common/views/components/connect-failed.troubleshooter.vue:
-  title: "トラブルシューティング"
-  network: "ネットワーク接続"
-  checking-network: "ネットワーク接続を確認中"
-  internet: "インターネット接続"
-  checking-internet: "インターネット接続を確認中"
-  server: "サーバー接続"
-  checking-server: "サーバー接続を確認中"
-  finding: "問題を調べています"
-  no-network: "ネットワークに接続されていません"
-  no-network-desc: "お使いのPCのネットワーク接続が正常か確認してください。"
-  no-internet: "インターネットに接続されていません"
-  no-internet-desc: "ネットワークには接続されていますが、インターネットには接続されていないようです。お使いのPCのインターネット接続が正常か確認してください。"
-  no-server: "Misskeyのサーバーに接続できません"
-  no-server-desc: "お使いのPCのインターネット接続は正常ですが、Misskeyのサーバーには接続できませんでした。サーバーがダウンまたはメンテナンスしている可能性があるので、しばらくしてから再度御アクセスください。"
-  success: "Misskeyのサーバーに接続できました"
-  success-desc: "正常に接続できるようです。ページを再度読み込みしてください。"
-  flush: "キャッシュの削除"
-  set-version: "バージョン指定"
-
-common/views/components/messaging.vue:
-  search-user: "ユーザーを探す"
-  you: "あなた"
-  no-history: "履歴はありません"
-
-common/views/components/messaging-room.vue:
-  empty: "このユーザーと話したことはありません"
-  more: "もっと読む"
-  no-history: "これより過去の履歴はありません"
-  resize-form: "ドラッグしてフォームの広さを調整"
-  new-message: "新しいメッセージがあります"
-
-common/views/components/messaging-room.form.vue:
-  input-message-here: "ここにメッセージを入力"
-  send: "送信"
-  attach-from-local: "PCからファイルを添付する"
-  attach-from-drive: "ドライブからファイルを添付する"
-
-common/views/components/messaging-room.message.vue:
-  is-read: "既読"
-  deleted: "このメッセージは削除されました"
-
-common/views/components/nav.vue:
-  about: "Misskeyについて"
-  stats: "統計"
-  status: "ステータス"
-  wiki: "Wiki"
-  donors: "ドナー"
-  repository: "リポジトリ"
-  develop: "開発者"
-  feedback: "フィードバック"
-
-common/views/components/note-menu.vue:
-  favorite: "お気に入り"
-  pin: "ピン留め"
-  remote: "投稿元で見る"
-
-common/views/components/poll.vue:
-  vote-to: "「{}」に投票する"
-  vote-count: "{}票"
-  total-users: "{}人が投票"
-  vote: "投票する"
-  show-result: "結果を見る"
-  voted: "投票済み"
-
-common/views/components/poll-editor.vue:
-  no-only-one-choice: "投票には、選択肢が最低2つ必要です"
-  choice-n: "選択肢{}"
-  remove: "この選択肢を削除"
-  add: "+選択肢を追加"
-  destroy: "投票を破棄"
-
-common/views/components/reaction-picker.vue:
-  choose-reaction: "リアクションを選択"
-
-common/views/components/signin.vue:
-  username: "ユーザー名"
-  password: "パスワード"
-  token: "トークン"
-  signing-in: "やってます..."
-  signin: "サインイン"
-
-common/views/components/signup.vue:
-  username: "ユーザー名"
-  checking: "確認しています..."
-  available: "利用できます"
-  unavailable: "既に利用されています"
-  error: "通信エラー"
-  invalid-format: "a~z、A~Z、0~9、_が使えます"
-  too-short: "1文字以上でお願いします！"
-  too-long: "20文字以内でお願いします"
-  password: "パスワード"
-  password-placeholder: "8文字以上を推奨します"
-  weak-password: "弱いパスワード"
-  normal-password: "まあまあのパスワード"
-  strong-password: "強いパスワード"
-  retype: "再入力"
-  retype-placeholder: "確認のため再入力してください"
-  password-matched: "確認されました"
-  password-not-matched: "一致していません"
-  recaptcha: "認証"
-  create: "アカウント作成"
-  some-error: "何らかの原因によりアカウントの作成に失敗しました。再度お試しください。"
-
-common/views/components/special-message.vue:
-  new-year: "Happy New Year!"
-  christmas: "Merry Christmas!"
-
-common/views/components/stream-indicator.vue:
-  connecting: "接続中"
-  reconnecting: "再接続中"
-  connected: "接続完了"
-
-common/views/components/twitter-setting.vue:
-  description: "お使いのTwitterアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでTwitterアカウント情報が表示されるようになったり、Twitterを用いた便利なサインインを利用できるようになります。"
-  connected-to: "次のTwitterアカウントに接続されています"
-  detail: "詳細..."
-  reconnect: "再接続する"
-  connect: "Twitterと接続する"
-  disconnect: "切断する"
-
-common/views/components/uploader.vue:
-  waiting: "待機中"
-
-common/views/widgets/broadcast.vue:
-  fetching: "確認中"
-  no-broadcasts: "お知らせはありません"
-  have-a-nice-day: "良い一日を！"
-  next: "次"
-
-common/views/widgets/donation.vue:
-  title: "寄付のお願い"
-  text: "Misskeyの運営にはドメイン、サーバー等のコストが掛かります。Misskeyは広告を掲載したりしないため、収入を皆様からの寄付に頼っています。もしご興味があれば、{}までご連絡ください。ご協力ありがとうございます。"
-
-common/views/widgets/photo-stream.vue:
-  title: "フォトストリーム"
-  no-photos: "写真はありません"
-
-common/views/widgets/server.vue:
-  title: "サーバー情報"
-  toggle: "表示を切り替え"
-
-desktop/views/components/activity.vue:
-  title: "アクティビティ"
-  toggle: "表示を切り替え"
-
-desktop/views/components/calendar.vue:
-  title: "{1}年 {2}月"
-  prev: "前の月"
-  next: "次の月"
-  go: "クリックして時間遡行"
-
-desktop/views/components/drive-window.vue:
-  used: "使用中"
-  drive: "ドライブ"
-
-desktop/views/components/drive.file.vue:
-  avatar: "アイコン"
-  banner: "バナー"
-  contextmenu:
-    rename: "名前を変更"
-    copy-url: "URLをコピー"
-    download: "ダウンロード"
-    else-files: "その他..."
-    set-as-avatar: "アイコンに設定"
-    set-as-banner: "バナーに設定"
-    open-in-app: "アプリで開く"
-    add-app: "アプリを追加"
-    rename-file: "ファイル名の変更"
-    input-new-file-name: "新しいファイル名を入力してください"
-    copied: "コピー完了"
-    copied-url-to-clipboard: "URLをクリップボードにコピーしました"
-
-desktop/views/components/drive.folder.vue:
-  unable-to-process: "操作を完了できません"
-  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
-  unhandled-error: "不明なエラー"
-  contextmenu:
-    move-to-this-folder: "このフォルダへ移動"
-    show-in-new-window: "新しいウィンドウで表示"
-    rename: "名前を変更"
-    rename-folder: "フォルダ名の変更"
-    input-new-folder-name: "新しいフォルダ名を入力してください"
-
-desktop/views/components/drive.nav-folder.vue:
-  drive: "ドライブ"
-
-desktop/views/components/drive.vue:
-  search: "検索"
-  load-more: "もっと読み込む"
-  empty-draghover: "ドロップですか？いいですよ、ボクはカワイイですからね"
-  empty-drive: "ドライブには何もありません。"
-  empty-drive-description: "右クリックして「ファイルをアップロード」を選んだり、ファイルをドラッグ&ドロップすることでもアップロードできます。"
-  empty-folder: "このフォルダーは空です"
-  unable-to-process: "操作を完了できません"
-  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
-  unhandled-error: "不明なエラー"
-  url-upload: "URLアップロード"
-  url-of-file: "アップロードしたいファイルのURL"
-  url-upload-requested: "アップロードをリクエストしました"
-  may-take-time: "アップロードが完了するまで時間がかかる場合があります。"
-  create-folder: "フォルダー作成"
-  folder-name: "フォルダー名"
-  contextmenu:
-    create-folder: "フォルダーを作成"
-    upload: "ファイルをアップロード"
-    url-upload: "URLからアップロード"
-
-desktop/views/components/messaging-window.vue:
-  title: "メッセージ"
-
-desktop/views/components/notes.note.vue:
-  reposted-by: "{}がRenote"
-  reply: "返信"
-  renote: "Renote"
-  add-reaction: "リアクション"
-  detail: "詳細"
-
-desktop/views/components/notifications.vue:
-  more: "もっと見る"
-  empty: "ありません！"
-
-desktop/views/components/post-form.vue:
-  note-placeholder: "いまどうしてる？"
-  reply-placeholder: "この投稿への返信..."
-  quote-placeholder: "この投稿を引用..."
-  note: "投稿"
-  reply: "返信"
-  renote: "Renote"
-  posted: "投稿しました！"
-  replied: "返信しました！"
-  reposted: "Renoteしました！"
-  note-failed: "投稿に失敗しました"
-  reply-failed: "返信に失敗しました"
-  renote-failed: "Renoteに失敗しました"
-  posting: "投稿中"
-  attach-media-from-local: "PCからメディアを添付"
-  attach-media-from-drive: "ドライブからメディアを添付"
-  attach-cancel: "添付取り消し"
-  insert-a-kao: "v(‘ω’)v"
-  create-poll: "投票を作成"
-  text-remain: "残り{}文字"
-
-desktop/views/components/post-form-window.vue:
-  note: "新規投稿"
-  reply: "返信"
-  attaches: "添付: {}メディア"
-  uploading-media: "{}個のメディアをアップロード中"
-
-desktop/views/components/renote-form.vue:
-  quote: "引用する..."
-  cancel: "キャンセル"
-  renote: "Renote"
-  reposting: "しています..."
-  success: "Renoteしました！"
-  failure: "Renoteに失敗しました"
-
-desktop/views/components/renote-form-window.vue:
-  title: "この投稿をRenoteしますか？"
-
-desktop/views/components/settings.vue:
-  profile: "プロフィール"
-  notification: "通知"
-  apps: "アプリ"
-  mute: "ミュート"
-  drive: "ドライブ"
-  security: "セキュリティ"
-  password: "パスワード"
-  2fa: "二段階認証"
-  other: "その他"
-  license: "ライセンス"
-
-desktop/views/components/settings.2fa.vue:
-  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
-  detail: "詳細..."
-  url: "https://www.google.co.jp/intl/ja/landing/2step/"
-  caution: "登録したデバイスを紛失するなどした場合、Misskeyにサインインできなくなりますのでご注意ください。"
-  register: "デバイスを登録する"
-  already-registered: "既に設定は完了しています。"
-  unregister: "設定を解除"
-  unregistered: "二段階認証が無効になりました。"
-  enter-password: "パスワードを入力してください"
-  authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
-  howtoinstall: "インストール方法はこちら"
-  scan: "次に、表示されているQRコードをスキャンします:"
-  done: "お使いのデバイスに表示されているトークンを入力して完了します:"
-  submit: "完了"
-  success: "設定が完了しました！"
-  failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
-  info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
-
-desktop/views/components/settings.api.vue:
-  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
-  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
-  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
-  regenerate-token: "トークンを再生成"
-  enter-password: "パスワードを入力してください"
-
-desktop/views/components/settings.app.vue:
-  no-apps: "連携しているアプリケーションはありません"
-
-desktop/views/components/settings.mute.vue:
-  no-users: "ミュートしているユーザーはいません"
-
-desktop/views/components/settings.password.vue:
-  reset: "パスワードを変更する"
-  enter-current-password: "現在のパスワードを入力してください"
-  enter-new-password: "新しいパスワードを入力してください"
-  enter-new-password-again: "もう一度新しいパスワードを入力してください"
-  not-match: "新しいパスワードが一致しません"
-  changed: "パスワードを変更しました"
-
-desktop/views/components/settings.profile.vue:
-  avatar: "アイコン"
-  choice-avatar: "画像を選択"
-  name: "名前"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  save: "保存"
-
-desktop/views/components/ui.header.account.vue:
-  profile: "プロフィール"
-  drive: "ドライブ"
-  favorites: "お気に入り"
-  lists: "リスト"
-  customize: "カスタマイズ"
-  settings: "設定"
-  signout: "サインアウト"
-  dark: "闇に飲まれる"
-
-desktop/views/components/ui.header.nav.vue:
-  home: "ホーム"
-  messaging: "メッセージ"
-  game: "ゲーム"
-
-desktop/views/components/ui.header.notifications.vue:
-  title: "通知"
-
-desktop/views/components/ui.header.post.vue:
-  post: "新規投稿"
-
-desktop/views/components/ui.header.search.vue:
-  placeholder: "検索"
-
-desktop/views/pages/note.vue:
-  prev: "前の投稿"
-  next: "次の投稿"
-
-desktop/views/pages/selectdrive.vue:
-  title: "ファイルを選択してください"
-  ok: "決定"
-  cancel: "キャンセル"
-  upload: "PCからドライブにファイルをアップロード"
-
-desktop/views/pages/user/user.followers-you-know.vue:
-  title: "知り合いのフォロワー"
-  loading: "読み込み中"
-  no-users: "知り合いのフォロワーはいません"
-
-desktop/views/pages/user/user.friends.vue:
-  title: "よく話すユーザー"
-  loading: "読み込み中"
-  no-users: "よく話すユーザーはいません"
-
-desktop/views/pages/user/user.header.vue:
-  is-suspended: "このユーザーは凍結されています。"
-  is-remote: "このユーザーはリモートユーザーです。"
-  view-remote: "正確な情報を見る"
-
-desktop/views/pages/user/user.home.vue:
-  last-used-at: "最終アクセス"
-
-desktop/views/pages/user/user.photos.vue:
-  title: "フォト"
-  loading: "読み込み中"
-  no-photos: "写真はありません"
-
-desktop/views/pages/user/user.profile.vue:
-  follows-you: "フォローされています"
-  stalk: "ストークする"
-  stalking: "ストーキングしています"
-  unstalk: "ストーク解除"
-  mute: "ミュートする"
-  muted: "ミュートしています"
-  unmute: "ミュート解除"
-
-desktop/views/widgets/messaging.vue:
-  title: "メッセージ"
-
-desktop/views/widgets/notifications.vue:
-  title: "通知"
-  settings: "通知の設定"
-
-desktop/views/widgets/polls.vue:
-  title: "投票"
-  refresh: "他を見る"
-  nothing: "ありません！"
-
-desktop/views/widgets/post-form.vue:
-  title: "投稿"
-  note: "投稿"
-  placeholder: "いまどうしてる？"
-
-desktop/views/widgets/trends.vue:
-  title: "トレンド"
-  refresh: "他を見る"
-  nothing: "ありません！"
-
-desktop/views/widgets/users.vue:
-  title: "おすすめユーザー"
-  refresh: "他を見る"
-  no-one: "いません！"
-
-desktop/views/widgets/channel.vue:
-  title: "チャンネル"
-  settings: "ウィジェットの設定"
-  get-started: "右上の歯車をクリックして受信するチャンネルを指定してください"
-
-mobile/views/components/drive.vue:
-  drive: "ドライブ"
-  used: "使用中"
-  folder-count: "フォルダ"
-  count-separator: "、"
-  file-count: "ファイル"
-  load-more: "もっと読み込む"
-  nothing-in-drive: "ドライブには何もありません"
-  folder-is-empty: "このフォルダは空です"
-
-mobile/views/components/drive-file-chooser.vue:
-  select-file: "ファイルを選択"
-
-mobile/views/components/drive-folder-chooser.vue:
-  select-folder: "フォルダーを選択"
-
-mobile/views/components/drive.file-detail.vue:
-  download: "ダウンロード"
-  rename: "名前を変更"
-  move: "移動"
-  hash: "ハッシュ (md5)"
-  exif: "EXIF"
-
-mobile/views/components/follow-button.vue:
-  follow: "フォロー"
-  unfollow: "フォロー解除"
-
-mobile/views/components/note.vue:
-  reposted-by: "{}がRenote"
-
-mobile/views/components/note-detail.vue:
-  reply: "返信"
-  reaction: "リアクション"
-
-mobile/views/components/notifications.vue:
-  more: "もっと見る"
-  empty: "ありません！"
-
-mobile/views/components/post-form.vue:
-  submit: "投稿"
-  reply-placeholder: "この投稿への返信..."
-  note-placeholder: "いまどうしてる？"
-
-mobile/views/components/sub-note-content.vue:
-  media-count: "{}個のメディア"
-  poll: "投票"
-
-mobile/views/components/timeline.vue:
-  empty: "投稿がありません"
-  load-more: "もっと"
-
-mobile/views/components/ui.nav.vue:
-  home: "ホーム"
-  notifications: "通知"
-  messaging: "メッセージ"
-  search: "検索"
-  drive: "ドライブ"
-  settings: "設定"
-  about: "Misskeyについて"
-
-mobile/views/components/user-timeline.vue:
-  no-notes: "このユーザーは投稿していないようです。"
-  no-notes-with-media: "メディア付き投稿はありません。"
-  load-more: "もっと"
-
-mobile/views/components/users-list.vue:
-  all: "すべて"
-  known: "知り合い"
-  load-more: "もっと"
-
-mobile/views/pages/drive.vue:
-  drive: "ドライブ"
-
-mobile/views/pages/followers.vue:
-  followers-of: "{}のフォロワー"
-
-mobile/views/pages/following.vue:
-  following-of: "{}のフォロー"
-
-mobile/views/pages/home.vue:
-  timeline: "タイムライン"
-
-mobile/views/pages/messaging.vue:
-  messaging: "メッセージ"
-
-mobile/views/pages/messaging-room.vue:
-  messaging: "メッセージ"
-
-mobile/views/pages/note.vue:
-  title: "投稿"
-  prev: "前の投稿"
-  next: "次の投稿"
-
-mobile/views/pages/notifications.vue:
-  notifications: "通知"
-  read-all: "すべての通知を既読にしますか？"
-
-mobile/views/pages/profile-setting.vue:
-  title: "プロフィール設定"
-  will-be-published: "これらのプロフィールは公開されます。"
-  name: "名前"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  avatar-saved: "アイコンを保存しました"
-  banner-saved: "バナーを保存しました"
-  set-avatar: "アイコンを選択する"
-  set-banner: "バナーを選択する"
-  save: "保存"
-  saved: "プロフィールを保存しました"
-
-mobile/views/pages/search.vue:
-  search: "検索"
-  empty: "「{}」に関する投稿は見つかりませんでした。"
-
-mobile/views/pages/selectdrive.vue:
-  select-file: "ファイルを選択"
-
-mobile/views/pages/settings.vue:
-  signed-in-as: "{}としてサインイン中"
-  profile: "プロフィール"
-  twitter: "Twitter連携"
-  signin-history: "サインイン履歴"
-  settings: "設定"
-  signout: "サインアウト"
-
-mobile/views/pages/user.vue:
-  follows-you: "フォローされています"
-  following: "フォロー"
-  followers: "フォロワー"
-  notes: "投稿"
-  overview: "概要"
-  timeline: "タイムライン"
-  media: "メディア"
-  is-suspended: "このユーザーは凍結されています。"
-  is-remote: "このユーザーはリモートユーザーです。"
-  view-remote: "正確な情報を見る"
-
-mobile/views/pages/user/home.vue:
-  recent-notes: "最近の投稿"
-  images: "画像"
-  activity: "アクティビティ"
-  keywords: "キーワード"
-  domains: "頻出ドメイン"
-  frequently-replied-users: "よく会話するユーザー"
-  followers-you-know: "知り合いのフォロワー"
-  last-used-at: "最終ログイン"
-
-mobile/views/pages/user/home.followers-you-know.vue:
-  loading: "読み込み中"
-  no-users: "知り合いのユーザーはいません"
-
-mobile/views/pages/user/home.friends.vue:
-  loading: "読み込み中"
-  no-users: "よく会話するユーザーはいません"
-
-mobile/views/pages/user/home.notes.vue:
-  loading: "読み込み中"
-  no-notes: "投稿はありません"
-
-mobile/views/pages/user/home.photos.vue:
-  loading: "読み込み中"
-  no-photos: "写真はありません"
-
-docs:
-  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
-  edit-this-page-on-github-link: "このページをGitHubで編集"
-
-  api:
-    entities:
-      properties: "プロパティ"
-    endpoints:
-      params: "パラメータ"
-      res: "レスポンス"
-    props:
-      name: "名前"
-      type: "型"
-      optional: "オプション"
-      description: "説明"
-      yes: "はい"
-      no: "いいえ"

locales/pl.yml

@@ -1,628 +0,0 @@
-common:
-  misskey: "Dziel się zawartością z innymi korzystając z Misskey."
-
-  time:
-    unknown: "nieznany"
-    future: "w przyszłości"
-    just_now: "teraz"
-    seconds_ago: "{} sek. temu"
-    minutes_ago: "{} min. temu"
-    hours_ago: "{} godz. temu"
-    days_ago: "{} dni temu"
-    weeks_ago: "{} tyg. temu"
-    months_ago: "{} mies. temu"
-    years_ago: "{} lat temu"
-
-  weekday-short:
-    sunday: "N"
-    monday: "Pn"
-    tuesday: "W"
-    wednesday: "Ś"
-    thursday: "C"
-    friday: "P"
-    satruday: "S"
-
-  reactions:
-    like: "Lubię"
-    love: "Kocham"
-    laugh: "Śmieszne"
-    hmm: "Hmm…?"
-    surprise: "Wow"
-    congrats: "Gratuluję!"
-    angry: "Wściekły"
-    confused: "Zmieszany"
-    pudding: "Pudding"
-
-  delete: "Usuń"
-  loading: "Ładowanie"
-  ok: "OK"
-  update-available: "Nowa wersja Misskey jest dostępna ({newer}, obecna to {current}). Odśwież stronę, aby zastosować aktualizację."
-  my-token-regenerated: "Twój token został wygenerowany. Zostaniesz wylogowany."
-
-common/views/components/connect-failed.vue:
-  title: "Nie udało się połączyć z serwerem"
-  description: "Wystąpił problem z Twoim połączeniem z Internetem, lub z serwerem. {Spróbuj ponownie} wkrótce."
-  thanks: "Dziękujemy za korzystanie z Misskey."
-  troubleshoot: "Rozwiązywanie problemów"
-
-common/views/components/connect-failed.troubleshooter.vue:
-  title: "Rozwiązywanie problemów"
-  network: "Połączenie z siecią"
-  checking-network: "Sprawdzanie połączenia sieciowego"
-  internet: "Połączenie z Internetem"
-  checking-internet: "Sprawdzanie połączenia z Internetem"
-  server: "Połączenie z serwerem"
-  checking-server: "Sprawdzanie połączenia z serwerem"
-  finding: "Wyszukiwanie problemu"
-  no-network: "Brak połączenia z siecią"
-  no-network-desc: "Upewnij się, że jesteś połączony z siecią."
-  no-internet: "Brak połączenia z Internetem"
-  no-internet-desc: "Upewnij się, że jesteś połączony z Internetem."
-  no-server: "Nie udało się połączyć z serwerem"
-  no-server-desc: "Połączenie sieciowe działa, ale nie udało się połączyć z serwerem Misskey. Możliwe że serwer nie działa lub trwają prace konserwacyjne, spróbuj ponownie później."
-  success: "Pomyślnie połączono z serwerem Misskey"
-  success-desc: "Wygląda na to, że udało się połączyć. Odśwież stronę."
-  flush: "Wyczyść pamięć podręczną"
-  set-version: "Określ wersję"
-
-common/views/components/messaging.vue:
-  search-user: "Znajdź użytkownika"
-  you: "Ty"
-  no-history: "Brak historii"
-
-common/views/components/messaging-room.vue:
-  empty: "Brak konwersacji"
-  more: "Więcej"
-  no-history: "Brak dalszej historii"
-  resize-form: "Przeciągnij aby zmienić rozmiar"
-  new-message: "Nowa wiadomość"
-
-common/views/components/messaging-room.form.vue:
-  input-message-here: "Wprowadź wiadomość tutaj"
-  send: "Wyślij"
-  attach-from-local: "Załącz pliki z komputera"
-  attach-from-drive: "Załącz pliki z dysku"
-
-common/views/components/messaging-room.message.vue:
-  is-read: "Przeczytano"
-  deleted: "Wiadomość została usunięta"
-
-common/views/components/nav.vue:
-  about: "O stronie"
-  stats: "Statystyki"
-  status: "Stan"
-  wiki: "Wiki"
-  donors: "Sponsorzy"
-  repository: "Repozytorium"
-  develop: "Autorzy"
-  feedback: "Opinie"
-
-common/views/components/note-menu.vue:
-  favorite: "Dodaj do ulubionych"
-  pin: "Przypnij do profilu"
-
-common/views/components/poll.vue:
-  vote-to: "Zagłosuj na '{}'"
-  vote-count: "{} głosów"
-  total-users: "{} głosujących"
-  vote: "Zagłosuj"
-  show-result: "Pokaż wyniki"
-  voted: "Zagłosowano"
-
-common/views/components/poll-editor.vue:
-  no-only-one-choice: "Musisz wprowadzić dwie lub więcej opcji."
-  choice-n: "Opcja {}"
-  remove: "Usuń tą opcję"
-  add: "+ Dodaj opcję"
-  destroy: "Usuń ankietę"
-
-common/views/components/reaction-picker.vue:
-  choose-reaction: "Wybierz reakcję"
-
-common/views/components/signin.vue:
-  username: "Nazwa użytkownika"
-  password: "Hasło"
-  token: "Token"
-  signing-in: "Logowanie…"
-  signin: "Zaloguj"
-
-common/views/components/signup.vue:
-  username: "Nazwa użytkownika"
-  checking: "Sprawdzanie…"
-  available: "Dostępna"
-  unavailable: "Niedostępna"
-  error: "Błąd sieci"
-  invalid-format: "Może zawierać litery, cyfry i myślniki."
-  too-short: "Wprowadź przynajmniej jeden znak"
-  too-long: "Nazwa nie może zawierać więcej niż 20 znaków"
-  password: "Hasło"
-  password-placeholder: "Zalecamy korzystanie z hasła zawierającego przynajmniej 8 znaków."
-  weak-password: "Słabe"
-  normal-password: "Średnie"
-  strong-password: "Silne"
-  retype: "Powtórz hasło"
-  retype-placeholder: "Potwierdź hasło"
-  password-matched: "OK"
-  password-not-matched: "Hasła nie zgadzają się"
-  recaptcha: "Weryfikacja"
-  create: "Utwórz konto"
-  some-error: "Nie udało się utworzyć konta. Spróbuj ponownie."
-
-common/views/components/special-message.vue:
-  new-year: "Szczęśliwego nowego roku!"
-  christmas: "Wesołych świąt!"
-
-common/views/components/stream-indicator.vue:
-  connecting: "Łączenie"
-  reconnecting: "Ponowne łączenie"
-  connected: "Połączono"
-
-common/views/components/twitter-setting.vue:
-  description: "Jeżeli połączysz konto Twittera z kontem Misskey, informacje z Twittera będą widoczne na Twoim profilu i będziesz mógł logować się z użyciem Twittera."
-  connected-to: "Jesteś połączony z tym kontem Twittera"
-  detail: "Szczegóły…"
-  reconnect: "Połącz ponownie"
-  connect: "Połącz z kontem Twittera"
-  disconnect: "Rozłącz"
-
-common/views/components/uploader.vue:
-  waiting: "Oczekiwanie"
-
-common/views/widgets/broadcast.vue:
-  no-broadcasts: "Brak transmisji"
-  have-a-nice-day: "Miłego dnia!"
-  next: "Dalej"
-
-common/views/widgets/donation.vue:
-  title: "Dotacje"
-  text: "Aby utrzymywać Misskey, płacimy za domenę, serwery i nie tylko… Nie zarabiamy na tym, więc byłoby nam miło, gdybyśmy uzyskali od Ciebie dotację. Jeżeli jesteś zainteresowany, skontaktuj się z {}. Dziękujemy za wsparcie!"
-
-common/views/widgets/photo-stream.vue:
-  no-photos: "Brak zdjęć"
-
-common/views/widgets/server.vue:
-  title: "Informacje o serwerze"
-  toggle: "Przełącz widok"
-
-desktop/views/components/activity.vue:
-  title: "Aktywność"
-  toggle: "Przełącz widok"
-
-desktop/views/components/calendar.vue:
-  title: "{1} / {2}"
-  prev: "Poprzedni miesiąc"
-  next: "Następny miesiąc"
-  go: "Naciśnij, aby przejść"
-
-desktop/views/components/drive-window.vue:
-  used: "wykorzystane"
-  drive: "Dysk"
-
-desktop/views/components/drive.file.vue:
-  avatar: "Awatar"
-  banner: "Baner"
-  contextmenu:
-    rename: "Zmień nazwę"
-    copy-url: "Skopiuj adres"
-    download: "Pobierz"
-    else-files: "Inne"
-    set-as-avatar: "Ustaw jako awatar"
-    set-as-banner: "Ustaw jako baner"
-    open-in-app: "Otwórz w aplikacji"
-    add-app: "Dodaj aplikację"
-    rename-file: "Zmień nazwę pliku"
-    input-new-file-name: "Wprowadź nową nazwę"
-    copied: "Skopiowano"
-    copied-url-to-clipboard: "Skopiowano adres do schowka"
-
-desktop/views/components/drive.folder.vue:
-  unable-to-process: "Nie udało się ukończyć działania."
-  circular-reference-detected: "Docelowy katalog znajduje się w katalogu, który chcesz przenieść."
-  unhandled-error: "Nieznany błąd"
-  contextmenu:
-    move-to-this-folder: "Przenieś do tego katalogu"
-    show-in-new-window: "Otwórz w nowym oknie"
-    rename: "Zmień nazwę"
-    rename-folder: "Zmień nazwę katalogu"
-    input-new-folder-name: "Wprowadź nową nazwę"
-
-desktop/views/components/drive.nav-folder.vue:
-  drive: "Dysk"
-
-desktop/views/components/drive.vue:
-  search: "Szukaj"
-  load-more: "Załaduj więcej"
-  empty-drive: "Twój dysk jest posty"
-  empty-drive-description: "Możesz wysłać plik klikając prawym przyciskiem myszy i wybierając \"Wyślij plik\" lub przeciągnąć plik i upuścić w tym oknie."
-  empty-folder: "Ten katalog jest posty"
-  unable-to-process: "Nie udało się dokończyć działania."
-  circular-reference-detected: "Ten katalog znajduje się w katalogu, który chcesz przenieść."
-  unhandled-error: "Nieznany błąd"
-  url-upload: "Wyślij z adresu"
-  url-of-file: "Adres URL pliku, który chcesz wysłać"
-  may-take-time: "Może trochę potrwać, zanim wysyłanie zostanie ukończone."
-  create-folder: "Utwórz katalog"
-  folder-name: "Nazwa katalogu"
-  contextmenu:
-    create-folder: "Utwórz katalog"
-    upload: "Wyślij plik"
-    url-upload: "Wyślij z adresu URL"
-
-desktop/views/components/messaging-window.vue:
-  title: "Wiadomości"
-
-desktop/views/components/notes.note.vue:
-  reposted-by: "Udostępniono przez {}"
-  reply: "Odpowiedz"
-  add-reaction: "Dodaj reakcję"
-  detail: "Pokaż szczegóły"
-
-desktop/views/components/notifications.vue:
-  more: "Więcej"
-  empty: "Brak powiadomień"
-
-desktop/views/components/post-form.vue:
-  note-placeholder: "Co się dzieje?"
-  reply-placeholder: "Odpowiedz na ten wpis…"
-  quote-placeholder: "Zacytuj ten wpis…"
-  note: "Wyślij"
-  reply: "Odpowiedz"
-  posted: "Posted!"
-  replied: "Odpowiedziano!"
-  reposted: "Udostępniono!"
-  note-failed: "Nie udało się wysłać"
-  reply-failed: "Nie udało się odpowiedzieć"
-  posting: "Wysyłanie"
-  attach-media-from-local: "Załącz zawartość multimedialną z komputera"
-  attach-media-from-drive: "Załącz zawartość multimedialną z dysku"
-  attach-cancel: "Usuń załącznik"
-  insert-a-kao: "v(‘ω’)v"
-  create-poll: "Utwórz ankietę"
-  text-remain: "pozostałe znaki: {}"
-
-desktop/views/components/post-form-window.vue:
-  note: "Nowy wpis"
-  reply: "Odpowiedz"
-  attaches: "{} załączników multimedialnych"
-  uploading-media: "Wysyłanie {} treści multimedialnych"
-
-desktop/views/components/renote-form.vue:
-  quote: "Cytuj…"
-  cancel: "Anuluj"
-  reposting: "Udostępnianie…"
-  success: "Udostępniono!"
-
-desktop/views/components/settings.vue:
-  profile: "Profil"
-  notification: "Powiadomienie"
-  apps: "Aplikacje"
-  mute: "Wycisz"
-  drive: "Dysk"
-  security: "Bezpieczeństwo"
-  password: "Hasło"
-  2fa: "Uwierzytelnianie dwuetapowe"
-  other: "Inne"
-  license: "Licencja"
-
-desktop/views/components/settings.2fa.vue:
-  intro: "Jeżeli skonfigurujesz uwierzytelnianie dwuetapowe, aby zablokować się będziesz potrzebować (oprócz hasła) kodu ze skonfigurowanego urządzenia (np. smartfonu), co zwiększy bezpieczeństwo."
-  detail: "Zobacz szczegóły…"
-  url: "https://www.google.com/landing/2step/"
-  caution: "Jeżeli stracisz dostęp do urządzenia, nie będziesz mógł logować się do Misskey!"
-  register: "Zarejestruj urządzenie"
-  already-registered: "Urządzenie jest już zarejestrowane"
-  unregister: "Wyłącz"
-  unregistered: "Wyłączono uwierzytelnianie dwuetapowe."
-  enter-password: "Wprowadź hasło"
-  authenticator: "Na początek musisz zainstalować Google Authenticator na swoim urządzeniu:"
-  howtoinstall: "Jak zainstalować"
-  scan: "Później, zeskanuje ten kod QR:"
-  done: "Wprowadź token wyświetlony na Twoim urządzeniu:"
-  submit: "Wyślij"
-  success: "Pomyślnie ukończono konfigurację!"
-  failed: "Nie udało się skonfigurować uwierzytelniania dwuetapowego, upewnij się że wprowadziłeś prawidłowy token."
-  info: "Od teraz, wprowadzaj token wyświetlany na urządzeniu przy każdym logowaniu do Misskey."
-
-desktop/views/components/settings.api.vue:
-  caution: "Nie pokazuj tego tokenu osobom trzecim (nie wprowadzaj go nigdzie indziej), aby konto nie trafiło w niepowołane ręce."
-  regeneration-of-token: "W przypadku wycieku tokenu, możesz wygenerować nowy."
-  regenerate-token: "Wygeneruj nowy token"
-  enter-password: "Wprowadź hasło"
-
-desktop/views/components/settings.app.vue:
-  no-apps: "Brak zautoryzowanych aplikacji"
-
-desktop/views/components/settings.mute.vue:
-  no-users: "Brak wyciszonych użytkowników"
-
-desktop/views/components/settings.password.vue:
-  reset: "Zmień hasło"
-  enter-current-password: "Wprowadź obecne hasło"
-  enter-new-password: "Wprowadź nowe hasło"
-  enter-new-password-again: "Wprowadź ponownie nowe hasło"
-  not-match: "Nowe hasła nie pasują do siebie"
-  changed: "Pomyślnie zmieniono hasło"
-
-desktop/views/components/settings.profile.vue:
-  avatar: "Awatar"
-  choice-avatar: "Wybierz obraz"
-  name: "Nazwa"
-  location: "Lokalizacja"
-  description: "Opis"
-  birthday: "Data urodzenia"
-  save: "Aktualizuj profil"
-
-desktop/views/components/ui.header.account.vue:
-  profile: "Twój profil"
-  drive: "Dysk"
-  favorites: "Ulubione"
-  lists: "Listy"
-  customize: "Dostosuj"
-  settings: "Ustawienia"
-  signout: "Wyloguj się"
-  dark: "Sprowadź ciemność"
-
-desktop/views/components/ui.header.nav.vue:
-  home: "Strona główna"
-  messaging: "Wiadomości"
-  game: "Gra"
-
-desktop/views/components/ui.header.notifications.vue:
-  title: "Powiadomienia"
-
-desktop/views/components/ui.header.post.vue:
-  post: "Utwórz nowy wpis"
-
-desktop/views/components/ui.header.search.vue:
-  placeholder: "Szukaj"
-
-desktop/views/pages/note.vue:
-  prev: "Poprzedni wpis"
-  next: "Następny wpis"
-
-desktop/views/pages/selectdrive.vue:
-  title: "Wybierz plik(i)"
-  ok: "OK"
-  cancel: "Anuluj"
-  upload: "Wyślij pliki z Twojego komputera"
-
-desktop/views/pages/user/user.followers-you-know.vue:
-  title: "Śledzący których znasz"
-  loading: "Ładowanie"
-  no-users: "Brak użytkowników"
-
-desktop/views/pages/user/user.friends.vue:
-  title: "Najczęściej odpisujący"
-  loading: "Ładowanie"
-  no-users: "Brak użytkowników"
-
-desktop/views/pages/user/user.header.vue:
-  is-suspended: "To konto zostało zawieszone."
-  is-remote: "To jest użytkownik zdalnej instancji, informacje mogą nie być w pełni dokładne."
-  view-remote: "Wyświetl dokładne informacje"
-
-desktop/views/pages/user/user.home.vue:
-  last-used-at: "Ostatnio aktywny: "
-
-desktop/views/pages/user/user.photos.vue:
-  title: "Zdjęcia"
-  loading: "Ładowanie"
-  no-photos: "Brak zdjęć"
-
-desktop/views/pages/user/user.profile.vue:
-  follows-you: "Śledzi Cię"
-  stalk: "Stalkuj"
-  stalking: "Stalkujesz"
-  unstalk: "Przestań stalkować"
-  mute: "Wycisz"
-  muted: "Wyciszyłeś"
-  unmute: "Cofnij wyciszenie"
-
-desktop/views/widgets/notifications.vue:
-  title: "Powiadomienia"
-  settings: "Ustawienia"
-
-desktop/views/widgets/polls.vue:
-  title: "Ankiety"
-  refresh: "Pokaż inne"
-  nothing: "Pusto"
-
-desktop/views/widgets/post-form.vue:
-  title: "Wpis"
-  note: "Wpis"
-  placeholder: "Co się dzieje?"
-
-desktop/views/widgets/trends.vue:
-  title: "Na czasie"
-  refresh: "Pokaż inne"
-  nothing: "Pusto"
-
-desktop/views/widgets/users.vue:
-  title: "Polecani użytkownicy"
-  refresh: "Pokaż innych"
-  no-one: "Pusto"
-
-desktop/views/widgets/channel.vue:
-  title: "Kanał"
-  settings: "Ustawienia widżetu"
-
-mobile/views/components/drive.vue:
-  drive: "Dysk"
-  used: "użyto"
-  folder-count: "Katalog(i)"
-  count-separator: ", "
-  file-count: "Plik(i)"
-  load-more: "Załaduj więcej"
-  nothing-in-drive: "Pusto"
-  folder-is-empty: "Ten katalog jest pusty"
-
-mobile/views/components/drive-file-chooser.vue:
-  select-file: "Wybierz plik"
-
-mobile/views/components/drive-folder-chooser.vue:
-  select-folder: "Wybierz katalog"
-
-mobile/views/components/drive.file-detail.vue:
-  download: "Pobierz"
-  rename: "Zmień nazwę"
-  move: "Przenieś"
-  hash: "Hash (md5)"
-  exif: "EXIF"
-
-mobile/views/components/follow-button.vue:
-  follow: "Śledź"
-  unfollow: "Przestań śledzić"
-
-mobile/views/components/note-detail.vue:
-  reply: "Odpowiedz"
-  reaction: "Reakcja"
-
-mobile/views/components/notifications.vue:
-  more: "Więcej"
-  empty: "Brak powiadomień"
-
-mobile/views/components/post-form.vue:
-  submit: "Wyślij"
-  reply-placeholder: "Odpowiedź na ten wpis…"
-  note-placeholder: "Co się dzieje?"
-
-mobile/views/components/sub-note-content.vue:
-  media-count: "{} zawartości multimedialnej"
-  poll: "Ankieta"
-
-mobile/views/components/timeline.vue:
-  empty: "Brak wpisów"
-  load-more: "Więcej"
-
-mobile/views/components/ui.nav.vue:
-  home: "Strona główna"
-  notifications: "Powiadomienia"
-  messaging: "Wiadomości"
-  drive: "Dysk"
-  settings: "Ustawienia"
-  about: "O Misskey"
-  search: "Szukaj"
-
-mobile/views/components/user-timeline.vue:
-  no-notes: "Wygląda na to, że ten użytkownik nie opublikował jeszcze niczego"
-  no-notes-with-media: "Brak wpisów z zawartością multimedialną"
-  load-more: "Więcej"
-
-mobile/views/components/users-list.vue:
-  all: "Wszyscy"
-  known: "Znasz"
-  load-more: "Więcej"
-
-mobile/views/pages/drive.vue:
-  drive: "Dysk"
-
-mobile/views/pages/followers.vue:
-  followers-of: "Śledzący {}"
-
-mobile/views/pages/following.vue:
-  following-of: "Śledzeni przez {}"
-
-mobile/views/pages/home.vue:
-  timeline: "Oś czasu"
-
-mobile/views/pages/messaging.vue:
-  messaging: "Wiadomości"
-
-mobile/views/pages/messaging-room.vue:
-  messaging: "Wiadomości"
-
-mobile/views/pages/note.vue:
-  title: "Wyślij"
-  prev: "Poprzedni wpis"
-  next: "Następny wpis"
-
-mobile/views/pages/notifications.vue:
-  notifications: "Powiadomienia"
-  read-all: "Czy na pewno chcesz oznaczyć wszystkie powiadomienia jako przeczytane?"
-
-mobile/views/pages/profile-setting.vue:
-  title: "Ustawienia profilu"
-  will-be-published: "Te ustawienia profilu zostaną zaktualizowane."
-  name: "Nazwa"
-  location: "Lokalizacja"
-  description: "Opis"
-  birthday: "Data urodzenia"
-  avatar: "Awatar"
-  banner: "Baner"
-  avatar-saved: "Pomyślnie zaktualizowano awatar"
-  banner-saved: "Pomyślnie zaktualizowano baner"
-  set-avatar: "Wybierz awatar"
-  set-banner: "Wybierz baner"
-  save: "Zapisz"
-  saved: "Pomyślnie zaktualizowano profil"
-
-mobile/views/pages/search.vue:
-  search: "Szukaj"
-  empty: "Nie znaleziono wpisów zawierających '{}'"
-
-mobile/views/pages/selectdrive.vue:
-  select-file: "Wybierz plik"
-
-mobile/views/pages/settings.vue:
-  signed-in-as: "Zalogowany jako {}"
-  profile: "Profil"
-  twitter-integration: "Integracja z Twitterem"
-  signin-history: "Historia logowań"
-  settings: "Ustawienia"
-  signout: "Wyloguj"
-
-mobile/views/pages/user.vue:
-  follows-you: "Śledzi Cię"
-  following: "Śledzeni"
-  followers: "Śledzący"
-  notes: "Wpisy"
-  overview: "Przegląd"
-  timeline: "Oś czasu"
-  media: "Zawartość multimedialna"
-  is-suspended: "To konto zostało zablokowane"
-  is-remote: "To jest użytkownik zdalnej instancji, informacje mogą nie być w pełni dokładne."
-  view-remote: "Wyświetl dokładne informacje"
-
-mobile/views/pages/user/home.vue:
-  recent-notes: "Ostatnie wpisy"
-  images: "Zdjęcia"
-  activity: "Aktywność"
-  keywords: "Słowa kluczowe"
-  domains: "Domeny"
-  frequently-replied-users: "Często aktywni użytkownicy"
-  followers-you-know: "Śledzący których znasz"
-  last-used-at: "Ostatnio aktywny:"
-
-mobile/views/pages/user/home.followers-you-know.vue:
-  loading: "Ładowanie"
-  no-users: "Brak użytkowników"
-
-mobile/views/pages/user/home.friends.vue:
-  loading: "Ładowanie"
-  no-users: "Brak użytkowników"
-
-mobile/views/pages/user/home.notes.vue:
-  loading: "Ładowanie"
-  no-notes: "Brak wpisów"
-
-mobile/views/pages/user/home.photos.vue:
-  loading: "Ładowanie"
-  no-photos: "Brak zdjęć"
-
-docs:
-  edit-this-page-on-github: "Znalazłeś błąd lub chcesz pomóc w tworzeniu dokumentacji?"
-  edit-this-page-on-github-link: "Edytuj stronę na GitHubie!"
-
-  api:
-    entities:
-      properties: "Właściwości"
-    endpoints:
-      params: "Parametry"
-      res: "Odpowiedź"
-    props:
-      name: "Nazwa"
-      type: "Rodzaj"
-      optional: "Nieobowiązkowy"
-      description: "Opis"
-      yes: "Tak"
-      no: "Nie"

migration/README.md

@@ -1,11 +0,0 @@
-Misskeyの破壊的変更に対応するいくつかのスニペットがあります。
-MongoDBシェルで実行する必要のあるものとnodeで直接実行する必要のあるものがあります。
-ファイル名が `shell.` から始まるものは前者、 `node.` から始まるものは後者です。
-
-MongoDBシェルで実行する場合、`use`でデータベースを選択しておく必要があります。
-
-nodeで実行するいくつかのスニペットは、並列処理させる数を引数で設定できるものがあります。
-処理中にエラーで落ちる場合は、メモリが足りていない可能性があるので、少ない数に設定してみてください。
-※デフォルトは`5`です。
-
-ファイルを作成する際は `../init-migration-file.sh -t _type_ -n _name_` を実行すると _type_._unixtime_._name_.js が生成されます

migration/init-migration-file.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-usage() {
-		echo "$0 [-t type] [-n name]"
-		echo "  type: [node | shell]"
-		echo "  name: if no present, set untitled"
-		exit 0
-}
-
-while getopts :t:n:h OPT
-do
-	case $OPT in
-		t)	type=$OPTARG
-				;;
-		n)	name=$OPTARG
-				;;
-		h)	usage
-				;;
-		\?) usage
-				;;
-		:)	usage
-				;;
-	esac
-done
-
-if [ "$type" = "" ]
-then
-	echo "no type present!!!"
-	usage
-fi
-
-if [ "$name" = "" ]
-then
-	name="untitled"
-fi
-
-touch "$(realpath $(dirname $BASH_SOURCE))/migration/$type.$(date +%s).$name.js"

package.json

@@ -1,21 +1,18 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.3.0",
-	"clientVersion": "1.0.5207",
+	"version": "9.4.0",
+	"clientVersion": "1.0.10062",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
 	"scripts": {
-		"config": "node ./cli/init.js",
 		"start": "node ./built",
 		"debug": "DEBUG=misskey:* node ./built",
-		"swagger": "node ./swagger.js",
 		"build": "webpack && gulp build",
 		"webpack": "webpack",
 		"watch": "webpack --watch",
 		"gulp": "gulp build",
-		"rebuild": "gulp rebuild",
 		"clean": "gulp clean",
 		"cleanall": "gulp cleanall",
 		"lint": "gulp lint",
@@ -23,21 +20,20 @@
 		"format": "gulp format"
 	},
 	"dependencies": {
-		"@fortawesome/fontawesome": "1.0.1",
-		"@fortawesome/fontawesome-free-brands": "5.0.2",
-		"@fortawesome/fontawesome-free-regular": "5.0.2",
-		"@fortawesome/fontawesome-free-solid": "5.0.2",
-		"@koa/cors": "2.2.1",
+		"@fortawesome/fontawesome-svg-core": "1.2.4",
+		"@fortawesome/free-brands-svg-icons": "5.3.1",
+		"@fortawesome/free-regular-svg-icons": "5.3.1",
+		"@fortawesome/free-solid-svg-icons": "5.3.1",
+		"@koa/cors": "2.2.2",
 		"@prezzemolo/rap": "0.1.2",
 		"@prezzemolo/zip": "0.0.3",
-		"@types/bcryptjs": "2.4.1",
-		"@types/chai": "4.1.3",
-		"@types/chai-http": "3.0.4",
+		"@types/bcryptjs": "2.4.2",
+		"@types/dateformat": "1.0.1",
 		"@types/debug": "0.0.30",
 		"@types/deep-equal": "1.0.1",
-		"@types/elasticsearch": "5.0.22",
-		"@types/eventemitter3": "2.0.2",
-		"@types/gm": "1.17.33",
+		"@types/double-ended-queue": "2.1.0",
+		"@types/elasticsearch": "5.0.26",
+		"@types/file-type": "5.2.1",
 		"@types/gulp": "3.8.36",
 		"@types/gulp-htmlmin": "1.3.32",
 		"@types/gulp-mocha": "0.0.32",
@@ -45,99 +41,103 @@
 		"@types/gulp-replace": "0.0.31",
 		"@types/gulp-uglify": "3.0.5",
 		"@types/gulp-util": "3.0.34",
-		"@types/inquirer": "0.0.41",
 		"@types/is-root": "1.0.0",
 		"@types/is-url": "1.2.28",
-		"@types/js-yaml": "3.11.1",
-		"@types/koa": "2.0.45",
-		"@types/koa-bodyparser": "4.2.0",
+		"@types/js-yaml": "3.11.2",
+		"@types/koa": "2.0.46",
+		"@types/koa-bodyparser": "5.0.1",
 		"@types/koa-compress": "2.0.8",
 		"@types/koa-favicon": "2.0.19",
 		"@types/koa-logger": "3.1.0",
 		"@types/koa-mount": "3.0.1",
 		"@types/koa-multer": "1.0.0",
-		"@types/koa-router": "7.0.28",
+		"@types/koa-router": "7.0.32",
 		"@types/koa-send": "4.1.1",
-		"@types/koa-views": "^2.0.3",
-		"@types/koa__cors": "2.2.2",
-		"@types/kue": "0.11.8",
-		"@types/license-checker": "15.0.0",
+		"@types/koa-views": "2.0.3",
+		"@types/koa__cors": "2.2.3",
+		"@types/minio": "7.0.0",
 		"@types/mkdirp": "0.5.2",
-		"@types/mocha": "5.2.0",
-		"@types/mongodb": "3.0.15",
-		"@types/monk": "6.0.0",
+		"@types/mocha": "5.2.3",
+		"@types/mongodb": "3.1.7",
 		"@types/ms": "0.7.30",
-		"@types/node": "9.6.6",
-		"@types/nopt": "3.0.29",
+		"@types/node": "10.10.3",
+		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
-		"@types/qrcode": "0.8.1",
+		"@types/qrcode": "1.2.0",
 		"@types/ratelimiter": "2.1.28",
 		"@types/redis": "2.8.6",
-		"@types/request": "2.47.0",
-		"@types/request-promise-native": "1.0.14",
+		"@types/request": "2.47.1",
+		"@types/request-promise-native": "1.0.15",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
-		"@types/single-line-log": "^1.1.0",
+		"@types/sharp": "0.17.10",
+		"@types/showdown": "1.7.5",
+		"@types/single-line-log": "1.1.0",
 		"@types/speakeasy": "2.0.2",
+		"@types/systeminformation": "3.23.0",
+		"@types/tinycolor2": "1.4.1",
 		"@types/tmp": "0.0.33",
-		"@types/uuid": "3.4.3",
-		"@types/webpack": "4.1.4",
+		"@types/uuid": "3.4.4",
+		"@types/webpack": "4.4.12",
 		"@types/webpack-stream": "3.2.10",
-		"@types/websocket": "0.0.38",
-		"@types/ws": "4.0.2",
+		"@types/websocket": "0.0.40",
+		"@types/ws": "6.0.1",
 		"animejs": "2.2.0",
-		"autosize": "4.0.1",
+		"autosize": "4.0.2",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
-		"bootstrap-vue": "2.0.0-rc.6",
-		"cafy": "8.0.0",
-		"chai": "4.1.2",
-		"chai-http": "4.0.0",
+		"bee-queue": "1.2.2",
+		"bootstrap-vue": "2.0.0-rc.11",
+		"cafy": "11.3.0",
 		"chalk": "2.4.1",
+		"chart.js": "2.7.2",
+		"commander": "2.17.1",
 		"crc-32": "1.2.0",
-		"css-loader": "0.28.11",
-		"debug": "3.1.0",
+		"css-loader": "1.0.0",
+		"dateformat": "3.0.3",
+		"debug": "4.0.1",
 		"deep-equal": "1.0.1",
 		"deepcopy": "0.6.3",
 		"diskusage": "0.2.4",
-		"dompurify": "1.0.3",
-		"elasticsearch": "14.2.2",
-		"element-ui": "2.3.6",
-		"emojilib": "2.2.12",
+		"dompurify": "1.0.5",
+		"double-ended-queue": "2.1.0-0",
+		"elasticsearch": "15.1.1",
+		"emojilib": "2.3.0",
 		"escape-regexp": "0.0.1",
-		"eslint": "4.19.1",
-		"eslint-plugin-vue": "4.5.0",
+		"eslint": "5.0.1",
+		"eslint-plugin-vue": "4.7.1",
 		"eventemitter3": "3.1.0",
 		"exif-js": "2.3.0",
 		"file-loader": "1.1.11",
-		"file-type": "7.6.0",
+		"file-type": "9.0.0",
 		"fuckadblock": "3.2.1",
-		"gm": "1.23.1",
 		"gulp": "3.9.1",
 		"gulp-cssnano": "2.1.3",
 		"gulp-htmlmin": "4.0.0",
 		"gulp-imagemin": "4.1.0",
-		"gulp-mocha": "5.0.0",
+		"gulp-mocha": "6.0.0",
 		"gulp-pug": "4.0.1",
-		"gulp-rename": "1.2.2",
-		"gulp-replace": "0.6.1",
+		"gulp-rename": "1.4.0",
+		"gulp-replace": "1.0.0",
 		"gulp-sourcemaps": "2.6.4",
 		"gulp-stylus": "2.7.0",
 		"gulp-tslint": "8.1.3",
 		"gulp-typescript": "4.0.2",
-		"gulp-uglify": "3.0.0",
+		"gulp-uglify": "3.0.1",
 		"gulp-util": "3.0.8",
-		"hard-source-webpack-plugin": "0.6.4",
+		"hard-source-webpack-plugin": "0.12.0",
 		"highlight.js": "9.12.0",
-		"html-minifier": "3.5.15",
+		"html-minifier": "3.5.20",
 		"http-signature": "1.2.0",
-		"inquirer": "5.2.0",
+		"insert-text-at-cursor": "0.1.1",
 		"is-root": "2.0.0",
 		"is-url": "1.2.4",
-		"js-yaml": "3.11.0",
-		"jsdom": "11.9.0",
+		"js-yaml": "3.12.0",
+		"jsdom": "11.12.0",
+		"json5": "2.1.0",
+		"json5-loader": "1.0.1",
 		"koa": "2.5.1",
-		"koa-bodyparser": "4.2.0",
+		"koa-bodyparser": "4.2.1",
 		"koa-compress": "3.0.0",
 		"koa-favicon": "2.0.1",
 		"koa-json-body": "5.3.0",
@@ -145,80 +145,97 @@
 		"koa-mount": "3.0.0",
 		"koa-multer": "1.0.2",
 		"koa-router": "7.4.0",
-		"koa-send": "4.1.3",
+		"koa-send": "5.0.0",
 		"koa-slow": "2.1.0",
-		"koa-views": "^6.1.4",
-		"kue": "0.11.6",
-		"license-checker": "18.0.0",
+		"koa-views": "6.1.4",
 		"loader-utils": "1.1.0",
+		"lodash.assign": "4.2.0",
 		"mecab-async": "0.1.2",
+		"merge-options": "1.0.1",
+		"minio": "7.0.1",
 		"mkdirp": "0.5.1",
-		"mocha": "5.1.1",
+		"mocha": "5.2.0",
 		"moji": "0.5.1",
-		"mongodb": "3.0.7",
-		"monk": "6.0.5",
+		"mongodb": "3.1.1",
+		"monk": "6.0.6",
 		"ms": "2.1.1",
-		"nan": "2.10.0",
-		"node-sass": "4.9.0",
-		"node-sass-json-importer": "3.2.0",
-		"nopt": "4.0.1",
+		"nan": "2.11.0",
+		"nested-property": "0.0.7",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
 		"on-build-webpack": "0.1.0",
 		"os-utils": "0.0.14",
+		"parse5": "5.1.0",
+		"portscanner": "2.2.0",
 		"progress-bar-webpack-plugin": "1.11.0",
-		"prominence": "0.2.0",
-		"promise-sequential": "^1.1.1",
+		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
-		"punycode": "2.1.0",
-		"qrcode": "1.2.0",
-		"ratelimiter": "3.0.3",
+		"punycode": "2.1.1",
+		"qrcode": "1.2.2",
+		"ratelimiter": "3.2.0",
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "3.2.2",
 		"redis": "2.8.0",
-		"request": "2.85.0",
+		"request": "2.88.0",
 		"request-promise-native": "1.0.5",
+		"request-stats": "3.0.0",
 		"rimraf": "2.6.2",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass-loader": "7.0.1",
-		"seedrandom": "2.4.3",
-		"single-line-log": "^1.1.2",
+		"sass-loader": "7.1.0",
+		"seedrandom": "2.4.4",
+		"sharp": "0.20.7",
+		"showdown": "1.8.6",
+		"showdown-highlightjs-extension": "0.1.2",
+		"single-line-log": "1.1.2",
 		"speakeasy": "2.0.0",
-		"style-loader": "0.21.0",
+		"stringz": "1.0.0",
+		"style-loader": "0.23.0",
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
-		"summaly": "2.0.4",
-		"swagger-jsdoc": "1.9.7",
+		"summaly": "2.2.0",
+		"systeminformation": "3.45.6",
 		"syuilo-password-strength": "0.0.1",
-		"tcp-port-used": "0.1.2",
 		"textarea-caret": "3.1.0",
+		"tinycolor2": "1.4.1",
 		"tmp": "0.0.33",
-		"ts-loader": "4.2.0",
-		"ts-node": "6.0.1",
-		"tslint": "5.9.1",
-		"typescript": "2.8.3",
-		"typescript-eslint-parser": "15.0.0",
+		"ts-loader": "4.4.1",
+		"ts-node": "7.0.1",
+		"tslint": "5.10.0",
+		"typescript": "2.9.2",
+		"typescript-eslint-parser": "18.0.0",
 		"uglify-es": "3.3.9",
-		"url-loader": "1.0.1",
-		"uuid": "3.2.1",
+		"url-loader": "1.1.1",
+		"uuid": "3.3.2",
 		"v-animate-css": "0.0.2",
-		"vue": "2.5.16",
-		"vue-cropperjs": "2.2.0",
-		"vue-js-modal": "1.3.13",
+		"vue": "2.5.17",
+		"vue-chartjs": "3.4.0",
+		"vue-color": "2.6.0",
+		"vue-cropperjs": "2.2.2",
+		"vue-js-modal": "1.3.26",
 		"vue-json-tree-view": "2.1.4",
-		"vue-loader": "15.0.3",
+		"vue-loader": "15.4.2",
 		"vue-router": "3.0.1",
-		"vue-template-compiler": "2.5.16",
+		"vue-style-loader": "4.1.2",
+		"vue-svg-inline-loader": "1.1.3",
+		"vue-template-compiler": "2.5.17",
 		"vuedraggable": "2.16.0",
+		"vuewordcloud": "18.7.11",
 		"vuex": "3.0.1",
-		"web-push": "3.3.0",
+		"vuex-persistedstate": "2.5.4",
+		"web-push": "3.3.3",
 		"webfinger.js": "2.6.6",
-		"webpack": "4.6.0",
-		"webpack-cli": "2.0.15",
-		"webpack-replace-loader": "1.3.0",
-		"websocket": "1.0.26",
-		"ws": "5.1.1",
-		"xev": "2.0.0"
+		"webpack": "4.19.1",
+		"webpack-cli": "3.1.0",
+		"websocket": "1.0.28",
+		"ws": "6.0.0",
+		"xev": "2.0.1"
+	},
+	"greenkeeper": {
+		"ignore": [
+			"deepcopy",
+			"cafy",
+			"@types/gulp"
+		]
 	}
 }

src/acct/render.ts

@@ -1,3 +0,0 @@
-export default user => {
-	return user.host === null ? user.username : `${user.username}@${user.host}`;
-};