10.23.1

New Crowdin translations

.autogen/autogen.sh

@@ -30,7 +30,7 @@ while :
   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 && \
+  jq -r '(.data|map(select(.relationships.currently_entitled_tiers.data[]))|map(.relationships.user.data.id))as$data|.included|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}' | \

.config/example.yml

@@ -60,11 +60,6 @@ mongodb:
   user: example-misskey-user
   pass: example-misskey-pass
 
-redis:
-  host: localhost
-  port: 6379
-  pass: example-pass
-
 # Drive capacity of a local user (MB)
 localDriveCapacityMb: 256
 
@@ -122,6 +117,12 @@ drive:
 # Below settings are optional
 #
 
+# Redis
+#redis:
+#  host: localhost
+#  port: 6379
+#  pass: example-pass
+
 # Elasticsearch
 #elasticsearch:
 #  host: localhost
@@ -137,12 +138,10 @@ drive:
 #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:
@@ -159,3 +158,9 @@ drive:
 
 # Summaly proxy
 #summalyProxy: "http://example.com"
+
+# User recommendation
+#user_recommendation:
+#  external: true
+#  engine: http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}
+#  timeout: 300000

.config/mongo_initdb_example.js

@@ -0,0 +1,13 @@
+var user = {
+	user: 'example-misskey-user',
+	pwd: 'example-misskey-pass',
+	roles: [
+	    {
+		    role: 'readWrite',
+		    db: 'misskey'
+	    }
+	]
+};
+
+db.createUser(user);
+

.dockerignore

@@ -0,0 +1,12 @@
+.autogen
+.git
+.github
+.travis
+.vscode
+Dockerfile
+build/
+docker-compose.yml
+node_modules/
+mongo/
+redis/
+elasticsearch/

.gitignore

@@ -1,5 +1,6 @@
 /.config/*
 !/.config/example.yml
+!/.config/mongo_initdb_example.js
 /.vscode
 /node_modules
 /build
@@ -12,3 +13,6 @@ npm-debug.log
 run.bat
 api-docs.json
 *.log
+/redis
+/mongo
+/elasticsearch

.travis/default.yml

@@ -1,12 +1,8 @@
-maintainer: '@syuilo'
+maintainer:
-url: 'https://misskey.xyz'
+  name: syuilo
-secondary_url: 'https://himasaku.net'
+  url: 'https://syuilo.com'
+url: 'http://misskey.local'
 port: 80
-https:
-  enable: false
-  key: null
-  cert: null
-  ca: null
 mongodb:
   host: localhost
   port: 27017
@@ -21,6 +17,3 @@ elasticsearch:
   host: localhost
   port: 9200
   pass: ''
-recaptcha:
-  site_key: hima
-  secret_key: saku

.travis/test.yml

@@ -1,12 +1,8 @@
-maintainer: '@syuilo'
+maintainer:
-url: 'https://misskey.xyz'
+  name: syuilo
-secondary_url: 'https://himasaku.net'
+  url: 'https://syuilo.com'
+url: 'http://misskey.local'
 port: 80
-https:
-  enable: false
-  key: null
-  cert: null
-  ca: null
 mongodb:
   host: localhost
   port: 27017
@@ -21,6 +17,3 @@ elasticsearch:
   host: localhost
   port: 9200
   pass: ''
-recaptcha:
-  site_key: hima
-  secret_key: saku

Dockerfile

@@ -0,0 +1,28 @@
+FROM alpine:latest AS base
+
+ENV NODE_ENV=production
+
+RUN apk add --no-cache nodejs nodejs-npm
+RUN apk add vips fftw --update-cache --repository https://dl-3.alpinelinux.org/alpine/edge/testing/
+WORKDIR /misskey
+COPY . ./
+
+FROM base AS builder
+
+RUN apk add --no-cache	gcc g++ python autoconf automake file make nasm
+RUN apk add vips-dev fftw-dev --update-cache --repository https://dl-3.alpinelinux.org/alpine/edge/testing/
+RUN npm install \
+    && npm install -g node-gyp \
+    && node-gyp configure \
+    && node-gyp build \
+    && npm run build
+
+FROM base AS runner
+
+COPY --from=builder /misskey/built ./built
+COPY --from=builder /misskey/node_modules ./node_modules
+
+RUN apk add --no-cache tini
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["npm", "start"]

README.md

@@ -71,6 +71,7 @@ Please see [Contribution guide](./CONTRIBUTING.md).
 ----------------------------------------------------------------
 <!-- PATREON_START -->
 <table><tr>
+<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=CXe9AqlZy9AsYfiWd3OBYVOzvODoN47Litz0Tu4BFpU%3D" alt="Gargron"></td>
 <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>
@@ -80,6 +81,7 @@ Please see [Contribution guide](./CONTRIBUTING.md).
 <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/mastodon">Gargron</a></td>
 <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>

docker-compose.yml

@@ -0,0 +1,52 @@
+version: "3"
+
+services:
+  web:
+    build: .
+    restart: always
+    links:
+      - mongo
+      - redis
+#      - es
+    ports:
+      - "127.0.0.1:3000:3000"
+    networks:
+      - internal_network
+      - external_network
+
+  redis:
+    restart: always
+    image: redis:4.0-alpine
+    networks:
+      - internal_network
+### Uncomment to enable Redis persistance
+#    volumes:
+#      - ./redis:/data
+
+  mongo:
+    restart: always
+    image: mongo:4.1-bionic
+    networks:
+      - internal_network
+    environment:
+      MONGO_INITDB_DATABASE: "misskey"
+    volumes:
+      - ./.config/mongo_initdb.js:/docker-entrypoint-initdb.d/mongo_initdb.js:ro
+### Uncomment to enable MongoDB persistance
+#      - ./mongo:/data
+
+#  es:
+#    restart: always
+#    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2
+#    environment:
+#      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+#    networks:
+#      - internal_network
+#### Uncomment to enable ES persistence
+##    volumes:
+##      - ./elasticsearch:/usr/share/elasticsearch/data
+
+networks:
+  internal_network:
+    internal: true
+  external_network:

docs/docker.en.md

@@ -0,0 +1,47 @@
+Docker Guide
+================================================================
+
+This guide describes how to install and setup Misskey with Docker.
+
+[Japanese version also available - 日本語版もあります](./docker.ja.md)
+
+----------------------------------------------------------------
+
+*1.* Make configuration files
+----------------------------------------------------------------
+1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.
+2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` Copy the `.config/mongo_initdb_example.js` and rename it to `mongo_initdb.js`.
+2. Edit `default.yml` and `mongo_initdb.js`.
+
+*2.* Configure Docker
+----------------------------------------------------------------
+Edit `docker-compose.yml`.
+
+*3.* Build Misskey
+----------------------------------------------------------------
+Build misskey with the following:
+
+`docker-compose build`
+
+*4.* That is it.
+----------------------------------------------------------------
+Well done! Now, you have an environment that run to Misskey.
+
+### Launch normally
+Just `docker-compose up -d`. GLHF!
+
+### Way to Update to latest version of your Misskey
+1. `git fetch`
+2. `git stash`
+3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+4. `git stash pop`
+5. `docker-compose build`
+6. Check [ChangeLog](../CHANGELOG.md) for migration information
+7. `docker-compose stop && docker-compose up -d`
+
+### Way to execute cli command:
+`docker-compose run --rm web node cli/mark-admin @example`
+
+----------------------------------------------------------------
+
+If you have any questions or troubles, feel free to contact us!

docs/docker.ja.md

@@ -0,0 +1,48 @@
+Dockerを使ったMisskey構築方法
+================================================================
+
+このガイドはDockerを使ったMisskeyセットアップ方法について解説します。
+
+[英語版もあります - English version also available](./docker.en.md)
+
+----------------------------------------------------------------
+
+*1.* 設定ファイルを作成する
+----------------------------------------------------------------
+1. `cp .config/example.yml .config/default.yml` `.config/example.yml`をコピーし名前を`default.yml`にする
+2. `cp .config/mongo_initdb_example.js .config/mongo_initdb.js` `.config/mongo_initdb_example.js`をコピーし名前を`mongo_initdb.js`にする
+3. `default.yml`と`mongo_initdb.js`を編集する
+
+*2.* Dockerの設定
+----------------------------------------------------------------
+`docker-compose.yml`を編集してください。
+
+*3.* Misskeyのビルド
+----------------------------------------------------------------
+次のコマンドでMisskeyをビルドしてください:
+
+`docker-compose build`
+
+*4.* 以上です！
+----------------------------------------------------------------
+お疲れ様でした。これでMisskeyを動かす準備は整いました。
+
+### 通常起動
+`docker-compose up -d`するだけです。GLHF!
+
+### Misskeyを最新バージョンにアップデートする方法:
+1. `git fetch`
+2. `git stash`
+3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)`
+4. `git stash pop`
+5. `docker-compose build`
+6. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する
+7. `docker-compose stop && docker-compose up -d`
+
+### cliコマンドを実行する方法:
+
+`docker-compose run --rm web node cli/mark-admin @example`
+
+----------------------------------------------------------------
+
+なにかお困りのことがありましたらお気軽にご連絡ください。

docs/setup.en.md

@@ -24,11 +24,11 @@ Please install and setup these softwares:
 #### Dependencies :package:
 * **[Node.js](https://nodejs.org/en/)**
 * **[MongoDB](https://www.mongodb.com/)** >= 3.6
-* **[Redis](https://redis.io/)**
 
 ##### Optional
-* [Elasticsearch](https://www.elastic.co/) - used to provide searching feature instead of MongoDB
+* [Redis](https://redis.io/)
-
+  * Redis is optional, but we strongly recommended to install it
+* [Elasticsearch](https://www.elastic.co/) - required to enable the search feature
 
 *3.* Setup MongoDB
 ----------------------------------------------------------------

docs/setup.ja.md

@@ -24,10 +24,17 @@ adduser --disabled-password --disabled-login misskey
 #### 依存関係 :package:
 * **[Node.js](https://nodejs.org/en/)**
 * **[MongoDB](https://www.mongodb.com/)** (3.6以上)
-* **[Redis](https://redis.io/)**
 
 ##### オプション
-* [Elasticsearch](https://www.elastic.co/) - 検索機能を向上させるために用います。
+* [Redis](https://redis.io/)
+	* Redisはオプションですが、インストールすることを強く推奨します。
+	* インストールしなくていいのは、あなたのインスタンスが自分専用のときだけとお考えください。
+	* 具体的には、Redisをインストールしないと、次の事が出来なくなります:
+		* Misskeyプロセスを複数起動しての負荷分散
+		* レートリミット
+		* Twitter連携
+* [Elasticsearch](https://www.elastic.co/)
+	* 検索機能を有効にするためにはインストールが必要です。
 
 *3.* MongoDBの設定
 ----------------------------------------------------------------

locales/ca-ES.yml

@@ -286,6 +286,9 @@ common/views/components/theme.vue:
   invalid-theme: "テーマが正しくありません。"
   already-installed: "既にそのテーマはインストールされています。"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
@@ -332,6 +335,7 @@ common/views/components/note-menu.vue:
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
+  unfavorite: "お気に入り解除"
   pin: "ピン留め"
   unpin: "ピン留め解除"
   delete: "削除"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -636,7 +659,7 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "詳細設定"
   api-via-stream: "ストリームを経由したAPIリクエスト"
   api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "デザインと表示"
   customize: "ホームをカスタマイズ"
+  wallpaper: "壁紙"
   choose-wallpaper: "壁紙を選択"
   delete-wallpaper: "壁紙を削除"
   dark-mode: "ダークモード"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "リプライ先を表示する"
+  timeline: "タイムライン"
   show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "マップの自動展開"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "サウンド"
   enable-sounds: "サウンドを有効にする"
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  mobile: "モバイル"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   language: "言語"
   pick-language: "言語を選択"
   recommended: "推奨"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "ツール"
   task-manager: "タスクマネージャ"
   third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
   detail: "詳細..."
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   enter-new-password-again: "もう一度新しいパスワードを入力してください"
   not-match: "新しいパスワードが一致しません"
   changed: "パスワードを変更しました"
-desktop/views/components/settings.profile.vue:
-  avatar: "アイコン"
-  choice-avatar: "画像を選択"
-  name: "名前"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  save: "保存"
-  locked-account: "アカウントの保護"
-  is-locked: "フォローを承認制にする"
-  other: "その他"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
-  profile-updated: "プロフィールを更新しました"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
   is-media-view: "メディアビュー"
   edit: "オプション"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
   nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  name: "名前"
-  account: "アカウント"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  is-cat: "このアカウントはCatです"
-  is-locked: "フォローを承認制にする"
-  advanced: "その他"
-  privacy: "プライバシー"
-  save: "保存"
-  saved: "プロフィールを保存しました"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
 mobile/views/pages/search.vue:
   search: "検索"
   empty: "「{}」に関する投稿は見つかりませんでした。"

locales/de-DE.yml

@@ -3,44 +3,44 @@ meta:
   lang: "Deutsch"
   divider: ""
 common:
-  misskey: "A ⭐ of fediverse"
+  misskey: "Ein ⭐ des Fediversums"
-  about-title: "A ⭐ of fediverse."
+  about-title: "Ein ⭐ des Fediversums."
   about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
   intro:
-    title: "Misskeyって？"
+    title: "Was ist Misskey?"
     about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。"
-    features: "特徴"
+    features: "Funktionen"
-    rich-contents: "投稿"
+    rich-contents: "Notizen"
     rich-contents-desc: "自分の考え、話題の出来事、皆と共有したいことについて発信してください。必要であれば、様々な構文を使って投稿を装飾したり、好きな画像、動画などのファイルやアンケートを添付することもできます。"
-    reaction: "リアクション"
+    reaction: "Reaktionen"
     reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません。"
-    ui: "インターフェース"
+    ui: "Benutzeroberfläche"
     ui-desc: "どのようなUIが使いやすいかは人それぞれです。だから、Misskeyは自由度の高いUIを持っています。レイアウトやデザインを調整したり、カスタマイズ可能な様々なウィジェットを配置したりして、自分だけのホームを作ってください。"
-    drive: "ドライブ"
+    drive: "Drive"
     drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
     outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
   adblock:
-    detected: "広告ブロッカーを無効にしてください"
+    detected: "Bitte deaktivieren Sie den Werbeblocker."
     warning: "<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。"
-  application-authorization: "アプリの連携"
+  application-authorization: "Autorisierte Anwendungen"
-  close: "閉じる"
+  close: "Schließen"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
-  got-it: "わかった"
+  got-it: "Verstanden!"
   customization-tips:
-    title: "カスタマイズのヒント"
+    title: "Anpassung-Tipps"
     paragraph1: "ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。"
     paragraph2: "一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。"
     paragraph3: "ウィジェットを削除するには、ヘッダーの<strong>「ゴミ箱」</strong>と書かれたエリアにウィジェットをドラッグ&ドロップします。"
     paragraph4: "カスタマイズを終了するには、右上の「完了」をクリックします。"
     gotit: "Got it!"
   notification:
-    file-uploaded: "ファイルがアップロードされました"
+    file-uploaded: "Datei hochgeladen!"
-    message-from: "{}さんからメッセージ:"
+    message-from: "Nachricht von {}:"
     reversi-invited: "対局への招待があります"
-    reversi-invited-by: "{}さんから"
+    reversi-invited-by: "Eingeladen von {}:"
-    notified-by: "{}さんから"
+    notified-by: "Benachrichtigt von {}:"
-    reply-from: "{}さんから返信:"
+    reply-from: "Antwort von {}:"
-    quoted-by: "{}さんが引用:"
+    quoted-by: "Zitiert von {}:"
   time:
     unknown: "Unbekannt"
     future: "Zukunft"
@@ -52,8 +52,8 @@ common:
     weeks_ago: "vor {0} Woche{0:n}"
     months_ago: "vor {0} Monat{0:en}"
     years_ago: "vor {} Jahr{0:en}"
-  month-and-day: "{month}月 {day}日"
+  month-and-day: "{day}/{month}"
-  trash: "ゴミ箱"
+  trash: "Papierkorb"
   weekday-short:
     sunday: "So"
     monday: "Mo"
@@ -63,15 +63,15 @@ common:
     friday: "Fr"
     saturday: "Sa"
   weekday:
-    sunday: "日曜日"
+    sunday: "Sonntag"
-    monday: "月曜日"
+    monday: "Montag"
-    tuesday: "火曜日"
+    tuesday: "Dienstag"
-    wednesday: "水曜日"
+    wednesday: "Mittwoch"
-    thursday: "木曜日"
+    thursday: "Donnerstag"
-    friday: "金曜日"
+    friday: "Freitag"
-    saturday: "土曜日"
+    saturday: "Samstag"
   reactions:
-    like: "いいね"
+    like: "Gefällt mir"
     love: "Lieben"
     laugh: "Lachen"
     hmm: "Hmm...?"
@@ -82,14 +82,14 @@ common:
     rip: "RIP"
     pudding: "Pudding"
   note-visibility:
-    public: "公開"
+    public: "Öffentlich"
-    home: "ホーム"
+    home: "Startseite"
-    home-desc: "ホームタイムラインにのみ公開"
+    home-desc: "Nur auf die Startseite posten"
-    followers: "フォロワー"
+    followers: "Abonnenten"
-    followers-desc: "自分のフォロワーにのみ公開"
+    followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
-    specified: "ダイレクト"
+    specified: "Direkt"
-    specified-desc: "指定したユーザーにのみ公開"
+    specified-desc: "Nur für bestimmte Benutzer posten"
-    private: "非公開"
+    private: "Privat"
   note-placeholders:
     a: "Was machst du gerade?"
     b: "Was ist so passiert?"
@@ -97,34 +97,34 @@ common:
     d: "Willst du etwas sagen?"
     e: "Schreib hier etwas!"
     f: "Warte darauf, das du schreibst."
-  search: "検索"
+  search: "Suche"
   delete: "Löschen"
   loading: "Laden"
   ok: "OK"
-  update-available-title: "更新があります"
+  update-available-title: "Aktualisierung verfügbar"
   update-available: "Eine neue Version von Misskey ist verfügbar ({newer}, aktuell ist {current}). Lade die Seite neu um die aktuelle Version zu laden"
   my-token-regenerated: "Dein Token wurde generiert. Du wirst jetzt abgemeldet."
-  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  i-like-sushi: "Ich bevorzuge Sushi anstelle von Pudding"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
-  verified-user: "公式アカウント"
+  verified-user: "Verifizierter Benutzer"
   disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   always-show-nsfw: "常に閲覧注意のメディアを表示する"
   always-mark-nsfw: "常にメディアを閲覧注意として投稿"
   show-full-acct: "ユーザー名のホストを省略しない"
-  reduce-motion: "UIの動きを減らす"
+  reduce-motion: "Animationen der Benutzeroberfläche reduzieren"
-  this-setting-is-this-device-only: "このデバイスのみ"
+  this-setting-is-this-device-only: "Nur auf diesem Gerät"
-  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
+  do-not-use-in-production: 'Dies ist eine Entwicklungsversion. Nicht in einer Produktionsumgebung verwenden.'
   reversi:
-    drawn: "引き分け"
+    drawn: "Unentschieden"
-    my-turn: "あなたのターンです"
+    my-turn: "Du bist am Zug"
-    opponent-turn: "相手のターンです"
+    opponent-turn: "Dein Gegner ist an der Reihe"
-    turn-of: "{}のターンです"
+    turn-of: "{} ist am Zug"
-    past-turn-of: "{}のターン"
+    past-turn-of: "Zug von {}"
-    won: "{}の勝ち"
+    won: "{} hat gewonnen!"
-    black: "黒"
+    black: "Schwarz"
-    white: "白"
+    white: "Weiß"
-    total: "合計"
+    total: "Gesamt"
     this-turn: "{}ターン目"
   widgets:
     analog-clock: "Analoge Uhr"
@@ -142,23 +142,23 @@ common:
     broadcast: "ブロードキャスト"
     notifications: "Benachrichtigungen"
     users: "Empfohlene Benutzer"
-    polls: "アンケート"
+    polls: "Umfrage"
     post-form: "Beitragsform"
     messaging: "Nachrichten"
     server: "Server-Info"
     donation: "Spenden"
     nav: "Navigation"
     tips: "Tipps"
-    hashtags: "ハッシュタグ"
+    hashtags: "Hashtags"
   deck:
     widgets: "Widget hinzufügen:"
     home: "Startseite"
     local: "Lokal"
     hybrid: "ソーシャル"
-    hashtag: "ハッシュタグ"
+    hashtag: "Hashtag"
     global: "Global"
-    mentions: "あなた宛て"
+    mentions: "Erwähnungen"
-    direct: "ダイレクト投稿"
+    direct: "Direktnachrichten"
     notifications: "Mitteilungen"
     list: "Listen"
     swap-left: "Nach links"
@@ -182,10 +182,10 @@ auth/views/form.vue:
   drive-write: "ドライブを操作する。"
   notification-read: "通知を見る。"
   notification-write: "通知を操作する。"
-  cancel: "キャンセル"
+  cancel: "Abbrechen"
-  accept: "アクセスを許可"
+  accept: "Zugriff erlauben."
 auth/views/index.vue:
-  loading: "読み込み中"
+  loading: "Lädt"
   denied: "アプリケーションの連携をキャンセルしました。"
   denied-paragraph: "このアプリがあなたのアカウントにアクセスすることはありません。"
   already-authorized: "このアプリは既に連携済みです"
@@ -196,46 +196,46 @@ auth/views/index.vue:
   sign-in: "サインインしてください"
 common/views/components/games/reversi/reversi.vue:
   matching:
-    waiting-for: "{}を待っています"
+    waiting-for: "Warten auf {}"
-    cancel: "キャンセル"
+    cancel: "Abbrechen"
 common/views/components/games/reversi/reversi.game.vue:
-  surrender: "投了"
+  surrender: "Aufgeben"
   surrendered: "投了により"
   is-llotheo: "石の少ない方が勝ち(ロセオ)"
   looped-map: "ループマップ"
   can-put-everywhere: "どこでも置けるモード"
 common/views/components/games/reversi/reversi.index.vue:
   title: "Misskey Reversi"
-  sub-title: "他のMisskeyユーザーとリバーシで対戦しよう"
+  sub-title: "Spiele Reversi mit deinen Freunden!"
-  invite: "招待"
+  invite: "Einladen"
-  rule: "遊び方"
+  rule: "Spielanleitung"
   rule-desc: "リバーシは、相手と交互に石をボードに置いて、相手の石を挟んで自分の色に変えてゆき、最終的に残った石が多い方が勝ちというボードゲームです。"
-  mode-invite: "招待"
+  mode-invite: "Einladen"
   mode-invite-desc: "指定したユーザーと対戦するモードです。"
   invitations: "対局の招待があります！"
   my-games: "自分の対局"
-  all-games: "みんなの対局"
+  all-games: "Alle Spiele"
-  enter-username: "ユーザー名を入力してください"
+  enter-username: "Bitte gib einen Benutzernamen ein"
   game-state:
-    ended: "終了"
+    ended: "Fertig"
     playing: "進行中"
 common/views/components/games/reversi/reversi.room.vue:
-  settings-of-the-game: "ゲームの設定"
+  settings-of-the-game: "Spieleinstellungen"
-  choose-map: "マップを選択"
+  choose-map: "Wähle eine Karte"
-  random: "ランダム"
+  random: "Zufällige Auswahl"
-  black-or-white: "先手/後手"
+  black-or-white: "Schwarz/Weiß"
-  black-is: "{}が黒"
+  black-is: "Schwarz ist {}"
-  rules: "ルール"
+  rules: "Regeln"
   is-llotheo: "石の少ない方が勝ち(ロセオ)"
   looped-map: "ループマップ"
   can-put-everywhere: "どこでも置けるモード"
   settings-of-the-bot: "Botの設定"
   this-game-is-started-soon: "ゲームは数秒後に開始されます"
-  waiting-for-other: "相手の準備が完了するのを待っています"
+  waiting-for-other: "Warte auf den Gegner"
   waiting-for-me: "あなたの準備が完了するのを待っています"
   waiting-for-both: "準備中"
-  cancel: "キャンセル"
+  cancel: "Abbrechen"
-  ready: "準備完了"
+  ready: "Bereit"
   cancel-ready: "準備続行"
 common/views/components/connect-failed.vue:
   title: "Verbindung zum Server ist fehlgeschlagen"
@@ -262,38 +262,41 @@ common/views/components/connect-failed.troubleshooter.vue:
   flush: "Cache leeren"
   set-version: "Version angeben"
 common/views/components/media-banner.vue:
-  sensitive: "閲覧注意"
+  sensitive: "Dieser Inhalt ist NSFW"
-  click-to-show: "クリックして表示"
+  click-to-show: "Klicke zum den Inhalt anzusehen"
 common/views/components/theme.vue:
-  light-theme: "非ダークモード時に使用するテーマ"
+  light-theme: "Thema"
-  dark-theme: "ダークモード時に使用するテーマ"
+  dark-theme: "Thema während des Nachtmodus"
-  light-themes: "明るいテーマ"
+  light-themes: "Helles Thema"
-  dark-themes: "暗いテーマ"
+  dark-themes: "Dunkles Thema"
   install-a-theme: "テーマのインストール"
   theme-code: "テーマコード"
-  install: "インストール"
+  install: "Anwenden"
-  installed: "「{}」をインストールしました"
+  installed: "\"{}\" wurde installiert"
-  create-a-theme: "テーマの作成"
+  create-a-theme: "Thema erstellen"
-  save-created-theme: "テーマを保存"
+  save-created-theme: "Thema speichern"
-  primary-color: "プライマリ カラー"
+  primary-color: "Primäre Farbe"
-  secondary-color: "セカンダリ カラー"
+  secondary-color: "Sekundäre Farbe"
-  text-color: "文字色"
+  text-color: "Textfarbe"
-  base-theme: "ベーステーマ"
+  base-theme: "Basisthema"
-  base-theme-light: "Light"
+  base-theme-light: "Hell"
-  base-theme-dark: "Dark"
+  base-theme-dark: "Dunkel"
-  theme-name: "テーマ名"
+  theme-name: "Name des Themas"
-  preview-created-theme: "プレビュー"
+  preview-created-theme: "Vorschau"
-  invalid-theme: "テーマが正しくありません。"
+  invalid-theme: "Thema ist ungültig"
-  already-installed: "既にそのテーマはインストールされています。"
+  already-installed: "Thema ist bereits installiert"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
   uninstalled: "「{}」をアンインストールしました"
-  author: "作者"
+  author: "Autor"
   desc: "説明"
-  export: "エクスポート"
+  export: "Exportieren"
-  import: "インポート"
+  import: "Importieren"
   import-by-code: "またはコードをペースト"
   theme-name-required: "テーマ名は必須です。"
 common/views/components/cw-button.vue:
@@ -332,6 +335,7 @@ common/views/components/note-menu.vue:
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "Diese Anmerkung favorisieren"
+  unfavorite: "Entfavorisieren"
   pin: "An die Profilseite pinnen"
   unpin: "ピン留め解除"
   delete: "Löschen"
@@ -358,7 +362,7 @@ common/views/components/signin.vue:
   token: "Token"
   signing-in: "Melde an..."
   signin: "Anmelden"
-  or: "または"
+  or: "Oder"
   signin-with-twitter: "Twitterでログイン"
   login-failed: "ログインできませんでした。ユーザー名とパスワードを確認してください。"
 common/views/components/signup.vue:
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "Laden"
   no-broadcasts: "Keine Broadcasts"
@@ -506,7 +529,7 @@ desktop/views/components/charts.vue:
   notes: "投稿"
   users: "ユーザー"
   drive: "ドライブ"
-  network: "ネットワーク"
+  network: "Netzwerk"
   charts:
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
@@ -518,9 +541,9 @@ desktop/views/components/charts.vue:
     drive-total: "ドライブ使用量の積算"
     drive-files: "ドライブのファイル数の増減"
     drive-files-total: "ドライブのファイル数の積算"
-    network-requests: "リクエスト"
+    network-requests: "Anfragen"
-    network-time: "応答時間"
+    network-time: "Antwortzeit"
-    network-usage: "通信量"
+    network-usage: "Datenverkehr"
 desktop/views/components/choose-file-from-drive-window.vue:
   choose-file: "Datei auswählen"
   upload: "Dateien von deinem PC hochladen"
@@ -636,25 +659,25 @@ desktop/views/components/note-detail.vue:
   location: "Ort"
   renote: "Anmerkung"
   add-reaction: "Reaktion hinzufügen"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
-  reposted-by: "Auch geteilt von"
+  reposted-by: "{}がRenote"
-  reply: "Antworten"
+  reply: "返信"
-  renote: "Anmerken"
+  renote: "Renote"
-  add-reaction: "Eine Reaktion hinzufügen"
+  add-reaction: "リアクション"
-  detail: "Zeige Details"
+  detail: "詳細"
-  private: "Dieser Beitrag ist eine privat"
+  private: "この投稿は非公開です"
-  deleted: "Dieser Beitrag wurde entfernt"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "Laden fehlgeschlagen."
   retry: "Erneut versuchen"
-  load-more: "もっと読み込む"
+  load-more: "Mehr laden"
 desktop/views/components/notifications.vue:
   more: "Mehr"
   empty: "Keine Benachrichtigungen"
 desktop/views/components/post-form.vue:
-  add-visible-user: "+ユーザーを追加"
+  add-visible-user: "+Nutzer hinzufügen"
   attach-location-information: "位置情報を添付する"
-  hide-contents: "内容を隠す"
+  hide-contents: "Inhalt verstecken"
   reply-placeholder: "Antworte auf diese Anmerkung..."
   quote-placeholder: "Zitiere diese Anmerkung..."
   submit: "Beitragsform"
@@ -675,10 +698,10 @@ desktop/views/components/post-form.vue:
   text-remain: "{} Zeichen verbleibend"
   recent-tags: "最近"
   click-to-tagging: "クリックでタグ付け"
-  visibility: "公開範囲"
+  visibility: "Sichtbarkeit"
   geolocation-alert: "お使いの端末は位置情報に対応していません"
-  error: "エラー"
+  error: "Fehler"
-  enter-username: "ユーザー名を入力してください"
+  enter-username: "Bitte gib einen Benutzernamen ein..."
   annotations: "内容への注釈 (オプション)"
 desktop/views/components/post-form-window.vue:
   note: "Neue Notiz"
@@ -722,30 +745,35 @@ desktop/views/components/settings.vue:
   advanced: "Erweiterte Einstellungen"
   api-via-stream: "API-Anfrage via stream"
   api-via-stream-desc: "API-Anfrage über WebSocket statt native Aktualisierungs-API (für bessere Leistung). Diese Einstellung wird im Browser gespeichert."
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "Erscheinungsbild und Anzeige"
   customize: "Startseite anpassen"
+  wallpaper: "壁紙"
   choose-wallpaper: "壁紙を選択"
   delete-wallpaper: "壁紙を削除"
   dark-mode: "Nacht Modus"
   use-shadow: "UIに影を使用"
-  rounded-corners: "UIの角を丸める"
+  rounded-corners: "Abgerundete Ecken"
   circle-icons: "Kreisförmige Icons"
   contrasted-acct: "ユーザー名にコントラストを付ける"
   post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "Zeige Antworten"
+  timeline: "タイムライン"
   show-my-renotes: "Zeige meine Reposts auf der Zeitleiste"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "Karte anzeigen"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "Ton"
   enable-sounds: "Ton aktivieren"
   enable-sounds-desc: "Spiel einen Ton ab beim Erhalten eines Beitrags bzw. einer Nachricht. Diese Einstellung wird im Browser gespeichert."
   volume: "Lautstärke"
   test: "Test"
-  mobile: "Mobil"
-  disable-via-mobile: "Diesen Beitrag nicht mit 'vom Handy' absenden"
   language: "Sprache"
   pick-language: "Sprache auswählen"
   recommended: "Empfohlen"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "Werkzeuge"
   task-manager: "Taskmanager"
   third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
   detail: "詳細..."
@@ -814,26 +846,12 @@ desktop/views/components/settings.drive.vue:
 desktop/views/components/settings.mute.vue:
   no-users: "ミュートしているユーザーはいません"
 desktop/views/components/settings.password.vue:
-  reset: "パスワードを変更する"
+  reset: "Passwort ändern"
   enter-current-password: "Derzeitiges Passwort eingeben"
   enter-new-password: "Neues Passwort eingeben"
   enter-new-password-again: "Neues Passwort erneut eingeben"
-  not-match: "新しいパスワードが一致しません"
+  not-match: "Passwörter stimmen nicht überein."
-  changed: "パスワードを変更しました"
+  changed: "Passwort geändert"
-desktop/views/components/settings.profile.vue:
-  avatar: "アイコン"
-  choice-avatar: "画像を選択"
-  name: "名前"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  save: "Profil aktualisieren"
-  locked-account: "アカウントの保護"
-  is-locked: "フォローを承認制にする"
-  other: "その他"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
-  profile-updated: "プロフィールを更新しました"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -893,7 +911,7 @@ desktop/views/components/user-preview.vue:
 desktop/views/components/users-list.vue:
   all: "すべて"
   iknow: "知り合い"
-  load-more: "もっと"
+  load-more: "Mehr"
   fetching: "Lade…"
 desktop/views/components/users-list-item.vue:
   followed: "フォローされています"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
   is-media-view: "メディアビュー"
   edit: "オプション"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
   nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -1154,19 +1172,19 @@ mobile/views/components/ui.nav.vue:
 mobile/views/components/user-timeline.vue:
   no-notes: "このユーザーは投稿していないようです。"
   no-notes-with-media: "メディア付き投稿はありません。"
-  load-more: "もっと"
+  load-more: "Mehr"
 mobile/views/components/users-list.vue:
   all: "すべて"
   known: "知り合い"
-  load-more: "もっと"
+  load-more: "Mehr"
 mobile/views/pages/favorites.vue:
-  title: "お気に入り"
+  title: "Favoriten"
 mobile/views/pages/user-lists.vue:
   title: "リスト"
   enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
   drive: "ドライブ"
-  more: "もっと見る"
+  more: "Mehr laden"
 mobile/views/pages/signup.vue:
   lets-start: "📦 始めましょう"
 mobile/views/pages/followers.vue:
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "Profil"
-  name: "名前"
-  account: "アカウント"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  is-cat: "このアカウントはCatです"
-  is-locked: "フォローを承認制にする"
-  advanced: "その他"
-  privacy: "プライバシー"
-  save: "保存"
-  saved: "Profil wurde aktualisiert"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
 mobile/views/pages/search.vue:
   search: "検索"
   empty: "「{}」に関する投稿は見つかりませんでした。"
@@ -1297,7 +1298,7 @@ mobile/views/pages/user/home.vue:
   recent-notes: "最近の投稿"
   images: "画像"
   activity: "アクティビティ"
-  keywords: "キーワード"
+  keywords: "Schlagwörter"
   domains: "頻出ドメイン"
   frequently-replied-users: "よく会話するユーザー"
   followers-you-know: "知り合いのフォロワー"

locales/en-US.yml

@@ -110,7 +110,7 @@ common:
   verified-user: "Verified account"
   disable-animated-mfm: "Disable animated texts in a post"
   always-show-nsfw: "Always show NSFW contents"
-  always-mark-nsfw: "Always post with a warning about media attachment"
+  always-mark-nsfw: "Always mark posts with media attachments as NSFW"
   show-full-acct: "Do not omit the hostname from the username"
   reduce-motion: "Reduce motion in UI"
   this-setting-is-this-device-only: "Only for this device"
@@ -265,37 +265,40 @@ common/views/components/media-banner.vue:
   sensitive: "NSFW"
   click-to-show: "Click to show"
 common/views/components/theme.vue:
-  light-theme: "非ダークモード時に使用するテーマ"
+  light-theme: "Theme"
-  dark-theme: "ダークモード時に使用するテーマ"
+  dark-theme: "Theme during dark mode"
-  light-themes: "明るいテーマ"
+  light-themes: "Light theme"
-  dark-themes: "暗いテーマ"
+  dark-themes: "Dark theme"
-  install-a-theme: "テーマのインストール"
+  install-a-theme: "Install a theme"
-  theme-code: "テーマコード"
+  theme-code: "Theme code"
-  install: "インストール"
+  install: "Install"
-  installed: "「{}」をインストールしました"
+  installed: "\"{}\" has been installed"
-  create-a-theme: "テーマの作成"
+  create-a-theme: "Create a theme"
-  save-created-theme: "テーマを保存"
+  save-created-theme: "Save a theme"
-  primary-color: "プライマリ カラー"
+  primary-color: "Primary color"
-  secondary-color: "セカンダリ カラー"
+  secondary-color: "Secondary color"
-  text-color: "文字色"
+  text-color: "Text color"
-  base-theme: "ベーステーマ"
+  base-theme: "Base theme"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
-  theme-name: "テーマ名"
+  theme-name: "Theme name"
-  preview-created-theme: "プレビュー"
+  preview-created-theme: "Preview"
-  invalid-theme: "テーマが正しくありません。"
+  invalid-theme: "Not valid theme"
-  already-installed: "既にそのテーマはインストールされています。"
+  already-installed: "This theme is already installed."
-  saved: "保存しました"
+  saved: "Saved"
-  installed-themes: "インストールされたテーマ"
+  manage-themes: "Themes manager"
-  select-theme: "テーマを選択してください"
+  builtin-themes: "Standard themes"
-  uninstall: "アンインストール"
+  my-themes: "My themes"
-  uninstalled: "「{}」をアンインストールしました"
+  installed-themes: "Installed themes"
-  author: "作者"
+  select-theme: "Select your theme"
-  desc: "説明"
+  uninstall: "Uninstall"
-  export: "エクスポート"
+  uninstalled: "\"{}\" has been uninstalled"
-  import: "インポート"
+  author: "Author"
-  import-by-code: "またはコードをペースト"
+  desc: "Description"
-  theme-name-required: "テーマ名は必須です。"
+  export: "Export"
+  import: "Import"
+  import-by-code: "or paste code"
+  theme-name-required: "Theme name is required"
 common/views/components/cw-button.vue:
   hide: "Hide"
   show: "See more"
@@ -332,8 +335,9 @@ common/views/components/note-menu.vue:
   detail: "Details"
   copy-link: "Copy link"
   favorite: "Favorite this note"
+  unfavorite: "Unfavorite"
   pin: "Pin to your profile"
-  unpin: "ピン留め解除"
+  unpin: "Unpin"
   delete: "Delete"
   delete-confirm: "Delete this post?"
   remote: "Show original note"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{} users mentioned"
   empty: "No popular hashtag trends"
+common/views/components/profile-editor.vue:
+  title: "Profile"
+  name: "Name"
+  account: "Account"
+  location: "Location"
+  description: "About me"
+  birthday: "Birthday"
+  avatar: "Avatar"
+  banner: "Banner"
+  is-cat: "This account is a Cat"
+  is-bot: "This account is a Bot"
+  is-locked: "Follower requests require approval"
+  careful-bot: "Follower requests from bots require approval"
+  advanced: "Advanced"
+  privacy: "Privacy"
+  save: "Update profile"
+  saved: "Profile updated successfully"
+  uploading: "Uploading"
+  upload-failed: "Failed to upload"
 common/views/widgets/broadcast.vue:
   fetching: "Fetching"
   no-broadcasts: "No announcements"
@@ -459,7 +482,7 @@ common/views/widgets/tips.vue:
   tips-line10: "Using the Time Machine widget makes it easy to trace back to the past timeline."
   tips-line11: "You can pin posts to user page by clicking on \"...\""
   tips-line13: "All the files attached to the post are saved to Drive."
-  tips-line14: "While customizing the home, you can right click on the widget and change the design."
+  tips-line14: "While customizing your home layout, you can right click on a widget to change its design."
   tips-line17: "Surrounding the text with ** ** will highlight it."
   tips-line19: "Several windows can be detached outside the browser."
   tips-line20: "The percentage of the calendar widget shows the percentage of time elapsed."
@@ -511,13 +534,13 @@ desktop/views/components/charts.vue:
     notes: "The number of posts: increase/decrease (Combined)"
     local-notes: "The number of posts: increase/decrease (Local)"
     remote-notes: "The number of posts: increase/decrease (Remote)"
-    notes-total: "投稿の積算"
+    notes-total: "Total posts"
     users: "The number of users: increase/decrease"
-    users-total: "ユーザーの積算"
+    users-total: "Total users"
     drive: "Capacity used as the storage: increase/decrease"
-    drive-total: "ドライブ使用量の積算"
+    drive-total: "Total usage of Drive"
     drive-files: "The number of files on the storage: increase/decrease"
-    drive-files-total: "ドライブのファイル数の積算"
+    drive-files-total: "Total number of files on Drive"
     network-requests: "Requests"
     network-time: "Response time"
     network-usage: "Traffic"
@@ -636,14 +659,14 @@ desktop/views/components/note-detail.vue:
   location: "Location"
   renote: "Repost"
   add-reaction: "Add a reaction"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
   reposted-by: "Reposted by {}"
   reply: "Reply"
-  renote: "Repost"
+  renote: "Renote"
   add-reaction: "Add a reaction"
-  detail: "Show details"
+  detail: "Details"
-  private: "Post is private"
+  private: "This post is private"
-  deleted: "Post has been deleted"
+  deleted: "This post has been deleted"
 desktop/views/components/notes.vue:
   error: "Loading failed."
   retry: "Retry"
@@ -722,30 +745,35 @@ desktop/views/components/settings.vue:
   advanced: "Advanced settings"
   api-via-stream: "API request via stream"
   api-via-stream-desc: "API request is performed via the WebSocket connection instead of native fetch API (for better performance). This setting is stored in the browser."
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "Design and display"
   customize: "Customize home layout"
+  wallpaper: "Wallpaper"
   choose-wallpaper: "Choose a background"
   delete-wallpaper: "Remove background"
   dark-mode: "Dark Mode"
-  use-shadow: "UIに影を使用"
+  use-shadow: "Use shadows in the UI"
-  rounded-corners: "UIの角を丸める"
+  rounded-corners: "Round corners of UI"
   circle-icons: "Use circle icons"
   contrasted-acct: "Add contrast to username"
   post-form-on-timeline: "Display post form at the top of the timeline"
   suggest-recent-hashtags: "Show recent popular hashtags on the post form"
   show-clock-on-header: "Show clock on upper-right"
   show-reply-target: "Display reply target"
+  timeline: "Timeline"
   show-my-renotes: "Show my renotes in the timeline"
   show-renoted-my-notes: "Show renoted my posts in timelines"
   show-local-renotes: "Show renoted local posts in timelines"
   show-maps: "Display a map to show the location"
+  deck-column-align: "Deck column alignment"
+  deck-column-align-center: "Center"
+  deck-column-align-left: "Left"
   sound: "Sound"
   enable-sounds: "Enable sound"
   enable-sounds-desc: "Play a sound when you receive a post/message. This setting is stored in the browser."
   volume: "Volume"
   test: "Test"
-  mobile: "Mobile"
-  disable-via-mobile: "Don't mark the post as 'from mobile'"
   language: "Language"
   pick-language: "Select a language"
   recommended: "Recommended"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "Tools"
   task-manager: "Task Manager"
   third-parties: "Third-parties"
+  navbar-position: "Navigation bar position"
+  navbar-position-top: "Top"
+  navbar-position-left: "Left"
+  navbar-position-right: "Right"
 desktop/views/components/settings.2fa.vue:
   intro: "If you set up 2-step verification, you will not only need a password at sign-in, but also a pre-registered physical device (such as your smartphone), which will improve security."
   detail: "Details…"
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   enter-new-password-again: "Enter new password again"
   not-match: "The new passwords do not match"
   changed: "Password updated"
-desktop/views/components/settings.profile.vue:
-  avatar: "Avatar"
-  choice-avatar: "Select an image"
-  name: "Name"
-  location: "Location"
-  description: "Description"
-  birthday: "Birthday"
-  save: "Update profile"
-  locked-account: "Protect your account"
-  is-locked: "Follow request needs approval"
-  other: "Other"
-  is-bot: "This account is a Bot"
-  is-cat: "This account is a Cat"
-  profile-updated: "Your profile has been updated"
 desktop/views/components/sub-note-content.vue:
   private: "This post is private"
   deleted: "This post has been deleted"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "Only media posts"
   is-media-view: "Media view"
   edit: "Options"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "Reposted by {}"
+  pinned-notes: "Pinned posts"
-  private: "This post is private"
-  deleted: "This post has been deleted"
 desktop/views/pages/stats/stats.vue:
   all-users: "All Users"
   original-users: "Users on this instance"
@@ -950,7 +966,7 @@ desktop/views/pages/welcome.vue:
   signup-button: "Sign up"
   timeline: "Timeline"
   announcements: "Announcements"
-  photos: "Recent uploaded"
+  photos: "Recent Images"
   powered-by-misskey: "Powered by <b>Misskey</b>."
   info: "Information"
 desktop/views/pages/drive.vue:
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "Hash (md5)"
   exif: "EXIF"
   nsfw: "NSFW"
+  mark-as-sensitive: "Mark as 'sensitive'"
+  unmark-as-sensitive: "Unmark as 'sensitive'"
 mobile/views/components/media-image.vue:
   sensitive: "NSFW"
   click-to-show: "Click to show"
@@ -1153,7 +1171,7 @@ mobile/views/components/ui.nav.vue:
   about: "About Misskey"
 mobile/views/components/user-timeline.vue:
   no-notes: "It seems this user hasn't posted anything yet."
-  no-notes-with-media: "There are no posts attaching media"
+  no-notes-with-media: "There are no notes with media attachments"
   load-more: "More"
 mobile/views/components/users-list.vue:
   all: "All"
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "Do you wish to mark all notifications as read?"
 mobile/views/pages/games/reversi.vue:
   reversi: "Reversi"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "Profile"
-  name: "Name"
-  account: "Account"
-  location: "Location"
-  description: "Biography"
-  birthday: "Birthday"
-  avatar: "Avatar"
-  banner: "Banner"
-  is-cat: "This account is a Cat"
-  is-locked: "Follow request needs approval"
-  advanced: "Advanced"
-  privacy: "Privacy"
-  save: "Update profile"
-  saved: "Profile updated"
-  uploading: "Uploading"
-  upload-failed: "Failed to upload"
 mobile/views/pages/search.vue:
   search: "Search"
   empty: "No posts were found for '{}'"

locales/es-ES.yml

@@ -286,6 +286,9 @@ common/views/components/theme.vue:
   invalid-theme: "テーマが正しくありません。"
   already-installed: "既にそのテーマはインストールされています。"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
@@ -332,6 +335,7 @@ common/views/components/note-menu.vue:
   detail: "Detalles"
   copy-link: "Copiar enlace"
   favorite: "Me gusta esta nota"
+  unfavorite: "お気に入り解除"
   pin: "Fijar en el perfil"
   unpin: "ピン留め解除"
   delete: "Borrar"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "Recuperando"
   no-broadcasts: "Sin emisión"
@@ -636,14 +659,14 @@ desktop/views/components/note-detail.vue:
   location: "Localización"
   renote: "Republicar"
   add-reaction: "Agregar una reacción"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
-  reposted-by: "Republicado por {}"
+  reposted-by: "{}がRenote"
-  reply: "Responder"
+  reply: "返信"
-  renote: "Republicar"
+  renote: "Renote"
-  add-reaction: "Agregar una reacción"
+  add-reaction: "リアクション"
-  detail: "Mostrar detalles"
+  detail: "詳細"
-  private: "Esta publicación es privada"
+  private: "この投稿は非公開です"
-  deleted: "Esta publicación ha sido borrada"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "Error al cargar."
   retry: "Reintentar"
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "Configuración avanzada"
   api-via-stream: "Solicitar API por medio de un stream"
   api-via-stream-desc: "Las peticiones de las API se realizan por conexiones WebSocket en lugar de las tradicionales (para una mejora en el rendimiento). Esta función depende del navegador."
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "Diseño y pantalla"
   customize: "Personaliza la página principal"
+  wallpaper: "壁紙"
   choose-wallpaper: "Elije un fondo"
   delete-wallpaper: "Suprimir fondo"
   dark-mode: "Modo Nocturno"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "リプライ先を表示する"
+  timeline: "タイムライン"
   show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "マップの自動展開"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "サウンド"
   enable-sounds: "サウンドを有効にする"
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  mobile: "モバイル"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   language: "言語"
   pick-language: "言語を選択"
   recommended: "推奨"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "Herramientas"
   task-manager: "Navegador de tareas"
   third-parties: "Servicios externos"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
   detail: "Ver detalles..."
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   enter-new-password-again: "Ingresar nueva contraseña de nuevo"
   not-match: "Las nuevas contraseñas no se corresponden consigo mismas"
   changed: "Contraseña actualizada"
-desktop/views/components/settings.profile.vue:
-  avatar: "Avatar"
-  choice-avatar: "Escoger una imagen"
-  name: "Nombre"
-  location: "Localización"
-  description: "Descripción"
-  birthday: "Fecha de nacimiento"
-  save: "Perfil actualizado"
-  locked-account: "Protege tu cuenta"
-  is-locked: "フォローを承認制にする"
-  other: "その他"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
-  profile-updated: "プロフィールを更新しました"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
   is-media-view: "メディアビュー"
   edit: "オプション"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
   nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  name: "名前"
-  account: "アカウント"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  is-cat: "このアカウントはCatです"
-  is-locked: "フォローを承認制にする"
-  advanced: "その他"
-  privacy: "プライバシー"
-  save: "保存"
-  saved: "プロフィールを保存しました"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
 mobile/views/pages/search.vue:
   search: "検索"
   empty: "「{}」に関する投稿は見つかりませんでした。"

locales/fr-FR.yml

@@ -5,7 +5,7 @@ meta:
 common:
   misskey: "Une ⭐ du fédiverse"
   about-title: "Une ⭐ du fédivers."
-  about: "Merci d'avoir découvert Misskey. Misskey est une <b>plateforme de microblogage distribuée</b> née sur Terre. Parce qu'il fait partie du Fédivers (un univers composé de diverses plateformes de réseaux sociaux organisées), il est mutuellement connecté avec d'autres plateformes de réseaux sociaux. Désirez-vous prendre une pause, pendant un instant, loin de l'agitation de la ville et plonger dans un nouvel Internet ?"
+  about: "Merci d’avoir choisis Misskey. Misskey est une <b>plateforme de micro-blogging distribuée</b> née sur Terre et fait partie du Fédiverse (un univers composé de diverses plateformes de réseaux sociaux organisées), elle est connectée mutuellement avec d’autres plateformes de réseaux sociaux. Désirez-vous prendre une pause, un court instant, loin de l’agitation de la ville et plonger dans un Internet d’un nouveau genre ?"
   intro:
     title: "C’est quoi Misskey ?"
     about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。"
@@ -34,7 +34,7 @@ common:
     paragraph4: "Pour terminer la personnalisation, cliquez sur \"Terminer\" dans le coin supérieur droit."
     gotit: "Compris !"
   notification:
-    file-uploaded: "Le fichier a été téléversé !"
+    file-uploaded: "Le fichier a été transféré !"
     message-from: "Message de {} :"
     reversi-invited: "Invité à jouer"
     reversi-invited-by: "Invité par {} :"
@@ -43,7 +43,7 @@ common:
     quoted-by: "Cité·e par {} :"
   time:
     unknown: "inconnu"
-    future: "à l'instant"
+    future: "à l’instant"
     just_now: "à l'instant"
     seconds_ago: "Il y a {} seconde·s"
     minutes_ago: "Il y a {} minute·s"
@@ -83,17 +83,17 @@ common:
     pudding: "Pudding"
   note-visibility:
     public: "Public"
-    home: "Accueil"
+    home: "Principal"
-    home-desc: "Publier sur le fil local uniquement"
+    home-desc: "Publier sur le fil principal uniquement"
     followers: "Abonnés·es"
     followers-desc: "Publier à vos abonnés·es uniquement"
     specified: "Direct"
-    specified-desc: "Publier aux utilisateurs·trices mentionnés·es"
+    specified-desc: "Publier uniquement aux utilisateurs·rices mentionnés·es"
     private: "Privé"
   note-placeholders:
     a: "Que faites-vous maintenant ?"
     b: "Quoi de neuf ?"
-    c: "Qu'avez-vous en tête ?"
+    c: "Qu’avez-vous en tête ?"
     d: "Désirez-vous publier quelques mots ?"
     e: "Écrivez ici"
     f: "En attente de vos écrits"
@@ -103,7 +103,7 @@ common:
   ok: "OK"
   update-available-title: "Mise à jour disponible"
   update-available: "Une nouvelle version de Misskey est disponible ({newer}, version actuelle: {current}). Veuillez recharger la page pour appliquer la mise à jour."
-  my-token-regenerated: "Votre token vient d'être généré, vous allez maintenant être déconnecté."
+  my-token-regenerated: "Votre jeton vient d’être généré, vous allez maintenant être déconnecté."
   i-like-sushi: "Je préfère les sushis plutôt que le pudding"
   show-reversi-board-labels: "Afficher les étiquettes des lignes et colonnes dans Reversi"
   use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
@@ -120,7 +120,7 @@ common:
     my-turn: "C’est votre tour"
     opponent-turn: "Tour de l’adversaire"
     turn-of: "C’est le tour de {}"
-    past-turn-of: "C'est au tour de {}"
+    past-turn-of: "C’est au tour de {}"
     won: "{} a gagné"
     black: "Noirs"
     white: "Blancs"
@@ -136,7 +136,7 @@ common:
     memo: "Pense-bête"
     trends: "Tendances"
     photo-stream: "Flux de photos"
-    posts-monitor: "Graphe des publications"
+    posts-monitor: "Graph des publications"
     slideshow: "Diaporama"
     version: "Version"
     broadcast: "Diffusion"
@@ -254,7 +254,7 @@ common/views/components/connect-failed.troubleshooter.vue:
   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-internet-desc: "Assurez-vous que vous êtes bien connectés à internet."
   no-server: "Impossible de se connecter au serveur"
   no-server-desc: "Votre connexion semble correcte, mais il a été impossible de vous connecter au serveur de Misskey. Il se peut que le serveur soit hors-ligne ou en maintenance, veuillez ressayer plus tard."
   success: "Connexion au serveur de Misskey réussie !"
@@ -265,10 +265,10 @@ common/views/components/media-banner.vue:
   sensitive: "Contenu sensible"
   click-to-show: "Cliquer pour afficher"
 common/views/components/theme.vue:
-  light-theme: "非ダークモード時に使用するテーマ"
+  light-theme: "Thème durant le mode clair"
-  dark-theme: "ダークモード時に使用するテーマ"
+  dark-theme: "Thème durant le mode sombre"
-  light-themes: "明るいテーマ"
+  light-themes: "Thème clair"
-  dark-themes: "暗いテーマ"
+  dark-themes: "Thème sombre"
   install-a-theme: "Installer un thème"
   theme-code: "Code du thème"
   install: "Installation"
@@ -286,13 +286,16 @@ common/views/components/theme.vue:
   invalid-theme: "Thème n’est pas valide."
   already-installed: "Le thème est déjà installé."
   saved: "enregistré"
+  manage-themes: "Gestion des thèmes"
+  builtin-themes: "Thèmes standards"
+  my-themes: "Mes thèmes"
   installed-themes: "Thèmes installés"
   select-theme: "Veuillez sélectionner un thème"
   uninstall: "Désinstaller"
   uninstalled: "« {} » a été désinstallé"
   author: "Auteur"
   desc: "Description"
-  export: "エクスポート"
+  export: "Exporter"
   import: "Importer"
   import-by-code: "Ou coller du code"
   theme-name-required: "Nom du thème est obligatoire."
@@ -326,12 +329,13 @@ common/views/components/nav.vue:
   wiki: "Wiki"
   donors: "Donateur·rice·s"
   repository: "Dépôt"
-  develop: "Développeur·se·s"
+  develop: "Développeurs"
-  feedback: "Remarques"
+  feedback: "Suggestions"
 common/views/components/note-menu.vue:
   detail: "Détails"
   copy-link: "Copier le lien"
   favorite: "Mettre cette note en favoris"
+  unfavorite: "Retirer des favoris"
   pin: "Épingler sur votre profil"
   unpin: "Désépingler"
   delete: "Supprimer"
@@ -407,11 +411,30 @@ common/views/components/visibility-chooser.vue:
   followers: "Abonné·e·s"
   followers-desc: "Publier à vos abonné·e·s uniquement"
   specified: "Direct"
-  specified-desc: "Publier aux utilisateur·rice·s mentionné·e·s"
+  specified-desc: "Publier uniquement aux utilisateurs·rices mentionné·e·s"
   private: "Privé"
 common/views/components/trends.vue:
-  count: "{} utilisateurs·trices mentionnés·es"
+  count: "{} utilisateurs·rices mentionnés·es"
   empty: "Aucune tendance"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "Récupération"
   no-broadcasts: "Aucune annonce"
@@ -431,7 +454,7 @@ common/views/widgets/photo-stream.vue:
   title: "Flux de photos"
   no-photos: "Pas de photo"
 common/views/widgets/posts-monitor.vue:
-  title: "Graphe des publications"
+  title: "Graph des publications"
   toggle: "Basculer entre les vues"
 common/views/widgets/hashtags.vue:
   title: "Hashtags"
@@ -511,7 +534,7 @@ desktop/views/components/charts.vue:
     notes: "投稿の増減 (統合)"
     local-notes: "投稿の増減 (ローカル)"
     remote-notes: "投稿の増減 (リモート)"
-    notes-total: "投稿の積算"
+    notes-total: "Total des notes"
     users: "Nombre d’utilisateurs·trices : augmentation/diminution"
     users-total: "ユーザーの積算"
     drive: "ドライブ使用量の増減"
@@ -579,7 +602,7 @@ desktop/views/components/drive.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"
-  url-upload: "Uploader d'un URL"
+  url-upload: "Téléverser via une 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."
@@ -587,8 +610,8 @@ desktop/views/components/drive.vue:
   folder-name: "Nom du dossier"
   contextmenu:
     create-folder: "Créer un dossier"
-    upload: "Uploader un fichier"
+    upload: "Transférer un fichier"
-    url-upload: "Uploader d'un URL"
+    url-upload: "Transférer à partir d’une URL"
 desktop/views/components/media-image.vue:
   sensitive: "Le contenu est NSFW"
   click-to-show: "Cliquer pour afficher"
@@ -636,14 +659,14 @@ desktop/views/components/note-detail.vue:
   location: "Géolocalisation"
   renote: "Republier"
   add-reaction: "Ajouter votre reaction"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
-  reposted-by: "Reposté par {}"
+  reposted-by: "{}がRenote"
-  reply: "Répondre"
+  reply: "返信"
-  renote: "Republier"
+  renote: "Renote"
-  add-reaction: "Ajouter votre reaction"
+  add-reaction: "リアクション"
-  detail: "Afficher les détails"
+  detail: "詳細"
-  private: "cette publication est privée"
+  private: "この投稿は非公開です"
-  deleted: "cette publication a été supprimée"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "Échec du chargement."
   retry: "Réessayer"
@@ -655,21 +678,21 @@ desktop/views/components/post-form.vue:
   add-visible-user: "+Ajouter un utilisateur"
   attach-location-information: "Attacher des informations de localisation"
   hide-contents: "Masquer les contenus"
-  reply-placeholder: "Répondre à cette note"
+  reply-placeholder: "Répondre à cette note …"
-  quote-placeholder: "Citer cette note"
+  quote-placeholder: "Citer cette note …"
-  submit: "Poster"
+  submit: "Publier"
   reply: "Répondre"
   renote: "Republier"
-  posted: "Posté!"
+  posted: "Publié !"
   replied: "Répondu !"
   reposted: "Reposté !"
   note-failed: "La note à échoué"
   reply-failed: "La réponse à échoué"
-  renote-failed: "La renote à échoué"
+  renote-failed: "Échec lors de la republication"
-  posting: "Publication..."
+  posting: "Publication …"
-  attach-media-from-local: "Joindre un media depuis votre PC"
+  attach-media-from-local: "Joindre un média depuis votre appareil"
-  attach-media-from-drive: "Joindre un media depuis votre Drive"
+  attach-media-from-drive: "Joindre un média depuis votre Drive"
-  attach-cancel: "Annuler la jointure de fichier"
+  attach-cancel: "Annuler le fichier attaché"
   insert-a-kao: "v('ω')v"
   create-poll: "Créer un sondage"
   text-remain: "{} charactères restants"
@@ -684,15 +707,15 @@ desktop/views/components/post-form-window.vue:
   note: "Nouvelle note"
   reply: "Répondre"
   attaches: "{} media joint(s)"
-  uploading-media: "Upload du media {}"
+  uploading-media: "Transfert du média {}"
 desktop/views/components/progress-dialog.vue:
   waiting: "En attente"
 desktop/views/components/renote-form.vue:
   quote: "Citer..."
   cancel: "Annuler"
   renote: "Republier"
-  reposting: "Repost en cours..."
+  reposting: "Republication en cours …"
-  success: "Reposté!"
+  success: "Republié !"
   failure: "La renote a échoué"
 desktop/views/components/renote-form-window.vue:
   title: "Êtes vous sûr de vouloir renote cette note?"
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "Paramètres avancés"
   api-via-stream: "Requête API via le flux"
   api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "Affichage et design"
   customize: "Personnaliser l'Accueil"
+  wallpaper: "壁紙"
   choose-wallpaper: "Sélectionner un fond d'écran"
   delete-wallpaper: "Supprimer le fond d'écran"
   dark-mode: "Mode nuit"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "Afficher les hashtags populaires dans le champs de saisie"
   show-clock-on-header: "Afficher l'horloge à droite sur le coté supérieur"
   show-reply-target: "Afficher les réponses"
+  timeline: "タイムライン"
   show-my-renotes: "Afficher mes republications dans le fil"
   show-renoted-my-notes: "Afficher mes republications dans les fils"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "Afficher la carte"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "Son"
   enable-sounds: "Activer le son"
   enable-sounds-desc: "Jouer un son lorsque vous recevez un message. Ce paramètre est sauvegardé dans le navigateur."
   volume: "Volume"
   test: "Test"
-  mobile: "Mobile"
-  disable-via-mobile: "Enlever la mention publié via 'un périphérique mobile'"
   language: "Langue"
   pick-language: "Sélectionner une langue"
   recommended: "Recommandé"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "Outils"
   task-manager: "Gestionnaire de tâches"
   third-parties: "Services tiers"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "En haut"
+  navbar-position-left: "à gauche"
+  navbar-position-right: "à droite"
 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..."
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   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"
-  locked-account: "Protéger votre compte"
-  is-locked: "Demande d’abonnement en attente d’approbation"
-  other: "Autre"
-  is-bot: "Ce compte est un Bot"
-  is-cat: "Ce compte est un Chat"
-  profile-updated: "Profil mis à jour"
 desktop/views/components/sub-note-content.vue:
   private: "cette publication est privée"
   deleted: "cette publication a été supprimée"
@@ -855,7 +873,7 @@ desktop/views/components/timeline.vue:
   list-name: "Nom de la liste"
 desktop/views/components/ui.header.vue:
   welcome-back: "Content de vous revoir !"
-  adjective: "さん"
+  adjective: "M."
 desktop/views/components/ui.header.account.vue:
   profile: "Votre profil"
   drive: "Drive"
@@ -875,7 +893,7 @@ desktop/views/components/ui.header.nav.vue:
 desktop/views/components/ui.header.notifications.vue:
   title: "Notifications"
 desktop/views/components/ui.header.post.vue:
-  post: "Composer un nouveau post"
+  post: "Rédiger une nouvelle publication"
 desktop/views/components/ui.header.search.vue:
   placeholder: "Chercher"
 desktop/views/components/received-follow-requests-window.vue:
@@ -908,9 +926,9 @@ desktop/views/pages/admin/admin.vue:
 desktop/views/pages/admin/admin.dashboard.vue:
   dashboard: "Tableau de bord"
   all-users: "Toutes les utilisateurrices"
-  original-users: "Utilisateurrices sur cette instance"
+  original-users: "Utilisateur·rice·s sur cette instance"
   all-notes: "Toutes les publications"
-  original-notes: "Publication sur cette instance"
+  original-notes: "Publications sur cette instance"
   invite: "Invitation"
 desktop/views/pages/admin/admin.suspend-user.vue:
   suspend-user: "Suspendre un·e utilisateur·rice"
@@ -932,15 +950,13 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "Les publications médias uniquement"
   is-media-view: "Vue média"
   edit: "Options"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "Reposté par {}"
+  pinned-notes: "ピン留めされた投稿"
-  private: "cette publication est privée"
-  deleted: "cette publication a été supprimée"
 desktop/views/pages/stats/stats.vue:
   all-users: "Toutes les utilisateurrices"
-  original-users: "Utilisateurrices sur cette instance"
+  original-users: "Utilisateur·rice·s sur cette instance"
   all-notes: "Toutes les publications"
-  original-notes: "Publication sur cette instance"
+  original-notes: "Publications sur cette instance"
 desktop/views/pages/welcome.vue:
   about: "à propos"
   gotit: "J'ai compris !"
@@ -966,7 +982,7 @@ desktop/views/pages/selectdrive.vue:
   title: "Choisir fichier(s)"
   ok: "OK"
   cancel: "Annuler"
-  upload: "Uploader un ou plusieurs fichier(s) depuis votre PC"
+  upload: "Téléverser des fichiers à partir de votre ordinateur"
 desktop/views/pages/search.vue:
   not-available: "La fonction de recherche est désactivée dans les paramètres de l’instance."
   not-found: "Aucun message trouvé pour '{}'"
@@ -983,13 +999,13 @@ desktop/views/pages/user/user.followers-you-know.vue:
   loading: "Chargement en cours"
   no-users: "Pas d'utilisateurs"
 desktop/views/pages/user/user.friends.vue:
-  title: "Personnes qui répondent le plus"
+  title: "Mentions fréquentes"
   loading: "Chargement en cours"
   no-users: "Pas d'utilisateurs"
 desktop/views/pages/user/user.vue:
   is-suspended: "Ce compte a été suspendu."
-  is-remote: "Cet utilisateur n'est pas un utilisateur de Misskey. Certaines informations peuvent être erronées"
+  is-remote: "Cet utilisateur n'est pas un utilisateur Misskey. Certaines informations peuvent ne pas refléter ce profil dans sa totalité."
-  view-remote: "Voir les informations détaillées"
+  view-remote: "Consulter le profil complet"
 desktop/views/pages/user/user.home.vue:
   last-used-at: "Last used at"
 desktop/views/pages/user/user.photos.vue:
@@ -997,7 +1013,7 @@ desktop/views/pages/user/user.photos.vue:
   loading: "Chargement en cours"
   no-photos: "Pas de photos"
 desktop/views/pages/user/user.profile.vue:
-  follows-you: "Vous suis"
+  follows-you: "Vous suit"
   stalk: "Traquer"
   stalking: "ストーキングしています"
   unstalk: "ストーク解除"
@@ -1026,8 +1042,8 @@ desktop/views/widgets/polls.vue:
   refresh: "Afficher d'autres"
   nothing: "Rien"
 desktop/views/widgets/post-form.vue:
-  title: "Post"
+  title: "Publication"
-  note: "Post"
+  note: "Publication"
 desktop/views/widgets/profile.vue:
   update-banner: "Cliquer pour éditer votre bannière"
   update-avatar: "Cliquer pour éditer votre avatar"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "Hash (md5)"
   exif: "EXIF"
   nsfw: "CW"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "Le contenu est NSFW"
   click-to-show: "Cliquer pour afficher"
@@ -1089,7 +1107,7 @@ mobile/views/components/friends-maker.vue:
   refresh: "Voir plus"
   close: "Fermer"
 mobile/views/components/note.vue:
-  reposted-by: "Renoté par {}"
+  reposted-by: "Republié par {}"
   private: "cette publication est privée"
   deleted: "cette publication a été supprimée"
   location: "Géolocalisation"
@@ -1116,7 +1134,7 @@ mobile/views/components/notifications.vue:
   empty: "Pas de notifications"
 mobile/views/components/post-form.vue:
   add-visible-user: "Ajouter un utilisateur"
-  submit: "Poster"
+  submit: "Publier"
   reply: "Répondre"
   renote: "Republier"
   quote-placeholder: "Citer ce billet ... (Facultatif)"
@@ -1168,7 +1186,7 @@ mobile/views/pages/drive.vue:
   drive: "Drive"
   more: "Afficher plus ..."
 mobile/views/pages/signup.vue:
-  lets-start: "Commençons ! 📦"
+  lets-start: "Votre compte est prêt ! 📦"
 mobile/views/pages/followers.vue:
   followers-of: "Abonné·e·s de {}"
 mobile/views/pages/following.vue:
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "Êtes vous sûr de vouloir marqués toutes les notifications non-lus en tant que lus?"
 mobile/views/pages/games/reversi.vue:
   reversi: "Reversi"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "Profil"
-  name: "Nom"
-  account: "Compte"
-  location: "Lieu"
-  description: "Description"
-  birthday: "Date de naissance"
-  avatar: "Avatar"
-  banner: "Bannière"
-  is-cat: "Ce compte est un Bot"
-  is-locked: "Demande d’abonnement en attente d’approbation"
-  advanced: "Avancé"
-  privacy: "Vie privée"
-  save: "Mettre à jour le profil"
-  saved: "Profil mis à jour avec succès"
-  uploading: "En cours d'envoi"
-  upload-failed: "Échec de l'envoi"
 mobile/views/pages/search.vue:
   search: "Chercher"
   empty: "Aucun message trouvé pour '{}' "
@@ -1283,7 +1284,7 @@ mobile/views/pages/settings.vue:
   sound: "Sons"
   enable-sounds: "Activer les sons"
 mobile/views/pages/user.vue:
-  follows-you: "vous suit"
+  follows-you: "Vous suit"
   following: "Abonnements"
   followers: "Abonné·e·s"
   notes: "Notes"
@@ -1291,8 +1292,8 @@ mobile/views/pages/user.vue:
   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 "
+  is-remote: "Ceci est le profil d’un utilisateur·rice distant·e. Certaines informations peuvent ne pas refléter ce profil dans sa totalité."
-  view-remote: "Voir les informations détaillées"
+  view-remote: "Consulter son profil complet"
 mobile/views/pages/user/home.vue:
   recent-notes: "Notes récentes"
   images: "Images"
@@ -1316,7 +1317,7 @@ mobile/views/pages/user/home.photos.vue:
   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!"
+  edit-this-page-on-github-link: "Éditez cette page sur Github !"
   api:
     entities:
       properties: "Propriétés"

locales/it-IT.yml

@@ -286,6 +286,9 @@ common/views/components/theme.vue:
   invalid-theme: "テーマが正しくありません。"
   already-installed: "既にそのテーマはインストールされています。"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
@@ -332,6 +335,7 @@ common/views/components/note-menu.vue:
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
+  unfavorite: "お気に入り解除"
   pin: "ピン留め"
   unpin: "ピン留め解除"
   delete: "削除"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -636,7 +659,7 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "詳細設定"
   api-via-stream: "ストリームを経由したAPIリクエスト"
   api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "デザインと表示"
   customize: "ホームをカスタマイズ"
+  wallpaper: "壁紙"
   choose-wallpaper: "壁紙を選択"
   delete-wallpaper: "壁紙を削除"
   dark-mode: "ダークモード"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "リプライ先を表示する"
+  timeline: "タイムライン"
   show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "マップの自動展開"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "サウンド"
   enable-sounds: "サウンドを有効にする"
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  mobile: "モバイル"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   language: "言語"
   pick-language: "言語を選択"
   recommended: "推奨"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "ツール"
   task-manager: "タスクマネージャ"
   third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
   detail: "詳細..."
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   enter-new-password-again: "もう一度新しいパスワードを入力してください"
   not-match: "新しいパスワードが一致しません"
   changed: "パスワードを変更しました"
-desktop/views/components/settings.profile.vue:
-  avatar: "アイコン"
-  choice-avatar: "画像を選択"
-  name: "名前"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  save: "保存"
-  locked-account: "アカウントの保護"
-  is-locked: "フォローを承認制にする"
-  other: "その他"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
-  profile-updated: "プロフィールを更新しました"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
   is-media-view: "メディアビュー"
   edit: "オプション"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
   nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  name: "名前"
-  account: "アカウント"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  is-cat: "このアカウントはCatです"
-  is-locked: "フォローを承認制にする"
-  advanced: "その他"
-  privacy: "プライバシー"
-  save: "保存"
-  saved: "プロフィールを保存しました"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
 mobile/views/pages/search.vue:
   search: "検索"
   empty: "「{}」に関する投稿は見つかりませんでした。"

locales/ja-JP.yml

@@ -307,6 +307,9 @@ common/views/components/theme.vue:
   invalid-theme: "テーマが正しくありません。"
   already-installed: "既にそのテーマはインストールされています。"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
@@ -360,6 +363,7 @@ common/views/components/note-menu.vue:
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
+  unfavorite: "お気に入り解除"
   pin: "ピン留め"
   unpin: "ピン留め解除"
   delete: "削除"
@@ -452,6 +456,26 @@ common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
 
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
+
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -714,7 +738,7 @@ desktop/views/components/note-detail.vue:
   renote: "Renote"
   add-reaction: "リアクション"
 
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
@@ -810,9 +834,12 @@ desktop/views/components/settings.vue:
   advanced: "詳細設定"
   api-via-stream: "ストリームを経由したAPIリクエスト"
   api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
 
   display: "デザインと表示"
   customize: "ホームをカスタマイズ"
+  wallpaper: "壁紙"
   choose-wallpaper: "壁紙を選択"
   delete-wallpaper: "壁紙を削除"
   dark-mode: "ダークモード"
@@ -824,10 +851,14 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "リプライ先を表示する"
+  timeline: "タイムライン"
   show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "マップの自動展開"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
 
   sound: "サウンド"
   enable-sounds: "サウンドを有効にする"
@@ -835,9 +866,6 @@ desktop/views/components/settings.vue:
   volume: "ボリューム"
   test: "テスト"
 
-  mobile: "モバイル"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
-
   language: "言語"
   pick-language: "言語を選択"
   recommended: "推奨"
@@ -879,6 +907,11 @@ desktop/views/components/settings.vue:
   task-manager: "タスクマネージャ"
   third-parties: "サードパーティ"
 
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
+
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
   detail: "詳細..."
@@ -924,21 +957,6 @@ desktop/views/components/settings.password.vue:
   not-match: "新しいパスワードが一致しません"
   changed: "パスワードを変更しました"
 
-desktop/views/components/settings.profile.vue:
-  avatar: "アイコン"
-  choice-avatar: "画像を選択"
-  name: "名前"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  save: "保存"
-  locked-account: "アカウントの保護"
-  is-locked: "フォローを承認制にする"
-  other: "その他"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
-  profile-updated: "プロフィールを更新しました"
-
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -1059,10 +1077,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-view: "メディアビュー"
   edit: "オプション"
 
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
@@ -1229,6 +1245,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
   nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 
 mobile/views/components/media-image.vue:
   sensitive: "閲覧注意"
@@ -1405,24 +1423,6 @@ mobile/views/pages/notifications.vue:
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
 
-mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  name: "名前"
-  account: "アカウント"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  is-cat: "このアカウントはCatです"
-  is-locked: "フォローを承認制にする"
-  advanced: "その他"
-  privacy: "プライバシー"
-  save: "保存"
-  saved: "プロフィールを保存しました"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
-
 mobile/views/pages/search.vue:
   search: "検索"
   empty: "「{}」に関する投稿は見つかりませんでした。"

locales/ja-KS.yml

@@ -17,7 +17,7 @@ common:
     ui: "インターフェイス"
     ui-desc: "このUIええ言うてたで、知らんけど。あんたの好みのUIなんて知ったこっちゃない。Misskeyは好きにいじれるからな、レイアウトやデザイン変えたり、色んなウィジェットひっつけたりして、あんただけのMisskey作って楽しんでな！"
     drive: "ドライブ"
-    drive-desc: "「こないだの画像、どこやったかな…また投稿したいんやけど…」「さっきのファイルあのフォルダに直しといて」そんなこと言わんとって。Misskeyはもとからドライブ機能持っとるさかい、心配あらへん。ファイルの「わけわけ」したってな。"
+    drive-desc: "「こないだの画像、どこやったかな……また投稿したいんやけど……」「さっきのファイルあのフォルダに直しといて」そんなこと言わんとって。Misskeyはもとからドライブ機能持っとるさかい、心配あらへん。ファイルの「わけわけ」したってな。"
     outro: "Misskeyの機能は無限大や！知らんけど。知らん言うとるやんけ、あんたが見に行けや！Misskeyは分散型SNSやから、ここがあかんくても他がある。阪神でもオリックスでもワイは応援するで！"
   adblock:
     detected: "広告ブロッカーを無効にしてや"
@@ -265,37 +265,40 @@ common/views/components/media-banner.vue:
   sensitive: "見せたらあかん"
   click-to-show: "押してみ、見せたるわ"
 common/views/components/theme.vue:
-  light-theme: "非ダークモード時に使用するテーマ"
+  light-theme: "ナイトゲームちゃう時のテーマどないする？"
-  dark-theme: "ダークモード時に使用するテーマ"
+  dark-theme: "ナイトゲームの時のテーマどないする？"
-  light-themes: "明るいテーマ"
+  light-themes: "デイゲーム"
-  dark-themes: "暗いテーマ"
+  dark-themes: "ナイトゲーム"
-  install-a-theme: "テーマのインストール"
+  install-a-theme: "テーマ入れるで"
   theme-code: "テーマコード"
   install: "インストール"
-  installed: "「{}」をインストールしました"
+  installed: "「{}」を入れたで！"
-  create-a-theme: "テーマの作成"
+  create-a-theme: "テーマ作る"
-  save-created-theme: "テーマを保存"
+  save-created-theme: "テーマ保存"
-  primary-color: "プライマリ カラー"
+  primary-color: "この色一番重要や"
-  secondary-color: "セカンダリ カラー"
+  secondary-color: "次はこの色出したって"
-  text-color: "文字色"
+  text-color: "文字はこの色や！"
-  base-theme: "ベーステーマ"
+  base-theme: "この色が背景や！"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
   theme-name: "テーマ名"
-  preview-created-theme: "プレビュー"
+  preview-created-theme: "試してみる"
-  invalid-theme: "テーマが正しくありません。"
+  invalid-theme: "このテーマあかんわ、なんか間違うとる"
-  already-installed: "既にそのテーマはインストールされています。"
+  already-installed: "このテーマもうあるで"
-  saved: "保存しました"
+  saved: "保存したで！"
-  installed-themes: "インストールされたテーマ"
+  manage-themes: "テーマの管理"
-  select-theme: "テーマを選択してください"
+  builtin-themes: "いつものテーマ"
-  uninstall: "アンインストール"
+  my-themes: "ワイのテーマ"
-  uninstalled: "「{}」をアンインストールしました"
+  installed-themes: "入れたテーマ"
-  author: "作者"
+  select-theme: "テーマ選んでや！"
+  uninstall: "ほかす"
+  uninstalled: "「{}」をほかしてもうたわ"
+  author: "作った人"
   desc: "説明"
   export: "エクスポート"
   import: "インポート"
-  import-by-code: "またはコードをペースト"
+  import-by-code: "それかコードを貼っつける"
-  theme-name-required: "テーマ名は必須です。"
+  theme-name-required: "テーマ名は絶対要るで"
 common/views/components/cw-button.vue:
   hide: "もうええわ"
   show: "見たいやろ？"
@@ -332,6 +335,7 @@ common/views/components/note-menu.vue:
   detail: "もっと"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
+  unfavorite: "お気に入りやめる"
   pin: "ピン留め"
   unpin: "ピン留めやめる"
   delete: "ほかす"
@@ -365,7 +369,7 @@ common/views/components/signup.vue:
   invitation-code: "招待コード"
   invitation-info: "招待コードをもっとらんのやったら、<a href=\"{}\">管理者</a>まで連絡してや。"
   username: "ユーザー名"
-  checking: "確認中や…"
+  checking: "確認中や……"
   available: "使えるで"
   unavailable: "もう使われとるで"
   error: "通信あかんわ"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "流行は自分で作るんや"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "見てみるわ…"
   no-broadcasts: "お知らせはあらへんで"
@@ -472,7 +495,7 @@ common/views/pages/follow.vue:
   following: "フォローしとる"
   follow: "フォロー"
   request-pending: "フォローの許し待っとる"
-  follow-processing: "フォロー処理中"
+  follow-processing: "今フォロー処理やっとる‥"
   follow-request: "フォロー許してくれや！言うてみる"
 desktop:
   banner-crop-title: "どこバナーとして出す？"
@@ -487,10 +510,10 @@ desktop:
   choose-avatar: "アバターにする画像選んでや"
   invalid-filetype: "この形式のファイル無理やねん"
 desktop/views/components/activity.chart.vue:
-  total: "黒いの… 全部"
+  total: "黒いの ... 全部"
-  notes: "青いの… 投稿"
+  notes: "青いの ... 投稿"
-  replies: "赤いの… 返信"
+  replies: "赤いの ... 返信"
-  renotes: "みどり… Renotes"
+  renotes: "碧いの ... Renotes"
 desktop/views/components/activity.vue:
   title: "アクティビティ"
   toggle: "表示変える"
@@ -548,7 +571,7 @@ desktop/views/components/drive.file.vue:
     unmark-as-sensitive: "やっぱ見せたるわ"
     copy-url: "URLをコピー"
     download: "ダウンロード"
-    else-files: "もっとあるで…"
+    else-files: "まだあんで..."
     set-as-avatar: "アイコンにする"
     set-as-banner: "バナーにする"
     open-in-app: "アプリで開く"
@@ -582,7 +605,7 @@ desktop/views/components/drive.vue:
   url-upload: "URLアップロード"
   url-of-file: "このURLのファイルをアップロードしたいねん"
   url-upload-requested: "アップロードしたい言うといたで"
-  may-take-time: "アップロード終わるまで時間かかるわ、知らんけど。たこ焼き何個食べれるやろか…"
+  may-take-time: "アップロード終わるんにちょい時間かかるかもしれへんわ。"
   create-folder: "フォルダー作成"
   folder-name: "フォルダー名"
   contextmenu:
@@ -599,7 +622,7 @@ desktop/views/components/follow-button.vue:
   following: "フォローしとる"
   follow: "フォロー"
   request-pending: "フォローの許し待っとる"
-  follow-processing: "フォロー処理中"
+  follow-processing: "今フォロー処理やっとる‥"
   follow-request: "フォロー許してくれや！言うてみる"
 desktop/views/components/followers-window.vue:
   followers: "{} のフォロワー"
@@ -612,7 +635,7 @@ desktop/views/components/following.vue:
 desktop/views/components/friends-maker.vue:
   title: "おもろそうやな:"
   empty: "おもろいユーザー居らんかったわ"
-  fetching: "読みこんどるで…"
+  fetching: "読み込んどります"
   refresh: "もっとあるやろ！"
   close: "さいなら"
 desktop/views/components/game-window.vue:
@@ -636,14 +659,14 @@ desktop/views/components/note-detail.vue:
   location: "ここおるで:"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
   reposted-by: "{}がRenote"
-  reply: "返す"
+  reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
-  detail: "もっと"
+  detail: "詳細"
-  private: "この投稿は見せられへんわ"
+  private: "この投稿は非公開です"
-  deleted: "この投稿なんか無くなってもうたわ"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "あかん、読み込めへんわ"
   retry: "もっぺん"
@@ -684,11 +707,11 @@ desktop/views/components/post-form-window.vue:
   note: "新規投稿"
   reply: "返す"
   attaches: "添付: {}メディア"
-  uploading-media: "{}個のメディアを上げてるで…"
+  uploading-media: "{}個のメディアを上げとんねん……"
 desktop/views/components/progress-dialog.vue:
   waiting: "待っとる"
 desktop/views/components/renote-form.vue:
-  quote: "持ってくる…"
+  quote: "取ってくる……"
   cancel: "やめとくわ"
   renote: "Renote"
   reposting: "やっとります..."
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "もっと設定"
   api-via-stream: "ストリームを経由したAPIリクエスト"
   api-via-stream-desc: "この設定をオンにすると、WebSocket接続を経由してAPIリクエストが行われんで(パフォーマンス向上するかも、知らんけど)。オフにすると、ネイティブの fetch API が利用されるで。この設定はこのデバイスのみ有効やで。"
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "見た感じ"
   customize: "ホームをカスタマイズ"
+  wallpaper: "壁紙"
   choose-wallpaper: "壁紙選ぶ"
   delete-wallpaper: "壁紙ほかす"
   dark-mode: "夜にすんで"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示すんで"
   show-clock-on-header: "右上をカリヨン広場にする(時計表示)"
   show-reply-target: "どこにリプライするんや見せて"
+  timeline: "タイムライン"
   show-my-renotes: "わしのRenoteもタイムライン載せてくれや"
   show-renoted-my-notes: "わしのRenoteもタイムライン載せてくれや"
   show-local-renotes: "ローカル投稿のRenoteも見たいんや"
   show-maps: "地図勝手にバァーって開いてくれ"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "サウンド"
   enable-sounds: "サウンド鳴らす"
   enable-sounds-desc: "投稿やメッセージもろたとき、音鳴らしたるわ。大丈夫や、この設定はブラウザが覚えてくれとる。"
   volume: "ボリューム"
   test: "テスト"
-  mobile: "モバイル"
-  disable-via-mobile: "「モバイルからの投稿」フラグなんて要らんわ"
   language: "言語"
   pick-language: "言語選んでや"
   recommended: "おすすめ"
@@ -764,7 +792,7 @@ desktop/views/components/settings.vue:
   update: "Misskey Update"
   version: "バージョン:"
   latest-version: "最新のバージョン:"
-  update-checking: "アップデートはあらへんか…"
+  update-checking: "アップデートはあらへんか……"
   do-update: "アップデートあるか見てみる"
   update-settings: "もっと設定"
   prevent-update: "アップデートしたないわ、また今度や(やめときや)"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "ツール"
   task-manager: "タスクマネージャ"
   third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけとちゃうくて、予め登録しておいた物理的なデバイス(例えばあんさんのスマートフォンなど)も必要になり、よりセキュリティが向上すんで。"
   detail: "詳細..."
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   enter-new-password-again: "もういっぺんさらのパスワードを入れてや"
   not-match: "パスワードがおうとらん"
   changed: "パスワード変えたわ"
-desktop/views/components/settings.profile.vue:
-  avatar: "アイコン"
-  choice-avatar: "画像選んでや"
-  name: "名前"
-  location: "場所"
-  description: "ワイのこと"
-  birthday: "誕生日"
-  save: "保存"
-  locked-account: "アカウント守る"
-  is-locked: "他人のフォローは許可してからや！"
-  other: "その他"
-  is-bot: "このアカウントはBotやで"
-  is-cat: "このアカウントはCatやで"
-  profile-updated: "プロフィールを更新したで"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
@@ -894,7 +912,7 @@ desktop/views/components/users-list.vue:
   all: "すべて"
   iknow: "知っとる"
   load-more: "もっと"
-  fetching: "読みこんどるで…"
+  fetching: "読み込んどります"
 desktop/views/components/users-list-item.vue:
   followed: "フォローされとるで"
 desktop/views/components/window.vue:
@@ -932,21 +950,19 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿だけや"
   is-media-view: "メディアビュー"
   edit: "オプション"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は見せられへんわ"
-  deleted: "この投稿なんか無くなってもうたわ"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "ここの人らだけ"
   all-notes: "全ての投稿"
   original-notes: "このインスタンスの投稿"
 desktop/views/pages/welcome.vue:
-  about: "もっと…"
+  about: "もうちょい……"
   gotit: "ほい"
   signin: "サインイン"
   signup: "サインアップ"
-  signin-button: "サインイン中…"
+  signin-button: "やっとる"
   signup-button: "サインアップ"
   timeline: "タイムライン"
   announcements: "知っときや"
@@ -980,11 +996,11 @@ desktop/views/pages/user-list.users.vue:
   username: "ユーザー名"
 desktop/views/pages/user/user.followers-you-know.vue:
   title: "知っとるフォロワー"
-  loading: "読み込んどる…"
+  loading: "読み込んどります"
   no-users: "フォロワー全員知らんわ"
 desktop/views/pages/user/user.friends.vue:
   title: "よう話すツレ"
-  loading: "読み込んどる…"
+  loading: "読み込んどります"
   no-users: "よう話すツレは居らん"
 desktop/views/pages/user/user.vue:
   is-suspended: "このユーザーはあかんわ。凍結されとる。"
@@ -994,7 +1010,7 @@ desktop/views/pages/user/user.home.vue:
   last-used-at: "最後いつ来た？"
 desktop/views/pages/user/user.photos.vue:
   title: "写真"
-  loading: "読み込んどる…"
+  loading: "読み込んどります"
   no-photos: "写真はあらへんで"
 desktop/views/pages/user/user.profile.vue:
   follows-you: "フォローされとるで"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ(md5)"
   exif: "EXIF"
   nsfw: "ちょっと見せられへんわ"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "見たらあかんで"
   click-to-show: "押してみ、見せたるわ"
@@ -1080,12 +1098,12 @@ mobile/views/components/follow-button.vue:
   following: "フォローしとる"
   follow: "フォロー"
   request-pending: "フォローの許し待っとる"
-  follow-processing: "フォロー処理中"
+  follow-processing: "今フォロー処理やっとる‥"
   follow-request: "フォロー許してくれや！言うてみる"
 mobile/views/components/friends-maker.vue:
   title: "おもろそうやな"
   empty: "おすすめのユーザーはおらん。"
-  fetching: "読みこんどるで…"
+  fetching: "読み込んどります"
   refresh: "もっとあるやろ！"
   close: "さいなら"
 mobile/views/components/note.vue:
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "通知全部読んだか？"
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  name: "名前"
-  account: "アカウント"
-  location: "場所"
-  description: "ワイのこと"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  is-cat: "このアカウントはCatや"
-  is-locked: "他人のフォローは許してからや！"
-  advanced: "その他"
-  privacy: "プライバシー⇔オカンの年齢"
-  save: "保存"
-  saved: "プロフィールを保存したで"
-  uploading: "アップロードしとるで…"
-  upload-failed: "これアップロードでけへんわ"
 mobile/views/pages/search.vue:
   search: "探す"
   empty: "ワイは「{}」なんて投稿知らんわ、無いんちゃう？知らんけど。"
@@ -1242,7 +1243,7 @@ mobile/views/pages/settings.vue:
   specify-language: "言語選びや"
   design: "見た感じ"
   dark-mode: "ナイトゲームや！"
-  i-am-under-limited-internet: "電波がバァーっといけへんねん"
+  i-am-under-limited-internet: "電波と阪神がザコいんや"
   circle-icons: "アイコンもタコ焼きも丸いやんな？"
   contrasted-acct: "ユーザー名ようわからんし見やすしといて"
   timeline: "タイムライン"
@@ -1254,8 +1255,8 @@ mobile/views/pages/settings.vue:
   post-style-standard: "標準"
   post-style-smart: "べっぴんさん"
   notification-position: "通知どこ見せる？"
-  notification-position-bottom: "ミナミ"
+  notification-position-bottom: "ミナミの方"
-  notification-position-top: "キタ"
+  notification-position-top: "キタの方"
   theme: "テーマ"
   behavior: "動き"
   fetch-on-scroll: "スクロールしたらもっと見せてや"
@@ -1272,7 +1273,7 @@ mobile/views/pages/settings.vue:
   update: "あんたのMisskeyいつのや？"
   version: "バージョン:"
   latest-version: "いっちゃん新しいやつ:"
-  update-checking: "アップデートはあらへんか…"
+  update-checking: "アップデートあるか見とるで"
   check-for-updates: "アップデートあるんかな？"
   no-updates: "アップデートあらへんわ"
   no-updates-desc: "つこてるMisskeyは最新や！"
@@ -1303,16 +1304,16 @@ mobile/views/pages/user/home.vue:
   followers-you-know: "知っとるフォロワー"
   last-used-at: "最後いつ来た？"
 mobile/views/pages/user/home.followers-you-know.vue:
-  loading: "読み込んどる…"
+  loading: "読み込んどります"
   no-users: "知っとるユーザーは居らん"
 mobile/views/pages/user/home.friends.vue:
-  loading: "読み込んどる…"
+  loading: "読み込んどります"
   no-users: "よう話すユーザーは居らん"
 mobile/views/pages/user/home.notes.vue:
-  loading: "読み込んどる…"
+  loading: "読み込んどります"
   no-notes: "投稿はあらへん"
 mobile/views/pages/user/home.photos.vue:
-  loading: "読み込んどる…"
+  loading: "読み込んどります"
   no-photos: "写真はあらへんで"
 docs:
   edit-this-page-on-github: "間違いや改善点を見つけましたか？"

locales/ko-KR.yml

@@ -3,20 +3,20 @@ meta:
   lang: "한국어"
   divider: ""
 common:
-  misskey: "A ⭐ of fediverse"
+  misskey: "연합우주의 ⭐"
-  about-title: "A ⭐ of fediverse."
+  about-title: "연합우주의 ⭐."
   about: "Misskey를 찾아 주셔서 감사합니다. Misskey은 지구에서 태어난 <b>분산 마이크로 블로그 SNS </b> 입니다. Fediverse (다양한 SNS로 구성되는 우주)에 존재하는 다른 SNS와 상호 연결되어 있습니다. 잠시 도시의 번잡함에서 벗어나 새로운 인터넷에 다이브 해 보지 않겠습니까."
   intro:
-    title: "Misskeyって？"
+    title: "Misskey란?"
     about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。"
-    features: "特徴"
+    features: "특징"
-    rich-contents: "投稿"
+    rich-contents: "게시"
     rich-contents-desc: "自分の考え、話題の出来事、皆と共有したいことについて発信してください。必要であれば、様々な構文を使って投稿を装飾したり、好きな画像、動画などのファイルやアンケートを添付することもできます。"
-    reaction: "リアクション"
+    reaction: "반응"
     reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません。"
-    ui: "インターフェース"
+    ui: "인터페이스"
     ui-desc: "どのようなUIが使いやすいかは人それぞれです。だから、Misskeyは自由度の高いUIを持っています。レイアウトやデザインを調整したり、カスタマイズ可能な様々なウィジェットを配置したりして、自分だけのホームを作ってください。"
-    drive: "ドライブ"
+    drive: "드라이브"
     drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
     outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
   adblock:
@@ -71,7 +71,7 @@ common:
     friday: "금요일"
     saturday: "토요일"
   reactions:
-    like: "いいね"
+    like: "좋아요"
     love: "좋아"
     laugh: "크크"
     hmm: "음..."
@@ -82,14 +82,14 @@ common:
     rip: "RIP"
     pudding: "Pudding"
   note-visibility:
-    public: "公開"
+    public: "공개"
-    home: "ホーム"
+    home: "홈"
-    home-desc: "ホームタイムラインにのみ公開"
+    home-desc: "홈 타임라인에만 공개"
-    followers: "フォロワー"
+    followers: "팔로워"
-    followers-desc: "自分のフォロワーにのみ公開"
+    followers-desc: "자신의 팔로워에게만 공개"
-    specified: "ダイレクト"
+    specified: "다이렉트"
-    specified-desc: "指定したユーザーにのみ公開"
+    specified-desc: "지정한 사용자에게만 공개"
-    private: "非公開"
+    private: "비공개"
   note-placeholders:
     a: "지금 어떻게하고있어?"
     b: "뭔가 있었습니까?"
@@ -107,14 +107,14 @@ common:
   i-like-sushi: "나는(푸딩보다 오히려)스시가 좋아"
   show-reversi-board-labels: "리버시 보드의 행과 열 레이블을 표시"
   use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
-  verified-user: "公式アカウント"
+  verified-user: "공식 계정"
   disable-animated-mfm: "게시물의 문자 애니메이션을 비활성화 할"
-  always-show-nsfw: "常に閲覧注意のメディアを表示する"
+  always-show-nsfw: "항상 열람주의 미디어를 표시"
-  always-mark-nsfw: "常にメディアを閲覧注意として投稿"
+  always-mark-nsfw: "항상 미디어를 열람주의로 설정하여 게시"
   show-full-acct: "ユーザー名のホストを省略しない"
   reduce-motion: "UIの動きを減らす"
-  this-setting-is-this-device-only: "このデバイスのみ"
+  this-setting-is-this-device-only: "이 장치만"
-  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
+  do-not-use-in-production: '이것은 개발 빌드입니다. 프로덕션 환경에서 사용하지 마십시오.'
   reversi:
     drawn: "무승부"
     my-turn: "당신의 차례입니다"
@@ -155,19 +155,19 @@ common:
     home: "홈"
     local: "로컬"
     hybrid: "소셜"
-    hashtag: "ハッシュタグ"
+    hashtag: "해시태그"
     global: "글로벌"
     mentions: "あなた宛て"
     direct: "ダイレクト投稿"
     notifications: "통지"
     list: "목록"
-    swap-left: "左に移動"
+    swap-left: "왼쪽으로 이동"
-    swap-right: "右に移動"
+    swap-right: "오른쪽으로 이동"
-    swap-up: "上に移動"
+    swap-up: "위로 이동"
-    swap-down: "下に移動"
+    swap-down: "아래로 이동"
-    remove: "カラムを削除"
+    remove: "칼럼 제거"
-    add-column: "カラムを追加"
+    add-column: "칼럼 추가"
-    rename: "名前を変更"
+    rename: "이름 변경"
     stack-left: "左に重ねる"
     pop-right: "右に出す"
 auth/views/form.vue:
@@ -248,44 +248,47 @@ common/views/components/connect-failed.troubleshooter.vue:
   checking-network: "ネットワーク接続を確認中"
   internet: "インターネット接続"
   checking-internet: "インターネット接続を確認中"
-  server: "サーバー接続"
+  server: "서버 연결"
   checking-server: "サーバー接続を確認中"
   finding: "問題を調べています"
   no-network: "ネットワークに接続されていません"
   no-network-desc: "お使いのPCのネットワーク接続が正常か確認してください。"
   no-internet: "インターネットに接続されていません"
   no-internet-desc: "ネットワークには接続されていますが、インターネットには接続されていないようです。お使いのPCのインターネット接続が正常か確認してください。"
-  no-server: "Misskeyのサーバーに接続できません"
+  no-server: "Misskey 서버에 연결할 수 없습니다."
   no-server-desc: "お使いのPCのインターネット接続は正常ですが、Misskeyのサーバーには接続できませんでした。サーバーがダウンまたはメンテナンスしている可能性があるので、しばらくしてから再度御アクセスください。"
   success: "Misskeyのサーバーに接続できました"
   success-desc: "正常に接続できるようです。ページを再度読み込みしてください。"
-  flush: "キャッシュの削除"
+  flush: "캐시 삭제"
-  set-version: "バージョン指定"
+  set-version: "버전 지정"
 common/views/components/media-banner.vue:
-  sensitive: "閲覧注意"
+  sensitive: "열람주의"
-  click-to-show: "クリックして表示"
+  click-to-show: "클릭하여 표시"
 common/views/components/theme.vue:
   light-theme: "非ダークモード時に使用するテーマ"
   dark-theme: "ダークモード時に使用するテーマ"
-  light-themes: "明るいテーマ"
+  light-themes: "밝은 테마"
-  dark-themes: "暗いテーマ"
+  dark-themes: "어두운 테마"
-  install-a-theme: "テーマのインストール"
+  install-a-theme: "테마 설치"
-  theme-code: "テーマコード"
+  theme-code: "테마 코드"
-  install: "インストール"
+  install: "설치"
   installed: "「{}」をインストールしました"
-  create-a-theme: "テーマの作成"
+  create-a-theme: "테마 만들기"
-  save-created-theme: "テーマを保存"
+  save-created-theme: "테마 저장"
-  primary-color: "プライマリ カラー"
+  primary-color: "기본 색"
-  secondary-color: "セカンダリ カラー"
+  secondary-color: "보조 색"
-  text-color: "文字色"
+  text-color: "글자 색상"
   base-theme: "ベーステーマ"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
-  theme-name: "テーマ名"
+  theme-name: "테마명"
-  preview-created-theme: "プレビュー"
+  preview-created-theme: "미리보기"
   invalid-theme: "テーマが正しくありません。"
   already-installed: "既にそのテーマはインストールされています。"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
@@ -305,7 +308,7 @@ common/views/components/messaging.vue:
   no-history: "履歴はありません"
 common/views/components/messaging-room.vue:
   empty: "このユーザーと話したことはありません"
-  more: "もっと読む"
+  more: "더 보기"
   no-history: "これより過去の履歴はありません"
   resize-form: "ドラッグしてフォームの広さを調整"
   new-message: "新しいメッセージがあります"
@@ -320,18 +323,19 @@ common/views/components/messaging-room.message.vue:
   is-read: "읽음"
   deleted: "このメッセージは削除されました"
 common/views/components/nav.vue:
-  about: "Misskeyについて"
+  about: "Misskey에 대하여"
-  stats: "統計"
+  stats: "통계"
   status: "ステータス"
   wiki: "Wiki"
-  donors: "ドナー"
+  donors: "기증자"
-  repository: "リポジトリ"
+  repository: "저장소"
-  develop: "開発者"
+  develop: "개발자"
-  feedback: "フィードバック"
+  feedback: "피드백"
 common/views/components/note-menu.vue:
   detail: "詳細"
-  copy-link: "リンクをコピー"
+  copy-link: "링크 복사"
   favorite: "お気に入り"
+  unfavorite: "お気に入り解除"
   pin: "ピン留め"
   unpin: "ピン留め解除"
   delete: "削除"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -636,7 +659,7 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "詳細設定"
   api-via-stream: "ストリームを経由したAPIリクエスト"
   api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "デザインと表示"
   customize: "ホームをカスタマイズ"
+  wallpaper: "壁紙"
   choose-wallpaper: "壁紙を選択"
   delete-wallpaper: "壁紙を削除"
   dark-mode: "ダークモード"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "リプライ先を表示する"
+  timeline: "タイムライン"
   show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "マップの自動展開"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "サウンド"
   enable-sounds: "サウンドを有効にする"
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  mobile: "モバイル"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   language: "言語"
   pick-language: "言語を選択"
   recommended: "推奨"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "ツール"
   task-manager: "タスクマネージャ"
   third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
   detail: "詳細..."
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   enter-new-password-again: "もう一度新しいパスワードを入力してください"
   not-match: "新しいパスワードが一致しません"
   changed: "パスワードを変更しました"
-desktop/views/components/settings.profile.vue:
-  avatar: "アイコン"
-  choice-avatar: "画像を選択"
-  name: "名前"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  save: "保存"
-  locked-account: "アカウントの保護"
-  is-locked: "フォローを承認制にする"
-  other: "その他"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
-  profile-updated: "プロフィールを更新しました"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
   is-media-view: "メディアビュー"
   edit: "オプション"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
   nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  name: "名前"
-  account: "アカウント"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  is-cat: "このアカウントはCatです"
-  is-locked: "フォローを承認制にする"
-  advanced: "その他"
-  privacy: "プライバシー"
-  save: "保存"
-  saved: "プロフィールを保存しました"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
 mobile/views/pages/search.vue:
   search: "検索"
   empty: "「{}」に関する投稿は見つかりませんでした。"

locales/nl-NL.yml

@@ -286,6 +286,9 @@ common/views/components/theme.vue:
   invalid-theme: "テーマが正しくありません。"
   already-installed: "既にそのテーマはインストールされています。"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
@@ -332,6 +335,7 @@ common/views/components/note-menu.vue:
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "Deze notitie toevoegen aan favorieten"
+  unfavorite: "お気に入り解除"
   pin: "Vastmaken aan profielpagina"
   unpin: "ピン留め解除"
   delete: "削除"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "Bezig met ophalen"
   no-broadcasts: "Geen uitzendingen"
@@ -636,12 +659,12 @@ desktop/views/components/note-detail.vue:
   location: "Locatie"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
-  reposted-by: "Hergeplaatst door {}"
+  reposted-by: "{}がRenote"
-  reply: "Antwoord"
+  reply: "返信"
   renote: "Renote"
-  add-reaction: "Reactie toevoegen"
+  add-reaction: "リアクション"
-  detail: "Details tonen"
+  detail: "詳細"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "Geavanceerde instellingen"
   api-via-stream: "API-verzoek via stream"
   api-via-stream-desc: "API-verzoek wordt uitgevoerd via de WebSocket-verbinding i.p.v. de ingebouwde ophaal-API (voor verbeterde prestaties). Deze instelling wordt opgeslagen in je browser."
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "Ontwerp en weergave"
   customize: "Startpagina aanpassen"
+  wallpaper: "壁紙"
   choose-wallpaper: "壁紙を選択"
   delete-wallpaper: "壁紙を削除"
   dark-mode: "Donkere modus"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "Antwoord-knop tonen"
+  timeline: "タイムライン"
   show-my-renotes: "Mijn renote tonen op de tijdlijn"
   show-renoted-my-notes: "Mijn gerenote bericht tonen op de tijdlijn"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "Kaart tonen"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "Geluid"
   enable-sounds: "Geluid inschakelen"
   enable-sounds-desc: "Een geluid afspelen bij het ontvangen van een bericht. Deze instelling wordt opgeslagen in je browser."
   volume: "Volume"
   test: "Testen"
-  mobile: "Mobiel"
-  disable-via-mobile: "Berichten niet markeren als 'via mobiel'"
   language: "Taal"
   pick-language: "Selecteer een taal"
   recommended: "Aanbevolen"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "Hulpmiddelen"
   task-manager: "Taakbeheer"
   third-parties: "Derde partij"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "Als je verificatie in twee stappen instelt, dan heb je niet alleen een wachtwoord nodig bij het inloggen, maar ook een geregistreerd fysiek apparaat (zoals je smartphone). Dit verhoogt de veiligheid. "
   detail: "Details bekijken..."
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   enter-new-password-again: "Voer je nieuwe wachtwoord nogmaals in"
   not-match: "Het nieuwe wachtwoord komt niet overeen"
   changed: "Wachtwoord bijgewerkt"
-desktop/views/components/settings.profile.vue:
-  avatar: "Gebruikersafbeelding"
-  choice-avatar: "Kies een afbeelding"
-  name: "Naam"
-  location: "Locatie"
-  description: "Omschrijving"
-  birthday: "Geboortedatum"
-  save: "Profiel bijwerken"
-  locked-account: "アカウントの保護"
-  is-locked: "フォローを承認制にする"
-  other: "その他"
-  is-bot: "Dit account is een Bot"
-  is-cat: "Dit account is een Kat"
-  profile-updated: "プロフィールを更新しました"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
   is-media-view: "メディアビュー"
   edit: "オプション"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "Hash (md5)"
   exif: "EXIF"
   nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "Weet je zeker dat je alle meldingen wilt markeren als gelezen?"
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "Profiel"
-  name: "Naam"
-  account: "Account"
-  location: "Locatie"
-  description: "Omschrijving"
-  birthday: "Geboortedatum"
-  avatar: "Gebruikersafbeelding"
-  banner: "Omslagfoto"
-  is-cat: "Dit account is een Kat"
-  is-locked: "フォローを承認制にする"
-  advanced: "その他"
-  privacy: "プライバシー"
-  save: "Profiel bijwerken"
-  saved: "Profiel bijgewerkt"
-  uploading: "Bezig met uploaden"
-  upload-failed: "Upload mislukt"
 mobile/views/pages/search.vue:
   search: "Zoeken"
   empty: "Geen berichten gevonden voor '{}'"

locales/no-NO.yml

@@ -286,6 +286,9 @@ common/views/components/theme.vue:
   invalid-theme: "テーマが正しくありません。"
   already-installed: "既にそのテーマはインストールされています。"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
@@ -332,6 +335,7 @@ common/views/components/note-menu.vue:
   detail: "Detaljer"
   copy-link: "リンクをコピー"
   favorite: "Merket som favoritt"
+  unfavorite: "お気に入り解除"
   pin: "Fest til profilen din"
   unpin: "ピン留め解除"
   delete: "Slett"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "Henter"
   no-broadcasts: "お知らせはありません"
@@ -636,12 +659,12 @@ desktop/views/components/note-detail.vue:
   location: "Lokasjon"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
   reposted-by: "{}がRenote"
-  reply: "Svar"
+  reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
-  detail: "Vis detaljer"
+  detail: "詳細"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "Avanserte innstillinger"
   api-via-stream: "ストリームを経由したAPIリクエスト"
   api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "デザインと表示"
   customize: "ホームをカスタマイズ"
+  wallpaper: "壁紙"
   choose-wallpaper: "壁紙を選択"
   delete-wallpaper: "壁紙を削除"
   dark-mode: "ダークモード"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "リプライ先を表示する"
+  timeline: "タイムライン"
   show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "マップの自動展開"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "Lyd"
   enable-sounds: "サウンドを有効にする"
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "Volum"
   test: "Test"
-  mobile: "Mobil"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   language: "Språk"
   pick-language: "Velg språk"
   recommended: "Anbefalt"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "Verktøy"
   task-manager: "タスクマネージャ"
   third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
   detail: "Detaljer..."
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   enter-new-password-again: "もう一度新しいパスワードを入力してください"
   not-match: "新しいパスワードが一致しません"
   changed: "パスワードを変更しました"
-desktop/views/components/settings.profile.vue:
-  avatar: "Avatar"
-  choice-avatar: "Velg et bilde"
-  name: "Navn"
-  location: "Lokasjon"
-  description: "Om meg"
-  birthday: "Bursdag"
-  save: "Lagre profilen"
-  locked-account: "アカウントの保護"
-  is-locked: "フォローを承認制にする"
-  other: "Annet"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
-  profile-updated: "プロフィールを更新しました"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
   is-media-view: "メディアビュー"
   edit: "オプション"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
   nsfw: "NSFW"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "NSFW"
   click-to-show: "クリックして表示"
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/games/reversi.vue:
   reversi: "Reversi"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  name: "Navn"
-  account: "Konto"
-  location: "Lokasjon"
-  description: "Om meg"
-  birthday: "Bursdag"
-  avatar: "Avatar"
-  banner: "Banner"
-  is-cat: "このアカウントはCatです"
-  is-locked: "フォローを承認制にする"
-  advanced: "Avansert"
-  privacy: "プライバシー"
-  save: "Lagre profilen"
-  saved: "プロフィールを保存しました"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
 mobile/views/pages/search.vue:
   search: "Søk"
   empty: "「{}」に関する投稿は見つかりませんでした。"

locales/pl-PL.yml

@@ -286,6 +286,9 @@ common/views/components/theme.vue:
   invalid-theme: "テーマが正しくありません。"
   already-installed: "既にそのテーマはインストールされています。"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
@@ -332,6 +335,7 @@ common/views/components/note-menu.vue:
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "Dodaj do ulubionych"
+  unfavorite: "お気に入り解除"
   pin: "Przypnij do profilu"
   unpin: "ピン留め解除"
   delete: "Usuń"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "Sprawdzanie"
   no-broadcasts: "Brak transmisji"
@@ -636,14 +659,14 @@ desktop/views/components/note-detail.vue:
   location: "Informacje o lokalizacji"
   renote: "Udostępnienie"
   add-reaction: "Dodaj reakcję"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
-  reposted-by: "Udostępniono przez {}"
+  reposted-by: "{}がRenote"
-  reply: "Odpowiedz"
+  reply: "返信"
-  renote: "Udostępnij"
+  renote: "Renote"
-  add-reaction: "Dodaj reakcję"
+  add-reaction: "リアクション"
-  detail: "Pokaż szczegóły"
+  detail: "詳細"
-  private: "ten wpis jest prywatny"
+  private: "この投稿は非公開です"
-  deleted: "ten wpis został usunięty"
+  deleted: "この投稿は削除されました"
 desktop/views/components/notes.vue:
   error: "Ładowanie nie powiodło się."
   retry: "Spróbuj ponownie"
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "Ustawienia zaawansowane"
   api-via-stream: "ストリームを経由したAPIリクエスト"
   api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "Wygląd i wyświetlanie"
   customize: "Dostosuj stronę główną"
+  wallpaper: "壁紙"
   choose-wallpaper: "Wybierz tło"
   delete-wallpaper: "Usuń tło"
   dark-mode: "Tryb ciemny"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "Pokazuj cel odpowiedzi"
+  timeline: "タイムライン"
   show-my-renotes: "Pokazuj moje udostępnienia na osi czasu"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "Automatycznie pokazuj mapę"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "Dźwięk"
   enable-sounds: "Włącz dźwięk"
   enable-sounds-desc: "Odtwarzaj dźwięk przy wstawianiu wpisów, wysyłaniu lub otrzymywaniu wiadomości. Opcja ta jest zapamiętywana przez przeglądarkę."
   volume: "Głośność"
   test: "Test"
-  mobile: "Wersja mobilna"
-  disable-via-mobile: "Nie oznaczaj wpisów jako „wysłane z telefonu”"
   language: "Język"
   pick-language: "Wybierz język"
   recommended: "Zalecane"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "Narzędzia"
   task-manager: "Menedżer zadań"
   third-parties: "Autorzy trzeci"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 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…"
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   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"
-  locked-account: "Zabezpiecz swoje konto"
-  is-locked: "フォローを承認制にする"
-  other: "Inne"
-  is-bot: "To konto jest prowadzone przez bota"
-  is-cat: "To konto jest prowadzone przez kota"
-  profile-updated: "Zaktualizowano profil"
 desktop/views/components/sub-note-content.vue:
   private: "ten wpis jest prywatny"
   deleted: "ten wpis został usunięty"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "Tylko wpisy z zawartością multimedialną"
   is-media-view: "Widok multimediów"
   edit: "Opcje"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "Udostępniono przez {}"
+  pinned-notes: "ピン留めされた投稿"
-  private: "ten wpis jest prywatny"
-  deleted: "ten wpis został usunięty"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "Hash (md5)"
   exif: "EXIF"
   nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "To jest zawartość NSFW"
   click-to-show: "Naciśnij aby wyświetlić"
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "Czy na pewno chcesz oznaczyć wszystkie powiadomienia jako przeczytane?"
 mobile/views/pages/games/reversi.vue:
   reversi: "Reversi"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "Profil"
-  name: "Nazwa"
-  account: "Konto"
-  location: "Lokalizacja"
-  description: "Opis"
-  birthday: "Data urodzenia"
-  avatar: "Awatar"
-  banner: "Baner"
-  is-cat: "To konto jest prowadzone przez kota"
-  is-locked: "フォローを承認制にする"
-  advanced: "その他"
-  privacy: "プライバシー"
-  save: "Aktualizuj profil"
-  saved: "Pomyślnie zaktualizowano profil"
-  uploading: "Wysyłanie"
-  upload-failed: "Wysyłanie nie powiodło się"
 mobile/views/pages/search.vue:
   search: "Szukaj"
   empty: "Nie znaleziono wpisów zawierających '{}'"

locales/pt-PT.yml

@@ -286,6 +286,9 @@ common/views/components/theme.vue:
   invalid-theme: "テーマが正しくありません。"
   already-installed: "既にそのテーマはインストールされています。"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
@@ -332,6 +335,7 @@ common/views/components/note-menu.vue:
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
+  unfavorite: "お気に入り解除"
   pin: "ピン留め"
   unpin: "ピン留め解除"
   delete: "削除"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -636,7 +659,7 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "詳細設定"
   api-via-stream: "ストリームを経由したAPIリクエスト"
   api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "デザインと表示"
   customize: "ホームをカスタマイズ"
+  wallpaper: "壁紙"
   choose-wallpaper: "壁紙を選択"
   delete-wallpaper: "壁紙を削除"
   dark-mode: "ダークモード"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "リプライ先を表示する"
+  timeline: "タイムライン"
   show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "マップの自動展開"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "サウンド"
   enable-sounds: "サウンドを有効にする"
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  mobile: "モバイル"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   language: "言語"
   pick-language: "言語を選択"
   recommended: "推奨"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "ツール"
   task-manager: "タスクマネージャ"
   third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
   detail: "詳細..."
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   enter-new-password-again: "もう一度新しいパスワードを入力してください"
   not-match: "新しいパスワードが一致しません"
   changed: "パスワードを変更しました"
-desktop/views/components/settings.profile.vue:
-  avatar: "アイコン"
-  choice-avatar: "画像を選択"
-  name: "名前"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  save: "保存"
-  locked-account: "アカウントの保護"
-  is-locked: "フォローを承認制にする"
-  other: "その他"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
-  profile-updated: "プロフィールを更新しました"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
   is-media-view: "メディアビュー"
   edit: "オプション"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
   nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  name: "Nome"
-  account: "Conta"
-  location: "Lugar"
-  description: "Biografia"
-  birthday: "Data de nascimento"
-  avatar: "Avatar"
-  banner: "Capa"
-  is-cat: "Esta conta é gato"
-  is-locked: "Pedido para seguir precisa ser aprovado"
-  advanced: "Avançado"
-  privacy: "Provacidade"
-  save: "Atualizar perfil"
-  saved: "Perfil atualizado"
-  uploading: "Enviando"
-  upload-failed: "Falha ao enviar"
 mobile/views/pages/search.vue:
   search: "Pesquisar"
   empty: "「{}」に関する投稿は見つかりませんでした。"

locales/ru-RU.yml

@@ -3,9 +3,9 @@ meta:
   lang: "Русский язык"
   divider: ""
 common:
-  misskey: "A ⭐ of fediverse"
+  misskey: "Мы — ⭐ fediverse"
-  about-title: "A ⭐ of fediverse."
+  about-title: "Мы — ⭐ fediverse"
-  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
+  about: "Спасибо, что нашли Misskey. Misskey — это <b>децентрализованная платформа для микроблоггинга</b> родом с планеты Земля. Поскольку она существует внутри Fediverse (вселенной различных социальных платформ), она связана с другими платформами. Отдохните от шума большого города — и познакомьтесь с новым интернетом."
   intro:
     title: "Misskeyって？"
     about: "Misskeyはオープンソースの<b>分散型マイクロブログSNS</b>です。リッチで高度にカスタマイズできるUI、投稿へのリアクション、ファイルを一元管理できるドライブなど、先進的な機能を揃えています。また、Fediverseと呼ばれるネットワークに接続できるため、他のSNSともやり取りできます。例えば、あなたが何か投稿すると、その投稿はMisskeyだけでなく他のSNSにも伝わります。ちょうどある惑星から他の惑星に電波を発信している様子をイメージしてください。"
@@ -286,6 +286,9 @@ common/views/components/theme.vue:
   invalid-theme: "テーマが正しくありません。"
   already-installed: "既にそのテーマはインストールされています。"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
@@ -332,6 +335,7 @@ common/views/components/note-menu.vue:
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
+  unfavorite: "お気に入り解除"
   pin: "ピン留め"
   unpin: "ピン留め解除"
   delete: "削除"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -636,7 +659,7 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "詳細設定"
   api-via-stream: "ストリームを経由したAPIリクエスト"
   api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "デザインと表示"
   customize: "ホームをカスタマイズ"
+  wallpaper: "壁紙"
   choose-wallpaper: "壁紙を選択"
   delete-wallpaper: "壁紙を削除"
   dark-mode: "ダークモード"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "リプライ先を表示する"
+  timeline: "タイムライン"
   show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "マップの自動展開"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "サウンド"
   enable-sounds: "サウンドを有効にする"
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  mobile: "モバイル"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   language: "言語"
   pick-language: "言語を選択"
   recommended: "推奨"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "ツール"
   task-manager: "タスクマネージャ"
   third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
   detail: "詳細..."
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   enter-new-password-again: "もう一度新しいパスワードを入力してください"
   not-match: "新しいパスワードが一致しません"
   changed: "パスワードを変更しました"
-desktop/views/components/settings.profile.vue:
-  avatar: "アイコン"
-  choice-avatar: "画像を選択"
-  name: "名前"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  save: "保存"
-  locked-account: "アカウントの保護"
-  is-locked: "フォローを承認制にする"
-  other: "その他"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
-  profile-updated: "プロフィールを更新しました"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
   is-media-view: "メディアビュー"
   edit: "オプション"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
   nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  name: "名前"
-  account: "アカウント"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  is-cat: "このアカウントはCatです"
-  is-locked: "フォローを承認制にする"
-  advanced: "その他"
-  privacy: "プライバシー"
-  save: "保存"
-  saved: "プロフィールを保存しました"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
 mobile/views/pages/search.vue:
   search: "検索"
   empty: "「{}」に関する投稿は見つかりませんでした。"

locales/zh-CN.yml

@@ -286,6 +286,9 @@ common/views/components/theme.vue:
   invalid-theme: "テーマが正しくありません。"
   already-installed: "既にそのテーマはインストールされています。"
   saved: "保存しました"
+  manage-themes: "テーマの管理"
+  builtin-themes: "標準テーマ"
+  my-themes: "マイテーマ"
   installed-themes: "インストールされたテーマ"
   select-theme: "テーマを選択してください"
   uninstall: "アンインストール"
@@ -332,6 +335,7 @@ common/views/components/note-menu.vue:
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
+  unfavorite: "お気に入り解除"
   pin: "ピン留め"
   unpin: "ピン留め解除"
   delete: "削除"
@@ -412,6 +416,25 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
   count: "{}人が投稿"
   empty: "トレンドなし"
+common/views/components/profile-editor.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  is-bot: "このアカウントはBotです"
+  is-locked: "フォローを承認制にする"
+  careful-bot: "Botからのフォローだけ承認制にする"
+  advanced: "その他"
+  privacy: "プライバシー"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
 common/views/widgets/broadcast.vue:
   fetching: "確認中"
   no-broadcasts: "お知らせはありません"
@@ -636,7 +659,7 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
-desktop/views/components/notes.note.vue:
+desktop/views/components/note.vue:
   reposted-by: "{}がRenote"
   reply: "返信"
   renote: "Renote"
@@ -722,8 +745,11 @@ desktop/views/components/settings.vue:
   advanced: "詳細設定"
   api-via-stream: "ストリームを経由したAPIリクエスト"
   api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  deck-nav: "デッキ内ナビゲーション"
+  deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。"
   display: "デザインと表示"
   customize: "ホームをカスタマイズ"
+  wallpaper: "壁紙"
   choose-wallpaper: "壁紙を選択"
   delete-wallpaper: "壁紙を削除"
   dark-mode: "ダークモード"
@@ -735,17 +761,19 @@ desktop/views/components/settings.vue:
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
   show-clock-on-header: "右上に時計を表示する"
   show-reply-target: "リプライ先を表示する"
+  timeline: "タイムライン"
   show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
   show-renoted-my-notes: "自分の投稿のRenoteをタイムラインに表示する"
   show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
   show-maps: "マップの自動展開"
+  deck-column-align: "デッキのカラムの位置"
+  deck-column-align-center: "中央"
+  deck-column-align-left: "左"
   sound: "サウンド"
   enable-sounds: "サウンドを有効にする"
   enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
   volume: "ボリューム"
   test: "テスト"
-  mobile: "モバイル"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
   language: "言語"
   pick-language: "言語を選択"
   recommended: "推奨"
@@ -781,6 +809,10 @@ desktop/views/components/settings.vue:
   tools: "ツール"
   task-manager: "タスクマネージャ"
   third-parties: "サードパーティ"
+  navbar-position: "ナビゲーションバーの位置"
+  navbar-position-top: "上"
+  navbar-position-left: "左"
+  navbar-position-right: "右"
 desktop/views/components/settings.2fa.vue:
   intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
   detail: "詳細..."
@@ -820,20 +852,6 @@ desktop/views/components/settings.password.vue:
   enter-new-password-again: "もう一度新しいパスワードを入力してください"
   not-match: "新しいパスワードが一致しません"
   changed: "パスワードを変更しました"
-desktop/views/components/settings.profile.vue:
-  avatar: "アイコン"
-  choice-avatar: "画像を選択"
-  name: "名前"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  save: "保存"
-  locked-account: "アカウントの保護"
-  is-locked: "フォローを承認制にする"
-  other: "その他"
-  is-bot: "このアカウントはBotです"
-  is-cat: "このアカウントはCatです"
-  profile-updated: "プロフィールを更新しました"
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -932,10 +950,8 @@ desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "メディア投稿のみ"
   is-media-view: "メディアビュー"
   edit: "オプション"
-desktop/views/pages/deck/deck.note.vue:
+desktop/views/pages/deck/deck.user-column.vue:
-  reposted-by: "{}がRenote"
+  pinned-notes: "ピン留めされた投稿"
-  private: "この投稿は非公開です"
-  deleted: "この投稿は削除されました"
 desktop/views/pages/stats/stats.vue:
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
@@ -1070,6 +1086,8 @@ mobile/views/components/drive.file-detail.vue:
   hash: "ハッシュ (md5)"
   exif: "EXIF"
   nsfw: "閲覧注意"
+  mark-as-sensitive: "閲覧注意に設定"
+  unmark-as-sensitive: "閲覧注意を解除"
 mobile/views/components/media-image.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
@@ -1210,23 +1228,6 @@ mobile/views/pages/notifications.vue:
   read-all: "すべての通知を既読にしますか？"
 mobile/views/pages/games/reversi.vue:
   reversi: "リバーシ"
-mobile/views/pages/settings/settings.profile.vue:
-  title: "プロフィール"
-  name: "名前"
-  account: "アカウント"
-  location: "場所"
-  description: "自己紹介"
-  birthday: "誕生日"
-  avatar: "アイコン"
-  banner: "バナー"
-  is-cat: "このアカウントはCatです"
-  is-locked: "フォローを承認制にする"
-  advanced: "その他"
-  privacy: "プライバシー"
-  save: "保存"
-  saved: "プロフィールを保存しました"
-  uploading: "アップロード中"
-  upload-failed: "アップロードに失敗しました"
 mobile/views/pages/search.vue:
   search: "検索"
   empty: "「{}」に関する投稿は見つかりませんでした。"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.0.0",
+	"version": "10.23.1",
-	"clientVersion": "1.0.10328",
+	"clientVersion": "1.0.10732",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -20,26 +20,27 @@
 		"format": "gulp format"
 	},
 	"dependencies": {
-		"@fortawesome/fontawesome-svg-core": "1.2.4",
+		"@fortawesome/fontawesome-svg-core": "1.2.6",
-		"@fortawesome/free-brands-svg-icons": "5.3.1",
+		"@fortawesome/free-brands-svg-icons": "5.4.1",
-		"@fortawesome/free-regular-svg-icons": "5.3.1",
+		"@fortawesome/free-regular-svg-icons": "5.4.1",
-		"@fortawesome/free-solid-svg-icons": "5.3.1",
+		"@fortawesome/free-solid-svg-icons": "5.4.1",
 		"@koa/cors": "2.2.2",
 		"@prezzemolo/rap": "0.1.2",
 		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.2",
+		"@types/chai-http": "3.0.5",
 		"@types/dateformat": "1.0.1",
 		"@types/debug": "0.0.31",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/elasticsearch": "5.0.26",
+		"@types/elasticsearch": "5.0.28",
 		"@types/file-type": "5.2.1",
 		"@types/gulp": "3.8.36",
 		"@types/gulp-htmlmin": "1.3.32",
 		"@types/gulp-mocha": "0.0.32",
 		"@types/gulp-rename": "0.0.33",
 		"@types/gulp-replace": "0.0.31",
-		"@types/gulp-uglify": "3.0.5",
+		"@types/gulp-uglify": "3.0.6",
 		"@types/gulp-util": "3.0.34",
 		"@types/is-root": "1.0.0",
 		"@types/is-url": "1.2.28",
@@ -48,7 +49,7 @@
 		"@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-logger": "3.1.1",
 		"@types/koa-mount": "3.0.1",
 		"@types/koa-multer": "1.0.0",
 		"@types/koa-router": "7.0.32",
@@ -58,19 +59,19 @@
 		"@types/minio": "7.0.0",
 		"@types/mkdirp": "0.5.2",
 		"@types/mocha": "5.2.3",
-		"@types/mongodb": "3.1.10",
+		"@types/mongodb": "3.1.12",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.11.4",
+		"@types/node": "10.12.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.3.0",
 		"@types/ratelimiter": "2.1.28",
-		"@types/redis": "2.8.6",
+		"@types/redis": "2.8.7",
 		"@types/request": "2.47.1",
 		"@types/request-promise-native": "1.0.15",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
-		"@types/sharp": "0.17.10",
+		"@types/sharp": "0.21.0",
 		"@types/showdown": "1.7.5",
 		"@types/single-line-log": "1.1.0",
 		"@types/speakeasy": "2.0.2",
@@ -78,7 +79,7 @@
 		"@types/tinycolor2": "1.4.1",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.4",
-		"@types/webpack": "4.4.14",
+		"@types/webpack": "4.4.17",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
@@ -90,13 +91,15 @@
 		"bee-queue": "1.2.2",
 		"bootstrap-vue": "2.0.0-rc.11",
 		"cafy": "11.3.0",
+		"chai": "4.2.0",
+		"chai-http": "4.2.0",
 		"chalk": "2.4.1",
-		"chart.js": "2.7.2",
+		"chart.js": "2.7.3",
-		"commander": "2.17.1",
+		"commander": "2.19.0",
 		"crc-32": "1.2.0",
 		"css-loader": "1.0.0",
 		"dateformat": "3.0.3",
-		"debug": "4.0.1",
+		"debug": "4.1.0",
 		"deep-equal": "1.0.1",
 		"deepcopy": "0.6.3",
 		"diskusage": "0.2.5",
@@ -157,7 +160,7 @@
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",
 		"moji": "0.5.1",
-		"mongodb": "3.1.1",
+		"mongodb": "3.1.8",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nan": "2.11.1",
@@ -169,13 +172,14 @@
 		"parse5": "5.1.0",
 		"portscanner": "2.2.0",
 		"progress-bar-webpack-plugin": "1.11.0",
+		"promise-limit": "2.7.0",
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
 		"punycode": "2.1.1",
 		"qrcode": "1.3.0",
 		"ratelimiter": "3.2.0",
 		"recaptcha-promise": "0.1.3",
-		"reconnecting-websocket": "4.1.5",
+		"reconnecting-websocket": "4.1.9",
 		"redis": "2.8.0",
 		"request": "2.88.0",
 		"request-promise-native": "1.0.5",
@@ -186,12 +190,12 @@
 		"sass-loader": "7.1.0",
 		"seedrandom": "2.4.4",
 		"sharp": "0.21.0",
-		"showdown": "1.8.6",
+		"showdown": "1.8.7",
 		"showdown-highlightjs-extension": "0.1.2",
 		"single-line-log": "1.1.2",
 		"speakeasy": "2.0.0",
 		"stringz": "1.0.0",
-		"style-loader": "0.23.0",
+		"style-loader": "0.23.1",
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.2.0",
@@ -204,21 +208,23 @@
 		"ts-node": "7.0.1",
 		"tslint": "5.10.0",
 		"typescript": "2.9.2",
-		"typescript-eslint-parser": "19.0.2",
+		"typescript-eslint-parser": "20.0.0",
 		"uglify-es": "3.3.9",
-		"url-loader": "1.1.1",
+		"url-loader": "1.1.2",
 		"uuid": "3.3.2",
 		"v-animate-css": "0.0.2",
 		"vue": "2.5.17",
 		"vue-chartjs": "3.4.0",
-		"vue-color": "2.6.0",
+		"vue-color": "2.7.0",
+		"vue-content-loading": "1.5.3",
 		"vue-cropperjs": "2.2.2",
 		"vue-js-modal": "1.3.26",
 		"vue-json-tree-view": "2.1.4",
 		"vue-loader": "15.4.2",
 		"vue-router": "3.0.1",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.0",
+		"vue-svg-inline-loader": "1.2.1",
+		"vue-sweetalert2": "1.5.6",
 		"vue-template-compiler": "2.5.17",
 		"vuedraggable": "2.16.0",
 		"vuewordcloud": "18.7.11",
@@ -226,7 +232,7 @@
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
 		"webfinger.js": "2.6.6",
-		"webpack": "4.20.2",
+		"webpack": "4.21.0",
 		"webpack-cli": "3.1.2",
 		"websocket": "1.0.28",
 		"ws": "6.1.0",

src/client/app/app.styl

@@ -130,3 +130,29 @@ pre
 
 [data-fa]
 	display inline-block
+
+.swal2-container
+	z-index 10000 !important
+
+	&.swal2-shown
+		background-color rgba(0, 0, 0, 0.5) !important
+
+.swal2-popup
+	background var(--face) !important
+
+.swal2-content
+	color var(--text) !important
+
+.swal2-confirm
+	background-color var(--primary) !important
+	border-left-color var(--primary) !important
+	border-right-color var(--primary) !important
+	color var(--primaryForeground) !important
+
+	&:hover
+		background-image none !important
+		background-color var(--primaryDarken5) !important
+
+	&:active
+		background-image none !important
+		background-color var(--primaryDarken5) !important

src/client/app/boot.js

@@ -142,7 +142,7 @@
 		localStorage.setItem('shouldFlush', 'false');
 
 		// Random
-		localStorage.setItem('salt', Math.random().toString());
+		localStorage.setItem('salt', Math.random().toString().substr(2, 8));
 
 		// Clear cache (service worker)
 		try {

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

@@ -0,0 +1,178 @@
+import parse from '../../../../mfm/parse';
+import { sum } from '../../../../prelude/array';
+import MkNoteMenu from '../views/components/note-menu.vue';
+import MkReactionPicker from '../views/components/reaction-picker.vue';
+import Ok from '../views/components/ok.vue';
+
+function focus(el, fn) {
+	const target = fn(el);
+	if (target) {
+		if (target.hasAttribute('tabindex')) {
+			target.focus();
+		} else {
+			focus(target, fn);
+		}
+	}
+}
+
+type Opts = {
+	mobile?: boolean;
+};
+
+export default (opts: Opts = {}) => ({
+	data() {
+		return {
+			showContent: false
+		};
+	},
+
+	computed: {
+		keymap(): any {
+			return {
+				'r|left': () => this.reply(true),
+				'e|a|plus': () => this.react(true),
+				'q|right': () => this.renote(true),
+				'f|b': this.favorite,
+				'delete|ctrl+d': this.del,
+				'ctrl+q|ctrl+right': this.renoteDirectly,
+				'up|k|shift+tab': this.focusBefore,
+				'down|j|tab': this.focusAfter,
+				'esc': this.blur,
+				'm|o': () => this.menu(true),
+				's': this.toggleShowContent,
+				'1': () => this.reactDirectly('like'),
+				'2': () => this.reactDirectly('love'),
+				'3': () => this.reactDirectly('laugh'),
+				'4': () => this.reactDirectly('hmm'),
+				'5': () => this.reactDirectly('surprise'),
+				'6': () => this.reactDirectly('congrats'),
+				'7': () => this.reactDirectly('angry'),
+				'8': () => this.reactDirectly('confused'),
+				'9': () => this.reactDirectly('rip'),
+				'0': () => this.reactDirectly('pudding'),
+			};
+		},
+
+		isRenote(): boolean {
+			return (this.note.renote &&
+				this.note.text == null &&
+				this.note.fileIds.length == 0 &&
+				this.note.poll == null);
+		},
+
+		appearNote(): any {
+			return this.isRenote ? this.note.renote : this.note;
+		},
+
+		reactionsCount(): number {
+			return this.appearNote.reactionCounts
+				? sum(Object.values(this.appearNote.reactionCounts))
+				: 0;
+		},
+
+		title(): string {
+			return new Date(this.appearNote.createdAt).toLocaleString();
+		},
+
+		urls(): string[] {
+			if (this.appearNote.text) {
+				const ast = parse(this.appearNote.text);
+				return ast
+					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
+					.map(t => t.url);
+			} else {
+				return null;
+			}
+		}
+	},
+
+	methods: {
+		reply(viaKeyboard = false) {
+			(this as any).apis.post({
+				reply: this.appearNote,
+				animation: !viaKeyboard,
+				cb: () => {
+					this.focus();
+				}
+			});
+		},
+
+		renote(viaKeyboard = false) {
+			(this as any).apis.post({
+				renote: this.appearNote,
+				animation: !viaKeyboard,
+				cb: () => {
+					this.focus();
+				}
+			});
+		},
+
+		renoteDirectly() {
+			(this as any).api('notes/create', {
+				renoteId: this.appearNote.id
+			});
+		},
+
+		react(viaKeyboard = false) {
+			this.blur();
+			(this as any).os.new(MkReactionPicker, {
+				source: this.$refs.reactButton,
+				note: this.appearNote,
+				showFocus: viaKeyboard,
+				animation: !viaKeyboard,
+				compact: opts.mobile,
+				big: opts.mobile
+			}).$once('closed', this.focus);
+		},
+
+		reactDirectly(reaction) {
+			(this as any).api('notes/reactions/create', {
+				noteId: this.appearNote.id,
+				reaction: reaction
+			});
+		},
+
+		favorite() {
+			(this as any).api('notes/favorites/create', {
+				noteId: this.appearNote.id
+			}).then(() => {
+				(this as any).os.new(Ok);
+			});
+		},
+
+		del() {
+			(this as any).api('notes/delete', {
+				noteId: this.appearNote.id
+			});
+		},
+
+		menu(viaKeyboard = false) {
+			(this as any).os.new(MkNoteMenu, {
+				source: this.$refs.menuButton,
+				note: this.appearNote,
+				animation: !viaKeyboard,
+				compact: opts.mobile,
+			}).$once('closed', this.focus);
+		},
+
+		toggleShowContent() {
+			this.showContent = !this.showContent;
+		},
+
+		focus() {
+			this.$el.focus();
+		},
+
+		blur() {
+			this.$el.blur();
+		},
+
+		focusBefore() {
+			focus(this.$el, e => e.previousElementSibling);
+		},
+
+		focusAfter() {
+			focus(this.$el, e => e.nextElementSibling);
+		}
+	}
+});

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

@@ -13,14 +13,14 @@ export default prop => ({
 		},
 
 		$_ns_isRenote(): boolean {
-			return (this.$_ns_note_.renote &&
+			return (this.$_ns_note_.renote != null &&
 				this.$_ns_note_.text == null &&
 				this.$_ns_note_.fileIds.length == 0 &&
 				this.$_ns_note_.poll == null);
 		},
 
 		$_ns_target(): any {
-			return this._ns_isRenote ? this.$_ns_note_.renote : this.$_ns_note_;
+			return this.$_ns_isRenote ? this.$_ns_note_.renote : this.$_ns_note_;
 		},
 	},
 
@@ -86,8 +86,20 @@ export default prop => ({
 			switch (type) {
 				case 'reacted': {
 					const reaction = body.reaction;
-					if (this.$_ns_target.reactionCounts == null) Vue.set(this.$_ns_target, 'reactionCounts', {});
+
-					this.$_ns_target.reactionCounts[reaction] = (this.$_ns_target.reactionCounts[reaction] || 0) + 1;
+					if (this.$_ns_target.reactionCounts == null) {
+						Vue.set(this.$_ns_target, 'reactionCounts', {});
+					}
+
+					if (this.$_ns_target.reactionCounts[reaction] == null) {
+						Vue.set(this.$_ns_target.reactionCounts, reaction, 0);
+					}
+
+					this.$_ns_target.reactionCounts[reaction]++;
+
+					if (body.userId == this.$store.state.i.id) {
+						Vue.set(this.$_ns_target, 'myReaction', reaction);
+					}
 					break;
 				}
 

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

@@ -9,8 +9,8 @@ import MiOS from '../../mios';
  */
 export default class Stream extends EventEmitter {
 	private stream: ReconnectingWebsocket;
-	private state: string;
+	public state: string;
-	private buffer: any[];
+	private sharedConnectionPools: Pool[] = [];
 	private sharedConnections: SharedConnection[] = [];
 	private nonSharedConnections: NonSharedConnection[] = [];
 
@@ -18,7 +18,6 @@ export default class Stream extends EventEmitter {
 		super();
 
 		this.state = 'initializing';
-		this.buffer = [];
 
 		const user = os.store.state.i;
 
@@ -26,114 +25,34 @@ export default class Stream extends EventEmitter {
 		this.stream.addEventListener('open', this.onOpen);
 		this.stream.addEventListener('close', this.onClose);
 		this.stream.addEventListener('message', this.onMessage);
-
-		if (user) {
-			const main = this.useSharedConnection('main');
-
-			// 自分の情報が更新されたとき
-			main.on('meUpdated', i => {
-				os.store.dispatch('mergeMe', i);
-			});
-
-			main.on('readAllNotifications', () => {
-				os.store.dispatch('mergeMe', {
-					hasUnreadNotification: false
-				});
-			});
-
-			main.on('unreadNotification', () => {
-				os.store.dispatch('mergeMe', {
-					hasUnreadNotification: true
-				});
-			});
-
-			main.on('readAllMessagingMessages', () => {
-				os.store.dispatch('mergeMe', {
-					hasUnreadMessagingMessage: false
-				});
-			});
-
-			main.on('unreadMessagingMessage', () => {
-				os.store.dispatch('mergeMe', {
-					hasUnreadMessagingMessage: true
-				});
-			});
-
-			main.on('unreadMention', () => {
-				os.store.dispatch('mergeMe', {
-					hasUnreadMentions: true
-				});
-			});
-
-			main.on('readAllUnreadMentions', () => {
-				os.store.dispatch('mergeMe', {
-					hasUnreadMentions: false
-				});
-			});
-
-			main.on('unreadSpecifiedNote', () => {
-				os.store.dispatch('mergeMe', {
-					hasUnreadSpecifiedNotes: true
-				});
-			});
-
-			main.on('readAllUnreadSpecifiedNotes', () => {
-				os.store.dispatch('mergeMe', {
-					hasUnreadSpecifiedNotes: false
-				});
-			});
-
-			main.on('clientSettingUpdated', x => {
-				os.store.commit('settings/set', {
-					key: x.key,
-					value: x.value
-				});
-			});
-
-			main.on('homeUpdated', x => {
-				os.store.commit('settings/setHome', x);
-			});
-
-			main.on('mobileHomeUpdated', x => {
-				os.store.commit('settings/setMobileHome', x);
-			});
-
-			main.on('widgetUpdated', x => {
-				os.store.commit('settings/setWidget', {
-					id: x.id,
-					data: x.data
-				});
-			});
-
-			// トークンが再生成されたとき
-			// このままではMisskeyが利用できないので強制的にサインアウトさせる
-			main.on('myTokenRegenerated', () => {
-				alert('%i18n:common.my-token-regenerated%');
-				os.signout();
-			});
-		}
 	}
 
-	public useSharedConnection = (channel: string): SharedConnection => {
+	@autobind
-		const existConnection = this.sharedConnections.find(c => c.channel === channel);
+	public useSharedConnection(channel: string): SharedConnection {
+		let pool = this.sharedConnectionPools.find(p => p.channel === channel);
 
-		if (existConnection) {
+		if (pool == null) {
-			existConnection.use();
+			pool = new Pool(this, channel);
-			return existConnection;
+			this.sharedConnectionPools.push(pool);
-		} else {
+		}
-			const connection = new SharedConnection(this, channel);
+
-			connection.use();
+		const connection = new SharedConnection(this, channel, pool);
 		this.sharedConnections.push(connection);
 		return connection;
 	}
-	}
 
 	@autobind
 	public removeSharedConnection(connection: SharedConnection) {
-		this.sharedConnections = this.sharedConnections.filter(c => c.id !== connection.id);
+		this.sharedConnections = this.sharedConnections.filter(c => c !== connection);
 	}
 
-	public connectToChannel = (channel: string, params?: any): NonSharedConnection => {
+	@autobind
+	public removeSharedConnectionPool(pool: Pool) {
+		this.sharedConnectionPools = this.sharedConnectionPools.filter(p => p !== pool);
+	}
+
+	@autobind
+	public connectToChannel(channel: string, params?: any): NonSharedConnection {
 		const connection = new NonSharedConnection(this, channel, params);
 		this.nonSharedConnections.push(connection);
 		return connection;
@@ -141,7 +60,7 @@ export default class Stream extends EventEmitter {
 
 	@autobind
 	public disconnectToChannel(connection: NonSharedConnection) {
-		this.nonSharedConnections = this.nonSharedConnections.filter(c => c.id !== connection.id);
+		this.nonSharedConnections = this.nonSharedConnections.filter(c => c !== connection);
 	}
 
 	/**
@@ -154,17 +73,10 @@ export default class Stream extends EventEmitter {
 		this.state = 'connected';
 		this.emit('_connected_');
 
-		// バッファーを処理
-		const _buffer = [].concat(this.buffer); // Shallow copy
-		this.buffer = []; // Clear buffer
-		_buffer.forEach(data => {
-			this.send(data); // Resend each buffered messages
-		});
-
 		// チャンネル再接続
 		if (isReconnect) {
-			this.sharedConnections.forEach(c => {
+			this.sharedConnectionPools.forEach(p => {
-				c.connect();
+				p.connect();
 			});
 			this.nonSharedConnections.forEach(c => {
 				c.connect();
@@ -177,9 +89,11 @@ export default class Stream extends EventEmitter {
 	 */
 	@autobind
 	private onClose() {
+		if (this.state == 'connected') {
 			this.state = 'reconnecting';
 			this.emit('_disconnected_');
 		}
+	}
 
 	/**
 	 * Callback of when received a message from connection
@@ -190,8 +104,18 @@ export default class Stream extends EventEmitter {
 
 		if (type == 'channel') {
 			const id = body.id;
-			const connection = this.sharedConnections.find(c => c.id === id) || this.nonSharedConnections.find(c => c.id === id);
+
-			connection.emit(body.type, body.body);
+			let connections: Connection[];
+
+			connections = this.sharedConnections.filter(c => c.id === id);
+
+			if (connections.length === 0) {
+				connections = [this.nonSharedConnections.find(c => c.id === id)];
+			}
+
+			connections.filter(c => c != null).forEach(c => {
+				c.emit(body.type, body.body);
+			});
 		} else {
 			this.emit(type, body);
 		}
@@ -207,12 +131,6 @@ export default class Stream extends EventEmitter {
 			body: payload
 		};
 
-		// まだ接続が確立されていなかったらバッファリングして次に接続した時に送信する
-		if (this.state != 'connected') {
-			this.buffer.push(data);
-			return;
-		}
-
 		this.stream.send(JSON.stringify(data));
 	}
 
@@ -226,19 +144,139 @@ export default class Stream extends EventEmitter {
 	}
 }
 
-abstract class Connection extends EventEmitter {
+class Pool {
 	public channel: string;
 	public id: string;
-	protected params: any;
 	protected stream: Stream;
+	public users = 0;
+	private disposeTimerId: any;
+	private isConnected = false;
 
-	constructor(stream: Stream, channel: string, params?: any) {
+	constructor(stream: Stream, channel: string) {
+		this.channel = channel;
+		this.stream = stream;
+
+		this.id = Math.random().toString().substr(2, 8);
+
+		this.stream.on('_disconnected_', this.onStreamDisconnected);
+	}
+
+	@autobind
+	private onStreamDisconnected() {
+		this.isConnected = false;
+	}
+
+	@autobind
+	public inc() {
+		if (this.users === 0 && !this.isConnected) {
+			this.connect();
+		}
+
+		this.users++;
+
+		// タイマー解除
+		if (this.disposeTimerId) {
+			clearTimeout(this.disposeTimerId);
+			this.disposeTimerId = null;
+		}
+	}
+
+	@autobind
+	public dec() {
+		this.users--;
+
+		// そのコネクションの利用者が誰もいなくなったら
+		if (this.users === 0) {
+			// また直ぐに再利用される可能性があるので、一定時間待ち、
+			// 新たな利用者が現れなければコネクションを切断する
+			this.disposeTimerId = setTimeout(() => {
+				this.disconnect();
+			}, 3000);
+		}
+	}
+
+	@autobind
+	public connect() {
+		if (this.isConnected) return;
+		this.isConnected = true;
+		this.stream.send('connect', {
+			channel: this.channel,
+			id: this.id
+		});
+	}
+
+	@autobind
+	private disconnect() {
+		this.stream.off('_disconnected_', this.onStreamDisconnected);
+		this.stream.send('disconnect', { id: this.id });
+		this.stream.removeSharedConnectionPool(this);
+	}
+}
+
+abstract class Connection extends EventEmitter {
+	public channel: string;
+	protected stream: Stream;
+	public abstract id: string;
+
+	constructor(stream: Stream, channel: string) {
 		super();
 
 		this.stream = stream;
 		this.channel = channel;
+	}
+
+	@autobind
+	public send(id: string, typeOrPayload, payload?) {
+		const type = payload === undefined ? typeOrPayload.type : typeOrPayload;
+		const body = payload === undefined ? typeOrPayload.body : payload;
+
+		this.stream.send('ch', {
+			id: id,
+			type: type,
+			body: body
+		});
+	}
+
+	public abstract dispose(): void;
+}
+
+class SharedConnection extends Connection {
+	private pool: Pool;
+
+	public get id(): string {
+		return this.pool.id;
+	}
+
+	constructor(stream: Stream, channel: string, pool: Pool) {
+		super(stream, channel);
+
+		this.pool = pool;
+		this.pool.inc();
+	}
+
+	@autobind
+	public send(typeOrPayload, payload?) {
+		super.send(this.pool.id, typeOrPayload, payload);
+	}
+
+	@autobind
+	public dispose() {
+		this.pool.dec();
+		this.removeAllListeners();
+		this.stream.removeSharedConnection(this);
+	}
+}
+
+class NonSharedConnection extends Connection {
+	public id: string;
+	protected params: any;
+
+	constructor(stream: Stream, channel: string, params?: any) {
+		super(stream, channel);
+
 		this.params = params;
-		this.id = Math.random().toString();
+		this.id = Math.random().toString().substr(2, 8);
+
 		this.connect();
 	}
 
@@ -253,60 +291,7 @@ abstract class Connection extends EventEmitter {
 
 	@autobind
 	public send(typeOrPayload, payload?) {
-		const data = payload === undefined ? typeOrPayload : {
+		super.send(this.id, typeOrPayload, payload);
-			type: typeOrPayload,
-			body: payload
-		};
-
-		this.stream.send('channel', {
-			id: this.id,
-			body: data
-		});
-	}
-
-	public abstract dispose: () => void;
-}
-
-class SharedConnection extends Connection {
-	private users = 0;
-	private disposeTimerId: any;
-
-	constructor(stream: Stream, channel: string) {
-		super(stream, channel);
-	}
-
-	@autobind
-	public use() {
-		this.users++;
-
-		// タイマー解除
-		if (this.disposeTimerId) {
-			clearTimeout(this.disposeTimerId);
-			this.disposeTimerId = null;
-		}
-	}
-
-	@autobind
-	public dispose() {
-		this.users--;
-
-		// そのコネクションの利用者が誰もいなくなったら
-		if (this.users === 0) {
-			// また直ぐに再利用される可能性があるので、一定時間待ち、
-			// 新たな利用者が現れなければコネクションを切断する
-			this.disposeTimerId = setTimeout(() => {
-				this.disposeTimerId = null;
-				this.removeAllListeners();
-				this.stream.send('disconnect', { id: this.id });
-				this.stream.removeSharedConnection(this);
-			}, 3000);
-		}
-	}
-}
-
-class NonSharedConnection extends Connection {
-	constructor(stream: Stream, channel: string, params?: any) {
-		super(stream, channel, params);
 	}
 
 	@autobind

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

@@ -186,9 +186,8 @@ export default Vue.extend({
 		if (this.game.isStarted && !this.game.isEnded) {
 			this.pollingClock = setInterval(() => {
 				const crc32 = CRC32.str(this.logs.map(x => x.pos.toString()).join(''));
-				this.connection.send({
+				this.connection.send('check', {
-					type: 'check',
+					crc32: crc32
-					crc32
 				});
 			}, 3000);
 		}
@@ -224,9 +223,8 @@ export default Vue.extend({
 				sound.play();
 			}
 
-			this.connection.send({
+			this.connection.send('set', {
-				type: 'set',
+				pos: pos
-				pos
 			});
 
 			this.checkEnd();

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

@@ -149,9 +149,9 @@ export default Vue.extend({
 	},
 
 	created() {
-		this.connection.on('change-accepts', this.onChangeAccepts);
+		this.connection.on('changeAccepts', this.onChangeAccepts);
-		this.connection.on('update-settings', this.onUpdateSettings);
+		this.connection.on('updateSettings', this.onUpdateSettings);
-		this.connection.on('init-form', this.onInitForm);
+		this.connection.on('initForm', this.onInitForm);
 		this.connection.on('message', this.onMessage);
 
 		if (this.game.user1Id != this.$store.state.i.id && this.game.settings.form1) this.form = this.game.settings.form1;
@@ -159,9 +159,9 @@ export default Vue.extend({
 	},
 
 	beforeDestroy() {
-		this.connection.off('change-accepts', this.onChangeAccepts);
+		this.connection.off('changeAccepts', this.onChangeAccepts);
-		this.connection.off('update-settings', this.onUpdateSettings);
+		this.connection.off('updateSettings', this.onUpdateSettings);
-		this.connection.off('init-form', this.onInitForm);
+		this.connection.off('initForm', this.onInitForm);
 		this.connection.off('message', this.onMessage);
 	},
 
@@ -171,15 +171,11 @@ export default Vue.extend({
 		},
 
 		accept() {
-			this.connection.send({
+			this.connection.send('accept', {});
-				type: 'accept'
-			});
 		},
 
 		cancel() {
-			this.connection.send({
+			this.connection.send('cancelAccept', {});
-				type: 'cancel-accept'
-			});
 		},
 
 		onChangeAccepts(accepts) {
@@ -189,8 +185,7 @@ export default Vue.extend({
 		},
 
 		updateSettings() {
-			this.connection.send({
+			this.connection.send('updateSettings', {
-				type: 'update-settings',
 				settings: this.game.settings
 			});
 		},
@@ -216,8 +211,7 @@ export default Vue.extend({
 		},
 
 		onChangeForm(item) {
-			this.connection.send({
+			this.connection.send('updateForm', {
-				type: 'update-form',
 				id: item.id,
 				value: item.value
 			});

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

@@ -71,8 +71,7 @@ export default Vue.extend({
 
 			this.pingClock = setInterval(() => {
 				if (this.matching) {
-					this.connection.send({
+					this.connection.send('ping', {
-						type: 'ping',
 						id: this.matching.id
 					});
 				}

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

@@ -1,5 +1,7 @@
 import Vue from 'vue';
 
+import profileEditor from './profile-editor.vue';
+import noteSkeleton from './note-skeleton.vue';
 import theme from './theme.vue';
 import instance from './instance.vue';
 import cwButton from './cw-button.vue';
@@ -44,6 +46,8 @@ import uiSelect from './ui/select.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';
 
+Vue.component('mk-profile-editor', profileEditor);
+Vue.component('mk-note-skeleton', noteSkeleton);
 Vue.component('mk-theme', theme);
 Vue.component('mk-instance', instance);
 Vue.component('mk-cw-button', cwButton);

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

@@ -71,7 +71,7 @@ export default Vue.extend({
 	},
 
 	mounted() {
-		this.connection =((this as any).os.stream.connectToChannel('messaging', { otherparty: this.user.id });
+		this.connection = (this as any).os.stream.connectToChannel('messaging', { otherparty: this.user.id });
 
 		this.connection.on('message', this.onMessage);
 		this.connection.on('read', this.onRead);
@@ -174,8 +174,7 @@ export default Vue.extend({
 
 			this.messages.push(message);
 			if (message.userId != this.$store.state.i.id && !document.hidden) {
-				this.connection.send({
+				this.connection.send('read', {
-					type: 'read',
 					id: message.id
 				});
 			}
@@ -247,8 +246,7 @@ export default Vue.extend({
 			if (document.hidden) return;
 			this.messages.forEach(message => {
 				if (message.userId !== this.$store.state.i.id && !message.isRead) {
-					this.connection.send({
+					this.connection.send('read', {
-						type: 'read',
 						id: message.id
 					});
 				}
@@ -356,7 +354,7 @@ export default Vue.extend({
 		max-width 600px
 		margin 0 auto
 		padding 0
-		//background rgba(var(--face), 0.95)
+		background var(--messagingRoomBg)
 		background-clip content-box
 
 		> .new-message

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

@@ -116,16 +116,16 @@ export default Vue.component('misskey-flavored-markdown', {
 				case 'mention': {
 					return (createElement as any)('a', {
 						attrs: {
-							href: `${url}/@${getAcct(token)}`,
+							href: `${url}/${token.canonical}`,
 							target: '_blank',
 							dataIsMe: (this as any).i && getAcct((this as any).i) == getAcct(token),
 							style: 'color:var(--mfmMention);'
 						},
 						directives: [{
 							name: 'user-preview',
-							value: token.content
+							value: token.canonical
 						}]
-					}, token.content);
+					}, token.canonical);
 				}
 
 				case 'hashtag': {

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

@@ -8,6 +8,7 @@
 import Vue from 'vue';
 import { url } from '../../../config';
 import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
+import Ok from './ok.vue';
 
 export default Vue.extend({
 	props: ['note', 'source', 'compact'],
@@ -21,11 +22,33 @@ export default Vue.extend({
 				icon: '%fa:link%',
 				text: '%i18n:@copy-link%',
 				action: this.copyLink
-			}, null, {
+			}];
+
+			if (this.note.uri) {
+				items.push({
+					icon: '%fa:external-link-square-alt%',
+					text: '%i18n:@remote%',
+					action: () => {
+						window.open(this.note.uri, '_blank');
+					}
+				});
+			}
+
+			items.push(null);
+
+			if (this.note.isFavorited) {
+				items.push({
+					icon: '%fa:star%',
+					text: '%i18n:@unfavorite%',
+					action: this.unfavorite
+				});
+			} else {
+				items.push({
 					icon: '%fa:star%',
 					text: '%i18n:@favorite%',
 					action: this.favorite
-			}];
+				});
+			}
 
 			if (this.note.userId == this.$store.state.i.id) {
 				if ((this.$store.state.i.pinnedNoteIds || []).includes(this.note.id)) {
@@ -44,6 +67,7 @@ export default Vue.extend({
 			}
 
 			if (this.note.userId == this.$store.state.i.id || this.$store.state.i.isAdmin) {
+				items.push(null);
 				items.push({
 					icon: '%fa:trash-alt R%',
 					text: '%i18n:@delete%',
@@ -51,16 +75,6 @@ export default Vue.extend({
 				});
 			}
 
-			if (this.note.uri) {
-				items.push({
-					icon: '%fa:external-link-square-alt%',
-					text: '%i18n:@remote%',
-					action: () => {
-						window.open(this.note.uri, '_blank');
-					}
-				});
-			}
-
 			return items;
 		}
 	},
@@ -78,6 +92,7 @@ export default Vue.extend({
 			(this as any).api('i/pin', {
 				noteId: this.note.id
 			}).then(() => {
+				(this as any).os.new(Ok);
 				this.destroyDom();
 			});
 		},
@@ -103,6 +118,16 @@ export default Vue.extend({
 			(this as any).api('notes/favorites/create', {
 				noteId: this.note.id
 			}).then(() => {
+				(this as any).os.new(Ok);
+				this.destroyDom();
+			});
+		},
+
+		unfavorite() {
+			(this as any).api('notes/favorites/delete', {
+				noteId: this.note.id
+			}).then(() => {
+				(this as any).os.new(Ok);
 				this.destroyDom();
 			});
 		},

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

@@ -0,0 +1,52 @@
+<template>
+<div>
+	<vue-content-loading v-if="width" :width="width" :height="100" :primary="primary" :secondary="secondary">
+		<circle cx="30" cy="30" r="30" />
+		<rect x="75" y="13" rx="4" ry="4" :width="150 + r1" height="15" />
+		<rect x="75" y="39" rx="4" ry="4" :width="260 + r2" height="10" />
+		<rect x="75" y="59" rx="4" ry="4" :width="230 + r3" height="10" />
+	</vue-content-loading>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import VueContentLoading from 'vue-content-loading';
+import * as tinycolor from 'tinycolor2';
+
+export default Vue.extend({
+	components: {
+		VueContentLoading,
+	},
+
+	data() {
+		return {
+			width: 0,
+			r1: (Math.random() * 100) - 50,
+			r2: (Math.random() * 100) - 50,
+			r3: (Math.random() * 100) - 50
+		};
+	},
+
+	computed: {
+		text(): tinycolor.Instance {
+			const text = tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--text'));
+			return text;
+		},
+
+		primary(): string {
+			return '#' + this.text.clone().toHex();
+		},
+
+		secondary(): string {
+			return '#' + this.text.clone().darken(20).toHex();
+		}
+	},
+
+	mounted() {
+		let width = this.$el.clientWidth;
+		if (width < 400) width = 400;
+		this.width = width;
+	}
+});
+</script>

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

@@ -0,0 +1,175 @@
+<template>
+<div class="yvbkymdqeusiqucuuloahhiqflzinufs">
+	<div class="bg" ref="bg"></div>
+	<div class="body" ref="body">
+		<div class="icon">
+			<div class="circle left"></div>
+			<span class="check tip"></span>
+			<span class="check long"></span>
+			<div class="ring"></div>
+			<div class="fix"></div>
+			<div class="circle right"></div>
+		</div>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import * as anime from 'animejs';
+
+export default Vue.extend({
+	mounted() {
+		this.$nextTick(() => {
+			anime({
+				targets: this.$refs.bg,
+				opacity: 1,
+				duration: 300,
+				easing: 'linear'
+			});
+
+			anime({
+				targets: this.$refs.body,
+				opacity: 1,
+				scale: [1.2, 1],
+				duration: 300,
+				easing: [0, 0.5, 0.5, 1]
+			});
+		});
+
+		setTimeout(() => {
+			anime({
+				targets: this.$refs.bg,
+				opacity: 0,
+				duration: 300,
+				easing: 'linear'
+			});
+
+			anime({
+				targets: this.$refs.body,
+				opacity: 0,
+				scale: 0.8,
+				duration: 300,
+				easing: [0.5, 0, 1, 0.5],
+				complete: () => this.destroyDom()
+			});
+		}, 1250);
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.yvbkymdqeusiqucuuloahhiqflzinufs
+	pointer-events none
+
+	> .bg
+		display block
+		position fixed
+		z-index 10000
+		top 0
+		left 0
+		width 100%
+		height 100%
+		background rgba(#000, 0.7)
+		opacity 0
+
+	> .body
+		position fixed
+		z-index 10000
+		top 0
+		right 0
+		left 0
+		bottom 0
+		margin auto
+		width 150px
+		height 150px
+		background var(--face)
+		border-radius 8px
+		opacity 0
+
+		> .icon
+			display flex
+			justify-content center
+			position absolute
+			top 0
+			right 0
+			left 0
+			bottom 0
+			width 5em
+			height 5em
+			margin auto
+			border .25em solid transparent
+			border-radius 50%
+			line-height 5em
+			cursor default
+			box-sizing content-box
+			user-select none
+			zoom normal
+			border-color #a5dc86
+
+			> .circle
+				position absolute
+				width 3.75em
+				height 7.5em
+				transform rotate(45deg)
+				border-radius 50%
+				background var(--face)
+
+				&.left
+					top -.4375em
+					left -2.0635em
+					transform rotate(-45deg)
+					transform-origin 3.75em 3.75em
+					border-radius 7.5em 0 0 7.5em
+
+				&.right
+					top -.6875em
+					left 1.875em
+					transform rotate(-45deg)
+					transform-origin 0 3.75em
+					border-radius 0 7.5em 7.5em 0
+					animation swal2-rotate-success-circular-line 4.25s ease-in
+
+			> .check
+				display block
+				position absolute
+				height .3125em
+				border-radius .125em
+				background-color #a5dc86
+				z-index 2
+
+				&.tip
+					top 2.875em
+					left .875em
+					width 1.5625em
+					transform rotate(45deg)
+					animation swal2-animate-success-line-tip .75s
+
+				&.long
+					top 2.375em
+					right .5em
+					width 2.9375em
+					transform rotate(-45deg)
+					animation swal2-animate-success-line-long .75s
+
+			> .fix
+				position absolute
+				top .5em
+				left 1.625em
+				width .4375em
+				height 5.625em
+				transform rotate(-45deg)
+				z-index 1
+				background var(--face)
+
+			> .ring
+				position absolute
+				top -.25em
+				left -.25em
+				width 100%
+				height 100%
+				border .25em solid rgba(165,220,134,.3)
+				border-radius 50%
+				z-index 2
+				box-sizing content-box
+</style>

src/client/app/common/views/components/profile-editor.vue

@@ -49,6 +49,7 @@
 
 		<div>
 			<ui-switch v-model="isCat" @change="save(false)">%i18n:@is-cat%</ui-switch>
+			<ui-switch v-model="isBot" @change="save(false)">%i18n:@is-bot%</ui-switch>
 			<ui-switch v-model="alwaysMarkNsfw">%i18n:common.always-mark-nsfw%</ui-switch>
 		</div>
 	</section>
@@ -58,6 +59,7 @@
 
 		<div>
 			<ui-switch v-model="isLocked" @change="save(false)">%i18n:@is-locked%</ui-switch>
+			<ui-switch v-model="carefulBot" @change="save(false)">%i18n:@careful-bot%</ui-switch>
 		</div>
 	</section>
 </ui-card>
@@ -65,7 +67,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { apiUrl, host } from '../../../../config';
+import { apiUrl, host } from '../../../config';
 
 export default Vue.extend({
 	data() {
@@ -79,7 +81,9 @@ export default Vue.extend({
 			avatarId: null,
 			bannerId: null,
 			isCat: false,
+			isBot: false,
 			isLocked: false,
+			carefulBot: false,
 			saving: false,
 			avatarUploading: false,
 			bannerUploading: false
@@ -102,7 +106,9 @@ export default Vue.extend({
 		this.avatarId = this.$store.state.i.avatarId;
 		this.bannerId = this.$store.state.i.bannerId;
 		this.isCat = this.$store.state.i.isCat;
+		this.isBot = this.$store.state.i.isBot;
 		this.isLocked = this.$store.state.i.isLocked;
+		this.carefulBot = this.$store.state.i.carefulBot;
 	},
 
 	methods: {
@@ -161,7 +167,9 @@ export default Vue.extend({
 				avatarId: this.avatarId,
 				bannerId: this.bannerId,
 				isCat: this.isCat,
-				isLocked: this.isLocked
+				isBot: this.isBot,
+				isLocked: this.isLocked,
+				carefulBot: this.carefulBot
 			}).then(i => {
 				this.saving = false;
 				this.$store.state.i.avatarId = i.avatarId;
@@ -170,7 +178,10 @@ export default Vue.extend({
 				this.$store.state.i.bannerUrl = i.bannerUrl;
 
 				if (notify) {
-					alert('%i18n:@saved%');
+					this.$swal({
+						type: 'success',
+						text: '%i18n:@saved%'
+					});
 				}
 			});
 		}

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

@@ -1,16 +1,16 @@
 <template>
 <div class="mk-reactions-viewer">
 	<template v-if="reactions">
-		<span :class="{notReacted}" @click="react('like')" v-if="reactions.like"><mk-reaction-icon reaction="like"/><span>{{ reactions.like }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'like' }" @click="react('like')" v-if="reactions.like"><mk-reaction-icon reaction="like"/><span>{{ reactions.like }}</span></span>
-		<span :class="{notReacted}" @click="react('love')" v-if="reactions.love"><mk-reaction-icon reaction="love"/><span>{{ reactions.love }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'love' }" @click="react('love')" v-if="reactions.love"><mk-reaction-icon reaction="love"/><span>{{ reactions.love }}</span></span>
-		<span :class="{notReacted}" @click="react('laugh')" v-if="reactions.laugh"><mk-reaction-icon reaction="laugh"/><span>{{ reactions.laugh }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'laugh' }" @click="react('laugh')" v-if="reactions.laugh"><mk-reaction-icon reaction="laugh"/><span>{{ reactions.laugh }}</span></span>
-		<span :class="{notReacted}" @click="react('hmm')" v-if="reactions.hmm"><mk-reaction-icon reaction="hmm"/><span>{{ reactions.hmm }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'hmm' }" @click="react('hmm')" v-if="reactions.hmm"><mk-reaction-icon reaction="hmm"/><span>{{ reactions.hmm }}</span></span>
-		<span :class="{notReacted}" @click="react('surprise')" v-if="reactions.surprise"><mk-reaction-icon reaction="surprise"/><span>{{ reactions.surprise }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'surprise' }" @click="react('surprise')" v-if="reactions.surprise"><mk-reaction-icon reaction="surprise"/><span>{{ reactions.surprise }}</span></span>
-		<span :class="{notReacted}" @click="react('congrats')" v-if="reactions.congrats"><mk-reaction-icon reaction="congrats"/><span>{{ reactions.congrats }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'congrats' }" @click="react('congrats')" v-if="reactions.congrats"><mk-reaction-icon reaction="congrats"/><span>{{ reactions.congrats }}</span></span>
-		<span :class="{notReacted}" @click="react('angry')" v-if="reactions.angry"><mk-reaction-icon reaction="angry"/><span>{{ reactions.angry }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'angry' }" @click="react('angry')" v-if="reactions.angry"><mk-reaction-icon reaction="angry"/><span>{{ reactions.angry }}</span></span>
-		<span :class="{notReacted}" @click="react('confused')" v-if="reactions.confused"><mk-reaction-icon reaction="confused"/><span>{{ reactions.confused }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'confused' }" @click="react('confused')" v-if="reactions.confused"><mk-reaction-icon reaction="confused"/><span>{{ reactions.confused }}</span></span>
-		<span :class="{notReacted}" @click="react('rip')" v-if="reactions.rip"><mk-reaction-icon reaction="rip"/><span>{{ reactions.rip }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'rip' }" @click="react('rip')" v-if="reactions.rip"><mk-reaction-icon reaction="rip"/><span>{{ reactions.rip }}</span></span>
-		<span :class="{notReacted}" @click="react('pudding')" v-if="reactions.pudding"><mk-reaction-icon reaction="pudding"/><span>{{ reactions.pudding }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'pudding' }" @click="react('pudding')" v-if="reactions.pudding"><mk-reaction-icon reaction="pudding"/><span>{{ reactions.pudding }}</span></span>
 	</template>
 </div>
 </template>
@@ -22,9 +22,6 @@ export default Vue.extend({
 	computed: {
 		reactions(): number {
 			return this.note.reactionCounts;
-		},
-		notReacted(): boolean {
-			return this.note.myReaction == null;
 		}
 	},
 	methods: {
@@ -40,25 +37,42 @@ export default Vue.extend({
 
 <style lang="stylus" scoped>
 .mk-reactions-viewer
-	border-top dashed 1px var(--reactionViewerBorder)
+	margin 6px 0
-	border-bottom dashed 1px var(--reactionViewerBorder)
-	margin 4px 0
 
 	&:empty
 		display none
 
 	> span
-		margin-right 8px
+		display inline-block
+		height 32px
+		margin-right 6px
+		padding 0 6px
+		border-radius 4px
 
-		&.notReacted
+		*
+			user-select none
+			pointer-events none
+
+		&.reacted
+			background var(--primary)
+
+			> span
+				color var(--primaryForeground)
+
+		&:not(.reacted)
 			cursor pointer
+			background var(--reactionViewerButtonBg)
+
+			&:hover
+				background var(--reactionViewerButtonHoverBg)
 
 		> .mk-reaction-icon
 			font-size 1.4em
 
 		> span
-			margin-left 4px
+			font-size 1.1em
-			font-size 1.2em
+			line-height 32px
+			vertical-align middle
 			color var(--text)
 
 </style>

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

@@ -67,22 +67,30 @@
 	</details>
 
 	<details>
-		<summary>%fa:folder-open% %i18n:@installed-themes%</summary>
+		<summary>%fa:folder-open% %i18n:@manage-themes%</summary>
-		<ui-select v-model="selectedInstalledThemeId" placeholder="%i18n:@select-theme%">
+		<ui-select v-model="selectedThemeId" placeholder="%i18n:@select-theme%">
-			<option v-for="x in installedThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
+			<optgroup label="%i18n:@builtin-themes%">
+				<option v-for="x in builtinThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
+			</optgroup>
+			<optgroup label="%i18n:@my-themes%">
+				<option v-for="x in installedThemes.filter(t => t.author == this.$store.state.i.username)" :value="x.id" :key="x.id">{{ x.name }}</option>
+			</optgroup>
+			<optgroup label="%i18n:@installed-themes%">
+				<option v-for="x in installedThemes.filter(t => t.author != this.$store.state.i.username)" :value="x.id" :key="x.id">{{ x.name }}</option>
+			</optgroup>
 		</ui-select>
-		<template v-if="selectedInstalledTheme">
+		<template v-if="selectedTheme">
-			<ui-input readonly :value="selectedInstalledTheme.author">
+			<ui-input readonly :value="selectedTheme.author">
 				<span>%i18n:@author%</span>
 			</ui-input>
-			<ui-textarea v-if="selectedInstalledTheme.desc" readonly :value="selectedInstalledTheme.desc">
+			<ui-textarea v-if="selectedTheme.desc" readonly :value="selectedTheme.desc">
 				<span>%i18n:@desc%</span>
 			</ui-textarea>
-			<ui-textarea readonly :value="selectedInstalledThemeCode">
+			<ui-textarea readonly :value="selectedThemeCode">
 				<span>%i18n:@theme-code%</span>
 			</ui-textarea>
-			<ui-button @click="export_()" link :download="`${selectedInstalledTheme.name}.misskeytheme`" ref="export">%fa:box% %i18n:@export%</ui-button>
+			<ui-button @click="export_()" link :download="`${selectedTheme.name}.misskeytheme`" ref="export">%fa:box% %i18n:@export%</ui-button>
-			<ui-button @click="uninstall()">%fa:trash-alt R% %i18n:@uninstall%</ui-button>
+			<ui-button @click="uninstall()" v-if="!builtinThemes.some(t => t.id == selectedTheme.id)">%fa:trash-alt R% %i18n:@uninstall%</ui-button>
 		</template>
 	</details>
 </div>
@@ -117,8 +125,9 @@ export default Vue.extend({
 
 	data() {
 		return {
+			builtinThemes: builtinThemes,
 			installThemeCode: null,
-			selectedInstalledThemeId: null,
+			selectedThemeId: null,
 			myThemeBase: 'light',
 			myThemeName: '',
 			myThemeDesc: '',
@@ -155,14 +164,14 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'darkTheme', value }); }
 		},
 
-		selectedInstalledTheme() {
+		selectedTheme() {
-			if (this.selectedInstalledThemeId == null) return null;
+			if (this.selectedThemeId == null) return null;
-			return this.installedThemes.find(x => x.id == this.selectedInstalledThemeId);
+			return this.themes.find(x => x.id == this.selectedThemeId);
 		},
 
-		selectedInstalledThemeCode() {
+		selectedThemeCode() {
-			if (this.selectedInstalledTheme == null) return null;
+			if (this.selectedTheme == null) return null;
-			return JSON5.stringify(this.selectedInstalledTheme, null, '\t');
+			return JSON5.stringify(this.selectedTheme, null, '\t');
 		},
 
 		myTheme(): any {
@@ -210,7 +219,10 @@ export default Vue.extend({
 			try {
 				theme = JSON5.parse(code);
 			} catch (e) {
-				alert('%i18n:@invalid-theme%');
+				this.$swal({
+					type: 'error',
+					text: '%i18n:@invalid-theme%'
+				});
 				return;
 			}
 
@@ -220,12 +232,18 @@ export default Vue.extend({
 			}
 
 			if (theme.id == null) {
-				alert('%i18n:@invalid-theme%');
+				this.$swal({
+					type: 'error',
+					text: '%i18n:@invalid-theme%'
+				});
 				return;
 			}
 
 			if (this.$store.state.device.themes.some(t => t.id == theme.id)) {
-				alert('%i18n:@already-installed%');
+				this.$swal({
+					type: 'info',
+					text: '%i18n:@already-installed%'
+				});
 				return;
 			}
 
@@ -234,16 +252,23 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});
 
-			alert('%i18n:@installed%'.replace('{}', theme.name));
+			this.$swal({
+				type: 'success',
+				text: '%i18n:@installed%'.replace('{}', theme.name)
+			});
 		},
 
 		uninstall() {
-			const theme = this.selectedInstalledTheme;
+			const theme = this.selectedTheme;
 			const themes = this.$store.state.device.themes.filter(t => t.id != theme.id);
 			this.$store.commit('device/set', {
 				key: 'themes', value: themes
 			});
-			alert('%i18n:@uninstalled%'.replace('{}', theme.name));
+
+			this.$swal({
+				type: 'info',
+				text: '%i18n:@uninstalled%'.replace('{}', theme.name)
+			});
 		},
 
 		import_() {
@@ -251,7 +276,7 @@ export default Vue.extend({
 		}
 
 		export_() {
-			const blob = new Blob([this.selectedInstalledThemeCode], {
+			const blob = new Blob([this.selectedThemeCode], {
 				type: 'application/json5'
 			});
 			this.$refs.export.$el.href = window.URL.createObjectURL(blob);
@@ -275,16 +300,26 @@ export default Vue.extend({
 
 		gen() {
 			const theme = this.myTheme;
+
 			if (theme.name == null || theme.name.trim() == '') {
-				alert('%i18n:@theme-name-required%');
+				this.$swal({
+					type: 'warning',
+					text: '%i18n:@theme-name-required%'
+				});
 				return;
 			}
+
 			theme.id = uuid();
+
 			const themes = this.$store.state.device.themes.concat(theme);
 			this.$store.commit('device/set', {
 				key: 'themes', value: themes
 			});
-			alert('%i18n:@saved%');
+
+			this.$swal({
+				type: 'success',
+				text: '%i18n:@saved%'
+			});
 		}
 	}
 });

src/client/app/common/views/components/ui/card.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="ui-card">
+<div class="ui-card" :class="{ shadow: $store.state.settings.useShadow }">
 	<header>
 		<slot name="title"></slot>
 	</header>
@@ -24,6 +24,9 @@ export default Vue.extend({
 	margin 16px
 	color var(--faceText)
 	background var(--face)
+	border-radius var(--round)
+
+	&.shadow
 		box-shadow 0 3px 1px -2px rgba(#000, 0.2), 0 2px 2px 0 rgba(#000, 0.14), 0 1px 5px 0 rgba(#000, 0.12)
 
 	> header

src/client/app/common/views/components/ui/input.vue

@@ -122,6 +122,7 @@ export default Vue.extend({
 		}
 	},
 	mounted() {
+		this.$nextTick(() => {
 			if (this.$refs.prefix) {
 				this.$refs.label.style.left = (this.$refs.prefix.offsetLeft + this.$refs.prefix.offsetWidth) + 'px';
 				if (this.$refs.prefix.offsetWidth) {
@@ -133,6 +134,7 @@ export default Vue.extend({
 					this.$refs.input.style.paddingRight = this.$refs.suffix.offsetWidth + 'px';
 				}
 			}
+		});
 	},
 	methods: {
 		focus() {

src/client/app/common/views/directives/autocomplete.ts

@@ -1,6 +1,6 @@
 import * as getCaretCoordinates from 'textarea-caret';
 import MkAutocomplete from '../components/autocomplete.vue';
-import renderAcct from '../../../../../misc/acct/render';
+import { toASCII } from 'punycode';
 
 export default {
 	bind(el, binding, vn) {
@@ -188,7 +188,7 @@ class Autocomplete {
 			const trimmedBefore = before.substring(0, before.lastIndexOf('@'));
 			const after = source.substr(caret);
 
-			const acct = renderAcct(value);
+			const acct = value.host === null ? value.username : `${value.username}@${toASCII(value.host)}`;
 
 			// 挿入
 			this.text = `${trimmedBefore}@${acct} ${after}`;

src/client/app/common/views/widgets/photo-stream.vue

@@ -73,9 +73,6 @@ export default define({
 		border-radius 8px
 
 .stream
-	display -webkit-flex
-	display -moz-flex
-	display -ms-flex
 	display flex
 	justify-content center
 	flex-wrap wrap

src/client/app/common/views/widgets/posts-monitor.vue

@@ -113,9 +113,8 @@ export default define({
 
 		this.connection.on('stats', this.onStats);
 		this.connection.on('statsLog', this.onStatsLog);
-		this.connection.send({
+		this.connection.send('requestLog',{
-			type: 'requestLog',
+			id: Math.random().toString().substr(2, 8)
-			id: Math.random().toString()
 		});
 	},
 	beforeDestroy() {

src/client/app/common/views/widgets/rss.vue

@@ -44,7 +44,6 @@ export default define({
 		},
 		fetch() {
 			fetch(`https://api.rss2json.com/v1/api.json?rss_url=${this.props.url}`, {
-				cache: 'no-cache'
 			}).then(res => {
 				res.json().then(feed => {
 					this.items = feed.items;

src/client/app/common/views/widgets/server.cpu-memory.vue

@@ -91,9 +91,8 @@ export default Vue.extend({
 	mounted() {
 		this.connection.on('stats', this.onStats);
 		this.connection.on('statsLog', this.onStatsLog);
-		this.connection.send({
+		this.connection.send('requestLog', {
-			type: 'requestLog',
+			id: Math.random().toString().substr(2, 8)
-			id: Math.random().toString()
 		});
 	},
 	beforeDestroy() {

src/client/app/desktop/api/post.ts

@@ -6,13 +6,17 @@ export default (os: OS) => opts => {
 	const o = opts || {};
 	if (o.renote) {
 		const vm = os.new(RenoteFormWindow, {
-			note: o.renote
+			note: o.renote,
+			animation: o.animation == null ? true : o.animation
 		});
+		if (o.cb) vm.$once('closed', o.cb);
 		document.body.appendChild(vm.$el);
 	} else {
 		const vm = os.new(PostFormWindow, {
-			reply: o.reply
+			reply: o.reply,
+			animation: o.animation == null ? true : o.animation
 		});
+		if (o.cb) vm.$once('closed', o.cb);
 		document.body.appendChild(vm.$el);
 	}
 };

src/client/app/desktop/script.ts

@@ -67,8 +67,8 @@ init(async (launch) => {
 			{ path: '/tags/:tag', component: MkTag },
 			{ path: '/share', component: MkShare },
 			{ path: '/reversi/:game?', component: MkReversi },
-			{ path: '/@:user', component: MkUser },
+			{ path: '/@:user', name: 'user', component: MkUser },
-			{ path: '/notes/:note', component: MkNote },
+			{ path: '/notes/:note', name: 'note', component: MkNote },
 			{ path: '/authorize-follow', component: MkFollow }
 		]
 	});

src/client/app/desktop/views/components/ellipsis-icon.vue

@@ -1,37 +0,0 @@
-<template>
-<div class="mk-ellipsis-icon">
-	<div></div><div></div><div></div>
-</div>
-</template>
-
-<style lang="stylus" scoped>
-.mk-ellipsis-icon
-	width 70px
-	margin 0 auto
-	text-align center
-
-	> div
-		display inline-block
-		width 18px
-		height 18px
-		background-color rgba(#000, 0.3)
-		border-radius 100%
-		animation bounce 1.4s infinite ease-in-out both
-
-		&:nth-child(1)
-			animation-delay 0s
-
-		&:nth-child(2)
-			margin 0 6px
-			animation-delay 0.16s
-
-		&:nth-child(3)
-			animation-delay 0.32s
-
-	@keyframes bounce
-		0%, 80%, 100%
-			transform scale(0)
-		40%
-			transform scale(1)
-
-</style>

src/client/app/desktop/views/components/friends-maker.vue

@@ -8,7 +8,6 @@
 				<router-link class="name" :to="user | userPage" v-user-preview="user.id">{{ user | userName }}</router-link>
 				<p class="username">@{{ user | acct }}</p>
 			</div>
-			<mk-follow-button :user="user"/>
 		</div>
 	</div>
 	<p class="empty" v-if="!fetching && users.length == 0">%i18n:@empty%</p>

src/client/app/desktop/views/components/home.vue

@@ -38,7 +38,7 @@
 			</div>
 		</div>
 	</div>
-	<div class="main">
+	<div class="main" :class="{ side: widgets.left.length == 0 || widgets.right.length == 0 }">
 		<template v-if="customize">
 			<x-draggable v-for="place in ['left', 'right']"
 				:list="widgets[place]"
@@ -359,12 +359,10 @@ export default Vue.extend({
 				box-shadow var(--shadow)
 				border-radius var(--round)
 
-			@media (max-width 700px)
+		&.side
-				padding 0
+			> .main
-
+				width calc(100% - 280px)
-				> .tl
+				max-width 680px
-					border none
-					border-radius 0
 
 		> *:not(.main)
 			width 280px
@@ -381,12 +379,22 @@ export default Vue.extend({
 			padding-right 16px
 			order 3
 
-		@media (max-width 1100px)
+		&.side
+			@media (max-width 1000px)
+				> *:not(.main)
+					display none
+
+				> .main
+					width 100%
+					max-width 700px
+					margin 0 auto
+
+		&:not(.side)
+			@media (max-width 1200px)
 				> *:not(.main)
 					display none
 
 				> .main
-				float none
 					width 100%
 					max-width 700px
 					margin 0 auto

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

@@ -9,7 +9,6 @@ import subNoteContent from './sub-note-content.vue';
 import window from './window.vue';
 import noteFormWindow from './post-form-window.vue';
 import renoteFormWindow from './renote-form-window.vue';
-import ellipsisIcon from './ellipsis-icon.vue';
 import mediaImage from './media-image.vue';
 import mediaImageDialog from './media-image-dialog.vue';
 import mediaVideo from './media-video.vue';
@@ -39,7 +38,6 @@ Vue.component('mk-sub-note-content', subNoteContent);
 Vue.component('mk-window', window);
 Vue.component('mk-post-form-window', noteFormWindow);
 Vue.component('mk-renote-form-window', renoteFormWindow);
-Vue.component('mk-ellipsis-icon', ellipsisIcon);
 Vue.component('mk-media-image', mediaImage);
 Vue.component('mk-media-image-dialog', mediaImageDialog);
 Vue.component('mk-media-video', mediaVideo);

src/client/app/desktop/views/components/note-detail.vue

@@ -91,7 +91,7 @@ import MkPostFormWindow from './post-form-window.vue';
 import MkRenoteFormWindow from './renote-form-window.vue';
 import MkNoteMenu from '../../../common/views/components/note-menu.vue';
 import MkReactionPicker from '../../../common/views/components/reaction-picker.vue';
-import XSub from './notes.note.sub.vue';
+import XSub from './note.sub.vue';
 import { sum } from '../../../../../prelude/array';
 import noteSubscriber from '../../../common/scripts/note-subscriber';
 

src/client/app/desktop/views/components/note.sub.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="tkfdzaxtkdeianobciwadajxzbddorql" :title="title">
+<div class="tkfdzaxtkdeianobciwadajxzbddorql" :class="{ mini }" :title="title">
 	<mk-avatar class="avatar" :user="note.user"/>
 	<div class="main">
 		<mk-note-header class="header" :note="note"/>
@@ -24,6 +24,11 @@ export default Vue.extend({
 		note: {
 			type: Object,
 			required: true
+		},
+		mini: {
+			type: Boolean,
+			required: false,
+			default: false
 		}
 	},
 
@@ -44,11 +49,19 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .tkfdzaxtkdeianobciwadajxzbddorql
 	display flex
-	margin 0
 	padding 16px 32px
 	font-size 0.9em
 	background var(--subNoteBg)
 
+	&.mini
+		padding 16px
+		font-size 10px
+
+		> .avatar
+			margin 0 8px 0 0
+			width 38px
+			height 38px
+
 	> .avatar
 		flex-shrink 0
 		display block

src/client/app/desktop/views/components/note.vue

@@ -0,0 +1,379 @@
+<template>
+<div
+	class="note"
+	:class="{ mini }"
+	v-show="appearNote.deletedAt == null"
+	:tabindex="appearNote.deletedAt == null ? '-1' : null"
+	v-hotkey="keymap"
+	:title="title"
+>
+	<div class="conversation" v-if="detail && conversation.length > 0">
+		<x-sub v-for="note in conversation" :key="note.id" :note="note" :mini="mini"/>
+	</div>
+	<div class="reply-to" v-if="appearNote.reply && (!$store.getters.isSignedIn || $store.state.settings.showReplyTarget)">
+		<x-sub :note="appearNote.reply" :mini="mini"/>
+	</div>
+	<div class="renote" v-if="isRenote">
+		<mk-avatar class="avatar" :user="note.user"/>
+		%fa:retweet%
+		<span>{{ '%i18n:@reposted-by%'.substr(0, '%i18n:@reposted-by%'.indexOf('{')) }}</span>
+		<a class="name" :href="note.user | userPage" v-user-preview="note.userId">{{ note.user | userName }}</a>
+		<span>{{ '%i18n:@reposted-by%'.substr('%i18n:@reposted-by%'.indexOf('}') + 1) }}</span>
+		<mk-time :time="note.createdAt"/>
+	</div>
+	<article>
+		<mk-avatar class="avatar" :user="appearNote.user"/>
+		<div class="main">
+			<mk-note-header class="header" :note="appearNote"/>
+			<div class="body">
+				<p v-if="appearNote.cw != null" class="cw">
+					<span class="text" v-if="appearNote.cw != ''">{{ appearNote.cw }}</span>
+					<mk-cw-button v-model="showContent"/>
+				</p>
+				<div class="content" v-show="appearNote.cw == null || showContent">
+					<div class="text">
+						<span v-if="appearNote.isHidden" style="opacity: 0.5">%i18n:@private%</span>
+						<a class="reply" v-if="appearNote.reply">%fa:reply%</a>
+						<misskey-flavored-markdown v-if="appearNote.text" :text="appearNote.text" :i="$store.state.i" :class="$style.text"/>
+						<a class="rp" v-if="appearNote.renote">RP:</a>
+					</div>
+					<div class="files" v-if="appearNote.files.length > 0">
+						<mk-media-list :media-list="appearNote.files"/>
+					</div>
+					<mk-poll v-if="appearNote.poll" :note="appearNote" ref="pollViewer"/>
+					<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% 位置情報</a>
+					<div class="renote" v-if="appearNote.renote"><mk-note-preview :note="appearNote.renote" :mini="mini"/></div>
+					<mk-url-preview v-for="url in urls" :url="url" :key="url" :mini="mini"/>
+				</div>
+			</div>
+			<footer>
+				<mk-reactions-viewer :note="appearNote" ref="reactionsViewer"/>
+				<button class="replyButton" @click="reply()" title="%i18n:@reply%">
+					<template v-if="appearNote.reply">%fa:reply-all%</template>
+					<template v-else>%fa:reply%</template>
+					<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
+				</button>
+				<button class="renoteButton" @click="renote()" title="%i18n:@renote%">
+					%fa:retweet%<p class="count" v-if="appearNote.renoteCount > 0">{{ appearNote.renoteCount }}</p>
+				</button>
+				<button class="reactionButton" :class="{ reacted: appearNote.myReaction != null }" @click="react()" ref="reactButton" title="%i18n:@add-reaction%">
+					%fa:plus%<p class="count" v-if="appearNote.reactions_count > 0">{{ appearNote.reactions_count }}</p>
+				</button>
+				<button @click="menu()" ref="menuButton">
+					%fa:ellipsis-h%
+				</button>
+			</footer>
+		</div>
+	</article>
+	<div class="replies" v-if="detail && replies.length > 0">
+		<x-sub v-for="note in replies" :key="note.id" :note="note" :mini="mini"/>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+import XSub from './note.sub.vue';
+import noteMixin from '../../../common/scripts/note-mixin';
+import noteSubscriber from '../../../common/scripts/note-subscriber';
+
+export default Vue.extend({
+	components: {
+		XSub
+	},
+
+	mixins: [
+		noteMixin(),
+		noteSubscriber('note')
+	],
+
+	props: {
+		note: {
+			type: Object,
+			required: true
+		},
+		detail: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+		mini: {
+			type: Boolean,
+			required: false,
+			default: false
+		}
+	},
+
+	data() {
+		return {
+			conversation: [],
+			replies: []
+		};
+	},
+
+	created() {
+		if (this.detail) {
+			(this as any).api('notes/replies', {
+				noteId: this.appearNote.id,
+				limit: 8
+			}).then(replies => {
+				this.replies = replies;
+			});
+
+			(this as any).api('notes/conversation', {
+				noteId: this.appearNote.replyId
+			}).then(conversation => {
+				this.conversation = conversation.reverse();
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.note
+	margin 0
+	padding 0
+	background var(--face)
+	border-bottom solid 1px var(--faceDivider)
+
+	&.mini
+		font-size 13px
+
+		> .renote
+			padding 8px 16px 0 16px
+
+			.avatar
+				width 20px
+				height 20px
+
+		> article
+			padding 16px 16px 4px
+
+			> .avatar
+				margin 0 10px 8px 0
+				width 42px
+				height 42px
+
+	&:last-of-type
+		border-bottom none
+
+	&:focus
+		z-index 1
+
+		&:after
+			content ""
+			pointer-events none
+			position absolute
+			top 2px
+			right 2px
+			bottom 2px
+			left 2px
+			border 2px solid var(--primaryAlpha03)
+			border-radius 4px
+
+	> .renote
+		display flex
+		align-items center
+		padding 16px 32px 8px 32px
+		line-height 28px
+		white-space pre
+		color var(--renoteText)
+		background linear-gradient(to bottom, var(--renoteGradient) 0%, var(--face) 100%)
+
+		.avatar
+			flex-shrink 0
+			display inline-block
+			width 28px
+			height 28px
+			margin 0 8px 0 0
+			border-radius 6px
+
+		[data-fa]
+			margin-right 4px
+
+		> span
+			flex-shrink 0
+
+			&:last-of-type
+				margin-right 8px
+
+		.name
+			overflow hidden
+			flex-shrink 1
+			text-overflow ellipsis
+			white-space nowrap
+			font-weight bold
+
+		> .mk-time
+			display block
+			margin-left auto
+			flex-shrink 0
+			font-size 0.9em
+
+		& + article
+			padding-top 8px
+
+	> article
+		display flex
+		padding 28px 32px 18px 32px
+
+		&:hover
+			> .main > footer > button
+				color var(--noteActionsHighlighted)
+
+		> .avatar
+			flex-shrink 0
+			display block
+			margin 0 16px 10px 0
+			width 58px
+			height 58px
+			border-radius 8px
+			//position -webkit-sticky
+			//position sticky
+			//top 74px
+
+		> .main
+			flex 1
+			min-width 0
+
+			> .header
+				margin-bottom 4px
+
+			> .body
+
+				> .cw
+					cursor default
+					display block
+					margin 0
+					padding 0
+					overflow-wrap break-word
+					color var(--noteText)
+
+					> .text
+						margin-right 8px
+
+				> .content
+
+					> .text
+						cursor default
+						display block
+						margin 0
+						padding 0
+						overflow-wrap break-word
+						color var(--noteText)
+
+						>>> .title
+							display block
+							margin-bottom 4px
+							padding 4px
+							font-size 90%
+							text-align center
+							background var(--mfmTitleBg)
+							border-radius 4px
+
+						>>> .code
+							margin 8px 0
+
+						>>> .quote
+							margin 8px
+							padding 6px 12px
+							color var(--mfmQuote)
+							border-left solid 3px var(--mfmQuoteLine)
+
+						> .reply
+							margin-right 8px
+							color var(--text)
+
+						> .rp
+							margin-left 4px
+							font-style oblique
+							color var(--renoteText)
+
+					> .location
+						margin 4px 0
+						font-size 12px
+						color #ccc
+
+					> .map
+						width 100%
+						height 300px
+
+						&:empty
+							display none
+
+					.mk-url-preview
+						margin-top 8px
+
+					> .mk-poll
+						font-size 80%
+
+					> .renote
+						margin 8px 0
+
+						> *
+							padding 16px
+							border dashed 1px var(--quoteBorder)
+							border-radius 8px
+
+			> footer
+				> button
+					margin 0 28px 0 0
+					padding 0 8px
+					line-height 32px
+					font-size 1em
+					color var(--noteActions)
+					background transparent
+					border none
+					cursor pointer
+
+					&:last-child
+						margin-right 0
+
+					&:hover
+						color var(--noteActionsHover)
+
+					&.replyButton:hover
+						color var(--noteActionsReplyHover)
+
+					&.renoteButton:hover
+						color var(--noteActionsRenoteHover)
+
+					&.reactionButton:hover
+						color var(--noteActionsReactionHover)
+
+					> .count
+						display inline
+						margin 0 0 0 8px
+						color #999
+
+					&.reacted, &.reacted:hover
+						color var(--noteActionsReactionHover)
+
+</style>
+
+<style lang="stylus" module>
+.text
+
+	code
+		padding 4px 8px
+		margin 0 0.5em
+		font-size 80%
+		color #525252
+		background #f8f8f8
+		border-radius 2px
+
+	pre > code
+		padding 16px
+		margin 0
+
+	[data-is-me]:after
+		content "you"
+		padding 0 4px
+		margin-left 4px
+		font-size 80%
+		color var(--primaryForeground)
+		background var(--primary)
+		border-radius 4px
+</style>

src/client/app/desktop/views/components/notes.note.vue

@@ -1,477 +0,0 @@
-<template>
-<div class="note" tabindex="-1" v-hotkey="keymap" :title="title">
-	<div class="reply-to" v-if="p.reply && (!$store.getters.isSignedIn || $store.state.settings.showReplyTarget)">
-		<x-sub :note="p.reply"/>
-	</div>
-	<div class="renote" v-if="isRenote">
-		<mk-avatar class="avatar" :user="note.user"/>
-		%fa:retweet%
-		<span>{{ '%i18n:@reposted-by%'.substr(0, '%i18n:@reposted-by%'.indexOf('{')) }}</span>
-		<a class="name" :href="note.user | userPage" v-user-preview="note.userId">{{ note.user | userName }}</a>
-		<span>{{ '%i18n:@reposted-by%'.substr('%i18n:@reposted-by%'.indexOf('}') + 1) }}</span>
-		<mk-time :time="note.createdAt"/>
-	</div>
-	<article>
-		<mk-avatar class="avatar" :user="p.user"/>
-		<div class="main">
-			<mk-note-header class="header" :note="p"/>
-			<div class="body">
-				<p v-if="p.cw != null" class="cw">
-					<span class="text" v-if="p.cw != ''">{{ p.cw }}</span>
-					<mk-cw-button v-model="showContent"/>
-				</p>
-				<div class="content" v-show="p.cw == null || showContent">
-					<div class="text">
-						<span v-if="p.isHidden" style="opacity: 0.5">%i18n:@private%</span>
-						<span v-if="p.deletedAt" style="opacity: 0.5">%i18n:@deleted%</span>
-						<a class="reply" v-if="p.reply">%fa:reply%</a>
-						<misskey-flavored-markdown v-if="p.text" :text="p.text" :i="$store.state.i" :class="$style.text"/>
-						<a class="rp" v-if="p.renote">RP:</a>
-					</div>
-					<div class="files" v-if="p.files.length > 0">
-						<mk-media-list :media-list="p.files"/>
-					</div>
-					<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
-					<a class="location" v-if="p.geo" :href="`https://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% 位置情報</a>
-					<div class="map" v-if="p.geo" ref="map"></div>
-					<div class="renote" v-if="p.renote"><mk-note-preview :note="p.renote"/></div>
-					<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
-				</div>
-			</div>
-			<footer v-if="p.deletedAt == null">
-				<mk-reactions-viewer :note="p" ref="reactionsViewer"/>
-				<button class="replyButton" @click="reply()" title="%i18n:@reply%">
-					<template v-if="p.reply">%fa:reply-all%</template>
-					<template v-else>%fa:reply%</template>
-					<p class="count" v-if="p.repliesCount > 0">{{ p.repliesCount }}</p>
-				</button>
-				<button class="renoteButton" @click="renote()" title="%i18n:@renote%">
-					%fa:retweet%<p class="count" v-if="p.renoteCount > 0">{{ p.renoteCount }}</p>
-				</button>
-				<button class="reactionButton" :class="{ reacted: p.myReaction != null }" @click="react()" ref="reactButton" title="%i18n:@add-reaction%">
-					%fa:plus%<p class="count" v-if="p.reactions_count > 0">{{ p.reactions_count }}</p>
-				</button>
-				<button @click="menu()" ref="menuButton">
-					%fa:ellipsis-h%
-				</button>
-				<!-- <button title="%i18n:@detail">
-					<template v-if="!isDetailOpened">%fa:caret-down%</template>
-					<template v-if="isDetailOpened">%fa:caret-up%</template>
-				</button> -->
-			</footer>
-		</div>
-	</article>
-	<div class="detail" v-if="isDetailOpened">
-		<mk-note-status-graph width="462" height="130" :note="p"/>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import parse from '../../../../../mfm/parse';
-
-import MkPostFormWindow from './post-form-window.vue';
-import MkRenoteFormWindow from './renote-form-window.vue';
-import MkNoteMenu from '../../../common/views/components/note-menu.vue';
-import MkReactionPicker from '../../../common/views/components/reaction-picker.vue';
-import XSub from './notes.note.sub.vue';
-import { sum } from '../../../../../prelude/array';
-import noteSubscriber from '../../../common/scripts/note-subscriber';
-
-function focus(el, fn) {
-	const target = fn(el);
-	if (target) {
-		if (target.hasAttribute('tabindex')) {
-			target.focus();
-		} else {
-			focus(target, fn);
-		}
-	}
-}
-
-export default Vue.extend({
-	components: {
-		XSub
-	},
-
-	mixins: [noteSubscriber('note')],
-
-	props: {
-		note: {
-			type: Object,
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			showContent: false,
-			isDetailOpened: false
-		};
-	},
-
-	computed: {
-		keymap(): any {
-			return {
-				'r|left': () => this.reply(true),
-				'e|a|plus': () => this.react(true),
-				'q|right': () => this.renote(true),
-				'ctrl+q|ctrl+right': this.renoteDirectly,
-				'up|k|shift+tab': this.focusBefore,
-				'down|j|tab': this.focusAfter,
-				'esc': this.blur,
-				'm|o': () => this.menu(true),
-				's': this.toggleShowContent,
-				'1': () => this.reactDirectly('like'),
-				'2': () => this.reactDirectly('love'),
-				'3': () => this.reactDirectly('laugh'),
-				'4': () => this.reactDirectly('hmm'),
-				'5': () => this.reactDirectly('surprise'),
-				'6': () => this.reactDirectly('congrats'),
-				'7': () => this.reactDirectly('angry'),
-				'8': () => this.reactDirectly('confused'),
-				'9': () => this.reactDirectly('rip'),
-				'0': () => this.reactDirectly('pudding'),
-			};
-		},
-
-		isRenote(): boolean {
-			return (this.note.renote &&
-				this.note.text == null &&
-				this.note.fileIds.length == 0 &&
-				this.note.poll == null);
-		},
-
-		p(): any {
-			return this.isRenote ? this.note.renote : this.note;
-		},
-
-		reactionsCount(): number {
-			return this.p.reactionCounts
-				? sum(Object.values(this.p.reactionCounts))
-				: 0;
-		},
-
-		title(): string {
-			return new Date(this.p.createdAt).toLocaleString();
-		},
-
-		urls(): string[] {
-			if (this.p.text) {
-				const ast = parse(this.p.text);
-				return ast
-					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
-					.map(t => t.url);
-			} else {
-				return null;
-			}
-		}
-	},
-
-	methods: {
-		reply(viaKeyboard = false) {
-			(this as any).os.new(MkPostFormWindow, {
-				reply: this.p,
-				animation: !viaKeyboard
-			}).$once('closed', this.focus);
-		},
-
-		renote(viaKeyboard = false) {
-			(this as any).os.new(MkRenoteFormWindow, {
-				note: this.p,
-				animation: !viaKeyboard
-			}).$once('closed', this.focus);
-		},
-
-		renoteDirectly() {
-			(this as any).api('notes/create', {
-				renoteId: this.p.id
-			});
-		},
-
-		react(viaKeyboard = false) {
-			this.blur();
-			(this as any).os.new(MkReactionPicker, {
-				source: this.$refs.reactButton,
-				note: this.p,
-				showFocus: viaKeyboard,
-				animation: !viaKeyboard
-			}).$once('closed', this.focus);
-		},
-
-		reactDirectly(reaction) {
-			(this as any).api('notes/reactions/create', {
-				noteId: this.p.id,
-				reaction: reaction
-			});
-		},
-
-		menu(viaKeyboard = false) {
-			(this as any).os.new(MkNoteMenu, {
-				source: this.$refs.menuButton,
-				note: this.p,
-				animation: !viaKeyboard
-			}).$once('closed', this.focus);
-		},
-
-		toggleShowContent() {
-			this.showContent = !this.showContent;
-		},
-
-		focus() {
-			this.$el.focus();
-		},
-
-		blur() {
-			this.$el.blur();
-		},
-
-		focusBefore() {
-			focus(this.$el, e => e.previousElementSibling);
-		},
-
-		focusAfter() {
-			focus(this.$el, e => e.nextElementSibling);
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.note
-	margin 0
-	padding 0
-	background var(--face)
-	border-bottom solid 1px var(--faceDivider)
-
-	&[data-round]
-		&:first-child
-			border-top-left-radius 6px
-			border-top-right-radius 6px
-
-			> .renote
-				border-top-left-radius 6px
-				border-top-right-radius 6px
-
-	&:last-of-type
-		border-bottom none
-
-	&:focus
-		z-index 1
-
-		&:after
-			content ""
-			pointer-events none
-			position absolute
-			top 2px
-			right 2px
-			bottom 2px
-			left 2px
-			border 2px solid var(--primaryAlpha03)
-			border-radius 4px
-
-	> .renote
-		display flex
-		align-items center
-		padding 16px 32px 8px 32px
-		line-height 28px
-		white-space pre
-		color var(--renoteText)
-		background linear-gradient(to bottom, var(--renoteGradient) 0%, var(--face) 100%)
-
-		.avatar
-			display inline-block
-			width 28px
-			height 28px
-			margin 0 8px 0 0
-			border-radius 6px
-
-		[data-fa]
-			margin-right 4px
-
-		> span
-			flex-shrink 0
-
-			&:last-of-type
-				margin-right 8px
-
-		.name
-			overflow hidden
-			flex-shrink 1
-			text-overflow ellipsis
-			white-space nowrap
-			font-weight bold
-
-		> .mk-time
-			display block
-			margin-left auto
-			flex-shrink 0
-			font-size 0.9em
-
-		& + article
-			padding-top 8px
-
-	> article
-		display flex
-		padding 28px 32px 18px 32px
-
-		&:hover
-			> .main > footer > button
-				color var(--noteActionsHighlighted)
-
-		> .avatar
-			flex-shrink 0
-			display block
-			margin 0 16px 10px 0
-			width 58px
-			height 58px
-			border-radius 8px
-			//position -webkit-sticky
-			//position sticky
-			//top 74px
-
-		> .main
-			flex 1
-			min-width 0
-
-			> .header
-				margin-bottom 4px
-
-			> .body
-
-				> .cw
-					cursor default
-					display block
-					margin 0
-					padding 0
-					overflow-wrap break-word
-					color var(--noteText)
-
-					> .text
-						margin-right 8px
-
-				> .content
-
-					> .text
-						cursor default
-						display block
-						margin 0
-						padding 0
-						overflow-wrap break-word
-						color var(--noteText)
-
-						>>> .title
-							display block
-							margin-bottom 4px
-							padding 4px
-							font-size 90%
-							text-align center
-							background var(--mfmTitleBg)
-							border-radius 4px
-
-						>>> .code
-							margin 8px 0
-
-						>>> .quote
-							margin 8px
-							padding 6px 12px
-							color var(--mfmQuote)
-							border-left solid 3px var(--mfmQuoteLine)
-
-						> .reply
-							margin-right 8px
-							color var(--text)
-
-						> .rp
-							margin-left 4px
-							font-style oblique
-							color var(--renoteText)
-
-					> .location
-						margin 4px 0
-						font-size 12px
-						color #ccc
-
-					> .map
-						width 100%
-						height 300px
-
-						&:empty
-							display none
-
-					.mk-url-preview
-						margin-top 8px
-
-					> .mk-poll
-						font-size 80%
-
-					> .renote
-						margin 8px 0
-
-						> *
-							padding 16px
-							border dashed 1px var(--quoteBorder)
-							border-radius 8px
-
-			> footer
-				> button
-					margin 0 28px 0 0
-					padding 0 8px
-					line-height 32px
-					font-size 1em
-					color var(--noteActions)
-					background transparent
-					border none
-					cursor pointer
-
-					&:hover
-						color var(--noteActionsHover)
-
-					&.replyButton:hover
-						color var(--noteActionsReplyHover)
-
-					&.renoteButton:hover
-						color var(--noteActionsRenoteHover)
-
-					&.reactionButton:hover
-						color var(--noteActionsReactionHover)
-
-					> .count
-						display inline
-						margin 0 0 0 8px
-						color #999
-
-					&.reacted, &.reacted:hover
-						color var(--noteActionsReactionHover)
-
-	> .detail
-		padding-top 4px
-		background rgba(#000, 0.0125)
-
-</style>
-
-<style lang="stylus" module>
-.text
-
-	code
-		padding 4px 8px
-		margin 0 0.5em
-		font-size 80%
-		color #525252
-		background #f8f8f8
-		border-radius 2px
-
-	pre > code
-		padding 16px
-		margin 0
-
-	[data-is-me]:after
-		content "you"
-		padding 0 4px
-		margin-left 4px
-		font-size 80%
-		color var(--primaryForeground)
-		background var(--primary)
-		border-radius 4px
-</style>

src/client/app/desktop/views/components/notes.vue

@@ -9,6 +9,12 @@
 		<button @click="resolveInitPromise">%i18n:@retry%</button>
 	</div>
 
+	<div class="placeholder" v-if="fetching">
+		<template v-for="i in 10">
+			<mk-note-skeleton :key="i"/>
+		</template>
+	</div>
+
 	<!-- トランジションを有効にするとなぜかメモリリークする -->
 	<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="notes transition" tag="div" ref="notes">
 		<template v-for="(note, i) in _notes">
@@ -34,7 +40,7 @@ import Vue from 'vue';
 import * as config from '../../../config';
 import getNoteSummary from '../../../../../misc/get-note-summary';
 
-import XNote from './notes.note.vue';
+import XNote from './note.vue';
 
 const displayLimit = 30;
 
@@ -226,6 +232,10 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease
 
+	> .placeholder
+		padding 32px
+		opacity 0.3
+
 	> .notes
 		> .date
 			display block

src/client/app/desktop/views/components/notifications.vue

@@ -1,5 +1,11 @@
 <template>
 <div class="mk-notifications">
+	<div class="placeholder" v-if="fetching">
+		<template v-for="i in 10">
+			<mk-note-skeleton :key="i"/>
+		</template>
+	</div>
+
 	<div class="notifications" v-if="notifications.length != 0">
 		<!-- トランジションを有効にするとなぜかメモリリークする -->
 		<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notifications" class="transition" tag="div">
@@ -102,7 +108,6 @@
 		<template v-if="fetchingMoreNotifications">%fa:spinner .pulse .fw%</template>{{ fetchingMoreNotifications ? '%i18n:common.loading%' : '%i18n:@more%' }}
 	</button>
 	<p class="empty" v-if="notifications.length == 0 && !fetching">%i18n:@empty%</p>
-	<p class="loading" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
 </div>
 </template>
 
@@ -181,8 +186,7 @@ export default Vue.extend({
 
 		onNotification(notification) {
 			// TODO: ユーザーが画面を見てないと思われるとき(ブラウザやタブがアクティブじゃないなど)は送信しない
-			this.connection.send({
+			(this as any).os.stream.send('readNotification', {
-				type: 'readNotification',
 				id: notification.id
 			});
 
@@ -203,6 +207,10 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease
 
+	> .placeholder
+		padding 16px
+		opacity 0.3
+
 	> .notifications
 		> div
 			> .notification
@@ -299,7 +307,7 @@ export default Vue.extend({
 		display block
 		width 100%
 		padding 16px
-		color #555
+		color var(--text)
 		border-top solid 1px rgba(#000, 0.05)
 
 		&:hover
@@ -318,15 +326,6 @@ export default Vue.extend({
 		margin 0
 		padding 16px
 		text-align center
-		color #aaa
+		color var(--text)
-
-	> .loading
-		margin 0
-		padding 16px
-		text-align center
-		color #aaa
-
-		> [data-fa]
-			margin-right 4px
 
 </style>

src/client/app/desktop/views/components/post-form.vue

@@ -65,6 +65,7 @@ import { host } from '../../../config';
 import { erase, unique } from '../../../../../prelude/array';
 import { length } from 'stringz';
 import parseAcct from '../../../../../misc/acct/parse';
+import { toASCII } from 'punycode';
 
 export default Vue.extend({
 	components: {
@@ -158,14 +159,14 @@ export default Vue.extend({
 		}
 
 		if (this.reply && this.reply.user.host != null) {
-			this.text = `@${this.reply.user.username}@${this.reply.user.host} `;
+			this.text = `@${this.reply.user.username}@${toASCII(this.reply.user.host)} `;
 		}
 
 		if (this.reply && this.reply.text != null) {
 			const ast = parse(this.reply.text);
 
 			ast.filter(t => t.type == 'mention').forEach(x => {
-				const mention = x.host ? `@${x.username}@${x.host}` : `@${x.username}`;
+				const mention = x.host ? `@${x.username}@${toASCII(x.host)}` : `@${x.username}`;
 
 				// 自分は除外
 				if (this.$store.state.i.username == x.username && x.host == null) return;

src/client/app/desktop/views/components/settings.2fa.vue

@@ -2,10 +2,10 @@
 <div class="2fa">
 	<p>%i18n:@intro%<a href="%i18n:@url%" target="_blank">%i18n:@detail%</a></p>
 	<div class="ui info warn"><p>%fa:exclamation-triangle%%i18n:@caution%</p></div>
-	<p v-if="!data && !$store.state.i.twoFactorEnabled"><button @click="register" class="ui primary">%i18n:@register%</button></p>
+	<p v-if="!data && !$store.state.i.twoFactorEnabled"><ui-button @click="register">%i18n:@register%</ui-button></p>
 	<template v-if="$store.state.i.twoFactorEnabled">
 		<p>%i18n:@already-registered%</p>
-		<button @click="unregister" class="ui">%i18n:@unregister%</button>
+		<ui-button @click="unregister">%i18n:@unregister%</ui-button>
 	</template>
 	<div v-if="data">
 		<ol>
@@ -13,7 +13,7 @@
 			<li>%i18n:@scan%<br><img :src="data.qr"></li>
 			<li>%i18n:@done%<br>
 				<input type="number" v-model="token" class="ui">
-				<button @click="submit" class="ui primary">%i18n:@submit%</button>
+				<ui-button primary @click="submit">%i18n:@submit%</ui-button>
 			</li>
 		</ol>
 		<div class="ui info"><p>%fa:info-circle%%i18n:@info%</p></div>

src/client/app/desktop/views/components/settings.api.vue

@@ -1,10 +1,12 @@
 <template>
 <div class="root api">
-	<p>%i18n:@token% <code>{{ $store.state.i.token }}</code></p>
+	<ui-input :value="$store.state.i.token" readonly>
+		<span>%i18n:@token%</span>
+	</ui-input>
 	<p>%i18n:@intro%</p>
 	<div class="ui info warn"><p>%fa:exclamation-triangle%%i18n:@caution%</p></div>
 	<p>%i18n:@regeneration-of-token%</p>
-	<button class="ui" @click="regenerateToken">%i18n:@regenerate-token%</button>
+	<ui-button @click="regenerateToken">%i18n:@regenerate-token%</ui-button>
 </div>
 </template>
 

src/client/app/desktop/views/components/settings.password.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-	<button @click="reset" class="ui primary">%i18n:@reset%</button>
+	<ui-button @click="reset">%i18n:@reset%</ui-button>
 </div>
 </template>
 

src/client/app/desktop/views/components/settings.profile.vue

@@ -1,106 +0,0 @@
-<template>
-<div class="profile">
-	<label class="avatar ui from group">
-		<p>%i18n:@avatar%</p>
-		<img class="avatar" :src="$store.state.i.avatarUrl" alt="avatar"/>
-		<button class="ui" @click="updateAvatar">%i18n:@choice-avatar%</button>
-	</label>
-	<label class="ui from group">
-		<ui-input v-model="name" type="text">%i18n:@name%</ui-input>
-	</label>
-	<label class="ui from group">
-		<ui-input v-model="location" type="text">%i18n:@location%</ui-input>
-	</label>
-	<label class="ui from group">
-		<ui-textarea v-model="description">%i18n:@description%</ui-textarea>
-	</label>
-	<label class="ui from group">
-		<p>%i18n:@birthday%</p>
-		<input type="date" v-model="birthday"/>
-	</label>
-	<ui-button primary @click="save">%i18n:@save%</ui-button>
-	<section>
-		<h2>%i18n:@locked-account%</h2>
-		<ui-switch v-model="$store.state.i.isLocked" @change="onChangeIsLocked">%i18n:@is-locked%</ui-switch>
-	</section>
-	<section>
-		<h2>%i18n:@other%</h2>
-		<ui-switch v-model="$store.state.i.isBot" @change="onChangeIsBot">%i18n:@is-bot%</ui-switch>
-		<ui-switch v-model="$store.state.i.isCat" @change="onChangeIsCat">%i18n:@is-cat%</ui-switch>
-		<ui-switch v-model="alwaysMarkNsfw">%i18n:common.always-mark-nsfw%</ui-switch>
-	</section>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	data() {
-		return {
-			name: null,
-			location: null,
-			description: null,
-			birthday: null,
-		};
-	},
-	computed: {
-		alwaysMarkNsfw: {
-			get() { return this.$store.state.i.settings.alwaysMarkNsfw; },
-			set(value) { (this as any).api('i/update', { alwaysMarkNsfw: value }); }
-		},
-	},
-	created() {
-		this.name = this.$store.state.i.name || '';
-		this.location = this.$store.state.i.profile.location;
-		this.description = this.$store.state.i.description;
-		this.birthday = this.$store.state.i.profile.birthday;
-	},
-	methods: {
-		updateAvatar() {
-			(this as any).apis.updateAvatar();
-		},
-		save() {
-			(this as any).api('i/update', {
-				name: this.name || null,
-				location: this.location || null,
-				description: this.description || null,
-				birthday: this.birthday || null
-			}).then(() => {
-				(this as any).apis.notify('%i18n:@profile-updated%');
-			});
-		},
-		onChangeIsLocked() {
-			(this as any).api('i/update', {
-				isLocked: this.$store.state.i.isLocked
-			});
-		},
-		onChangeIsBot() {
-			(this as any).api('i/update', {
-				isBot: this.$store.state.i.isBot
-			});
-		},
-		onChangeIsCat() {
-			(this as any).api('i/update', {
-				isCat: this.$store.state.i.isCat
-			});
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.profile
-	> .avatar
-		> img
-			display inline-block
-			vertical-align top
-			width 64px
-			height 64px
-			border-radius 4px
-
-		> button
-			margin-left 8px
-
-</style>
-

src/client/app/desktop/views/components/settings.vue

@@ -2,30 +2,41 @@
 <div class="mk-settings">
 	<div class="nav">
 		<p :class="{ active: page == 'profile' }" @mousedown="page = 'profile'">%fa:user .fw%%i18n:@profile%</p>
+		<p :class="{ active: page == 'theme' }" @mousedown="page = 'theme'">%fa:palette .fw%%i18n:@theme%</p>
 		<p :class="{ active: page == 'web' }" @mousedown="page = 'web'">%fa:desktop .fw%Web</p>
 		<p :class="{ active: page == 'notification' }" @mousedown="page = 'notification'">%fa:R bell .fw%%i18n:@notification%</p>
 		<p :class="{ active: page == 'drive' }" @mousedown="page = 'drive'">%fa:cloud .fw%%i18n:@drive%</p>
 		<p :class="{ active: page == 'hashtags' }" @mousedown="page = 'hashtags'">%fa:hashtag .fw%%i18n:@tags%</p>
 		<p :class="{ active: page == 'mute' }" @mousedown="page = 'mute'">%fa:ban .fw%%i18n:@mute%</p>
 		<p :class="{ active: page == 'apps' }" @mousedown="page = 'apps'">%fa:puzzle-piece .fw%%i18n:@apps%</p>
-		<p :class="{ active: page == 'twitter' }" @mousedown="page = 'twitter'">%fa:B twitter .fw%Twitter</p>
 		<p :class="{ active: page == 'security' }" @mousedown="page = 'security'">%fa:unlock-alt .fw%%i18n:@security%</p>
 		<p :class="{ active: page == 'api' }" @mousedown="page = 'api'">%fa:key .fw%API</p>
 		<p :class="{ active: page == 'other' }" @mousedown="page = 'other'">%fa:cogs .fw%%i18n:@other%</p>
 	</div>
 	<div class="pages">
-		<section class="profile" v-show="page == 'profile'">
+		<div class="profile" v-show="page == 'profile'">
-			<h1>%i18n:@profile%</h1>
+			<mk-profile-editor/>
-			<x-profile/>
-		</section>
 
-		<section class="web" v-show="page == 'web'">
+			<ui-card>
-			<h1>%i18n:@theme%</h1>
+				<div slot="title">%fa:B twitter% %i18n:@twitter%</div>
+				<section>
+					<mk-twitter-setting/>
+				</section>
+			</ui-card>
+		</div>
+
+		<ui-card class="theme" v-show="page == 'theme'">
+			<div slot="title">%fa:palette% %i18n:@theme%</div>
+
+			<section>
 				<mk-theme/>
 			</section>
+		</ui-card>
 
-		<section class="web" v-show="page == 'web'">
+		<ui-card class="web" v-show="page == 'web'">
-			<h1>%i18n:@behaviour%</h1>
+			<div slot="title">%fa:sliders-h% %i18n:@behaviour%</div>
+
+			<section>
 				<ui-switch v-model="fetchOnScroll">
 					%i18n:@fetch-on-scroll%
 					<span slot="desc">%i18n:@fetch-on-scroll-desc%</span>
@@ -34,6 +45,23 @@
 					%i18n:@auto-popout%
 					<span slot="desc">%i18n:@auto-popout-desc%</span>
 				</ui-switch>
+				<ui-switch v-model="deckNav">%i18n:@deck-nav%<span slot="desc">%i18n:@deck-nav-desc%</span></ui-switch>
+
+				<details>
+					<summary>%i18n:@advanced%</summary>
+					<ui-switch v-model="apiViaStream">
+						%i18n:@api-via-stream%
+						<span slot="desc">%i18n:@api-via-stream-desc%</span>
+					</ui-switch>
+				</details>
+			</section>
+
+			<section>
+				<header>%i18n:@timeline%</header>
+				<ui-switch v-model="showMyRenotes">%i18n:@show-my-renotes%</ui-switch>
+				<ui-switch v-model="showRenotedMyNotes">%i18n:@show-renoted-my-notes%</ui-switch>
+				<ui-switch v-model="showLocalRenotes">%i18n:@show-local-renotes%</ui-switch>
+			</section>
 
 			<section>
 				<header>%i18n:@note-visibility%</header>
@@ -49,24 +77,27 @@
 					</ui-select>
 				</section>
 			</section>
+		</ui-card>
 
-			<details>
+		<ui-card class="web" v-show="page == 'web'">
-				<summary>%i18n:@advanced%</summary>
+			<div slot="title">%fa:desktop% %i18n:@display%</div>
-				<ui-switch v-model="apiViaStream">
+
-					%i18n:@api-via-stream%
+			<section>
-					<span slot="desc">%i18n:@api-via-stream-desc%</span>
+				<ui-switch v-model="showPostFormOnTopOfTl">%i18n:@post-form-on-timeline%</ui-switch>
-				</ui-switch>
+				<ui-button @click="customizeHome">%i18n:@customize%</ui-button>
-			</details>
 			</section>
-
+			<section>
-		<section class="web" v-show="page == 'web'">
+				<header>%i18n:@wallpaper%</header>
-			<h1>%i18n:@display%</h1>
+				<ui-button @click="updateWallpaper">%i18n:@choose-wallpaper%</ui-button>
-			<div class="div">
+				<ui-button @click="deleteWallpaper">%i18n:@delete-wallpaper%</ui-button>
-				<button class="ui button" @click="customizeHome" style="margin-bottom: 16px">%i18n:@customize%</button>
+			</section>
-			</div>
+			<section>
-			<div class="div">
+				<header>%i18n:@navbar-position%</header>
-				<button class="ui" @click="updateWallpaper">%i18n:@choose-wallpaper%</button>
+				<ui-radio v-model="navbar" value="top">%i18n:@navbar-position-top%</ui-radio>
-				<button class="ui" @click="deleteWallpaper">%i18n:@delete-wallpaper%</button>
+				<ui-radio v-model="navbar" value="left">%i18n:@navbar-position-left%</ui-radio>
+				<ui-radio v-model="navbar" value="right">%i18n:@navbar-position-right%</ui-radio>
+			</section>
+			<section>
 				<ui-switch v-model="darkmode">%i18n:@dark-mode%</ui-switch>
 				<ui-switch v-model="useShadow">%i18n:@use-shadow%</ui-switch>
 				<ui-switch v-model="roundedCorners">%i18n:@rounded-corners%</ui-switch>
@@ -75,23 +106,30 @@
 				<ui-switch v-model="contrastedAcct">%i18n:@contrasted-acct%</ui-switch>
 				<ui-switch v-model="showFullAcct">%i18n:common.show-full-acct%</ui-switch>
 				<ui-switch v-model="iLikeSushi">%i18n:common.i-like-sushi%</ui-switch>
-			</div>
+			</section>
-			<ui-switch v-model="showPostFormOnTopOfTl">%i18n:@post-form-on-timeline%</ui-switch>
+			<section>
 				<ui-switch v-model="suggestRecentHashtags">%i18n:@suggest-recent-hashtags%</ui-switch>
 				<ui-switch v-model="showClockOnHeader">%i18n:@show-clock-on-header%</ui-switch>
 				<ui-switch v-model="alwaysShowNsfw">%i18n:common.always-show-nsfw%</ui-switch>
 				<ui-switch v-model="showReplyTarget">%i18n:@show-reply-target%</ui-switch>
-			<ui-switch v-model="showMyRenotes">%i18n:@show-my-renotes%</ui-switch>
-			<ui-switch v-model="showRenotedMyNotes">%i18n:@show-renoted-my-notes%</ui-switch>
-			<ui-switch v-model="showLocalRenotes">%i18n:@show-local-renotes%</ui-switch>
 				<ui-switch v-model="showMaps">%i18n:@show-maps%</ui-switch>
 				<ui-switch v-model="disableAnimatedMfm">%i18n:common.disable-animated-mfm%</ui-switch>
+			</section>
+			<section>
+				<header>%i18n:@deck-column-align%</header>
+				<ui-radio v-model="deckColumnAlign" value="center">%i18n:@deck-column-align-center%</ui-radio>
+				<ui-radio v-model="deckColumnAlign" value="left">%i18n:@deck-column-align-left%</ui-radio>
+			</section>
+			<section>
 				<ui-switch v-model="games_reversi_showBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch>
 				<ui-switch v-model="games_reversi_useContrastStones">%i18n:common.use-contrast-reversi-stones%</ui-switch>
 			</section>
+		</ui-card>
 
-		<section class="web" v-show="page == 'web'">
+		<ui-card class="web" v-show="page == 'web'">
-			<h1>%i18n:@sound%</h1>
+			<div slot="title">%fa:volume-up% %i18n:@sound%</div>
+
+			<section>
 				<ui-switch v-model="enableSounds">
 					%i18n:@enable-sounds%
 					<span slot="desc">%i18n:@enable-sounds-desc%</span>
@@ -103,17 +141,14 @@
 					max="1"
 					step="0.1"
 				/>
-			<button class="ui button" @click="soundTest">%fa:volume-up% %i18n:@test%</button>
+				<ui-button @click="soundTest">%fa:volume-up% %i18n:@test%</ui-button>
 			</section>
+		</ui-card>
 
-		<section class="web" v-show="page == 'web'">
+		<ui-card class="web" v-show="page == 'web'">
-			<h1>%i18n:@mobile%</h1>
+			<div slot="title">%fa:language% %i18n:@language%</div>
-			<ui-switch v-model="disableViaMobile">%i18n:@disable-via-mobile%</ui-switch>
+			<section class="fit-top">
-		</section>
+				<ui-select v-model="lang" placeholder="%i18n:@pick-language%">
-
-		<section class="web" v-show="page == 'web'">
-			<h1>%i18n:@language%</h1>
-			<select v-model="lang" placeholder="%i18n:@pick-language%">
 					<optgroup label="%i18n:@recommended%">
 						<option value="">%i18n:@auto%</option>
 					</optgroup>
@@ -121,80 +156,102 @@
 					<optgroup label="%i18n:@specify-language%">
 						<option v-for="x in langs" :value="x[0]" :key="x[0]">{{ x[1] }}</option>
 					</optgroup>
-			</select>
+				</ui-select>
 				<div class="none ui info">
 					<p>%fa:info-circle%%i18n:@language-desc%</p>
 				</div>
 			</section>
+		</ui-card>
 
-		<section class="web" v-show="page == 'web'">
+		<ui-card class="web" v-show="page == 'web'">
-			<h1>%i18n:@cache%</h1>
+			<div slot="title">%fa:trash-alt R% %i18n:@cache%</div>
-			<button class="ui button" @click="clean">%i18n:@clean-cache%</button>
+			<section>
+				<ui-button @click="clean">%i18n:@clean-cache%</ui-button>
 				<div class="none ui info warn">
 					<p>%fa:exclamation-triangle%%i18n:@cache-warn%</p>
 				</div>
 			</section>
+		</ui-card>
 
-		<section class="notification" v-show="page == 'notification'">
+		<ui-card class="notification" v-show="page == 'notification'">
-			<h1>%i18n:@notification%</h1>
+			<div slot="title">%fa:bell R% %i18n:@notification%</div>
+			<section>
 				<ui-switch v-model="$store.state.i.settings.autoWatch" @change="onChangeAutoWatch">
 					%i18n:@auto-watch%
 					<span slot="desc">%i18n:@auto-watch-desc%</span>
 				</ui-switch>
+				<section>
+					<ui-button @click="readAllUnreadNotes">%i18n:@mark-as-read-all-unread-notes%</ui-button>
 				</section>
+			</section>
+		</ui-card>
 
-		<section class="drive" v-show="page == 'drive'">
+		<ui-card class="drive" v-show="page == 'drive'">
-			<h1>%i18n:@drive%</h1>
+			<div slot="title">%fa:cloud% %i18n:@drive%</div>
+			<section>
 				<x-drive/>
 			</section>
+		</ui-card>
 
-		<section class="hashtags" v-show="page == 'hashtags'">
+		<ui-card class="hashtags" v-show="page == 'hashtags'">
-			<h1>%i18n:@tags%</h1>
+			<div slot="title">%fa:hashtag% %i18n:@tags%</div>
+			<section>
 				<x-tags/>
 			</section>
+		</ui-card>
 
-		<section class="mute" v-show="page == 'mute'">
+		<ui-card class="mute" v-show="page == 'mute'">
-			<h1>%i18n:@mute%</h1>
+			<div slot="title">%fa:ban% %i18n:@mute%</div>
+			<section>
 				<x-mute/>
 			</section>
+		</ui-card>
 
-		<section class="apps" v-show="page == 'apps'">
+		<ui-card class="apps" v-show="page == 'apps'">
-			<h1>%i18n:@apps%</h1>
+			<div slot="title">%fa:puzzle-piece% %i18n:@apps%</div>
+			<section>
 				<x-apps/>
 			</section>
+		</ui-card>
 
-		<section class="twitter" v-show="page == 'twitter'">
+		<ui-card class="password" v-show="page == 'security'">
-			<h1>Twitter</h1>
+			<div slot="title">%fa:unlock-alt% %i18n:@password%</div>
-			<mk-twitter-setting/>
+			<section>
-		</section>
-
-		<section class="password" v-show="page == 'security'">
-			<h1>%i18n:@password%</h1>
 				<x-password/>
 			</section>
+		</ui-card>
 
-		<section class="2fa" v-show="page == 'security'">
+		<ui-card class="2fa" v-show="page == 'security'">
-			<h1>%i18n:@2fa%</h1>
+			<div slot="title">%fa:mobile-alt% %i18n:@2fa%</div>
+			<section>
 				<x-2fa/>
 			</section>
+		</ui-card>
 
-		<section class="signin" v-show="page == 'security'">
+		<ui-card class="signin" v-show="page == 'security'">
-			<h1>%i18n:@signin%</h1>
+			<div slot="title">%fa:sign-in-alt% %i18n:@signin%</div>
+			<section>
 				<x-signins/>
 			</section>
+		</ui-card>
 
-		<section class="api" v-show="page == 'api'">
+		<ui-card class="api" v-show="page == 'api'">
-			<h1>API</h1>
+			<div slot="title">%fa:key% API</div>
+			<section class="fit-top">
 				<x-api/>
 			</section>
+		</ui-card>
 
-		<section class="other" v-show="page == 'other'">
+		<ui-card class="other" v-show="page == 'other'">
-			<h1>%i18n:@about%</h1>
+			<div slot="title">%fa:info-circle% %i18n:@about%</div>
+			<section>
 				<p v-if="meta">%i18n:@operator%: <i><a :href="meta.maintainer.url" target="_blank">{{ meta.maintainer.name }}</a></i></p>
 			</section>
+		</ui-card>
 
-		<section class="other" v-show="page == 'other'">
+		<ui-card class="other" v-show="page == 'other'">
-			<h1>%i18n:@update%</h1>
+			<div slot="title">%fa:sync-alt% %i18n:@update%</div>
+			<section>
 				<p>
 					<span>%i18n:@version% <i>{{ version }}</i></span>
 					<template v-if="latestVersion !== undefined">
@@ -214,9 +271,11 @@
 					</ui-switch>
 				</details>
 			</section>
+		</ui-card>
 
-		<section class="other" v-show="page == 'other'">
+		<ui-card class="other" v-show="page == 'other'">
-			<h1>%i18n:@advanced-settings%</h1>
+			<div slot="title">%fa:cogs% %i18n:@advanced-settings%</div>
+			<section>
 				<ui-switch v-model="debug">
 					%i18n:@debug-mode%
 					<span slot="desc">%i18n:@debug-mode-desc%</span>
@@ -226,13 +285,13 @@
 					<span slot="desc">%i18n:@experimental-desc%</span>
 				</ui-switch>
 			</section>
+		</ui-card>
 	</div>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
-import XProfile from './settings.profile.vue';
 import XMute from './settings.mute.vue';
 import XPassword from './settings.password.vue';
 import X2fa from './settings.2fa.vue';
@@ -246,7 +305,6 @@ import checkForUpdate from '../../../common/scripts/check-for-update';
 
 export default Vue.extend({
 	components: {
-		XProfile,
 		XMute,
 		XPassword,
 		X2fa,
@@ -288,11 +346,26 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'autoPopout', value }); }
 		},
 
+		deckNav: {
+			get() { return this.$store.state.settings.deckNav; },
+			set(value) { this.$store.commit('settings/set', { key: 'deckNav', value }); }
+		},
+
 		darkmode: {
 			get() { return this.$store.state.device.darkmode; },
 			set(value) { this.$store.commit('device/set', { key: 'darkmode', value }); }
 		},
 
+		navbar: {
+			get() { return this.$store.state.device.navbar; },
+			set(value) { this.$store.commit('device/set', { key: 'navbar', value }); }
+		},
+
+		deckColumnAlign: {
+			get() { return this.$store.state.device.deckColumnAlign; },
+			set(value) { this.$store.commit('device/set', { key: 'deckColumnAlign', value }); }
+		},
+
 		enableSounds: {
 			get() { return this.$store.state.device.enableSounds; },
 			set(value) { this.$store.commit('device/set', { key: 'enableSounds', value }); }
@@ -426,11 +499,6 @@ export default Vue.extend({
 		disableAnimatedMfm: {
 			get() { return this.$store.state.settings.disableAnimatedMfm; },
 			set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); }
-		},
-
-		disableViaMobile: {
-			get() { return this.$store.state.settings.disableViaMobile; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'disableViaMobile', value }); }
 		}
 	},
 	created() {
@@ -439,6 +507,9 @@ export default Vue.extend({
 		});
 	},
 	methods: {
+		readAllUnreadNotes() {
+			(this as any).api('i/read_all_unread_notes');
+		},
 		customizeHome() {
 			this.$router.push('/i/customize-home');
 			this.$emit('done');
@@ -508,7 +579,8 @@ export default Vue.extend({
 		height 100%
 		padding 16px 0 0 0
 		overflow auto
-		border-right solid 1px var(--faceDivider)
+		box-shadow var(--shadowRight)
+		z-index 1
 
 		> p
 			display block
@@ -534,34 +606,10 @@ export default Vue.extend({
 		height 100%
 		flex auto
 		overflow auto
+		background var(--bg)
 
 		> section
 			margin 32px
 			color var(--text)
 
-			> h1
-				margin 0 0 1em 0
-				padding 0 0 8px 0
-				font-size 1em
-				border-bottom solid 1px var(--faceDivider)
-
-			&, >>> *
-				.ui.button.block
-					margin 16px 0
-
-				> section
-					margin 32px 0
-
-					> h2
-						margin 0 0 1em 0
-						padding 0 0 8px 0
-						font-size 1em
-						color var(--text)
-						border-bottom solid 1px var(--faceDivider)
-
-		> .web
-			> .div
-				border-bottom solid 1px var(--faceDivider)
-				margin 16px 0
-
 </style>

src/client/app/desktop/views/components/timeline.core.vue

@@ -1,9 +1,6 @@
 <template>
 <div class="mk-timeline-core">
 	<mk-friends-maker v-if="src == 'home' && alone"/>
-	<div class="fetching" v-if="fetching">
-		<mk-ellipsis-icon/>
-	</div>
 
 	<mk-notes ref="timeline" :more="existMore ? more : null">
 		<p :class="$style.empty" slot="empty">
@@ -170,15 +167,10 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-
-
 .mk-timeline-core
 	> .mk-friends-maker
 		border-bottom solid 1px #eee
 
-	> .fetching
-		padding 64px 0
-
 </style>
 
 <style lang="stylus" module>

src/client/app/desktop/views/components/ui.header.account.vue

@@ -19,7 +19,7 @@
 				<li @click="list">
 					<p>%fa:list%<span>%i18n:@lists%</span>%fa:angle-right%</p>
 				</li>
-				<li @click="followRequests" v-if="$store.state.i.isLocked">
+				<li @click="followRequests" v-if="($store.state.i.isLocked || $store.state.i.carefulBot)">
 					<p>%fa:envelope R%<span>%i18n:@follow-requests%<i v-if="$store.state.i.pendingReceivedFollowRequestsCount">{{ $store.state.i.pendingReceivedFollowRequestsCount }}</i></span>%fa:angle-right%</p>
 				</li>
 			</ul>
@@ -157,6 +157,9 @@ export default Vue.extend({
 			font-family Meiryo, sans-serif
 			text-decoration none
 
+			@media (max-width 1100px)
+				display none
+
 			[data-fa]
 				margin-left 8px
 
@@ -171,6 +174,9 @@ export default Vue.extend({
 			border-radius 4px
 			transition filter 100ms ease
 
+			@media (max-width 1100px)
+				margin-left 8px
+
 	> .menu
 		$bgcolor = var(--face)
 		display block

src/client/app/desktop/views/components/ui.header.post.vue

@@ -17,8 +17,6 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-
-
 .note
 	display inline-block
 	padding 8px

src/client/app/desktop/views/components/ui.header.search.vue

@@ -29,6 +29,9 @@ export default Vue.extend({
 
 <style lang="stylus" scoped>
 .search
+	@media (max-width 800px)
+		display none !important
+
 	> [data-fa]
 		display block
 		position absolute
@@ -58,6 +61,9 @@ export default Vue.extend({
 		transition color 0.5s ease, border 0.5s ease
 		color var(--desktopHeaderSearchFg)
 
+		@media (max-width 1000px)
+			width 10em
+
 		&::placeholder
 			color var(--desktopHeaderFg)
 

src/client/app/desktop/views/components/ui.sidebar.vue

@@ -0,0 +1,368 @@
+<template>
+<div class="header" :class="navbar">
+	<div class="body">
+		<div class="post">
+			<button @click="post" title="%i18n:@post%">%fa:pencil-alt%</button>
+		</div>
+
+		<div class="nav" v-if="$store.getters.isSignedIn">
+			<div class="home" :class="{ active: $route.name == 'index' }" @click="goToTop">
+				<router-link to="/">%fa:home%</router-link>
+			</div>
+			<div class="deck" :class="{ active: $route.name == 'deck' }" @click="goToTop">
+				<router-link to="/deck">%fa:columns%</router-link>
+			</div>
+			<div class="messaging">
+				<a @click="messaging">%fa:comments%<template v-if="hasUnreadMessagingMessage">%fa:circle%</template></a>
+			</div>
+			<div class="game">
+				<a @click="game">%fa:gamepad%<template v-if="hasGameInvitations">%fa:circle%</template></a>
+			</div>
+		</div>
+
+		<div class="nav bottom" v-if="$store.getters.isSignedIn">
+			<div>
+				<a @click="drive">%fa:cloud%</a>
+			</div>
+			<div ref="notificationsButton" :class="{ active: showNotifications }">
+				<a @click="notifications">%fa:R bell%</a>
+			</div>
+			<div>
+				<a @click="settings">%fa:cog%</a>
+			</div>
+		</div>
+
+		<div class="account">
+			<router-link :to="`/@${ $store.state.i.username }`">
+				<mk-avatar class="avatar" :user="$store.state.i"/>
+			</router-link>
+
+			<div class="nav menu">
+				<div class="signout">
+					<a @click="signout">%fa:power-off%</a>
+				</div>
+				<div>
+					<router-link to="/i/favorites">%fa:star%</router-link>
+				</div>
+				<div v-if="($store.state.i.isLocked || $store.state.i.carefulBot)">
+					<a @click="followRequests">%fa:envelope R%<i v-if="$store.state.i.pendingReceivedFollowRequestsCount">{{ $store.state.i.pendingReceivedFollowRequestsCount }}</i></a>
+				</div>
+			</div>
+		</div>
+
+		<div class="nav dark">
+			<div>
+				<a @click="dark"><template v-if="$store.state.device.darkmode">%fa:moon%</template><template v-else>%fa:R moon%</template></a>
+			</div>
+		</div>
+	</div>
+
+	<transition :name="`slide-${navbar}`">
+		<div class="notifications" v-if="showNotifications" ref="notifications" :class="navbar">
+			<mk-notifications/>
+		</div>
+	</transition>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import MkUserListsWindow from './user-lists-window.vue';
+import MkFollowRequestsWindow from './received-follow-requests-window.vue';
+import MkSettingsWindow from './settings-window.vue';
+import MkDriveWindow from './drive-window.vue';
+import MkMessagingWindow from './messaging-window.vue';
+import MkGameWindow from './game-window.vue';
+import contains from '../../../common/scripts/contains';
+
+export default Vue.extend({
+	data() {
+		return {
+			hasGameInvitations: false,
+			connection: null,
+			showNotifications: false
+		};
+	},
+
+	computed: {
+		hasUnreadMessagingMessage(): boolean {
+			return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadMessagingMessage;
+		},
+
+		navbar(): string {
+			return this.$store.state.device.navbar;
+		},
+	},
+
+	mounted() {
+		if (this.$store.getters.isSignedIn) {
+			this.connection = (this as any).os.stream.useSharedConnection('main');
+
+			this.connection.on('reversiInvited', this.onReversiInvited);
+			this.connection.on('reversi_no_invites', this.onReversiNoInvites);
+		}
+	},
+
+	beforeDestroy() {
+		if (this.$store.getters.isSignedIn) {
+			this.connection.dispose();
+		}
+	},
+
+	methods: {
+		onReversiInvited() {
+			this.hasGameInvitations = true;
+		},
+
+		onReversiNoInvites() {
+			this.hasGameInvitations = false;
+		},
+
+		messaging() {
+			(this as any).os.new(MkMessagingWindow);
+		},
+
+		game() {
+			(this as any).os.new(MkGameWindow);
+		},
+
+		post() {
+			(this as any).apis.post();
+		},
+
+		drive() {
+			(this as any).os.new(MkDriveWindow);
+		},
+
+		list() {
+			const w = (this as any).os.new(MkUserListsWindow);
+			w.$once('choosen', list => {
+				this.$router.push(`i/lists/${ list.id }`);
+			});
+		},
+
+		followRequests() {
+			(this as any).os.new(MkFollowRequestsWindow);
+		},
+
+		settings() {
+			(this as any).os.new(MkSettingsWindow);
+		},
+
+		signout() {
+			(this as any).os.signout();
+		},
+
+		notifications() {
+			this.showNotifications ? this.closeNotifications() : this.openNotifications();
+		},
+
+		openNotifications() {
+			this.showNotifications = true;
+			Array.from(document.querySelectorAll('body *')).forEach(el => {
+				el.addEventListener('mousedown', this.onMousedown);
+			});
+		},
+
+		closeNotifications() {
+			this.showNotifications = false;
+			Array.from(document.querySelectorAll('body *')).forEach(el => {
+				el.removeEventListener('mousedown', this.onMousedown);
+			});
+		},
+
+		onMousedown(e) {
+			e.preventDefault();
+			if (
+				!contains(this.$refs.notifications, e.target) &&
+				this.$refs.notifications != e.target &&
+				!contains(this.$refs.notificationsButton, e.target) &&
+				this.$refs.notificationsButton != e.target
+			) {
+				this.closeNotifications();
+			}
+			return false;
+		},
+
+		dark() {
+			this.$store.commit('device/set', {
+				key: 'darkmode',
+				value: !this.$store.state.device.darkmode
+			});
+		},
+
+		goToTop() {
+			window.scrollTo({
+				top: 0,
+				behavior: 'smooth'
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.header
+	$width = 68px
+
+	position fixed
+	top 0
+	z-index 1000
+	width $width
+	height 100%
+
+	&.left
+		left 0
+		box-shadow var(--shadowRight)
+
+	&.right
+		right 0
+		box-shadow var(--shadowLeft)
+
+	> .body
+		position fixed
+		top 0
+		z-index 1
+		width $width
+		height 100%
+		background var(--desktopHeaderBg)
+
+		> .post
+			width $width
+			height $width
+			padding 12px
+
+			> button
+				display inline-block
+				margin 0
+				padding 0
+				height 100%
+				width 100%
+				font-size 1.2em
+				font-weight normal
+				text-decoration none
+				color var(--primaryForeground)
+				background var(--primary) !important
+				outline none
+				border none
+				border-radius 100%
+				transition background 0.1s ease
+				cursor pointer
+
+				*
+					pointer-events none
+
+				&:hover
+					background var(--primaryLighten10) !important
+
+				&:active
+					background var(--primaryDarken10) !important
+					transition background 0s ease
+
+		> .nav.bottom
+			position absolute
+			bottom 128px
+			left 0
+
+		> .account
+			position absolute
+			bottom 64px
+			left 0
+			width $width
+			height $width
+			padding 14px
+
+			> .menu
+				display none
+				position absolute
+				bottom 64px
+				left 0
+				background var(--desktopHeaderBg)
+
+			&:hover
+				> .menu
+					display block
+
+			> *:not(.menu)
+				display block
+				width 100%
+				height 100%
+
+				> .avatar
+					pointer-events none
+					width 100%
+					height 100%
+
+		> .dark
+			position absolute
+			bottom 0
+			left 0
+			width $width
+			height $width
+
+	> .notifications
+		position fixed
+		top 0
+		width 350px
+		height 100%
+		overflow auto
+		background var(--face)
+
+		&.left
+			left $width
+			box-shadow var(--shadowRight)
+
+		&.right
+			right $width
+			box-shadow var(--shadowLeft)
+
+	.nav
+		> *
+			> *
+				display block
+				width $width
+				line-height 52px
+				text-align center
+				font-size 18px
+				color var(--desktopHeaderFg)
+
+				&:hover
+					background rgba(0, 0, 0, 0.05)
+					color var(--desktopHeaderHoverFg)
+					text-decoration none
+
+				&:active
+					background rgba(0, 0, 0, 0.1)
+
+	&.left
+		.nav
+			> *
+				&.active
+					box-shadow -4px 0 var(--primary) inset
+
+	&.right
+		.nav
+			> *
+				&.active
+					box-shadow 4px 0 var(--primary) inset
+
+.slide-left-enter-active,
+.slide-left-leave-active {
+	transition: all 0.2s ease;
+}
+
+.slide-left-enter, .slide-left-leave-to {
+	transform: translateX(-16px);
+	opacity: 0;
+}
+
+.slide-right-enter-active,
+.slide-right-leave-active {
+	transition: all 0.2s ease;
+}
+
+.slide-right-enter, .slide-right-leave-to {
+	transform: translateX(16px);
+	opacity: 0;
+}
+</style>

src/client/app/desktop/views/components/ui.vue

@@ -1,8 +1,9 @@
 <template>
 <div class="mk-ui" v-hotkey.global="keymap">
 	<div class="bg" v-if="$store.getters.isSignedIn && $store.state.i.wallpaperUrl" :style="style"></div>
-	<x-header class="header" v-show="!zenMode" ref="header"/>
+	<x-header class="header" v-if="navbar == 'top'" v-show="!zenMode" ref="header"/>
-	<div class="content">
+	<x-sidebar class="sidebar" v-if="navbar != 'top'" v-show="!zenMode" ref="sidebar"/>
+	<div class="content" :class="[{ sidebar: navbar != 'top', zen: zenMode }, navbar]">
 		<slot></slot>
 	</div>
 	<mk-stream-indicator v-if="$store.getters.isSignedIn"/>
@@ -12,10 +13,12 @@
 <script lang="ts">
 import Vue from 'vue';
 import XHeader from './ui.header.vue';
+import XSidebar from './ui.sidebar.vue';
 
 export default Vue.extend({
 	components: {
-		XHeader
+		XHeader,
+		XSidebar
 	},
 
 	data() {
@@ -25,6 +28,10 @@ export default Vue.extend({
 	},
 
 	computed: {
+		navbar(): string {
+			return this.$store.state.device.navbar;
+		},
+
 		style(): any {
 			if (!this.$store.getters.isSignedIn || this.$store.state.i.wallpaperUrl == null) return {};
 			return {
@@ -45,6 +52,12 @@ export default Vue.extend({
 	watch: {
 		'$store.state.uiHeaderHeight'() {
 			this.$el.style.paddingTop = this.$store.state.uiHeaderHeight + 'px';
+		},
+
+		navbar() {
+			if (this.navbar != 'top') {
+				this.$store.commit('setUiHeaderHeight', 0);
+			}
 		}
 	},
 
@@ -60,7 +73,9 @@ export default Vue.extend({
 		toggleZenMode() {
 			this.zenMode = !this.zenMode;
 			this.$nextTick(() => {
+				if (this.$refs.header) {
 					this.$store.commit('setUiHeaderHeight', this.$refs.header.$el.offsetHeight);
+				}
 			});
 		}
 	}
@@ -83,8 +98,13 @@ export default Vue.extend({
 		background-attachment fixed
 		opacity 0.3
 
-	> .header
+	> .content.sidebar.left
-		@media (max-width 1000px)
+		padding-left 68px
-			display none
+
+	> .content.sidebar.right
+		padding-right 68px
+
+	> .content.zen
+		padding 0 !important
 
 </style>

src/client/app/desktop/views/components/user-list-timeline.vue

@@ -26,12 +26,14 @@ export default Vue.extend({
 		this.init();
 	},
 	beforeDestroy() {
-		this.connection.close();
+		this.connection.dispose();
 	},
 	methods: {
 		init() {
-			if (this.connection) this.connection.close();
+			if (this.connection) this.connection.dispose();
-			this.connection = new UserListStream((this as any).os, this.$store.state.i, this.list.id);
+			this.connection = (this as any).os.stream.connectToChannel('userList', {
+				listId: this.list.id
+			});
 			this.connection.on('note', this.onNote);
 			this.connection.on('userAdded', this.onUserAdded);
 			this.connection.on('userRemoved', this.onUserRemoved);

src/client/app/desktop/views/pages/admin/admin.cpu-memory.vue

@@ -77,9 +77,8 @@ export default Vue.extend({
 	mounted() {
 		this.connection.on('stats', this.onStats);
 		this.connection.on('statsLog', this.onStatsLog);
-		this.connection.send({
+		this.connection.send('requestLog', {
-			type: 'requestLog',
+			id: Math.random().toString().substr(2, 8),
-			id: Math.random().toString(),
 			length: 200
 		});
 	},

src/client/app/desktop/views/pages/deck/deck.column.vue

@@ -1,7 +1,6 @@
 <template>
 <div class="dnpfarvgbnfmyzbdquhhzyxcmstpdqzs" :class="{ naked, narrow, active, isStacked, draghover, dragging, dropready }"
 		@dragover.prevent.stop="onDragover"
-		@dragenter.prevent="onDragenter"
 		@dragleave="onDragleave"
 		@drop.prevent.stop="onDrop">
 	<header :class="{ indicate: count > 0 }"
@@ -16,7 +15,8 @@
 		</button>
 		<slot name="header"></slot>
 		<span class="count" v-if="count > 0">({{ count }})</span>
-		<button class="menu" ref="menu" @click.stop="showMenu">%fa:caret-down%</button>
+		<button v-if="!isTemporaryColumn" class="menu" ref="menu" @click.stop="showMenu">%fa:caret-down%</button>
+		<button v-else class="close" @click.stop="close">%fa:times%</button>
 	</header>
 	<div ref="body" v-show="active">
 		<slot></slot>
@@ -34,11 +34,13 @@ export default Vue.extend({
 	props: {
 		column: {
 			type: Object,
-			required: true
+			required: false,
+			default: null
 		},
 		isStacked: {
 			type: Boolean,
-			required: true
+			required: false,
+			default: false
 		},
 		name: {
 			type: String,
@@ -61,6 +63,12 @@ export default Vue.extend({
 		}
 	},
 
+	computed: {
+		isTemporaryColumn(): boolean {
+			return this.column == null;
+		}
+	},
+
 	inject: {
 		getColumnVm: { from: 'getColumnVm' }
 	},
@@ -96,14 +104,20 @@ export default Vue.extend({
 
 	mounted() {
 		this.$refs.body.addEventListener('scroll', this.onScroll, { passive: true });
+
+		if (!this.isTemporaryColumn) {
 			this.$root.$on('deck.column.dragStart', this.onOtherDragStart);
 			this.$root.$on('deck.column.dragEnd', this.onOtherDragEnd);
+		}
 	},
 
 	beforeDestroy() {
 		this.$refs.body.removeEventListener('scroll', this.onScroll);
+
+		if (!this.isTemporaryColumn) {
 			this.$root.$off('deck.column.dragStart', this.onOtherDragStart);
 			this.$root.$off('deck.column.dragEnd', this.onOtherDragEnd);
+		}
 	},
 
 	methods: {
@@ -203,6 +217,7 @@ export default Vue.extend({
 		},
 
 		onContextmenu(e) {
+			if (this.isTemporaryColumn) return;
 			contextmenu((this as any).os)(e, this.getMenu());
 		},
 
@@ -214,6 +229,13 @@ export default Vue.extend({
 			});
 		},
 
+		close() {
+			this.$store.commit('device/set', {
+				key: 'deckTemporaryColumn',
+				value: null
+			});
+		},
+
 		goTop() {
 			this.$refs.body.scrollTo({
 				top: 0,
@@ -222,6 +244,12 @@ export default Vue.extend({
 		},
 
 		onDragstart(e) {
+			// テンポラリカラムはドラッグさせない
+			if (this.isTemporaryColumn) {
+				e.preventDefault();
+				return;
+			}
+
 			e.dataTransfer.effectAllowed = 'move';
 			e.dataTransfer.setData('mk-deck-column', this.column.id);
 			this.dragging = true;
@@ -232,6 +260,12 @@ export default Vue.extend({
 		},
 
 		onDragover(e) {
+			// テンポラリカラムにはドロップさせない
+			if (this.isTemporaryColumn) {
+				e.dataTransfer.dropEffect = 'none';
+				return;
+			}
+
 			// 自分自身がドラッグされている場合
 			if (this.dragging) {
 				// 自分自身にはドロップさせない
@@ -242,9 +276,7 @@ export default Vue.extend({
 			const isDeckColumn = e.dataTransfer.types[0] == 'mk-deck-column';
 
 			e.dataTransfer.dropEffect = isDeckColumn ? 'move' : 'none';
-		},
 
-		onDragenter() {
 			if (!this.dragging) this.draghover = true;
 		},
 
@@ -276,13 +308,24 @@ export default Vue.extend({
 	min-width 330px
 	height 100%
 	background var(--face)
-	border-radius 6px
+	border-radius var(--round)
-	//box-shadow 0 2px 16px rgba(#000, 0.1)
+	box-shadow var(--shadow)
 	overflow hidden
 
 	&.draghover
 		box-shadow 0 0 0 2px var(--primaryAlpha08)
 
+		&:after
+			content ""
+			display block
+			position absolute
+			z-index 1000
+			top 0
+			left 0
+			width 100%
+			height 100%
+			background var(--primaryAlpha02)
+
 	&.dragging
 		box-shadow 0 0 0 2px var(--primaryAlpha04)
 
@@ -310,7 +353,7 @@ export default Vue.extend({
 
 	> header
 		display flex
-		z-index 1
+		z-index 2
 		line-height $header-height
 		padding 0 16px
 		font-size 14px
@@ -338,6 +381,8 @@ export default Vue.extend({
 
 		> .toggleActive
 		> .menu
+		> .close
+			padding 0
 			width $header-height
 			line-height $header-height
 			font-size 16px
@@ -353,6 +398,7 @@ export default Vue.extend({
 			margin-left -16px
 
 		> .menu
+		> .close
 			margin-left auto
 			margin-right -16px
 

src/client/app/desktop/views/pages/deck/deck.list-tl.vue

@@ -46,8 +46,10 @@ export default Vue.extend({
 	},
 
 	mounted() {
-		if (this.connection) this.connection.close();
+		if (this.connection) this.connection.dispose();
-		this.connection = new UserListStream((this as any).os, this.$store.state.i, this.list.id);
+		this.connection = (this as any).os.stream.connectToChannel('userList', {
+			listId: this.list.id
+		});
 		this.connection.on('note', this.onNote);
 		this.connection.on('userAdded', this.onUserAdded);
 		this.connection.on('userRemoved', this.onUserRemoved);
@@ -56,7 +58,7 @@ export default Vue.extend({
 	},
 
 	beforeDestroy() {
-		this.connection.close();
+		this.connection.dispose();
 	},
 
 	methods: {

src/client/app/desktop/views/pages/deck/deck.note-column.vue

@@ -0,0 +1,69 @@
+<template>
+<x-column>
+	<span slot="header">
+		%fa:comment-alt R%<span>{{ title }}</span>
+	</span>
+
+	<div class="rvtscbadixhhbsczoorqoaygovdeecsx" v-if="note">
+		<div class="is-remote" v-if="note.user.host != null">%fa:exclamation-triangle% %i18n:@is-remote%<a :href="note.url || note.uri" target="_blank">%i18n:@view-remote%</a></div>
+		<x-note :note="note" :detail="true" :mini="true"/>
+	</div>
+</x-column>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import XColumn from './deck.column.vue';
+import XNotes from './deck.notes.vue';
+import XNote from '../../components/note.vue';
+
+export default Vue.extend({
+	components: {
+		XColumn,
+		XNotes,
+		XNote
+	},
+
+	props: {
+		noteId: {
+			type: String,
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			note: null,
+			fetching: true
+		};
+	},
+
+	computed: {
+		title(): string {
+			return this.note ? Vue.filter('userName')(this.note.user) : '';
+		}
+	},
+
+	created() {
+		(this as any).api('notes/show', { noteId: this.noteId }).then(note => {
+			this.note = note;
+			this.fetching = false;
+		});
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.rvtscbadixhhbsczoorqoaygovdeecsx
+	> .is-remote
+		padding 8px 16px
+		font-size 12px
+
+		&.is-remote
+			color var(--remoteInfoFg)
+			background var(--remoteInfoBg)
+
+		> a
+			font-weight bold
+
+</style>

src/client/app/desktop/views/pages/deck/deck.note.sub.vue

@@ -1,71 +0,0 @@
-<template>
-<div class="fnlfosztlhtptnongximhlbykxblytcq">
-	<mk-avatar class="avatar" :user="note.user"/>
-	<div class="main">
-		<mk-note-header class="header" :note="note" :mini="true"/>
-		<div class="body">
-			<mk-sub-note-content class="text" :note="note"/>
-		</div>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		note: {
-			type: Object,
-			required: true
-		},
-		// TODO
-		truncate: {
-			type: Boolean,
-			default: true
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.fnlfosztlhtptnongximhlbykxblytcq
-	display flex
-	padding 16px
-	font-size 10px
-	background var(--subNoteBg)
-
-	&.smart
-		> .main
-			width 100%
-
-			> header
-				align-items center
-
-	> .avatar
-		flex-shrink 0
-		display block
-		margin 0 8px 0 0
-		width 38px
-		height 38px
-		border-radius 8px
-
-	> .main
-		flex 1
-		min-width 0
-
-		> .header
-			margin-bottom 2px
-
-		> .body
-
-			> .text
-				margin 0
-				padding 0
-				color var(--subNoteText)
-
-				pre
-					max-height 120px
-					font-size 80%
-
-</style>

src/client/app/desktop/views/pages/deck/deck.note.vue

@@ -1,360 +0,0 @@
-<template>
-<div v-if="!mediaView" class="zyjjkidcqjnlegkqebitfviomuqmseqk" :class="{ renote: isRenote }">
-	<div class="reply-to" v-if="p.reply && (!$store.getters.isSignedIn || $store.state.settings.showReplyTarget)">
-		<x-sub :note="p.reply"/>
-	</div>
-	<div class="renote" v-if="isRenote">
-		<mk-avatar class="avatar" :user="note.user"/>
-		%fa:retweet%
-		<span>{{ '%i18n:@reposted-by%'.substr(0, '%i18n:@reposted-by%'.indexOf('{')) }}</span>
-		<router-link class="name" :to="note.user | userPage">{{ note.user | userName }}</router-link>
-		<span>{{ '%i18n:@reposted-by%'.substr('%i18n:@reposted-by%'.indexOf('}') + 1) }}</span>
-		<mk-time :time="note.createdAt"/>
-	</div>
-	<article>
-		<mk-avatar class="avatar" :user="p.user"/>
-		<div class="main">
-			<mk-note-header class="header" :note="p" :mini="true"/>
-			<div class="body">
-				<p v-if="p.cw != null" class="cw">
-					<span class="text" v-if="p.cw != ''">{{ p.cw }}</span>
-					<mk-cw-button v-model="showContent"/>
-				</p>
-				<div class="content" v-show="p.cw == null || showContent">
-					<div class="text">
-						<span v-if="p.isHidden" style="opacity: 0.5">(%i18n:@private%)</span>
-						<span v-if="p.deletedAt" style="opacity: 0.5">(%i18n:@deleted%)</span>
-						<a class="reply" v-if="p.reply">%fa:reply%</a>
-						<misskey-flavored-markdown v-if="p.text" :text="p.text" :i="$store.state.i"/>
-						<a class="rp" v-if="p.renote != null">RP:</a>
-					</div>
-					<div class="files" v-if="p.files.length > 0">
-						<mk-media-list :media-list="p.files"/>
-					</div>
-					<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
-					<a class="location" v-if="p.geo" :href="`https://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% %i18n:@location%</a>
-					<div class="renote" v-if="p.renote">
-						<mk-note-preview :note="p.renote" :mini="true"/>
-					</div>
-					<mk-url-preview v-for="url in urls" :url="url" :key="url" :detail="false" :mini="true"/>
-				</div>
-				<span class="app" v-if="p.app">via <b>{{ p.app.name }}</b></span>
-			</div>
-			<footer>
-				<mk-reactions-viewer :note="p" ref="reactionsViewer"/>
-				<button @click="reply">
-					<template v-if="p.reply">%fa:reply-all%</template>
-					<template v-else>%fa:reply%</template>
-				</button>
-				<button @click="renote" title="Renote">%fa:retweet%</button>
-				<button :class="{ reacted: p.myReaction != null }" @click="react" ref="reactButton">%fa:plus%</button>
-				<button class="menu" @click="menu" ref="menuButton">%fa:ellipsis-h%</button>
-			</footer>
-		</div>
-	</article>
-</div>
-<div v-else class="srwrkujossgfuhrbnvqkybtzxpblgchi">
-	<div v-if="note.files.length > 0">
-		<mk-media-list :media-list="note.files"/>
-	</div>
-	<div v-if="note.renote && note.renote.files.length > 0">
-		<mk-media-list :media-list="note.renote.files"/>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import parse from '../../../../../../mfm/parse';
-
-import MkNoteMenu from '../../../../common/views/components/note-menu.vue';
-import MkReactionPicker from '../../../../common/views/components/reaction-picker.vue';
-import XSub from './deck.note.sub.vue';
-import noteSubscriber from '../../../../common/scripts/note-subscriber';
-
-export default Vue.extend({
-	components: {
-		XSub
-	},
-
-	mixins: [noteSubscriber('note')],
-
-	props: {
-		note: {
-			type: Object,
-			required: true
-		},
-		mediaView: {
-			type: Boolean,
-			required: false,
-			default: false
-		}
-	},
-
-	data() {
-		return {
-			showContent: false
-		};
-	},
-
-	computed: {
-		isRenote(): boolean {
-			return (this.note.renote &&
-				this.note.text == null &&
-				this.note.fileIds.length == 0 &&
-				this.note.poll == null);
-		},
-
-		p(): any {
-			return this.isRenote ? this.note.renote : this.note;
-		},
-
-		urls(): string[] {
-			if (this.p.text) {
-				const ast = parse(this.p.text);
-				return ast
-					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
-					.map(t => t.url);
-			} else {
-				return null;
-			}
-		}
-	},
-
-	methods: {
-		reply() {
-			(this as any).apis.post({
-				reply: this.p
-			});
-		},
-
-		renote() {
-			(this as any).apis.post({
-				renote: this.p
-			});
-		},
-
-		react() {
-			(this as any).os.new(MkReactionPicker, {
-				source: this.$refs.reactButton,
-				note: this.p,
-				compact: true
-			});
-		},
-
-		menu() {
-			(this as any).os.new(MkNoteMenu, {
-				source: this.$refs.menuButton,
-				note: this.p,
-				compact: true
-			});
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.srwrkujossgfuhrbnvqkybtzxpblgchi
-	font-size 13px
-	margin 4px 12px
-
-	&:first-child
-		margin-top 12px
-
-	&:last-child
-		margin-bottom 12px
-
-.zyjjkidcqjnlegkqebitfviomuqmseqk
-	font-size 13px
-	border-bottom solid 1px var(--faceDivider)
-
-	&:last-of-type
-		border-bottom none
-
-	&.smart
-		> article
-			> .main
-				> header
-					align-items center
-					margin-bottom 4px
-
-	> .renote
-		display flex
-		align-items center
-		padding 8px 16px 0 16px
-		line-height 28px
-		white-space pre
-		color var(--renoteText)
-		background linear-gradient(to bottom, var(--renoteGradient) 0%, var(--face) 100%)
-
-		.avatar
-			flex-shrink 0
-			display inline-block
-			width 20px
-			height 20px
-			margin 0 8px 0 0
-			border-radius 6px
-
-		[data-fa]
-			margin-right 4px
-
-		> span
-			flex-shrink 0
-
-			&:last-of-type
-				margin-right 8px
-
-		.name
-			overflow hidden
-			flex-shrink 1
-			text-overflow ellipsis
-			white-space nowrap
-			font-weight bold
-
-		> .mk-time
-			display block
-			margin-left auto
-			flex-shrink 0
-			font-size 0.9em
-
-		& + article
-			padding-top 8px
-
-	> article
-		display flex
-		padding 16px 16px 4px
-
-		> .avatar
-			flex-shrink 0
-			display block
-			margin 0 10px 8px 0
-			width 42px
-			height 42px
-			border-radius 6px
-			//position -webkit-sticky
-			//position sticky
-			//top 62px
-
-		> .main
-			flex 1
-			min-width 0
-
-			> .body
-
-				> .cw
-					cursor default
-					display block
-					margin 0
-					padding 0
-					overflow-wrap break-word
-					color var(--noteText)
-
-					> .text
-						margin-right 8px
-
-				> .content
-
-					> .text
-						display block
-						margin 0
-						padding 0
-						overflow-wrap break-word
-						color var(--noteText)
-
-						>>> .title
-							display block
-							margin-bottom 4px
-							padding 4px
-							font-size 90%
-							text-align center
-							background var(--mfmTitleBg)
-							border-radius 4px
-
-						>>> .code
-							margin 8px 0
-
-						>>> .quote
-							margin 8px
-							padding 6px 12px
-							color var(--mfmQuote)
-							border-left solid 3px var(--mfmQuoteLine)
-
-						> .reply
-							margin-right 8px
-							color var(--noteText)
-
-						> .rp
-							margin-left 4px
-							font-style oblique
-							color var(--renoteText)
-
-						[data-is-me]:after
-							content "you"
-							padding 0 4px
-							margin-left 4px
-							font-size 80%
-							color var(--primaryForeground)
-							background var(--primary)
-							border-radius 4px
-
-					.mk-url-preview
-						margin-top 8px
-
-					> .files
-						> img
-							display block
-							max-width 100%
-
-					> .location
-						margin 4px 0
-						font-size 12px
-						color #ccc
-
-					> .map
-						width 100%
-						height 200px
-
-						&:empty
-							display none
-
-					> .mk-poll
-						font-size 80%
-
-					> .renote
-						margin 8px 0
-
-						> *
-							padding 16px
-							border dashed 1px var(--quoteBorder)
-							border-radius 8px
-
-				> .app
-					font-size 12px
-					color #ccc
-
-			> footer
-				> button
-					margin 0
-					padding 4px 8px 8px 8px
-					background transparent
-					border none
-					box-shadow none
-					font-size 1em
-					color var(--noteActions)
-					cursor pointer
-
-					&:not(:last-child)
-						margin-right 28px
-
-					&:hover
-						color var(--noteActionsHover)
-
-					> .count
-						display inline
-						margin 0 0 0 8px
-						color #999
-
-					&.reacted
-						color var(--primary)
-
-</style>

src/client/app/desktop/views/pages/deck/deck.notes.vue

@@ -2,6 +2,12 @@
 <div class="eamppglmnmimdhrlzhplwpvyeaqmmhxu">
 	<slot name="empty" v-if="notes.length == 0 && !fetching && requestInitPromise == null"></slot>
 
+	<div class="placeholder" v-if="fetching">
+		<template v-for="i in 10">
+			<mk-note-skeleton :key="i"/>
+		</template>
+	</div>
+
 	<div v-if="!fetching && requestInitPromise != null">
 		<p>%i18n:@error%</p>
 		<button @click="resolveInitPromise">%i18n:@retry%</button>
@@ -11,7 +17,7 @@
 	<!--<transition-group name="mk-notes" class="transition">-->
 	<div class="notes">
 		<template v-for="(note, i) in _notes">
-			<x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)" :media-view="mediaView"/>
+			<x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)" :media-view="mediaView" :mini="true"/>
 			<p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date">
 				<span>%fa:angle-up%{{ note._datetext }}</span>
 				<span>%fa:angle-down%{{ _notes[i + 1]._datetext }}</span>
@@ -32,7 +38,7 @@
 <script lang="ts">
 import Vue from 'vue';
 
-import XNote from './deck.note.vue';
+import XNote from '../../components/note.vue';
 
 const displayLimit = 20;
 
@@ -205,12 +211,16 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease
 
+	> .placeholder
+		padding 16px
+		opacity 0.3
+
 	> .notes
 		> .date
 			display block
 			margin 0
 			line-height 32px
-			font-size 14px
+			font-size 12px
 			text-align center
 			color var(--dateDividerFg)
 			background var(--dateDividerBg)

src/client/app/desktop/views/pages/deck/deck.notification.vue

@@ -66,15 +66,15 @@
 	</div>
 
 	<template v-if="notification.type == 'quote'">
-		<x-note :note="notification.note" @update:note="onNoteUpdated"/>
+		<x-note :note="notification.note" @update:note="onNoteUpdated" :mini="true"/>
 	</template>
 
 	<template v-if="notification.type == 'reply'">
-		<x-note :note="notification.note" @update:note="onNoteUpdated"/>
+		<x-note :note="notification.note" @update:note="onNoteUpdated" :mini="true"/>
 	</template>
 
 	<template v-if="notification.type == 'mention'">
-		<x-note :note="notification.note" @update:note="onNoteUpdated"/>
+		<x-note :note="notification.note" @update:note="onNoteUpdated" :mini="true"/>
 	</template>
 </div>
 </template>
@@ -82,7 +82,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import getNoteSummary from '../../../../../../misc/get-note-summary';
-import XNote from './deck.note.vue';
+import XNote from '../../components/note.vue';
 
 export default Vue.extend({
 	components: {

src/client/app/desktop/views/pages/deck/deck.notifications.vue

@@ -1,5 +1,11 @@
 <template>
 <div class="oxynyeqmfvracxnglgulyqfgqxnxmehl">
+	<div class="placeholder" v-if="fetching">
+		<template v-for="i in 10">
+			<mk-note-skeleton :key="i"/>
+		</template>
+	</div>
+
 	<!-- トランジションを有効にするとなぜかメモリリークする -->
 	<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notifications" class="transition notifications">
 		<template v-for="(notification, i) in _notifications">
@@ -14,7 +20,6 @@
 		<template v-if="fetchingMoreNotifications">%fa:spinner .pulse .fw%</template>{{ fetchingMoreNotifications ? '%i18n:common.loading%' : '%i18n:@more%' }}
 	</button>
 	<p class="empty" v-if="notifications.length == 0 && !fetching">%i18n:@empty%</p>
-	<p class="loading" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
 </div>
 </template>
 
@@ -113,8 +118,7 @@ export default Vue.extend({
 
 		onNotification(notification) {
 			// TODO: ユーザーが画面を見てないと思われるとき(ブラウザやタブがアクティブじゃないなど)は送信しない
-			this.connection.send({
+			(this as any).os.stream.send('readNotification', {
-				type: 'readNotification',
 				id: notification.id
 			});
 
@@ -162,6 +166,10 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease
 
+	> .placeholder
+		padding 16px
+		opacity 0.3
+
 	> .notifications
 
 		> .notification:not(:last-child)
@@ -208,13 +216,4 @@ export default Vue.extend({
 		text-align center
 		color #aaa
 
-	> .loading
-		margin 0
-		padding 16px
-		text-align center
-		color #aaa
-
-		> [data-fa]
-			margin-right 4px
-
 </style>

src/client/app/desktop/views/pages/deck/deck.tl-column.vue

@@ -15,7 +15,7 @@
 		<ui-switch v-model="column.isMediaView" @change="onChangeSettings">%i18n:@is-media-view%</ui-switch>
 	</div>
 	<x-list-tl v-if="column.type == 'list'" :list="column.list" :media-only="column.isMediaOnly" :media-view="column.isMediaView"/>
-	<x-hashtag-tl v-if="column.type == 'hashtag'" :tag-tl="$store.state.settings.tagTimelines.find(x => x.id == column.tagTlId)" :media-only="column.isMediaOnly" :media-view="column.isMediaView"/>
+	<x-hashtag-tl v-else-if="column.type == 'hashtag'" :tag-tl="$store.state.settings.tagTimelines.find(x => x.id == column.tagTlId)" :media-only="column.isMediaOnly" :media-view="column.isMediaView"/>
 	<x-tl v-else :src="column.type" :media-only="column.isMediaOnly" :media-view="column.isMediaView"/>
 </x-column>
 </template>

src/client/app/desktop/views/pages/deck/deck.user-column.vue

@@ -0,0 +1,269 @@
+<template>
+<x-column>
+	<span slot="header">
+		%fa:user%<span>{{ title }}</span>
+	</span>
+
+	<div class="zubukjlciycdsyynicqrnlsmdwmymzqu" v-if="user">
+		<div class="is-remote" v-if="user.host != null">%fa:exclamation-triangle% %i18n:@is-remote%<a :href="user.url || user.uri" target="_blank">%i18n:@view-remote%</a></div>
+		<header :style="bannerStyle">
+			<div>
+				<mk-follow-button v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" class="follow"/>
+				<mk-avatar class="avatar" :user="user" :disable-preview="true"/>
+				<span class="name">{{ user | userName }}</span>
+				<span class="acct">@{{ user | acct }}</span>
+			</div>
+		</header>
+		<div class="info">
+			<div class="description">
+				<misskey-flavored-markdown v-if="user.description" :text="user.description" :i="$store.state.i"/>
+			</div>
+		</div>
+		<div class="pinned" v-if="user.pinnedNotes && user.pinnedNotes.length > 0">
+			<p>%fa:thumbtack% %i18n:@pinned-notes%</p>
+			<div class="notes">
+				<x-note v-for="n in user.pinnedNotes" :key="n.id" :note="n" :mini="true"/>
+			</div>
+		</div>
+		<div class="images" v-if="images.length > 0">
+			<router-link v-for="image in images" :style="`background-image: url(${image.thumbnailUrl})`" :key="`${image.id}:${image._note.id}`" :to="image._note | notePage"></router-link>
+		</div>
+		<div class="tl">
+			<x-notes ref="timeline" :more="existMore ? fetchMoreNotes : null"/>
+		</div>
+	</div>
+</x-column>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import parseAcct from '../../../../../../misc/acct/parse';
+import XColumn from './deck.column.vue';
+import XNotes from './deck.notes.vue';
+import XNote from '../../components/note.vue';
+import { concat } from '../../../../../../prelude/array';
+
+const fetchLimit = 10;
+
+export default Vue.extend({
+	components: {
+		XColumn,
+		XNotes,
+		XNote
+	},
+
+	props: {
+		acct: {
+			type: String,
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			user: null,
+			fetching: true,
+			existMore: false,
+			moreFetching: false,
+			withFiles: false,
+			images: []
+		};
+	},
+
+	computed: {
+		title(): string {
+			return this.user ? Vue.filter('userName')(this.user) : '';
+		},
+
+		bannerStyle(): any {
+			if (this.user == null) return {};
+			if (this.user.bannerUrl == null) return {};
+			return {
+				backgroundColor: this.user.bannerColor && this.user.bannerColor.length == 3 ? `rgb(${ this.user.bannerColor.join(',') })` : null,
+				backgroundImage: `url(${ this.user.bannerUrl })`
+			};
+		},
+	},
+
+	created() {
+		(this as any).api('users/show', parseAcct(this.acct)).then(user => {
+			this.user = user;
+			this.fetching = false;
+
+			this.$nextTick(() => {
+				(this.$refs.timeline as any).init(() => this.initTl());
+			});
+
+			const image = [
+				'image/jpeg',
+				'image/png',
+				'image/gif'
+			];
+
+			(this as any).api('users/notes', {
+				userId: this.user.id,
+				fileType: image,
+				limit: 9
+			}).then(notes => {
+				notes.forEach(note => {
+					note.files.forEach(file => {
+						file._note = note;
+					});
+				});
+				const files = concat(notes.map((n: any): any[] => n.files));
+				this.images = files.filter(f => image.includes(f.type)).slice(0, 6);
+			});
+		});
+	},
+
+	methods: {
+		initTl() {
+			return new Promise((res, rej) => {
+				(this as any).api('users/notes', {
+					userId: this.user.id,
+					limit: fetchLimit + 1,
+					withFiles: this.withFiles,
+					includeMyRenotes: this.$store.state.settings.showMyRenotes,
+					includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
+					includeLocalRenotes: this.$store.state.settings.showLocalRenotes
+				}).then(notes => {
+					if (notes.length == fetchLimit + 1) {
+						notes.pop();
+						this.existMore = true;
+					}
+					res(notes);
+				}, rej);
+			});
+		},
+
+		fetchMoreNotes() {
+			this.moreFetching = true;
+
+			const promise = (this as any).api('users/notes', {
+				userId: this.user.id,
+				limit: fetchLimit + 1,
+				untilId: (this.$refs.timeline as any).tail().id,
+				withFiles: this.withFiles,
+				includeMyRenotes: this.$store.state.settings.showMyRenotes,
+				includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
+				includeLocalRenotes: this.$store.state.settings.showLocalRenotes
+			});
+
+			promise.then(notes => {
+				if (notes.length == fetchLimit + 1) {
+					notes.pop();
+				} else {
+					this.existMore = false;
+				}
+				notes.forEach(n => (this.$refs.timeline as any).append(n));
+				this.moreFetching = false;
+			});
+
+			return promise;
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.zubukjlciycdsyynicqrnlsmdwmymzqu
+	background var(--deckUserColumnBg)
+
+	> .is-remote
+		padding 8px 16px
+		font-size 12px
+
+		&.is-remote
+			color var(--remoteInfoFg)
+			background var(--remoteInfoBg)
+
+		> a
+			font-weight bold
+
+	> header
+		overflow hidden
+		background-size cover
+		background-position center
+
+		> div
+			padding 32px
+			background rgba(#000, 0.5)
+			color #fff
+			text-align center
+
+			> .follow
+				position absolute
+				top 16px
+				right 16px
+
+			> .avatar
+				display block
+				width 64px
+				height 64px
+				margin 0 auto
+
+			> .name
+				display block
+				margin-top 8px
+				font-weight bold
+				text-shadow 0 0 8px #000
+
+			> .acct
+				font-size 14px
+				opacity 0.7
+				text-shadow 0 0 8px #000
+
+	> .info
+		padding 16px
+		font-size 14px
+		color var(--text)
+		text-align center
+		background var(--face)
+		border-bottom solid 1px var(--faceDivider)
+
+		&:before
+			content ""
+			display blcok
+			position absolute
+			top -32px
+			left 0
+			right 0
+			width 0px
+			margin 0 auto
+			border-top solid 16px transparent
+			border-left solid 16px transparent
+			border-right solid 16px transparent
+			border-bottom solid 16px var(--face)
+
+	> .pinned
+		padding-bottom 16px
+		background var(--deckUserColumnBg)
+
+		> p
+			margin 0
+			padding 8px 16px
+			font-size 12px
+			color var(--text)
+
+		> .notes
+			background var(--face)
+
+	> .images
+		display grid
+		grid-template-rows 1fr 1fr 1fr
+		grid-template-columns 1fr 1fr 1fr
+		gap 4px
+		height 250px
+		padding 16px
+		margin-bottom 16px
+		background var(--face)
+
+		> *
+			background-position center center
+			background-size cover
+			background-clip content-box
+
+	> .tl
+		background var(--face)
+
+</style>

src/client/app/desktop/views/pages/deck/deck.vue

@@ -1,6 +1,6 @@
 <template>
 <mk-ui :class="$style.root">
-	<div class="qlvquzbjribqcaozciifydkngcwtyzje" :style="style">
+	<div class="qlvquzbjribqcaozciifydkngcwtyzje" :style="style" :class="{ center: $store.state.device.deckColumnAlign == 'center' }">
 		<template v-for="ids in layout">
 			<div v-if="ids.length > 1" class="folder">
 				<template v-for="id, i in ids">
@@ -9,6 +9,10 @@
 			</div>
 			<x-column-core v-else :ref="ids[0]" :key="ids[0]" :column="columns.find(c => c.id == ids[0])"/>
 		</template>
+		<template v-if="temporaryColumn">
+			<x-user-column v-if="temporaryColumn.type == 'user'" :acct="temporaryColumn.acct" :key="temporaryColumn.acct"/>
+			<x-note-column v-else-if="temporaryColumn.type == 'note'" :note-id="temporaryColumn.noteId" :key="temporaryColumn.noteId"/>
+		</template>
 		<button ref="add" @click="add" title="%i18n:common.deck.add-column%">%fa:plus%</button>
 	</div>
 </mk-ui>
@@ -19,11 +23,16 @@ import Vue from 'vue';
 import XColumnCore from './deck.column-core.vue';
 import Menu from '../../../../common/views/components/menu.vue';
 import MkUserListsWindow from '../../components/user-lists-window.vue';
+import XUserColumn from './deck.user-column.vue';
+import XNoteColumn from './deck.note-column.vue';
+
 import * as uuid from 'uuid';
 
 export default Vue.extend({
 	components: {
-		XColumnCore
+		XColumnCore,
+		XUserColumn,
+		XNoteColumn
 	},
 
 	computed: {
@@ -31,15 +40,21 @@ export default Vue.extend({
 			if (this.$store.state.settings.deck == null) return [];
 			return this.$store.state.settings.deck.columns;
 		},
+
 		layout(): any[] {
 			if (this.$store.state.settings.deck == null) return [];
 			if (this.$store.state.settings.deck.layout == null) return this.$store.state.settings.deck.columns.map(c => [c.id]);
 			return this.$store.state.settings.deck.layout;
 		},
+
 		style(): any {
 			return {
 				height: `calc(100vh - ${this.$store.state.uiHeaderHeight}px)`
 			};
+		},
+
+		temporaryColumn(): any {
+			return this.$store.state.device.deckTemporaryColumn;
 		}
 	},
 
@@ -50,6 +65,8 @@ export default Vue.extend({
 	},
 
 	created() {
+		this.$store.commit('navHook', this.onNav);
+
 		if (this.$store.state.settings.deck == null) {
 			const deck = {
 				columns: [/*{
@@ -95,6 +112,8 @@ export default Vue.extend({
 	},
 
 	beforeDestroy() {
+		this.$store.commit('navHook', null);
+
 		document.documentElement.style.overflow = 'auto';
 	},
 
@@ -103,6 +122,30 @@ export default Vue.extend({
 			return this.$refs[id][0];
 		},
 
+		onNav(to) {
+			if (!this.$store.state.settings.deckNav) return false;
+
+			if (to.name == 'user') {
+				this.$store.commit('device/set', {
+					key: 'deckTemporaryColumn',
+					value: {
+						type: 'user',
+						acct: to.params.user
+					}
+				});
+				return true;
+			} else if (to.name == 'note') {
+				this.$store.commit('device/set', {
+					key: 'deckTemporaryColumn',
+					value: {
+						type: 'note',
+						noteId: to.params.note
+					}
+				});
+				return true;
+			}
+		},
+
 		add() {
 			this.os.new(Menu, {
 				source: this.$refs.add,
@@ -240,6 +283,7 @@ export default Vue.extend({
 			> *:not(:last-child)
 				margin-bottom 8px
 
+	&.center
 		> *
 			&:first-child
 				margin-left auto

src/client/app/desktop/views/pages/search.vue

@@ -3,9 +3,6 @@
 	<header :class="$style.header">
 		<h1>{{ q }}</h1>
 	</header>
-	<div :class="$style.loading" v-if="fetching">
-		<mk-ellipsis-icon/>
-	</div>
 	<p :class="$style.notAvailable" v-if="!fetching && notAvailable">%i18n:@not-available%</p>
 	<p :class="$style.empty" v-if="!fetching && empty">%fa:search% {{ '%i18n:not-found%'.split('{}')[0] }}{{ q }}{{ '%i18n:not-found%'.split('{}')[1] }}</p>
 	<mk-notes ref="timeline" :class="$style.notes" :more="existMore ? more : null"/>
@@ -119,9 +116,6 @@ export default Vue.extend({
 	border-radius 6px
 	overflow hidden
 
-.loading
-	padding 64px 0
-
 .empty
 	display block
 	margin 0 auto

src/client/app/desktop/views/pages/tag.vue

@@ -3,9 +3,6 @@
 	<header :class="$style.header">
 		<h1>#{{ $route.params.tag }}</h1>
 	</header>
-	<div :class="$style.loading" v-if="fetching">
-		<mk-ellipsis-icon/>
-	</div>
 	<p :class="$style.empty" v-if="!fetching && empty">%fa:search% {{ '%i18n:no-posts-found%'.split('{}')[0] }}{{ q }}{{ '%i18n:no-posts-found%'.split('{}')[1] }}</p>
 	<mk-notes ref="timeline" :class="$style.notes" :more="existMore ? more : null"/>
 </mk-ui>
@@ -108,9 +105,6 @@ export default Vue.extend({
 	border-radius 6px
 	overflow hidden
 
-.loading
-	padding 64px 0
-
 .empty
 	display block
 	margin 0 auto

src/client/app/desktop/views/pages/user/user.header.vue

@@ -8,8 +8,6 @@
 			<div>
 				<span class="username"><mk-acct :user="user" :detail="true" /></span>
 				<span v-if="user.isBot" title="%i18n:@is-bot%">%fa:robot%</span>
-				<span class="location" v-if="user.host === null && user.profile.location">%fa:map-marker% {{ user.profile.location }}</span>
-				<span class="birthday" v-if="user.host === null && user.profile.birthday">%fa:birthday-cake% {{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' }} ({{ age }}歳)</span>
 			</div>
 		</div>
 	</div>
@@ -18,6 +16,10 @@
 		<div class="description">
 			<misskey-flavored-markdown v-if="user.description" :text="user.description" :i="$store.state.i"/>
 		</div>
+		<div class="info">
+			<span class="location" v-if="user.host === null && user.profile.location">%fa:map-marker% {{ user.profile.location }}</span>
+			<span class="birthday" v-if="user.host === null && user.profile.birthday">%fa:birthday-cake% {{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' }} ({{ age }}歳)</span>
+		</div>
 		<div class="status">
 			<span class="notes-count"><b>{{ user.notesCount | number }}</b>%i18n:@posts%</span>
 			<span class="following clickable" @click="showFollowing"><b>{{ user.followingCount | number }}</b>%i18n:@following%</span>
@@ -182,6 +184,14 @@ export default Vue.extend({
 		padding 16px 16px 16px 154px
 		color var(--text)
 
+		> .info
+			margin-top 16px
+			padding-top 16px
+			border-top solid 1px var(--faceDivider)
+
+			> *
+				margin-right 16px
+
 		> .status
 			margin-top 16px
 			padding-top 16px

src/client/app/desktop/views/pages/user/user.photos.vue

@@ -60,9 +60,6 @@ export default Vue.extend({
 			margin-right 4px
 
 	> .stream
-		display -webkit-flex
-		display -moz-flex
-		display -ms-flex
 		display flex
 		justify-content center
 		flex-wrap wrap

src/client/app/desktop/views/pages/user/user.timeline.vue

@@ -5,9 +5,6 @@
 		<span :data-active="mode == 'with-replies'" @click="mode = 'with-replies'">%fa:comments% %i18n:@with-replies%</span>
 		<span :data-active="mode == 'with-media'" @click="mode = 'with-media'">%fa:images% %i18n:@with-media%</span>
 	</header>
-	<div class="loading" v-if="fetching">
-		<mk-ellipsis-icon/>
-	</div>
 	<mk-notes ref="timeline" :more="existMore ? more : null">
 		<p class="empty" slot="empty">%fa:R comments%%i18n:@empty%</p>
 	</mk-notes>
@@ -152,9 +149,6 @@ export default Vue.extend({
 				&:hover
 					color var(--desktopTimelineSrcHover)
 
-	> .loading
-		padding 64px 0
-
 	> .empty
 		display block
 		margin 0 auto

src/client/app/desktop/views/widgets/users.vue

@@ -13,7 +13,6 @@
 						<router-link class="name" :to="_user | userPage" v-user-preview="_user.id">{{ _user | userName }}</router-link>
 						<p class="username">@{{ _user | acct }}</p>
 					</div>
-					<mk-follow-button :user="_user"/>
 				</div>
 			</template>
 			<p class="empty" v-else>%i18n:@no-one%</p>

src/client/app/init.ts

@@ -8,6 +8,7 @@ import VueRouter from 'vue-router';
 import * as TreeView from 'vue-json-tree-view';
 import VAnimateCss from 'v-animate-css';
 import VModal from 'vue-js-modal';
+import VueSweetalert2 from 'vue-sweetalert2';
 
 import VueHotkey from './common/hotkey';
 import App from './app.vue';
@@ -26,6 +27,7 @@ Vue.use(TreeView);
 Vue.use(VAnimateCss);
 Vue.use(VModal);
 Vue.use(VueHotkey);
+Vue.use(VueSweetalert2);
 
 // Register global directives
 require('./common/views/directives');
@@ -122,11 +124,17 @@ export default (callback: (launch: (router: VueRouter, api?: (os: MiOS) => API)
 
 			//#region shadow
 			const shadow = '0 3px 8px rgba(0, 0, 0, 0.2)';
+			const shadowRight = '4px 0 4px rgba(0, 0, 0, 0.1)';
+			const shadowLeft = '-4px 0 4px rgba(0, 0, 0, 0.1)';
 			if (os.store.state.settings.useShadow) document.documentElement.style.setProperty('--shadow', shadow);
+			if (os.store.state.settings.useShadow) document.documentElement.style.setProperty('--shadowRight', shadowRight);
+			if (os.store.state.settings.useShadow) document.documentElement.style.setProperty('--shadowLeft', shadowLeft);
 			os.store.watch(s => {
 				return s.settings.useShadow;
 			}, v => {
 				document.documentElement.style.setProperty('--shadow', v ? shadow : 'none');
+				document.documentElement.style.setProperty('--shadowRight', v ? shadowRight : 'none');
+				document.documentElement.style.setProperty('--shadowLeft', v ? shadowLeft : 'none');
 			});
 			//#endregion
 
@@ -140,6 +148,19 @@ export default (callback: (launch: (router: VueRouter, api?: (os: MiOS) => API)
 			});
 			//#endregion
 
+			// Navigation hook
+			router.beforeEach((to, from, next) => {
+				if (os.store.state.navHook) {
+					if (os.store.state.navHook(to)) {
+						next(false);
+					} else {
+						next();
+					}
+				} else {
+					next();
+				}
+			});
+
 			Vue.mixin({
 				data() {
 					return {

src/client/app/mios.ts

@@ -212,7 +212,7 @@ export default class MiOS extends EventEmitter {
 		const fetched = () => {
 			this.emit('signedin');
 
-			this.stream = new Stream(this);
+			this.initStream();
 
 			// Finish init
 			callback();
@@ -247,12 +247,103 @@ export default class MiOS extends EventEmitter {
 					// Finish init
 					callback();
 
-					this.stream = new Stream(this);
+					this.initStream();
 				}
 			});
 		}
 	}
 
+	@autobind
+	private initStream() {
+		this.stream = new Stream(this);
+
+		if (this.store.getters.isSignedIn) {
+			const main = this.stream.useSharedConnection('main');
+
+			// 自分の情報が更新されたとき
+			main.on('meUpdated', i => {
+				this.store.dispatch('mergeMe', i);
+			});
+
+			main.on('readAllNotifications', () => {
+				this.store.dispatch('mergeMe', {
+					hasUnreadNotification: false
+				});
+			});
+
+			main.on('unreadNotification', () => {
+				this.store.dispatch('mergeMe', {
+					hasUnreadNotification: true
+				});
+			});
+
+			main.on('readAllMessagingMessages', () => {
+				this.store.dispatch('mergeMe', {
+					hasUnreadMessagingMessage: false
+				});
+			});
+
+			main.on('unreadMessagingMessage', () => {
+				this.store.dispatch('mergeMe', {
+					hasUnreadMessagingMessage: true
+				});
+			});
+
+			main.on('unreadMention', () => {
+				this.store.dispatch('mergeMe', {
+					hasUnreadMentions: true
+				});
+			});
+
+			main.on('readAllUnreadMentions', () => {
+				this.store.dispatch('mergeMe', {
+					hasUnreadMentions: false
+				});
+			});
+
+			main.on('unreadSpecifiedNote', () => {
+				this.store.dispatch('mergeMe', {
+					hasUnreadSpecifiedNotes: true
+				});
+			});
+
+			main.on('readAllUnreadSpecifiedNotes', () => {
+				this.store.dispatch('mergeMe', {
+					hasUnreadSpecifiedNotes: false
+				});
+			});
+
+			main.on('clientSettingUpdated', x => {
+				this.store.commit('settings/set', {
+					key: x.key,
+					value: x.value
+				});
+			});
+
+			main.on('homeUpdated', x => {
+				this.store.commit('settings/setHome', x);
+			});
+
+			main.on('mobileHomeUpdated', x => {
+				this.store.commit('settings/setMobileHome', x);
+			});
+
+			main.on('widgetUpdated', x => {
+				this.store.commit('settings/setWidget', {
+					id: x.id,
+					data: x.data
+				});
+			});
+
+			// トークンが再生成されたとき
+			// このままではMisskeyが利用できないので強制的にサインアウトさせる
+			main.on('myTokenRegenerated', () => {
+				alert('%i18n:common.my-token-regenerated%');
+				this.signout();
+			});
+		}
+	}
+
 	/**
 	 * Register service worker
 	 */
@@ -352,10 +443,10 @@ export default class MiOS extends EventEmitter {
 		};
 
 		const promise = new Promise((resolve, reject) => {
-			const viaStream = this.stream && this.store.state.device.apiViaStream && !forceFetch;
+			const viaStream = this.stream && this.stream.state == 'connected' && this.store.state.device.apiViaStream && !forceFetch;
 
 			if (viaStream) {
-				const id = Math.random().toString();
+				const id = Math.random().toString().substr(2, 8);
 
 				this.stream.once(`api:${id}`, res => {
 					if (res == null || Object.keys(res).length == 0) {

src/client/app/mobile/api/post.ts

@@ -18,6 +18,7 @@ export default (os) => (opts) => {
 	}).$mount();
 	vm.$once('cancel', recover);
 	vm.$once('posted', recover);
+	if (o.cb) vm.$once('closed', o.cb);
 	document.body.appendChild(vm.$el);
 	(vm as any).focus();
 };