10.73.0

New Crowdin translations

CHANGELOG.md

@@ -1,6 +1,52 @@
 ChangeLog
 =========
 
+10.73.0
+-------
+* テーマの強化
+* line thiknessの設定はデバイスに保存するように
+
+10.72.0
+-------
+* いくつかのテーマの追加
+* デザインの調整
+* バグ修正
+* など
+
+10.71.0
+-------
+* いくつかのテーマの追加
+
+10.70.1
+-------
+* notes/mentions にミュートを適用するように
+* Add id to return of users/relation
+* デザインの調整
+
+10.70.0
+-------
+* フォローしているユーザーからのフォローを自動承認するオプション
+* 「非公開」の公開範囲を廃止
+* Renote数の表示を廃止
+* 投稿のフィルタリングを強化
+* デザインの調整
+
+10.69.0
+-------
+* 通知の管理を強化
+* ユーザビリティの強化
+* デザインの調整
+
+10.68.0
+-------
+* 特定ユーザーにメンション付きで新規投稿ができるボタンを追加
+* 自分の投稿にリアクションできないように
+* 数式に文法エラーがあるとき、数式のソースをそのまま表示するように
+* CWボタンにアンケートの有無を表記するように
+* デスクトップ版で設定を新しいタブで開くように
+* モバイル版で検索ができない問題を修正
+* i18nの修正
+
 10.67.0
 -------
 * トークのメッセージを削除できるように

locales/ca-ES.yml

@@ -90,7 +90,6 @@ common:
     followers-desc: "自分のフォロワーにのみ公開"
     specified: "ダイレクト"
     specified-desc: "指定したユーザーにのみ公開"
-    private: "非公開"
     local-public: "公開 (ローカルのみ)"
     local-home: "ホーム (ローカルのみ)"
     local-followers: "フォロワー (ローカルのみ)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "公式アカウント"
   disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "UIの動きを減らす"
   this-setting-is-this-device-only: "このデバイスのみ"
   use-os-default-emojis: "OS標準の絵文字を使用"
-  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
+  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user}がRenote"
   error:
-    title: '問題が発生しました'
-    retry: 'やり直す'
+    title: "問題が発生しました"
+    retry: "やり直す"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "非ダークモード時に使用するテーマ"
   dark-theme: "ダークモード時に使用するテーマ"
   light-themes: "明るいテーマ"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "ベーステーマ"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "テーマ名"
   preview-created-theme: "プレビュー"
   invalid-theme: "テーマが正しくありません。"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "もっと見る"
   chars: "{count}文字"
   files: "{count}ファイル"
+  poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "ユーザーを探す"
   you: "あなた"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "開発者"
   feedback: "フィードバック"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "接続中"
   reconnecting: "再接続中"
   connected: "接続完了"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "接続する"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "自分のフォロワーにのみ公開"
   specified: "ダイレクト"
   specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
   local-public: "公開 (ローカルのみ)"
   local-public-desc: "リモートへは公開しない"
   local-home: "ホーム (ローカルのみ)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotです"
   is-locked: "フォローを承認制にする"
   careful-bot: "Botからのフォローだけ承認制にする"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシー"
   save: "保存"
@@ -527,10 +538,10 @@ common/views/widgets/tips.vue:
   tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができます"
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示しています"
   tips-line21: "APIを利用してbotの開発なども行えます"
-  tips-line23: "まゆかわいいよまゆ"
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskeyは2014年にサービスを開始しました"
   tips-line25: "対応ブラウザではMisskeyを開いていなくても通知を受け取れます"
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "{}としてサインイン中"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
   detail: "詳細"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "二段階認証"
   other: "その他"
   license: "ライセンス"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "テーマ"
   behaviour: "動作"
   fetch-on-scroll: "スクロールで自動読み込み"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "ダークモード"
   use-shadow: "UIに影を使用"
   rounded-corners: "UIの角を丸める"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "円形のアイコンを使用"
   contrasted-acct: "ユーザー名にコントラストを付ける"
   post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
   cache-cleared: "キャッシュを削除しました"
   cache-cleared-desc: "ページを再度読み込みしてください。"
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
   about: "Misskeyについて"
   operator: "このサーバーの運営者"
   update: "Misskey Update"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "パスワードを入力してください"
   authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
   howtoinstall: "インストール方法はこちら"
+  token: "トークン"
   scan: "次に、表示されているQRコードをスキャンします:"
   done: "お使いのデバイスに表示されているトークンを入力して完了します:"
   submit: "完了"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "パスワードを入力してください"
   console:
-    title: 'APIコンソール'
-    endpoint: 'エンドポイント'
-    parameter: 'パラメータ'
+    title: "APIコンソール"
+    endpoint: "エンドポイント"
+    parameter: "パラメータ"
     credential-info: "「i」パラメータは自動で付与されます。"
-    send: '送信'
-    sending: '応答待ち'
-    response: '結果'
+    send: "送信"
+    sending: "応答待ち"
+    response: "結果"
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   is-bot: "このアカウントはBotです"
   years-old: "{age}歳"
   year: "年"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "投稿"
   with-replies: "投稿と返信"
   with-media: "メディア"
+  my-posts: "私の投稿"
   empty: "このユーザーはまだ何も投稿していないようです。"
 desktop/views/widgets/messaging.vue:
   title: "メッセージ"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知の表示"
   notification-position-bottom: "下"
   notification-position-top: "上"
-  theme: "テーマ"
   behavior: "動作"
   fetch-on-scroll: "スクロールで自動読み込み"
   note-visibility: "投稿の公開範囲"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "概要"
   timeline: "タイムライン"
   media: "メディア"
-  is-suspended: "このユーザーは凍結されています。"
   mute: "ミュート"
   unmute: "ミュート解除"
   block: "ブロック"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   images: "画像"
   activity: "アクティビティ"
   timeline: "タイムライン"

locales/de-DE.yml

@@ -90,7 +90,6 @@ common:
     followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
     specified: "Direkt"
     specified-desc: "Nur für bestimmte Benutzer posten"
-    private: "Privat"
     local-public: "公開 (ローカルのみ)"
     local-home: "ホーム (ローカルのみ)"
     local-followers: "フォロワー (ローカルのみ)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "Dein Token wurde generiert. Du wirst jetzt abgemeldet."
   i-like-sushi: "Ich bevorzuge Sushi anstelle von Pudding"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "Verifizierter Benutzer"
   disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "Animationen der Benutzeroberfläche reduzieren"
   this-setting-is-this-device-only: "Nur auf diesem Gerät"
   use-os-default-emojis: "OS標準の絵文字を使用"
-  do-not-use-in-production: 'Dies ist eine Entwicklungsversion. Nicht in einer Produktionsumgebung verwenden.'
+  do-not-use-in-production: "Dies ist eine Entwicklungsversion. Nicht in einer Produktionsumgebung verwenden."
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user}がRenote"
   error:
-    title: '問題が発生しました'
-    retry: 'Erneut versuchen'
+    title: "問題が発生しました"
+    retry: "Erneut versuchen"
   reversi:
     drawn: "Unentschieden"
     my-turn: "Du bist am Zug"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "Dieser Inhalt ist NSFW"
   click-to-show: "Klicke zum den Inhalt anzusehen"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "Thema"
   dark-theme: "Thema während des Nachtmodus"
   light-themes: "Helles Thema"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "Basisthema"
   base-theme-light: "Hell"
   base-theme-dark: "Dunkel"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "Name des Themas"
   preview-created-theme: "Vorschau"
   invalid-theme: "Thema ist ungültig"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "もっと見る"
   chars: "{count}文字"
   files: "{count}ファイル"
+  poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "Einen Nutzer suchen"
   you: "Du"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "Entwickler"
   feedback: "Feedback"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "Diese Notiz favorisieren"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "Verbindung wird hergestellt"
   reconnecting: "Erneut verbinden"
   connected: "Verbindung hergestellt"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "接続する"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "Nur für diejenigen sichtbar, die dir folgen"
   specified: "Direkt"
   specified-desc: "Poste nur für bestimmte Benutzer"
-  private: "Privat"
   local-public: "公開 (ローカルのみ)"
   local-public-desc: "リモートへは公開しない"
   local-home: "ホーム (ローカルのみ)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotです"
   is-locked: "フォローを承認制にする"
   careful-bot: "Botからのフォローだけ承認制にする"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシー"
   save: "保存"
@@ -527,10 +538,10 @@ common/views/widgets/tips.vue:
   tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができます"
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示しています"
   tips-line21: "APIを利用してbotの開発なども行えます"
-  tips-line23: "まゆかわいいよまゆ"
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskeyは2014年にサービスを開始しました"
   tips-line25: "対応ブラウザではMisskeyを開いていなくても通知を受け取れます"
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "{}としてサインイン中"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "Ort"
   renote: "Anmerkung"
   add-reaction: "Reaktion hinzufügen"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
   detail: "詳細"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "Zwei-Faktor-Authentifizierung"
   other: "Anderes"
   license: "Lizenz"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "テーマ"
   behaviour: "Verhalten"
   fetch-on-scroll: "Aktualisieren beim scrollen"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "Nacht Modus"
   use-shadow: "UIに影を使用"
   rounded-corners: "Abgerundete Ecken"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "Kreisförmige Icons"
   contrasted-acct: "ユーザー名にコントラストを付ける"
   post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "Der Cache deines Benutzerkontos (Info, Beiträge, Antworten, Direktnachrichten, Einstellungen), die lokal im Browser gespeichert sind werden gelöscht.\nDu musst die Seite aktualisieren nachdem du aufgeräumt hast."
   cache-cleared: "キャッシュを削除しました"
   cache-cleared-desc: "ページを再度読み込みしてください。"
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
   about: "Misskeyについて"
   operator: "このサーバーの運営者"
   update: "Misskey Update"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "Bitte Passwort eingeben"
   authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
   howtoinstall: "インストール方法はこちら"
+  token: "トークン"
   scan: "次に、表示されているQRコードをスキャンします:"
   done: "お使いのデバイスに表示されているトークンを入力して完了します:"
   submit: "完了"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "パスワードを入力してください"
   console:
-    title: 'APIコンソール'
-    endpoint: 'エンドポイント'
-    parameter: 'パラメータ'
+    title: "APIコンソール"
+    endpoint: "エンドポイント"
+    parameter: "パラメータ"
     credential-info: "「i」パラメータは自動で付与されます。"
-    send: '送信'
-    sending: '応答待ち'
-    response: '結果'
+    send: "送信"
+    sending: "応答待ち"
+    response: "結果"
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   is-bot: "このアカウントはBotです"
   years-old: "{age}歳"
   year: "年"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "投稿"
   with-replies: "投稿と返信"
   with-media: "メディア"
+  my-posts: "私の投稿"
   empty: "このユーザーはまだ何も投稿していないようです。"
 desktop/views/widgets/messaging.vue:
   title: "メッセージ"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知の表示"
   notification-position-bottom: "下"
   notification-position-top: "上"
-  theme: "テーマ"
   behavior: "動作"
   fetch-on-scroll: "スクロールで自動読み込み"
   note-visibility: "投稿の公開範囲"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "概要"
   timeline: "タイムライン"
   media: "メディア"
-  is-suspended: "このユーザーは凍結されています。"
   mute: "ミュート"
   unmute: "ミュート解除"
   block: "ブロック"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   images: "画像"
   activity: "アクティビティ"
   timeline: "タイムライン"

locales/en-US.yml

@@ -18,7 +18,7 @@ common:
     ui-desc: "No UI fits for everyone. Therefore, Misskey has a highly customizable UI for your taste. Make your original home by editing, adjusting layouts of timeline and placing selectable widgets you can easily customize."
     drive: "Drive"
     drive-desc: "Wanna post a picture you have already uploaded? Wish to organize, name and create a folder for your uploaded files? Misskey Drive is the best solution for you. Very easy to share your files online."
-    outro: "Check further Misskey-unique features on your eyes! Feeling like this is not for you, try other instances as Misskey is a decentralized SNS so that you can easily find your mates. Then, GLHF!"
+    outro: "Check Misskey-unique features by seeing them with your own eyes! If you feel like this instance is not for you, try other instances, as Misskey is a decentralized SNS, so that you can easily find your mates. Then, GLHF!"
   adblock:
     detected: "Please disable ad blocker."
     warning: "Some features may be unavailable or cause malfunctions if ad blocking features are enabled. <strong>Misskey is not running ads</strong>."
@@ -90,7 +90,6 @@ common:
     followers-desc: "Post to followers only"
     specified: "Direct"
     specified-desc: "Post to specified users only"
-    private: "Private"
     local-public: "Public (Only local)"
     local-home: "Home (Only local)"
     local-followers: "Followers (Only local)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "Your token has been regenerated, so you will be signed out."
   i-like-sushi: "I prefer sushi rather than pudding"
   show-reversi-board-labels: "Show row and column labels in Reversi"
-  use-white-black-reversi-stones: "Use white-black stone in reversi"
+  use-avatar-reversi-stones: "Use avatar as a stone in reversi"
   verified-user: "Verified account"
   disable-animated-mfm: "Disable animated texts in a post"
   suggest-recent-hashtags: "Suggest recently used hashtags within the post composition area"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "Reduce motion in UI"
   this-setting-is-this-device-only: "Only for this device"
   use-os-default-emojis: "Use the OS default Emojis"
-  do-not-use-in-production: 'This is a development build. Do not use in production.'
+  do-not-use-in-production: "This is a development build. Do not use in production."
+  user-suspended: "This user has been suspended."
   is-remote-user: "This user information is copied."
   is-remote-post: "This post information is a copy."
   view-on-remote: "View it on remote"
   renoted-by: "Renoted by {user}"
   error:
-    title: 'Something happened :('
-    retry: 'Retry'
+    title: "Something happened :("
+    retry: "Retry"
   reversi:
     drawn: "Draw"
     my-turn: "Your turn"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "NSFW"
   click-to-show: "Click to show"
 common/views/components/theme.vue:
+  theme: "Theme"
   light-theme: "Theme"
   dark-theme: "Theme during dark mode"
   light-themes: "Light theme"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "Base theme"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
+  find-more-theme: "Find more themes"
   theme-name: "Theme name"
   preview-created-theme: "Preview"
   invalid-theme: "Not valid theme"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "See more"
   chars: "{count} chars"
   files: "{count} files"
+  poll: "Poll"
 common/views/components/messaging.vue:
   search-user: "Find a user"
   you: "You"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "Developers"
   feedback: "Feedback"
 common/views/components/note-menu.vue:
+  mention: "Mention"
   detail: "Details"
   copy-link: "Copy link"
   favorite: "Favorite this note"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "Connecting"
   reconnecting: "Reconnecting"
   connected: "Connected"
+common/views/components/notification-settings.vue:
+  title: "Notifications"
+  mark-as-read-all-notifications: "Mark all notifications as read"
+  mark-as-read-all-unread-notes: "Mark all posts as read"
+  mark-as-read-all-talk-messages: "Mark all conversations as read"
+  auto-watch: "Automatically watch out for posts"
+  auto-watch-desc: "Automatically receive notifications about posts you react to, or respond to."
 common/views/components/integration-settings.vue:
   title: "Service cooperation"
   connect: "Connect"
@@ -416,7 +427,7 @@ common/views/components/github-setting.vue:
   connect: "Link your GitHub account"
   disconnect: "Disconnect"
 common/views/components/discord-setting.vue:
-  description: "Once you connect your Discord account to your Misskey account, you will be able to see information about your Discord account on your profile, and you will be able to sign-in using Discord."
+  description: "Once you connect your Discord account to your Misskey account, you will be able to see information from your Discord account on your profile, and you will be able to sign-in using Discord."
   connected-to: "You are connected to this Discord account"
   detail: "Details…"
   reconnect: "Reconnect"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "Post to Followers only"
   specified: "Direct"
   specified-desc: "Post to specified users only"
-  private: "Private"
   local-public: "Local (Public)"
   local-public-desc: "Do not publish to remote"
   local-home: "Home (Only local)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "This account is a Bot"
   is-locked: "Follower requests require approval"
   careful-bot: "Follower requests from bots require approval"
+  auto-accept-followed: "Automatically approve follows from the people you follow"
   advanced: "Other"
   privacy: "Privacy"
   save: "Save"
@@ -488,8 +499,8 @@ common/views/widgets/calendar.vue:
   month: "{},"
   day: "{}"
   today: "Today: "
-  this-month: "This month: "
-  this-year: "This year: "
+  this-month: "Month:"
+  this-year: "Year:"
 common/views/widgets/photo-stream.vue:
   title: "Photo stream"
   no-photos: "No photos"
@@ -527,11 +538,11 @@ common/views/widgets/tips.vue:
   tips-line19: "Several windows can be detached outside the browser."
   tips-line20: "The percentage of the calendar widget shows the percentage of time elapsed."
   tips-line21: "You can also use the API to develop bots."
-  tips-line23: "Mayu is so cute with its eyebrows."
+  tips-line23: "Ai-chan kawaii!"
   tips-line24: "Misskey has been running since 2014."
   tips-line25: "In a browser compatible with notification features, you can receive notifications in case Misskey is not open"
-common/views/pages/404.vue:
-  page-not-found: "Page not found"
+common/views/pages/not-found.vue:
+  page-not-found: "The page has not been found"
 common/views/pages/follow.vue:
   signed-in-as: "Signed in as {}"
   following: "Following"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "Location"
   renote: "Repost"
   add-reaction: "Add a reaction"
+  undo-reaction: "Reverse reaction"
 desktop/views/components/note.vue:
   reply: "Reply"
   renote: "Renote"
   add-reaction: "Add a reaction"
+  undo-reaction: "Reverse reaction"
   detail: "Details"
   private: "This post is private"
   deleted: "This post has been deleted"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "Two-factor authentication"
   other: "Other"
   license: "License"
-  mark-as-read-all-unread-notes: "Mark all posts as read"
   theme: "Theme"
   behaviour: "Behavior"
   fetch-on-scroll: "Endless loading on scroll"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "Dark Mode"
   use-shadow: "Use shadows in the UI"
   rounded-corners: "Round corners of UI"
+  line-width: "Line thickness"
+  line-width-thin: "Thin"
+  line-width-normal: "Regular"
+  line-width-thick: "Thick"
   circle-icons: "Use circle icons"
   contrasted-acct: "Add contrast to username"
   post-form-on-timeline: "Display post form at the top of the timeline"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "The cache of account info/posts/replies/messages/settings stored in the browser will be deleted. You need to reload the page after cleaning up."
   cache-cleared: "Cache cleared"
   cache-cleared-desc: "Please reload the page."
-  auto-watch: "Automatic watch"
-  auto-watch-desc: "Receive notifications about the post/reply/reaction automatically."
   about: "About Misskey"
   operator: "The admin of this instance"
   update: "Misskey Update"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "Enter the password"
   authenticator: "First, you need to install Google Authenticator on your device:"
   howtoinstall: "How to install"
+  token: "Token"
   scan: "And then, scan the QR code:"
   done: "Please enter the token displayed on your device:"
   submit: "Submit"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "Enter the password"
   console:
-    title: 'API console'
-    endpoint: 'Endpoint'
-    parameter: 'Parameters'
+    title: "API console"
+    endpoint: "Endpoint"
+    parameter: "Parameters"
     credential-info: "Parameter \"i\" is not required at this console."
-    send: 'Send'
-    sending: 'Sending'
-    response: 'Result'
+    send: "Send"
+    sending: "Sending"
+    response: "Result"
 desktop/views/components/settings.apps.vue:
   no-apps: "No linked applications"
 common/views/components/drive-settings.vue:
@@ -1005,8 +1020,8 @@ admin/views/instance.vue:
   enable-github-integration: "Enable connection to GitHub"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
-  discord-integration-config: "Setting of Discord Integration"
-  discord-integration-info: "The callback URL is set on {url}."
+  discord-integration-config: "Discord Integration settings"
+  discord-integration-info: "The callback URL is set to {url}."
   enable-discord-integration: "Enable Discord connection"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "Notes"
   following: "Following"
   followers: "Followers"
+  mention: "Mentions"
   is-bot: "This account is a Bot"
   years-old: "{age} years old"
   year: "/"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "Posts"
   with-replies: "Posts and replies"
   with-media: "Media"
+  my-posts: "My posts"
   empty: "This user doesn't seem to have posted anything yet."
 desktop/views/widgets/messaging.vue:
   title: "Message"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "Notification style"
   notification-position-bottom: "Bottom"
   notification-position-top: "Top"
-  theme: "Theme"
   behavior: "Behavior"
   fetch-on-scroll: "Endless loading on scroll"
   note-visibility: "Post visibility"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "Overview"
   timeline: "Timeline"
   media: "Media"
-  is-suspended: "This account has been suspended."
   mute: "Mute"
   unmute: "Unmute"
   block: "Block"
@@ -1509,13 +1524,14 @@ deck/deck.user-column.vue:
   posts: "Posts"
   following: "Following"
   followers: "Followers"
+  mention: "Mentions"
   images: "Images"
   activity: "Activity"
   timeline: "Timeline"
   pinned-notes: "Pinned posts"
   push-to-a-list: "Add to list"
 docs:
-  edit-this-page-on-github: "Found a mistake or want to contribute for the documentation?"
+  edit-this-page-on-github: "Found an error, or do you want to contribute to the documentation?"
   edit-this-page-on-github-link: "Edit this page at GitHub!"
   api:
     entities:

locales/es-ES.yml

@@ -90,7 +90,6 @@ common:
     followers-desc: "自分のフォロワーにのみ公開"
     specified: "ダイレクト"
     specified-desc: "指定したユーザーにのみ公開"
-    private: "非公開"
     local-public: "公開 (ローカルのみ)"
     local-home: "ホーム (ローカルのみ)"
     local-followers: "フォロワー (ローカルのみ)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "Tu token se ha regenerado vas a ser desconectado."
   i-like-sushi: "Prefiero sushi a pudín"
   show-reversi-board-labels: "Mostrar etiquetas de filas y columnas en Reversi"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "Cuenta verificada"
   disable-animated-mfm: "Desactivar texto animado en una publicación"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "UIの動きを減らす"
   this-setting-is-this-device-only: "このデバイスのみ"
   use-os-default-emojis: "OS標準の絵文字を使用"
-  do-not-use-in-production: 'Esto está en desarrollo, no usarlo para producción.'
+  do-not-use-in-production: "Esto está en desarrollo, no usarlo para producción."
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user}がRenote"
   error:
-    title: '問題が発生しました'
-    retry: 'やり直す'
+    title: "問題が発生しました"
+    retry: "やり直す"
   reversi:
     drawn: "Empatado"
     my-turn: "Mi turno"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "非ダークモード時に使用するテーマ"
   dark-theme: "ダークモード時に使用するテーマ"
   light-themes: "明るいテーマ"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "ベーステーマ"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "テーマ名"
   preview-created-theme: "プレビュー"
   invalid-theme: "テーマが正しくありません。"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "もっと見る"
   chars: "{count}文字"
   files: "{count}ファイル"
+  poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "Encuentra un usuario"
   you: "Tu"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "Desarrolladores"
   feedback: "Opiniones"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "Detalles"
   copy-link: "Copiar enlace"
   favorite: "Me gusta esta nota"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "Conectando"
   reconnecting: "Reconectando"
   connected: "Conectado"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "接続する"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "Piblica solo para tus seguidores"
   specified: "Directo"
   specified-desc: "Publica solo para los seguidores que quieras"
-  private: "Privada"
   local-public: "公開 (ローカルのみ)"
   local-public-desc: "リモートへは公開しない"
   local-home: "ホーム (ローカルのみ)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotです"
   is-locked: "フォローを承認制にする"
   careful-bot: "Botからのフォローだけ承認制にする"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシー"
   save: "保存"
@@ -527,10 +538,10 @@ common/views/widgets/tips.vue:
   tips-line19: "Algunas ventanas pueden ser separadas fuera del navegador"
   tips-line20: "El porcentaje mostrando en el accesorio de calendario indica el porcentaje de tiempo transcurrido."
   tips-line21: "También puedes usar la API para desarrollar tus propios bots."
-  tips-line23: "Mayu is tan bonito con sus cejas."
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskey inició en 2014."
   tips-line25: "Puedes recibir notificaciones incluso si Misskey no está abierto en un navegador compatible."
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "Autenticado como {}"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "Localización"
   renote: "Republicar"
   add-reaction: "Agregar una reacción"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
   detail: "詳細"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "Autenticación de Doble-Factor"
   other: "Otros"
   license: "Licencia"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "テーマ"
   behaviour: "Acciones"
   fetch-on-scroll: "Desplazamiento infinito"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "Modo Nocturno"
   use-shadow: "UIに影を使用"
   rounded-corners: "UIの角を丸める"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "Usar iconos circulares"
   contrasted-acct: "ユーザー名にコントラストを付ける"
   post-form-on-timeline: "Mostrar el formulario de las entradas encima de la línea de tiempo"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
   cache-cleared: "キャッシュを削除しました"
   cache-cleared-desc: "ページを再度読み込みしてください。"
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
   about: "Misskeyについて"
   operator: "このサーバーの運営者"
   update: "Misskey Update"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "Escribe una contraseña"
   authenticator: "Primero, necesitas instalar Google Authenticator en tu dispositivo:"
   howtoinstall: "Cómo instalar"
+  token: "トークン"
   scan: "Luego, escanea el código QR:"
   done: "Por favor ingresa el token mostrado en tu dispositivo:"
   submit: "Enviar"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "パスワードを入力してください"
   console:
-    title: 'APIコンソール'
-    endpoint: 'エンドポイント'
-    parameter: 'パラメータ'
+    title: "APIコンソール"
+    endpoint: "エンドポイント"
+    parameter: "パラメータ"
     credential-info: "「i」パラメータは自動で付与されます。"
-    send: '送信'
-    sending: '応答待ち'
-    response: '結果'
+    send: "送信"
+    sending: "応答待ち"
+    response: "結果"
 desktop/views/components/settings.apps.vue:
   no-apps: "No hay aplicaciones asociadas"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   is-bot: "このアカウントはBotです"
   years-old: "{age}歳"
   year: "年"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "投稿"
   with-replies: "投稿と返信"
   with-media: "メディア"
+  my-posts: "私の投稿"
   empty: "このユーザーはまだ何も投稿していないようです。"
 desktop/views/widgets/messaging.vue:
   title: "メッセージ"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知の表示"
   notification-position-bottom: "下"
   notification-position-top: "上"
-  theme: "テーマ"
   behavior: "動作"
   fetch-on-scroll: "スクロールで自動読み込み"
   note-visibility: "投稿の公開範囲"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "概要"
   timeline: "タイムライン"
   media: "メディア"
-  is-suspended: "このユーザーは凍結されています。"
   mute: "ミュート"
   unmute: "ミュート解除"
   block: "ブロック"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   images: "画像"
   activity: "アクティビティ"
   timeline: "タイムライン"

locales/fr-FR.yml

@@ -8,12 +8,12 @@ common:
   about: "Merci d’avoir choisis Misskey. Misskey est une <b>plateforme de microblogage distribuée</b> née sur Terre et fait partie du Fédiverse (un univers composé de diverses plateformes de réseaux sociaux organisées), elle est connectée mutuellement avec d’autres plateformes de réseaux sociaux. Désirez-vous prendre une pause, un court instant, loin de l’agitation de la ville et plonger dans un Internet d’un nouveau genre ?"
   intro:
     title: "C’est quoi Misskey ?"
-    about: "Misskey est un <b>réseau social de Microblogage</b> open source. Il offre une interface utilisateur riche et hautement personnalisable, une variété de réactions aux publications et un lecteur pour la gestion centralisée de fichiers. De plus, comme il est possible de se connecter au reste du du Fédiverse, vous pouvez interagir avec d'autres plateformes fédérées. Par exemple, si vous publiez quelque chose, la note sera transmise non seulement aux utilisateurs de Misskey, mais aussi à d'autres plateformes de réseaux sociaux dans le Fédiverse. Imaginez que vous puissiez transmettre des ondes radio d'une planète vers l'autre."
+    about: "Misskey est un <b>réseau social de Microblogage</b> open source. Il offre une interface utilisateur riche et hautement personnalisable, une variété de réactions aux publications et un lecteur pour la gestion centralisée de fichiers. De plus, comme il est possible de se connecter au reste du Fédiverse, vous pouvez interagir avec d'autres plateformes fédérées. Par exemple, si vous publiez quelque chose, la note sera transmise non seulement aux utilisateurs de Misskey, mais aussi à d'autres plateformes de réseaux sociaux dans le Fédiverse. Imaginez que vous puissiez transmettre des ondes radio d'une planète vers l'autre."
     features: "Options"
     rich-contents: "Notes"
     rich-contents-desc: "Partagez vos idées, les événements et les sujets qui vous tiennent à cœur ainsi que tout autre chose que vous souhaitez partager avec les autres. Si vous le désirez, vous pouvez décorer vos messages en utilisant une syntaxe différente ou en y joignant des sondages et des fichiers, tels que les photos ou les vidéos que vous aimez."
     reaction: "Réactions"
-    reaction-desc: "Une manière simple d'exprimer vos émotions. Misskey peut attacher diverses réactions aux publications des autres utilisateurs. Si vous goûtez aux réactions sur Misskey une fois, vous ne pourrez plus être en mesure de retourner vers une autre plateforme de réseaux sociaux n'offrant que des \"J'aime\"."
+    reaction-desc: "Une manière simple d'exprimer vos émotions. Misskey peut attacher diverses réactions aux publications des autres utilisateurs. Si vous essayez les réactions sur Misskey, vous ne pourrez plus retourner sur une autre plateforme de réseaux sociaux n'offrant que des « J'aime »."
     ui: "Interface utilisateur"
     ui-desc: "どのようなUIが使いやすいかは人それぞれです。だから、Misskeyは自由度の高いUIを持っています。レイアウトやデザインを調整したり、カスタマイズ可能な様々なウィジェットを配置したりして、自分だけのホームを作ってください。"
     drive: "Drive"
@@ -33,7 +33,7 @@ common:
     paragraph: "<p>ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。</p><p>一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。</p><p>ウィジェットを削除するには、ヘッダーの<strong>「ゴミ箱」</strong>と書かれたエリアにウィジェットをドラッグ&ドロップします。</p><p>カスタマイズを終了するには、右上の「完了」をクリックします。</p>"
     gotit: "Compris !"
   notification:
-    file-uploaded: "Le fichier a été transféré !"
+    file-uploaded: "Le fichier a été téléversé !"
     message-from: "Message de {} :"
     reversi-invited: "Invité à jouer"
     reversi-invited-by: "Invité par {} :"
@@ -90,7 +90,6 @@ common:
     followers-desc: "Publier à vos abonnés uniquement"
     specified: "Direct"
     specified-desc: "Publier uniquement aux utilisateurs mentionnés"
-    private: "Privé"
     local-public: "Local (Public)"
     local-home: "Accueil (local uniquement)"
     local-followers: "Local (Abonnés)"
@@ -110,7 +109,7 @@ common:
   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-white-black-reversi-stones: "Jouer avec des pions noirs et blancs sur Reversi"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "Compte vérifié"
   disable-animated-mfm: "Désactiver les textes animés dans les publications"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "Réduire les animations dans l’interface utilisateur"
   this-setting-is-this-device-only: "Uniquement sur cet appareil"
   use-os-default-emojis: "Utiliser les émojis standards du système"
-  do-not-use-in-production: 'Il s’agit d’une version de développement. Ne pas utiliser dans un environnement de production.'
+  do-not-use-in-production: "Il s’agit d’une version de développement. Ne pas utiliser dans un environnement de production."
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "Ces informations appartiennent à un utilisateur distant."
   is-remote-post: "Ceci est une publication distante."
   view-on-remote: " Consulter le profil complet"
   renoted-by: "Renoté par {user}"
   error:
-    title: 'Une erreur est survenue'
-    retry: 'Réessayer'
+    title: "Une erreur est survenue"
+    retry: "Réessayer"
   reversi:
     drawn: "Partie nulle"
     my-turn: "C’est votre tour"
@@ -150,7 +150,7 @@ common:
     memo: "Pense-bête"
     trends: "Tendances"
     photo-stream: "Flux de photos"
-    posts-monitor: "Graph des publications"
+    posts-monitor: "Graphe des publications"
     slideshow: "Diaporama"
     version: "Version"
     broadcast: "Diffusion"
@@ -210,7 +210,7 @@ common/views/components/games/reversi/reversi.index.vue:
   invitations: "Vous avez reçu une invitation !"
   my-games: "Mes jeux"
   all-games: "Tous les jeux"
-  enter-username: "Saisir un nom d'utilisateur·rice"
+  enter-username: "Saisir un nom d'utilisateur"
   game-state:
     ended: "Terminée"
     playing: "En cours"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "Contenu sensible"
   click-to-show: "Cliquer pour afficher"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "Thème en mode jour"
   dark-theme: "Thème en mode nuit"
   light-themes: "Thème clair"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "Thème de base"
   base-theme-light: "Clair"
   base-theme-dark: "Sombre"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "Nom du Thème"
   preview-created-theme: "Prévisualisation"
   invalid-theme: "Thème n’est pas valide."
@@ -299,8 +301,9 @@ common/views/components/cw-button.vue:
   show: "Voir plus"
   chars: "{count} caractères"
   files: "{count} fichiers"
+  poll: "アンケート"
 common/views/components/messaging.vue:
-  search-user: "Trouver un·e utilisateur·trice"
+  search-user: "Trouver un utilisateur"
   you: "Vous"
   no-history: "Pas d'historique"
 common/views/components/messaging-room.vue:
@@ -323,11 +326,12 @@ common/views/components/nav.vue:
   stats: "Statistiques"
   status: "Statut"
   wiki: "Wiki"
-  donors: "Donateur·rice·s"
+  donors: "Donateurs"
   repository: "Dépôt"
   develop: "Développeurs"
   feedback: "Suggestions"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "Détails"
   copy-link: "Copier le lien"
   favorite: "Mettre cette note en favoris"
@@ -340,7 +344,7 @@ common/views/components/note-menu.vue:
 common/views/components/poll.vue:
   vote-to: "Voter pour '{}'"
   vote-count: "{} votes"
-  total-users: "{} utilisateur·rice·s ont voté·e·s"
+  total-users: "{} utilisateurs ont voté"
   vote: "Vote"
   show-result: "Montrer les résultats"
   voted: "Voté"
@@ -363,7 +367,7 @@ common/views/components/emoji-picker.vue:
   symbols: "Symboles"
   flags: "Drapeaux"
 common/views/components/signin.vue:
-  username: "Nom d'utilisateur·rice"
+  username: "Nom d'utilisateur"
   password: "Mot de passe"
   token: "Jeton"
   signing-in: "Connexion…"
@@ -375,8 +379,8 @@ common/views/components/signin.vue:
   login-failed: "Échec d’authentification. Veuillez vérifier que votre nom d’utilisateur et mot de passe sont corrects."
 common/views/components/signup.vue:
   invitation-code: "Code d’invitation"
-  invitation-info: "Si vous n’avez pas de code d’invitation, contactez un·e <a href=\"{}\">administrateur·rice</a>."
-  username: "Nom d'utilisateur·rice"
+  invitation-info: "Si vous n’avez pas de code d’invitation, contactez un <a href=\"{}\">administrateur</a>."
+  username: "Nom d'utilisateur"
   checking: "Vérification…"
   available: "Disponible"
   unavailable: "Non disponible"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "Connexion en cours"
   reconnecting: "Reconnexion en cours"
   connected: "Connecté"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "Intégrations"
   connect: "Connecter"
@@ -418,7 +429,7 @@ common/views/components/github-setting.vue:
 common/views/components/discord-setting.vue:
   description: "Si vous liez votre compte Discord à votre compte Misskey, vous serez en mesure de voir votre compte Twitter s'afficher sur votre profil, vous aurez aussi la possibilité de vous connecter à Misskey en utilisant votre compte Discord."
   connected-to: "Vous êtes connecté à votre compte Discord"
-  detail: "Détails …"
+  detail: "Détails…"
   reconnect: "Reconnecter"
   connect: "Lier votre compte Discord"
   disconnect: "Déconnecter"
@@ -428,17 +439,16 @@ common/views/components/visibility-chooser.vue:
   public: "Public"
   home: "Accueil"
   home-desc: "Publier sur le fil d'Accueil uniquement"
-  followers: "Abonné·e·s"
-  followers-desc: "Publier à vos abonné·e·s uniquement"
+  followers: "Abonnés"
+  followers-desc: "Publier à vos abonnés uniquement"
   specified: "Direct"
-  specified-desc: "Publier uniquement aux utilisateurs·rices mentionné·e·s"
-  private: "Privé"
+  specified-desc: "Publier uniquement aux utilisateurs mentionnés"
   local-public: "Local (Public)"
   local-public-desc: "Ne pas publier pour les distants"
   local-home: "Accueil (local uniquement)"
   local-followers: "Local (Abonnés)"
 common/views/components/trends.vue:
-  count: "{} utilisateurs·rices mentionnés·es"
+  count: "{} utilisateurs mentionnés"
   empty: "Aucune tendance"
 common/views/components/language-settings.vue:
   title: "Langue "
@@ -461,11 +471,12 @@ common/views/components/profile-editor.vue:
   is-bot: "Ce compte est un Bot"
   is-locked: "Demandes d’abonnements requièrent l’approbation"
   careful-bot: "Les demandes d’abonnements venant de Bots requièrent l’approbation"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "Avancé"
   privacy: "Vie privée"
   save: "Mettre à jour le profil"
   saved: "Profil mis à jour avec succès"
-  uploading: "En cours d'envoi …"
+  uploading: "En cours d'envoi…"
   upload-failed: "Échec de l'envoi"
   email: "Paramètres de messagerie"
   email-address: "Adresse de courrier électronique"
@@ -494,7 +505,7 @@ common/views/widgets/photo-stream.vue:
   title: "Flux de photos"
   no-photos: "Pas de photo"
 common/views/widgets/posts-monitor.vue:
-  title: "Graph des publications"
+  title: "Graphe des publications"
   toggle: "Basculer entre les vues"
 common/views/widgets/hashtags.vue:
   title: "Hashtags"
@@ -527,25 +538,25 @@ common/views/widgets/tips.vue:
   tips-line19: "Plusieurs fenêtres peuvent être détachées en dehors du navigateur."
   tips-line20: "Pourcentage sur le widget calendrier qui indique le pourcentage de temps passé"
   tips-line21: "Vous pouvez aussi utiliser l'API pour développer des Bots."
-  tips-line23: "Mayu est mignonne avec ses sourcils."
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskey est fonctionnel depuis 2014"
   tips-line25: "Vous pouvez recevoir les notifications de Misskey dans un navigateur web compatible"
-common/views/pages/404.vue:
-  page-not-found: "La page demandée est introuvable !"
+common/views/pages/not-found.vue:
+  page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
-  signed-in-as: "Connecté·e en tant que {}"
+  signed-in-as: "Connecté en tant que {}"
   following: "Suit"
   follow: "Suivre"
   request-pending: "Demande d’abonnement en attente"
   follow-processing: "Demande en attente"
   follow-request: "Demande d’abonnement"
 desktop:
-  banner-crop-title: "Découpez la partie qui apparaitra comme bannière"
+  banner-crop-title: "Découpez la partie qui apparaîtra comme bannière"
   banner: "Bannière"
   uploading-banner: "Téléversement d'une nouvelle bannière"
   banner-updated: "Mise à jour de la bannière avec succès"
   choose-banner: "Choisir une bannière"
-  avatar-crop-title: "Découpez la partie qui apparaitra comme avatar"
+  avatar-crop-title: "Découpez la partie qui apparaîtra comme avatar"
   avatar: "Avatar"
   uploading-avatar: "Téléversement du nouvel avatar"
   avatar-updated: "Mise à jour de l’avatar avec succès"
@@ -565,7 +576,7 @@ desktop/views/components/calendar.vue:
   next: "Mois suivant"
   go: "Cliquez pour naviguer"
 desktop/views/components/choose-file-from-drive-window.vue:
-  chosen-files: "{count} fichier·s sélectionné·s"
+  chosen-files: "{count} fichier(s) sélectionné(s)"
   upload: "Téléverser des fichiers à partir de votre ordinateur"
   cancel: "Annuler"
   ok: "OK"
@@ -613,21 +624,21 @@ desktop/views/components/drive.vue:
   search: "Rechercher"
   empty-draghover: "Drop Welcome!"
   empty-drive: "Votre Drive est vide"
-  empty-drive-description: "Vous pouvez également uploader le fichier en faisant un clic droit et en choisissant 'Uploader' ou tout simplement en faisant glisser votre fichier."
+  empty-drive-description: "Vous pouvez également téléverser le fichier en faisant un clic droit et en choisissant « Téléverser » ou tout simplement en faisant glisser votre fichier."
   empty-folder: "Ce dossier est vide"
   unable-to-process: "L'opération n'a pas pu être complétée"
   circular-reference-detected: "Le dossier de destination est un sous-dossier du dossier que vous souhaitez déplacer."
   unhandled-error: "Erreur inconnue"
   url-upload: "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."
+  url-of-file: "URL de l'image que vous souhaitez téléverser."
+  url-upload-requested: "Téléversement demandé"
+  may-take-time: "Le téléversement de votre fichier peut prendre un certain temps."
   create-folder: "Créer un dossier"
   folder-name: "Nom du dossier"
   contextmenu:
     create-folder: "Créer un dossier"
-    upload: "Transférer un fichier"
-    url-upload: "Transférer à partir d’une URL"
+    upload: "Téléverser un fichier"
+    url-upload: "Téléverser à partir d’une URL"
 desktop/views/components/media-image.vue:
   sensitive: "Le contenu est NSFW"
   click-to-show: "Cliquer pour afficher"
@@ -635,16 +646,16 @@ desktop/views/components/media-video.vue:
   sensitive: "Le contenu est NSFW"
   click-to-show: "Cliquer pour afficher"
 desktop/views/components/followers-window.vue:
-  followers: "{} abonné·e·s"
+  followers: "{} abonnés"
 desktop/views/components/followers.vue:
-  empty: "Il semble que vous n’avez pas encore d’abonné·e·s."
+  empty: "Il semble que vous n'avez pas encore d'abonnés."
 desktop/views/components/following-window.vue:
   following: "Suit {}"
 desktop/views/components/following.vue:
   empty: "Vous ne suivez aucun compte."
 desktop/views/components/friends-maker.vue:
-  title: "Utilisateurs·rices recommandé·e·s :"
-  empty: "Impossible de trouver des utilisateurs·trices à recommander."
+  title: "Utilisateurs recommandés :"
+  empty: "Impossible de trouver des utilisateurs à recommander."
   fetching: "Chargement"
   refresh: "Plus"
   close: "Fermer"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "Géolocalisation"
   renote: "Republier"
   add-reaction: "Ajouter votre reaction"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "Répondre"
   renote: "Partager"
   add-reaction: "Ajouter votre réaction"
+  undo-reaction: "リアクション解除"
   detail: "Détails"
   private: "Cette publication est privée"
   deleted: "Cette publication a été supprimée"
@@ -683,8 +696,8 @@ 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 …"
-  quote-placeholder: "Citer cette note …"
+  reply-placeholder: "Répondre à cette note…"
+  quote-placeholder: "Citer cette note…"
   submit: "Publier"
   reply: "Répondre"
   renote: "Republier"
@@ -694,7 +707,7 @@ desktop/views/components/post-form.vue:
   note-failed: "La note à échoué"
   reply-failed: "La réponse a échoué"
   renote-failed: "Échec lors de la republication"
-  posting: "Publication …"
+  posting: "Publication…"
   attach-media-from-local: "Joindre un média depuis votre appareil"
   attach-media-from-drive: "Joindre un média depuis votre Drive"
   attach-cancel: "Annuler le fichier attaché"
@@ -703,17 +716,17 @@ desktop/views/components/post-form.vue:
   text-remain: "{} caractères restants"
   recent-tags: "Récent"
   local-only-message: "Ce message sera publié uniquement sur le fil local"
-  click-to-tagging: "Cliquer pour tagguer"
+  click-to-tagging: "Cliquer pour taguer"
   visibility: "Visibilité"
   geolocation-alert: "Votre appareil ne prend pas en charge les services de localisation"
   error: "Erreur"
-  enter-username: "Saisir un nom d'utilisateur …"
+  enter-username: "Saisir un nom d'utilisateur…"
   annotations: "内容への注釈 (オプション)"
 desktop/views/components/post-form-window.vue:
   note: "Nouvelle note"
   reply: "Répondre"
   attaches: "{} media joint(s)"
-  uploading-media: "Transfert du média {}"
+  uploading-media: "Téléversement du média {}"
 desktop/views/components/progress-dialog.vue:
   waiting: "En attente"
 desktop/views/components/renote-form.vue:
@@ -721,7 +734,7 @@ desktop/views/components/renote-form.vue:
   cancel: "Annuler"
   renote: "Republier"
   renote-home: "Renote (Home)"
-  reposting: "Republication en cours …"
+  reposting: "Republication en cours…"
   success: "Republié !"
   failure: "La renote a échoué"
 desktop/views/components/renote-form-window.vue:
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "Vérification en deux étapes"
   other: "Autres"
   license: "Licence"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "Thèmes"
   behaviour: "Comportement"
   fetch-on-scroll: "Chargement lors du défilement"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "Mode nuit"
   use-shadow: "Utiliser les ombres dans l'interface utilisateur"
   rounded-corners: "Coins arrondis"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "Utiliser des icônes circulaires"
   contrasted-acct: "Nom d’utilisateur contrasté"
   post-form-on-timeline: "Afficher le formulaire en haut du fil"
@@ -801,14 +817,12 @@ desktop/views/components/settings.vue:
   cache-warn: "Le nettoyage du cache du compte supprime les informations stockées dans le navigateur comme les messages, les réponses ainsi que d’autres données (y compris les paramètres de configuration). Après le nettoyage, vous devez recharger la page."
   cache-cleared: "Cache nettoyé"
   cache-cleared-desc: "Veuillez recharger la page."
-  auto-watch: "Montre automatique"
-  auto-watch-desc: "Recevez automatiquement les notifications de publications, réponses et réactions."
   about: "À propose de Misskey"
   operator: "L'admin de cette instance"
   update: "Mise à jour de Misskey"
   version: "Version :"
   latest-version: "Dernière version :"
-  update-checking: "Vérification des mises à jour en cours …"
+  update-checking: "Vérification des mises à jour en cours…"
   do-update: "Rechercher des mises à jour"
   update-settings: "Paramètres avancés"
   prevent-update: "Reporter les mises à jour (non recommandé)"
@@ -818,7 +832,7 @@ desktop/views/components/settings.vue:
   update-available: "Nouvelle version disponible !"
   update-available-desc: "Les mises à jour seront appliquées une fois la page est rechargée."
   advanced-settings: "Réglages avancés"
-  debug-mode: "Activer le mode debug"
+  debug-mode: "Activer le mode débogage"
   debug-mode-desc: "Ce paramètre est stocké dans le navigateur."
   experimental: "Activer les fonctionnalités expérimentales"
   experimental-desc: "L’activation des fonctionnalités expérimentales peuvent rendre le client Misskey instable. Ce paramètre est stocké dans le navigateur."
@@ -841,27 +855,28 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "Entrez un mot de passe"
   authenticator: "Vous devez au préalable installer Google Authenticator sur votre appareil :"
   howtoinstall: "Comment installer"
-  scan: "Ensuite scannez le QR code afficher sur votre écran:"
-  done: "Veuillez entrer le token qui s'affiche sur votre appareil:"
+  token: "トークン"
+  scan: "Ensuite, scannez le code QR affiché sur votre écran :"
+  done: "Veuillez entrer le token qui s'affiche sur votre appareil :"
   submit: "Envoyer"
   success: "Sauvegarde des paramètres avec succès !"
   failed: "L’opération a échoué. Veuillez vous assurer que le jeton a été saisi correctement."
   info: "À partir de maintenant, à chaque fois que vous vous connectez entrez votre mot de passe ainsi que le jeton généré sur votre appareil."
 common/views/components/api-settings.vue:
-  intro: "Pour accéder à l'API, définissez ce jeton comme la clé de \"i\" dans les paramètres de requête."
+  intro: "Pour accéder à l'API, définissez ce jeton comme la clé de « i » dans les paramètres de requête."
   caution: "Merci de ne pas introduire ce jeton dans aucune application ou le divulguer à quiconque. Ceci risque de compromettre votre compte."
   regeneration-of-token: "Si votre jeton est compromis, vous pouvez le régénérer."
   regenerate-token: "Régénérer le jeton"
   token: "Jeton :"
   enter-password: "Entrez le mot de passe"
   console:
-    title: 'Console API'
-    endpoint: 'Point de terminaison'
-    parameter: 'Paramètres'
-    credential-info: "Le paramètre \"i\" est requis dans la console."
-    send: 'Envoyer'
-    sending: 'Envoi en cours'
-    response: 'Résultat'
+    title: "Console API"
+    endpoint: "Point de terminaison"
+    parameter: "Paramètres"
+    credential-info: "Le paramètre « i » est requis dans la console."
+    send: "Envoyer"
+    sending: "Envoi en cours"
+    response: "Résultat"
 desktop/views/components/settings.apps.vue:
   no-apps: "Aucune application autorisée"
 common/views/components/drive-settings.vue:
@@ -872,8 +887,8 @@ common/views/components/mute-and-block.vue:
   mute-and-block: "Silencés / Bloqués"
   mute: "Mettre en sourdine"
   block: "En cours blocage"
-  no-muted-users: "Aucun utilisateur·rice n’est mis·e en sourdine"
-  no-blocked-users: "Aucun utilisateur·rice n’est bloqué·e"
+  no-muted-users: "Aucun utilisateur n’est mis en sourdine"
+  no-blocked-users: "Aucun utilisateur n’est bloqué"
   word-mute: "Filtre de mots"
   muted-words: "Mots masqués"
   muted-words-description: "Description des mots mis en sourdine"
@@ -944,11 +959,11 @@ desktop/views/components/user-lists-window.vue:
 desktop/views/components/user-preview.vue:
   notes: "Publications"
   following: "Abonné à"
-  followers: "Abonné·e·s"
+  followers: "Abonnés"
 desktop/views/components/users-list.vue:
   all: "Tout"
   iknow: "Vous connaissez"
-  fetching: "Chargement ..."
+  fetching: "Chargement..."
 desktop/views/components/users-list-item.vue:
   followed: "vous suit"
 desktop/views/components/window.vue:
@@ -959,7 +974,7 @@ admin/views/index.vue:
   instance: "Instance"
   emoji: "Émoji"
   moderators: "Modérateurs"
-  users: "Utilisateur·rice·s"
+  users: "Utilisateurs"
   federation: "Fédération"
   announcements: "Annonces"
   hashtags: "Hashtags"
@@ -977,7 +992,7 @@ admin/views/instance.vue:
   instance-name: "Nom de l’instance"
   instance-description: "Description de l’instance"
   host: "Hôte"
-  banner-url: "Url de l’image de la bannière"
+  banner-url: "URL de l’image de la bannière"
   error-image-url: "URL de l’image d’erreur"
   languages: "Langue de l’instance"
   languages-desc: "Vous pouvez en définir plus d’une, séparées par des espaces."
@@ -997,7 +1012,7 @@ admin/views/instance.vue:
   recaptcha-secret-key: "Clé secrète reCAPTCHA"
   twitter-integration-config: "Paramètres de connexion à Twitter"
   twitter-integration-info: "L'URL de callback est {url}."
-  enable-twitter-integration: "Activer la connection à Twitter"
+  enable-twitter-integration: "Activer la connexion à Twitter"
   twitter-integration-consumer-key: "Clé du consommateur"
   twitter-integration-consumer-secret: "Secret du consommateur"
   github-integration-config: "Paramètres d’authentification GitHub"
@@ -1021,8 +1036,8 @@ admin/views/instance.vue:
   invite: "Inviter"
   save: "Sauvegarder"
   saved: "Enregistré"
-  user-recommendation-config: "Utilisateur·rice·s"
-  enable-external-user-recommendation: "Activer la recommandation des utilisateur·trice·s distant·e·s"
+  user-recommendation-config: "Utilisateurs"
+  enable-external-user-recommendation: "Activer la recommandation des utilisateurs distants"
   external-user-recommendation-engine: "Moteur"
   external-user-recommendation-engine-desc: "Exemple : https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
   external-user-recommendation-timeout: "Délai d’expiration"
@@ -1044,12 +1059,12 @@ admin/views/instance.vue:
   vapid-privatekey: "Clé privée VAPID"
   vapid-info: "ServiceWorkerを有効にする場合、VAPIDキーペアを生成する必要があります。シェルで次のようにします:"
 admin/views/charts.vue:
-  title: "Graph"
+  title: "Graphe"
   per-day: "par jour"
   per-hour: "par heure"
   federation: "Fédération"
   notes: "Publications"
-  users: "Utilisateur·rice·s"
+  users: "Utilisateurs"
   drive: "Lecteur"
   network: "Réseau"
   charts:
@@ -1059,8 +1074,8 @@ admin/views/charts.vue:
     local-notes: "Nombre des publications : augmentation/diminution (Local)"
     remote-notes: "Nombre de publications : augmentation/diminution (distants)"
     notes-total: "Total des publications"
-    users: "Nombre d’utilisateur·rice·s : augmentation/diminution"
-    users-total: "Nombre total des utilisateur·rice·s"
+    users: "Nombre d’utilisateurs : augmentation/diminution"
+    users-total: "Nombre total des utilisateurs"
     drive: "Capacité utilisée comme stockage : augmentation/diminution"
     drive-total: "Utilisation totale du lecteur"
     drive-files: "Le nombre de fichiers sur l'espace de stockage : augmentation/diminution"
@@ -1087,20 +1102,20 @@ admin/views/drive.vue:
 admin/views/users.vue:
   operation: "Actions"
   username-or-userid: "Nom d’utilisateur·rice ou ID utilisateur"
-  user-not-found: "Utilisateur·rice non trouvé·e"
+  user-not-found: "Utilisateur non trouvé"
   lookup: "Recherche"
   reset-password: "Réinitialiser mot de passe"
   password-updated: "Le mot de passe est « {password} »"
   suspend: "Suspendre"
-  suspended: "Suspendu·e avec succès."
+  suspended: "Suspendu avec succès."
   unsuspend: "Suspension levée"
-  unsuspended: "La suspension de l’utilisateur·rice a été levée avec succès"
+  unsuspended: "La suspension de l’utilisateur a été levée avec succès"
   verify: "Vérification du compte"
   verified: "Le compte a été vérifié"
-  unverify: "Ôter la vérification du compte"
+  unverify: "Enlever la vérification du compte"
   unverified: "Ce compte n'est plus vérifié"
   users:
-    title: "Utilisateur·rice·s"
+    title: "Utilisateurs"
     sort:
       title: "Trier par"
       createdAtAsc: "Date d’inscription (Ascendant)"
@@ -1183,11 +1198,11 @@ desktop/views/pages/share.vue:
 desktop/views/pages/tag.vue:
   no-posts-found: "Aucune publication contenant « {q} » n’a été trouvée."
 desktop/views/pages/user-list.users.vue:
-  users: "Utilisateurs·rices"
+  users: "Utilisateurs"
   add-user: "Ajouter un utilisateur"
   username: "Nom d'utilisateur"
 desktop/views/pages/user/user.followers-you-know.vue:
-  title: "Abonné·e·s que vous connaissez"
+  title: "Abonnés que vous connaissez"
   loading: "Chargement en cours"
   no-users: "Aucun abonné connu"
 desktop/views/pages/user/user.friends.vue:
@@ -1214,7 +1229,8 @@ desktop/views/pages/user/user.profile.vue:
 desktop/views/pages/user/user.header.vue:
   posts: "Notes"
   following: "Suit"
-  followers: "Abonné·e·s"
+  followers: "Abonnés"
+  mention: "メンション"
   is-bot: "Ce compte est un Bot"
   years-old: "{age} ans"
   year: "/"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "Publications"
   with-replies: "Publications et réponses"
   with-media: "Média"
+  my-posts: "Mes Messages"
   empty: "Cet utilisateur n'a rien posté encore."
 desktop/views/widgets/messaging.vue:
   title: "Messagerie"
@@ -1245,7 +1262,7 @@ desktop/views/widgets/trends.vue:
   refresh: "Afficher d'autres"
   nothing: "Rien"
 desktop/views/widgets/users.vue:
-  title: "Utilisateurs·rices"
+  title: "Utilisateurs"
   refresh: "Afficher d'autres"
   no-one: "Personne"
 mobile/views/components/drive.vue:
@@ -1284,14 +1301,14 @@ mobile/views/components/media-video.vue:
   sensitive: "Le contenu est NSFW"
   click-to-show: "Cliquer pour afficher"
 common/views/components/follow-button.vue:
-  following: "Abonné·e"
+  following: "Abonné"
   follow: " Suivre"
   request-pending: "Demande en attente"
   follow-processing: "En cours d’abonnement"
   follow-request: "Demande d’abonnement"
 mobile/views/components/friends-maker.vue:
   title: "Abonnez-vous à"
-  empty: "Impossible de trouver des utilisateurs·trices à recommander."
+  empty: "Impossible de trouver des utilisateurs à recommander."
   fetching: "Chargement"
   refresh: "Voir plus"
   close: "Fermer"
@@ -1320,7 +1337,7 @@ mobile/views/components/post-form.vue:
   submit: "Publier"
   reply: "Répondre"
   renote: "Republier"
-  quote-placeholder: "Citer ce billet ... (Facultatif)"
+  quote-placeholder: "Citer ce billet... (Facultatif)"
   reply-placeholder: "Répondre à cette note"
   cw-placeholder: "Commenter le contenu (optionnel)"
   location-alert: "Votre appareil ne prend pas en charge les services de localisation"
@@ -1350,7 +1367,7 @@ mobile/views/components/ui.nav.vue:
   admin: "Admin"
   about: "À propos de Misskey"
 mobile/views/components/user-timeline.vue:
-  no-notes: "Il semble que cet·te utilisateur·rice n’a rien publié pour le moment."
+  no-notes: "Il semble que cet utilisateur n’a rien publié pour le moment."
   no-notes-with-media: "Aucune notes avec des médias"
 mobile/views/components/users-list.vue:
   all: "Tout"
@@ -1363,9 +1380,9 @@ mobile/views/pages/user-lists.vue:
 mobile/views/pages/signup.vue:
   lets-start: "Votre compte est prêt ! 📦"
 mobile/views/pages/followers.vue:
-  followers-of: "Abonné·e·s de {name}"
+  followers-of: "Abonnés de {name}"
 mobile/views/pages/following.vue:
-  following-of: "Abonné·e·s de {name}"
+  following-of: "Abonnés de {name}"
 mobile/views/pages/home.vue:
   home: "Accueil"
   local: "Local"
@@ -1379,7 +1396,7 @@ mobile/views/pages/welcome.vue:
   signup: "S'enregistrer"
 mobile/views/pages/widgets.vue:
   dashboard: "Tableau de bord"
-  widgets-hints: "Vous pouvez ajouter, supprimer et réaranger les widgets. Faites glisser « 三 » pour déplacer le widget. Appuyez sur « x » pour supprimer le widget. Certains widgets peuvent changer d’apparence en cliquant dessus."
+  widgets-hints: "Vous pouvez ajouter, supprimer et réarranger les widgets. Faites glisser « 三 » pour déplacer le widget. Appuyez sur « x » pour supprimer le widget. Certains widgets peuvent changer d’apparence en cliquant dessus."
   add-widget: "Ajouter"
   customization-tips: "Conseils de personnalisation"
 mobile/views/pages/widgets/activity.vue:
@@ -1405,7 +1422,7 @@ mobile/views/pages/search.vue:
 mobile/views/pages/selectdrive.vue:
   select-file: "Choisissez un fichier"
 mobile/views/pages/settings.vue:
-  signed-in-as: "Connecté·e en tant que {}"
+  signed-in-as: "Connecté en tant que {}"
   design: "Affichage et design"
   dark-mode: "Mode nuit"
   i-am-under-limited-internet: "J'ai un accès Internet limité"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "Style de notification"
   notification-position-bottom: "en bas"
   notification-position-top: "en haut"
-  theme: "Thème"
   behavior: "Comportement"
   fetch-on-scroll: "Chargement lors du défilement"
   note-visibility: "Visibilité de la publication"
@@ -1430,7 +1446,7 @@ mobile/views/pages/settings.vue:
   remember-note-visibility: "Se souvenir du mode de visibilité de la publication"
   web-search-engine: "Moteur de recherche Web"
   web-search-engine-desc: "Exemple : https://www.google.com/?#q={{query}}"
-  disable-via-mobile: "Ne pas mentionner que ma publication provient d'un 'périphérique mobile'"
+  disable-via-mobile: "Ne pas mentionner que ma publication provient d'un « périphérique mobile »"
   load-raw-images: "Afficher les photos jointes en haute qualité"
   load-remote-media: "Afficher les médias sur le serveur distant"
   update: "Mise à jour de Misskey"
@@ -1450,12 +1466,11 @@ mobile/views/pages/settings.vue:
 mobile/views/pages/user.vue:
   follows-you: "Vous suit"
   following: "Abonnements"
-  followers: "Abonné·e·s"
+  followers: "Abonnés"
   notes: "Notes"
   overview: "Aperçu"
   timeline: "Fil d'actualité"
   media: "Média"
-  is-suspended: "This account has been suspended."
   mute: "Mettre en sourdine"
   unmute: "Enlever la sourdine"
   block: "Bloquer"
@@ -1470,13 +1485,13 @@ mobile/views/pages/user/home.vue:
   activity: "Activité"
   keywords: "Mot clés"
   domains: "Domaines"
-  frequently-replied-users: "Utilisateurs·rices mentionné·e·s souvent"
-  followers-you-know: "Abonné·e·s que vous connaissez"
+  frequently-replied-users: "Utilisateurs mentionnés souvent"
+  followers-you-know: "Abonnés que vous connaissez"
   last-used-at: "Dernière connexion il y a"
 mobile/views/pages/user/home.followers-you-know.vue:
-  no-users: "Aucun utilisateur·rice connu·e"
+  no-users: "Aucun utilisateur connu"
 mobile/views/pages/user/home.friends.vue:
-  no-users: "Aucun utilisateur·rice connu·e"
+  no-users: "Aucun utilisateur connu"
 mobile/views/pages/user/home.notes.vue:
   no-notes: "Pas de notes"
 mobile/views/pages/user/home.photos.vue:
@@ -1508,7 +1523,8 @@ deck/deck.tl-column.vue:
 deck/deck.user-column.vue:
   posts: "Notes"
   following: "Suit"
-  followers: "Abonné·e·s"
+  followers: "Abonnés"
+  mention: "メンション"
   images: "Images"
   activity: "Activité"
   timeline: "Fil d’actualité"

locales/it-IT.yml

@@ -90,7 +90,6 @@ common:
     followers-desc: "自分のフォロワーにのみ公開"
     specified: "ダイレクト"
     specified-desc: "指定したユーザーにのみ公開"
-    private: "非公開"
     local-public: "公開 (ローカルのみ)"
     local-home: "ホーム (ローカルのみ)"
     local-followers: "フォロワー (ローカルのみ)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "公式アカウント"
   disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "UIの動きを減らす"
   this-setting-is-this-device-only: "このデバイスのみ"
   use-os-default-emojis: "OS標準の絵文字を使用"
-  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
+  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user}がRenote"
   error:
-    title: '問題が発生しました'
-    retry: 'やり直す'
+    title: "問題が発生しました"
+    retry: "やり直す"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "非ダークモード時に使用するテーマ"
   dark-theme: "ダークモード時に使用するテーマ"
   light-themes: "明るいテーマ"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "ベーステーマ"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "テーマ名"
   preview-created-theme: "プレビュー"
   invalid-theme: "テーマが正しくありません。"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "もっと見る"
   chars: "{count}文字"
   files: "{count}ファイル"
+  poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "ユーザーを探す"
   you: "あなた"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "開発者"
   feedback: "フィードバック"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "接続中"
   reconnecting: "再接続中"
   connected: "接続完了"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "接続する"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "自分のフォロワーにのみ公開"
   specified: "ダイレクト"
   specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
   local-public: "公開 (ローカルのみ)"
   local-public-desc: "リモートへは公開しない"
   local-home: "ホーム (ローカルのみ)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotです"
   is-locked: "フォローを承認制にする"
   careful-bot: "Botからのフォローだけ承認制にする"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシー"
   save: "保存"
@@ -527,10 +538,10 @@ common/views/widgets/tips.vue:
   tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができます"
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示しています"
   tips-line21: "APIを利用してbotの開発なども行えます"
-  tips-line23: "まゆかわいいよまゆ"
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskeyは2014年にサービスを開始しました"
   tips-line25: "対応ブラウザではMisskeyを開いていなくても通知を受け取れます"
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "{}としてサインイン中"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
   detail: "詳細"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "二段階認証"
   other: "その他"
   license: "ライセンス"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "テーマ"
   behaviour: "動作"
   fetch-on-scroll: "スクロールで自動読み込み"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "ダークモード"
   use-shadow: "UIに影を使用"
   rounded-corners: "UIの角を丸める"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "円形のアイコンを使用"
   contrasted-acct: "ユーザー名にコントラストを付ける"
   post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
   cache-cleared: "キャッシュを削除しました"
   cache-cleared-desc: "ページを再度読み込みしてください。"
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
   about: "Misskeyについて"
   operator: "このサーバーの運営者"
   update: "Misskey Update"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "パスワードを入力してください"
   authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
   howtoinstall: "インストール方法はこちら"
+  token: "トークン"
   scan: "次に、表示されているQRコードをスキャンします:"
   done: "お使いのデバイスに表示されているトークンを入力して完了します:"
   submit: "完了"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "パスワードを入力してください"
   console:
-    title: 'APIコンソール'
-    endpoint: 'エンドポイント'
-    parameter: 'パラメータ'
+    title: "APIコンソール"
+    endpoint: "エンドポイント"
+    parameter: "パラメータ"
     credential-info: "「i」パラメータは自動で付与されます。"
-    send: '送信'
-    sending: '応答待ち'
-    response: '結果'
+    send: "送信"
+    sending: "応答待ち"
+    response: "結果"
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   is-bot: "このアカウントはBotです"
   years-old: "{age}歳"
   year: "年"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "投稿"
   with-replies: "投稿と返信"
   with-media: "メディア"
+  my-posts: "私の投稿"
   empty: "このユーザーはまだ何も投稿していないようです。"
 desktop/views/widgets/messaging.vue:
   title: "メッセージ"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知の表示"
   notification-position-bottom: "下"
   notification-position-top: "上"
-  theme: "テーマ"
   behavior: "動作"
   fetch-on-scroll: "スクロールで自動読み込み"
   note-visibility: "投稿の公開範囲"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "概要"
   timeline: "タイムライン"
   media: "メディア"
-  is-suspended: "このユーザーは凍結されています。"
   mute: "ミュート"
   unmute: "ミュート解除"
   block: "ブロック"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   images: "画像"
   activity: "アクティビティ"
   timeline: "タイムライン"

locales/ja-JP.yml

@@ -96,7 +96,6 @@ common:
     followers-desc: "自分のフォロワーにのみ公開"
     specified: "ダイレクト"
     specified-desc: "指定したユーザーにのみ公開"
-    private: "非公開"
     local-public: "公開 (ローカルのみ)"
     local-home: "ホーム (ローカルのみ)"
     local-followers: "フォロワー (ローカルのみ)"
@@ -118,7 +117,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "公式アカウント"
   disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -129,17 +128,21 @@ common:
   reduce-motion: "UIの動きを減らす"
   this-setting-is-this-device-only: "このデバイスのみ"
   use-os-default-emojis: "OS標準の絵文字を使用"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
 
-  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
-
+  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user}がRenote"
 
   error:
-    title: '問題が発生しました'
-    retry: 'やり直す'
+    title: "問題が発生しました"
+    retry: "やり直す"
 
   reversi:
     drawn: "引き分け"
@@ -284,6 +287,7 @@ common/views/components/media-banner.vue:
   click-to-show: "クリックして表示"
 
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "非ダークモード時に使用するテーマ"
   dark-theme: "ダークモード時に使用するテーマ"
   light-themes: "明るいテーマ"
@@ -300,6 +304,7 @@ common/views/components/theme.vue:
   base-theme: "ベーステーマ"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "テーマ名"
   preview-created-theme: "プレビュー"
   invalid-theme: "テーマが正しくありません。"
@@ -324,6 +329,7 @@ common/views/components/cw-button.vue:
   show: "もっと見る"
   chars: "{count}文字"
   files: "{count}ファイル"
+  poll: "アンケート"
 
 common/views/components/messaging.vue:
   search-user: "ユーザーを探す"
@@ -359,6 +365,7 @@ common/views/components/nav.vue:
   feedback: "フィードバック"
 
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
@@ -443,6 +450,14 @@ common/views/components/stream-indicator.vue:
   reconnecting: "再接続中"
   connected: "接続完了"
 
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
+
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "接続する"
@@ -476,7 +491,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "自分のフォロワーにのみ公開"
   specified: "ダイレクト"
   specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
   local-public: "公開 (ローカルのみ)"
   local-public-desc: "リモートへは公開しない"
   local-home: "ホーム (ローカルのみ)"
@@ -508,6 +522,7 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotです"
   is-locked: "フォローを承認制にする"
   careful-bot: "Botからのフォローだけ承認制にする"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシー"
   save: "保存"
@@ -584,11 +599,11 @@ common/views/widgets/tips.vue:
   tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができます"
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示しています"
   tips-line21: "APIを利用してbotの開発なども行えます"
-  tips-line23: "まゆかわいいよまゆ"
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskeyは2014年にサービスを開始しました"
   tips-line25: "対応ブラウザではMisskeyを開いていなくても通知を受け取れます"
 
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "ページが見つかりませんでした"
 
 common/views/pages/follow.vue:
@@ -750,11 +765,13 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
 
 desktop/views/components/note.vue:
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
   detail: "詳細"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -838,7 +855,6 @@ desktop/views/components/settings.vue:
   2fa: "二段階認証"
   other: "その他"
   license: "ライセンス"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "テーマ"
 
   behaviour: "動作"
@@ -900,9 +916,6 @@ desktop/views/components/settings.vue:
   cache-cleared: "キャッシュを削除しました"
   cache-cleared-desc: "ページを再度読み込みしてください。"
 
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
-
   about: "Misskeyについて"
   operator: "このサーバーの運営者"
 
@@ -945,6 +958,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "パスワードを入力してください"
   authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
   howtoinstall: "インストール方法はこちら"
+  token: "トークン"
   scan: "次に、表示されているQRコードをスキャンします:"
   done: "お使いのデバイスに表示されているトークンを入力して完了します:"
   submit: "完了"
@@ -960,13 +974,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "パスワードを入力してください"
   console:
-    title: 'APIコンソール'
-    endpoint: 'エンドポイント'
-    parameter: 'パラメータ'
+    title: "APIコンソール"
+    endpoint: "エンドポイント"
+    parameter: "パラメータ"
     credential-info: "「i」パラメータは自動で付与されます。"
-    send: '送信'
-    sending: '応答待ち'
-    response: '結果'
+    send: "送信"
+    sending: "応答待ち"
+    response: "結果"
 
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
@@ -1364,6 +1378,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   is-bot: "このアカウントはBotです"
   years-old: "{age}歳"
   year: "年"
@@ -1619,7 +1634,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知の表示"
   notification-position-bottom: "下"
   notification-position-top: "上"
-  theme: "テーマ"
   behavior: "動作"
   fetch-on-scroll: "スクロールで自動読み込み"
   note-visibility: "投稿の公開範囲"
@@ -1653,7 +1667,6 @@ mobile/views/pages/user.vue:
   overview: "概要"
   timeline: "タイムライン"
   media: "メディア"
-  is-suspended: "このユーザーは凍結されています。"
   mute: "ミュート"
   unmute: "ミュート解除"
   block: "ブロック"
@@ -1715,6 +1728,7 @@ deck/deck.user-column.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   images: "画像"
   activity: "アクティビティ"
   timeline: "タイムライン"

locales/ja-KS.yml

@@ -90,7 +90,6 @@ common:
     followers-desc: "自分のフォロワー以外に見せんとって"
     specified: "ダイレクト"
     specified-desc: "今から言うユーザー以外に見せんとってや"
-    private: "非公開"
     local-public: "公開 (ローカルだけ)"
     local-home: "ホーム (ローカルだけ)"
     local-followers: "フォロワー (ローカルだけ)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "あんさんのトークンが更新されたらしいわ。すまんがとりあえずサインアウトすんで。"
   i-like-sushi: "寿司(のほうがプリンよりむしろ)ウマい、タコ焼きはあらへんけど。"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示や！"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "アメちゃん付きアカウント"
   disable-animated-mfm: "投稿内のちょろちょろ動いてんのを止める"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "UI、動き過ぎや、静かにしてや"
   this-setting-is-this-device-only: "このデバイスのみ"
   use-os-default-emojis: "OSにもとから入っとる絵文字使う"
-  do-not-use-in-production: '開発ビルドや。本番環境で使わんといて！知らんで！'
+  do-not-use-in-production: "開発ビルドや。本番環境で使わんといて！知らんで！"
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "ちゃんとした情報見せてや！"
   renoted-by: "{user}がRenote"
   error:
-    title: '問題が起こったわ'
-    retry: 'もっぺん'
+    title: "問題が起こったわ"
+    retry: "もっぺん"
   reversi:
     drawn: "おあいこ"
     my-turn: "あんさんのターンや"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "見せたらあかん"
   click-to-show: "押してみ、見せたるわ"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "ナイトゲームちゃう時のテーマどないする？"
   dark-theme: "ナイトゲームの時のテーマどないする？"
   light-themes: "デイゲーム"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "この色が背景や！"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "テーマ名"
   preview-created-theme: "試してみる"
   invalid-theme: "このテーマあかんわ、なんか間違うとる"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "見たいやろ？"
   chars: "{count}文字"
   files: "{count}ファイル"
+  poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "ユーザーを探す"
   you: "あんさん"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "開発者"
   feedback: "フィードバック"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "もっと"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "つないどるで"
   reconnecting: "つなぎ直すで"
   connected: "つないだわ"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "つなげる"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "自分のフォロワー以外に見せんとって"
   specified: "ダイレクト"
   specified-desc: "今から言うユーザー以外に見せんとってや"
-  private: "非公開"
   local-public: "公開 (ローカルだけ)"
   local-public-desc: "リモートには見せへん"
   local-home: "ホーム (ローカルだけ)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotやで"
   is-locked: "他人のフォローは許可してからや！"
   careful-bot: "Botからのフォローだけは許可制や"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシーってなんや？オカンの年齢か？"
   save: "保存"
@@ -527,10 +538,10 @@ common/views/widgets/tips.vue:
   tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができんで"
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示してんねん"
   tips-line21: "APIをつこてbotの開発なども行えるで"
-  tips-line23: "ウチのタコちゃんかわええやろ…今の突っ込むところや！"
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskeyは2014年にサービスを開始したんよ"
   tips-line25: "対応ブラウザやったらMisskeyを開いとらんでも通知を受け取れんで"
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "{}としてサインイン中"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "ここおるで:"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "返す"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
   detail: "もっと"
   private: "この投稿は見せられへんわ"
   deleted: "この投稿なんか無くなってもうたわ"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "二段階認証"
   other: "その他"
   license: "ライセンス"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "テーマ"
   behaviour: "動き"
   fetch-on-scroll: "スクロールしたらもっと見せてや"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "夜にすんで"
   use-shadow: "UIに影付けたる"
   rounded-corners: "みんなまぁるくUI変更"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "アイコンもタコ焼きも丸いやんな？"
   contrasted-acct: "ユーザー名ようわからんし見やすしといて"
   post-form-on-timeline: "タイムラインの上の方で投稿できるようにせえへん？"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "お掃除するとな、ブラウザが覚えてくれとるアカウントのあれこれや書きかけの投稿・返信・メッセージや設定情報なんかのデータが全部飛んでいくんや。これやったらページ再読込しといてな。"
   cache-cleared: "キャッシュお掃除したで"
   cache-cleared-desc: "もっぺんページ読みこみ直してくれや"
-  auto-watch: "投稿勝手にウォッチしといてや"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を勝手に受け取るようにすんで。"
   about: "Misskeyってなんや？"
   operator: "このサーバー誰のや"
   update: "Misskey Update"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "パスワードを入れてや"
   authenticator: "まず、Google Authenticatorとかのをつこてるデバイスにインストールしてや:"
   howtoinstall: "インストール方法はここやで"
+  token: "トークン"
   scan: "んで、ここに出とるQRコードをスキャンしてな:"
   done: "最後にデバイスに表示されとるトークンを入力してな:"
   submit: "送信"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "パスワードを入れてや"
   console:
-    title: 'APIコンソール'
-    endpoint: 'エンドポイント'
-    parameter: 'パラメータ'
+    title: "APIコンソール"
+    endpoint: "エンドポイント"
+    parameter: "パラメータ"
     credential-info: "「i」パラメータは勝手に付くで。"
-    send: '送る'
-    sending: '応答待っとる'
-    response: 'こんなん返ってきたわ'
+    send: "送る"
+    sending: "応答待っとる"
+    response: "こんなん返ってきたわ"
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはあらへんで"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   is-bot: "このアカウントはBotや"
   years-old: "{age}歳"
   year: "年"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "投稿"
   with-replies: "投稿と返信"
   with-media: "メディア"
+  my-posts: "私の投稿"
   empty: "このユーザーはまだ何も投稿しとらんようや。"
 desktop/views/widgets/messaging.vue:
   title: "メッセージ"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知どこ見せる？"
   notification-position-bottom: "ミナミの方"
   notification-position-top: "キタの方"
-  theme: "テーマ"
   behavior: "動き"
   fetch-on-scroll: "スクロールしたらもっと見せてや"
   note-visibility: "投稿の公開範囲"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "こんなやつ"
   timeline: "タイムライン"
   media: "メディア"
-  is-suspended: "このユーザーはあかんわ。凍結されとる。"
   mute: "ミュート"
   unmute: "ミュートやめたる"
   block: "ブロック"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   images: "画像"
   activity: "アクティビティ"
   timeline: "タイムライン"

locales/ko-KR.yml

@@ -90,7 +90,6 @@ common:
     followers-desc: "자신의 팔로워에게만 공개"
     specified: "다이렉트"
     specified-desc: "지정한 사용자에게만 공개"
-    private: "비공개"
     local-public: "공개 (로컬 한정)"
     local-home: "홈 (로컬 한정)"
     local-followers: "팔로워 (로컬 한정)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "당신의 토큰이 업데이트되었으므로 로그아웃합니다."
   i-like-sushi: "저는 (푸딩보다 차라리) 초밥이 좋아요"
   show-reversi-board-labels: "리버시 보드의 행과 열 레이블을 표시"
-  use-white-black-reversi-stones: "리버시에 흑백 돌을 사용"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "공식 계정"
   disable-animated-mfm: "글의 문자 애니메이션을 비활성화"
   suggest-recent-hashtags: "최근 해시태그를 글 작성란에 표시"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "UI의 애니메이션 줄이기"
   this-setting-is-this-device-only: "이 장치만"
   use-os-default-emojis: "운영체제의 기본 이모지 사용"
-  do-not-use-in-production: '이것은 개발 빌드입니다. 프로덕션 환경에서 사용하지 마십시오.'
+  do-not-use-in-production: "이것은 개발 빌드입니다. 프로덕션 환경에서 사용하지 마십시오."
+  user-suspended: "이 사용자는 정지된 상태입니다."
   is-remote-user: "이 유저 정보는 복사본입니다."
   is-remote-post: "이 글 정보는 복사본입니다."
   view-on-remote: "정확한 정보 보기"
   renoted-by: "{user}이(가) 리노트"
   error:
-    title: '오류가 발생했습니다'
-    retry: '다시 시도'
+    title: "오류가 발생했습니다"
+    retry: "다시 시도"
   reversi:
     drawn: "무승부"
     my-turn: "당신의 차례입니다"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "열람주의"
   click-to-show: "클릭하여 표시"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "다크 모드가 아닐 때 사용하는 테마"
   dark-theme: "다크 모드일 때 사용하는 테마"
   light-themes: "밝은 테마"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "기본 테마"
   base-theme-light: "밝음"
   base-theme-dark: "어두움"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "테마명"
   preview-created-theme: "미리보기"
   invalid-theme: "테마가 올바르지 않습니다."
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "더 보기"
   chars: "{count}문자"
   files: "{count}파일"
+  poll: "투표"
 common/views/components/messaging.vue:
   search-user: "사용자 찾기"
   you: "당신"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "개발자"
   feedback: "피드백"
 common/views/components/note-menu.vue:
+  mention: "멘션"
   detail: "상세"
   copy-link: "링크 복사"
   favorite: "이 노트 즐겨찾기"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "연결중"
   reconnecting: "다시 연결 중"
   connected: "연결 완료"
+common/views/components/notification-settings.vue:
+  title: "알림"
+  mark-as-read-all-notifications: "모든 알림을 읽은 상태로 표시"
+  mark-as-read-all-unread-notes: "모든 글을 읽은 상태로 표시"
+  mark-as-read-all-talk-messages: "모든 대화를 읽은 상태로 표시"
+  auto-watch: "글 자동 감시"
+  auto-watch-desc: "리액션, 답글, 게시물에 대한 알림을 자동으로 받을 수 있도록 합니다."
 common/views/components/integration-settings.vue:
   title: "서비스 연계"
   connect: "접속"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "자신의 팔로워에게만 공개"
   specified: "다이렉트"
   specified-desc: "지정한 사용자에게만 공개"
-  private: "비공개"
   local-public: "공개 (로컬 한정)"
   local-public-desc: "원격에는 공개하지 않음"
   local-home: "홈 (로컬 한정)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "이 계정은 Bot입니다"
   is-locked: "팔로우를 수동으로 승인"
   careful-bot: "Bot의 팔로우만 수동으로 승인"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "기타"
   privacy: "프라이버시"
   save: "저장"
@@ -527,10 +538,10 @@ common/views/widgets/tips.vue:
   tips-line19: "몇몇 창은 브라우저 밖으로 분리할 수 있습니다"
   tips-line20: "달력 위젯의 퍼센트는 경과된 비율을 나타냅니다"
   tips-line21: "API를 사용하여 bot의 개발 등을 할 수 있습니다"
-  tips-line23: "마유 귀여워요 마유"
+  tips-line23: "아이 귀여워요 아이"
   tips-line24: "Misskey는 2014년에 서비스를 시작했습니다"
   tips-line25: "대응하는 브라우저인 경우 Misskey를 열어놓지 않아도 알림을 받을 수 있습니다"
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "페이지를 찾을 수 없습니다"
 common/views/pages/follow.vue:
   signed-in-as: "{}으로 로그인"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "위치 정보"
   renote: "리노트"
   add-reaction: "리액션 추가"
+  undo-reaction: "리액션 취소"
 desktop/views/components/note.vue:
   reply: "답글 달기"
   renote: "리노트"
   add-reaction: "리액션 추가"
+  undo-reaction: "리액션 취소"
   detail: "상세"
   private: "이 글은 비공개입니다"
   deleted: "이 글은 삭제되었습니다"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "2단계 인증"
   other: "기타"
   license: "라이선스"
-  mark-as-read-all-unread-notes: "모든 글을 읽은 상태로 표시"
   theme: "테마"
   behaviour: "동작"
   fetch-on-scroll: "스크롤하여 자동으로 불러오기"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "다크 모드"
   use-shadow: "UI에 그림자 효과 적용"
   rounded-corners: "UI의 모서리를 둥글게 설정"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "원형 아이콘 사용"
   contrasted-acct: "사용자명에 대비 추가"
   post-form-on-timeline: "타임라인 상단에 글 작성란을 표시"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "지우기를 실행하면 브라우저에 저장된 계정 정보 캐시, 글이나 답글 및 메시지의 임시 저장, 그 외 데이터 (설정 정보 포함) 가 삭제 됩니다. 지우기 작업을 수행한 후 페이지를 다시 로드해야 합니다."
   cache-cleared: "캐시를 삭제하였습니다"
   cache-cleared-desc: "페이지를 새로고침해 주십시오."
-  auto-watch: "글 자동 감시"
-  auto-watch-desc: "리액션, 답글, 게시물에 대한 알림을 자동으로 받을 수 있도록 합니다."
   about: "Misskey에 대하여"
   operator: "이 서버의 운영자"
   update: "Misskey Update"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "비밀번호를 입력하여 주십시오"
   authenticator: "먼저, 가지고 계신 장치에 Google Authenticator를 설치해야 합니다:"
   howtoinstall: "설치 방법은 여기에 있습니다"
+  token: "トークン"
   scan: "다음으로 표시되어 있는 QR 코드를 스캔합니다:"
   done: "사용중이신 장치에 표시된 토큰을 입력해주시면 마무리됩니다:"
   submit: "완료"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "비밀번호를 입력하여 주십시오"
   console:
-    title: 'API 콘솔'
-    endpoint: '엔드포인트'
-    parameter: '매개변수'
+    title: "API 콘솔"
+    endpoint: "엔드포인트"
+    parameter: "매개변수"
     credential-info: "\"i\" 패러미터는 자동으로 추가됩니다."
-    send: '전송'
-    sending: '응답을 기다리는 중'
-    response: '결과'
+    send: "전송"
+    sending: "응답을 기다리는 중"
+    response: "결과"
 desktop/views/components/settings.apps.vue:
   no-apps: "연결된 어플리케이션이 없습니다"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "글"
   following: "팔로잉"
   followers: "팔로워"
+  mention: "멘션"
   is-bot: "이 계정은 Bot입니다"
   years-old: "{age}세"
   year: "년"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "글"
   with-replies: "글과 답글"
   with-media: "미디어"
+  my-posts: "내 글"
   empty: "이 사용자는 아직 아무것도 게시하지 않은 것 같습니다."
 desktop/views/widgets/messaging.vue:
   title: "메시지"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "알림 표시"
   notification-position-bottom: "아래"
   notification-position-top: "위"
-  theme: "테마"
   behavior: "동작"
   fetch-on-scroll: "스크롤하여 자동으로 불러오기"
   note-visibility: "게시물의 공개 범위"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "요약"
   timeline: "타임라인"
   media: "미디어"
-  is-suspended: "이 사용자는 정지된 상태입니다."
   mute: "뮤트"
   unmute: "뮤트 해제"
   block: "차단"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "글"
   following: "팔로잉"
   followers: "팔로워"
+  mention: "멘션"
   images: "이미지"
   activity: "활동"
   timeline: "타임라인"

locales/nl-NL.yml

@@ -90,7 +90,6 @@ common:
     followers-desc: "自分のフォロワーにのみ公開"
     specified: "ダイレクト"
     specified-desc: "指定したユーザーにのみ公開"
-    private: "非公開"
     local-public: "公開 (ローカルのみ)"
     local-home: "ホーム (ローカルのみ)"
     local-followers: "フォロワー (ローカルのみ)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "Je sleutel is gegenereerd; je wordt nu uitgelogd."
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "公式アカウント"
   disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "UIの動きを減らす"
   this-setting-is-this-device-only: "このデバイスのみ"
   use-os-default-emojis: "OS標準の絵文字を使用"
-  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
+  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user}がRenote"
   error:
-    title: '問題が発生しました'
-    retry: 'やり直す'
+    title: "問題が発生しました"
+    retry: "やり直す"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "非ダークモード時に使用するテーマ"
   dark-theme: "ダークモード時に使用するテーマ"
   light-themes: "明るいテーマ"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "ベーステーマ"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "テーマ名"
   preview-created-theme: "プレビュー"
   invalid-theme: "テーマが正しくありません。"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "もっと見る"
   chars: "{count}文字"
   files: "{count}ファイル"
+  poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "Gebruiker zoeken"
   you: "Jij"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "Ontwikkelaars"
   feedback: "Feedback"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "Deze notitie toevoegen aan favorieten"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "Bezig met verbinden"
   reconnecting: "Bezig met herverbinden"
   connected: "Verbonden"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "接続する"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "自分のフォロワーにのみ公開"
   specified: "ダイレクト"
   specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
   local-public: "公開 (ローカルのみ)"
   local-public-desc: "リモートへは公開しない"
   local-home: "ホーム (ローカルのみ)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotです"
   is-locked: "フォローを承認制にする"
   careful-bot: "Botからのフォローだけ承認制にする"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシー"
   save: "保存"
@@ -527,10 +538,10 @@ common/views/widgets/tips.vue:
   tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができます"
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示しています"
   tips-line21: "APIを利用してbotの開発なども行えます"
-  tips-line23: "まゆかわいいよまゆ"
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskeyは2014年にサービスを開始しました"
   tips-line25: "対応ブラウザではMisskeyを開いていなくても通知を受け取れます"
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "{}としてサインイン中"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "Locatie"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
   detail: "詳細"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -698,7 +711,7 @@ desktop/views/components/post-form.vue:
   attach-media-from-local: "Media bijvoegen van je computer"
   attach-media-from-drive: "Media bijvoegen uit je Drive"
   attach-cancel: "Bijlage annuleren"
-  insert-a-kao: "v(‘ω’)v"
+  insert-a-kao: "v('ω')v"
   create-poll: "Peiling creëren"
   text-remain: "{} resterende tekens"
   recent-tags: "最近"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "Authenticatie in twee stappen"
   other: "Overig"
   license: "Licentie"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "テーマ"
   behaviour: "Gedrag"
   fetch-on-scroll: "Ophalen bij scrollen"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "Donkere modus"
   use-shadow: "UIに影を使用"
   rounded-corners: "UIの角を丸める"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "Ronde pictogrammen gebruiken"
   contrasted-acct: "ユーザー名にコントラストを付ける"
   post-form-on-timeline: "Berichtformulier boven de tijdlijn tonen"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "De cache van je accountinformatie/berichten/antwoorden/instellingen wordt verwijderd. Je moet de pagina herladen na het opschonen."
   cache-cleared: "Cache opgeschoond"
   cache-cleared-desc: "Herlaad de pagina."
-  auto-watch: "Automatisch volgen"
-  auto-watch-desc: "Automatisch meldingen ontvangen over het bericht/antwoord."
   about: "Over Misskey"
   operator: "De administrator van deze instantie"
   update: "Misskey-update"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "Voer het wachtwoord in"
   authenticator: "Installeer eerst Google Authenticator op je apparaat:"
   howtoinstall: "Hoe installeer ik dit?"
+  token: "トークン"
   scan: "Scan daarna de QR-code:"
   done: "Voer de op je apparaat getoonde sleutel in:"
   submit: "Versturen"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "パスワードを入力してください"
   console:
-    title: 'APIコンソール'
-    endpoint: 'エンドポイント'
-    parameter: 'パラメータ'
+    title: "APIコンソール"
+    endpoint: "エンドポイント"
+    parameter: "パラメータ"
     credential-info: "「i」パラメータは自動で付与されます。"
-    send: '送信'
-    sending: '応答待ち'
-    response: '結果'
+    send: "送信"
+    sending: "応答待ち"
+    response: "結果"
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   is-bot: "このアカウントはBotです"
   years-old: "{age}歳"
   year: "年"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "Berichten"
   with-replies: "Berichten en antwoorden"
   with-media: "Media"
+  my-posts: "私の投稿"
   empty: "Deze gebruiker heeft nog niks geplaatst."
 desktop/views/widgets/messaging.vue:
   title: "Gesprekken"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知の表示"
   notification-position-bottom: "下"
   notification-position-top: "上"
-  theme: "テーマ"
   behavior: "Gedrag"
   fetch-on-scroll: "Ophalen bij scrollen"
   note-visibility: "投稿の公開範囲"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "Overzicht"
   timeline: "Tijdlijn"
   media: "Media"
-  is-suspended: "Dit account is geschorst."
   mute: "ミュート"
   unmute: "ミュート解除"
   block: "ブロック"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   images: "画像"
   activity: "アクティビティ"
   timeline: "タイムライン"

locales/no-NO.yml

@@ -90,7 +90,6 @@ common:
     followers-desc: "自分のフォロワーにのみ公開"
     specified: "ダイレクト"
     specified-desc: "指定したユーザーにのみ公開"
-    private: "Privat"
     local-public: "公開 (ローカルのみ)"
     local-home: "ホーム (ローカルのみ)"
     local-followers: "フォロワー (ローカルのみ)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "Ditt synbol har blitt generert. Du vil nå bli utlogget."
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "公式アカウント"
   disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "UIの動きを減らす"
   this-setting-is-this-device-only: "このデバイスのみ"
   use-os-default-emojis: "OS標準の絵文字を使用"
-  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
+  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user}がRenote"
   error:
-    title: '問題が発生しました'
-    retry: 'やり直す'
+    title: "問題が発生しました"
+    retry: "やり直す"
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "Sensitivt innhold"
   click-to-show: "クリックして表示"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "非ダークモード時に使用するテーマ"
   dark-theme: "ダークモード時に使用するテーマ"
   light-themes: "明るいテーマ"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "ベーステーマ"
   base-theme-light: "Light"
   base-theme-dark: "Mørk"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "Tema navn"
   preview-created-theme: "プレビュー"
   invalid-theme: "テーマが正しくありません。"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "もっと見る"
   chars: "{count}文字"
   files: "{count}ファイル"
+  poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "ユーザーを探す"
   you: "Du"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "Utviklere"
   feedback: "フィードバック"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "Detaljer"
   copy-link: "リンクをコピー"
   favorite: "Merket som favoritt"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "Tilkobler"
   reconnecting: "Kobler til på nytt"
   connected: "Tilkoblet"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "接続する"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "自分のフォロワーにのみ公開"
   specified: "Direkte"
   specified-desc: "指定したユーザーにのみ公開"
-  private: "Privat"
   local-public: "公開 (ローカルのみ)"
   local-public-desc: "リモートへは公開しない"
   local-home: "ホーム (ローカルのみ)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotです"
   is-locked: "フォローを承認制にする"
   careful-bot: "Botからのフォローだけ承認制にする"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシー"
   save: "保存"
@@ -527,10 +538,10 @@ common/views/widgets/tips.vue:
   tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができます"
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示しています"
   tips-line21: "APIを利用してbotの開発なども行えます"
-  tips-line23: "まゆかわいいよまゆ"
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskeyは2014年にサービスを開始しました"
   tips-line25: "対応ブラウザではMisskeyを開いていなくても通知を受け取れます"
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "{}としてサインイン中"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "Lokasjon"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
   detail: "詳細"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "To-faktor autentisering"
   other: "Annet"
   license: "Lisens"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "Utseende"
   behaviour: "Oppførsel"
   fetch-on-scroll: "スクロールで自動読み込み"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "ダークモード"
   use-shadow: "UIに影を使用"
   rounded-corners: "UIの角を丸める"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "円形のアイコンを使用"
   contrasted-acct: "ユーザー名にコントラストを付ける"
   post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
   cache-cleared: "キャッシュを削除しました"
   cache-cleared-desc: "ページを再度読み込みしてください。"
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
   about: "Misskeyについて"
   operator: "このサーバーの運営者"
   update: "Misskey Update"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "パスワードを入力してください"
   authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
   howtoinstall: "インストール方法はこちら"
+  token: "トークン"
   scan: "次に、表示されているQRコードをスキャンします:"
   done: "お使いのデバイスに表示されているトークンを入力して完了します:"
   submit: "Send"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "パスワードを入力してください"
   console:
-    title: 'APIコンソール'
-    endpoint: 'エンドポイント'
-    parameter: 'パラメータ'
+    title: "APIコンソール"
+    endpoint: "エンドポイント"
+    parameter: "パラメータ"
     credential-info: "「i」パラメータは自動で付与されます。"
-    send: '送信'
-    sending: '応答待ち'
-    response: '結果'
+    send: "送信"
+    sending: "応答待ち"
+    response: "結果"
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "Innlegg"
   following: "Følger"
   followers: "フォロワー"
+  mention: "メンション"
   is-bot: "このアカウントはBotです"
   years-old: "{age}歳"
   year: "年"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "Innlegg"
   with-replies: "Innlegg og svar"
   with-media: "Media"
+  my-posts: "私の投稿"
   empty: "このユーザーはまだ何も投稿していないようです。"
 desktop/views/widgets/messaging.vue:
   title: "Melding"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知の表示"
   notification-position-bottom: "Bunn"
   notification-position-top: "Topp"
-  theme: "Utseende"
   behavior: "Oppførsel"
   fetch-on-scroll: "スクロールで自動読み込み"
   note-visibility: "投稿の公開範囲"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "Oversikt"
   timeline: "タイムライン"
   media: "Media"
-  is-suspended: "このユーザーは凍結されています。"
   mute: "ミュート"
   unmute: "ミュート解除"
   block: "ブロック"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   images: "画像"
   activity: "アクティビティ"
   timeline: "タイムライン"

locales/pl-PL.yml

@@ -90,7 +90,6 @@ common:
     followers-desc: "Widoczny tylko dla osób, które Cię śledzą"
     specified: "Bezpośredni"
     specified-desc: "Tylko dla określonych użytkowników"
-    private: "Prywatny"
     local-public: "Publiczny (tylko lokalnie)"
     local-home: "ホーム (ローカルのみ)"
     local-followers: "Dla śledzących (tylko lokalnie)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "Twój token został wygenerowany. Zostaniesz wylogowany."
   i-like-sushi: "Wolę sushi od puddingu"
   show-reversi-board-labels: "Pokazuj podpisy wierszy i kolumn w Reversi"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "Zweryfikowane konto"
   disable-animated-mfm: "Wyłącz animowany tekst we wpisach"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "Zredukuj ruch w UI"
   this-setting-is-this-device-only: "このデバイスのみ"
   use-os-default-emojis: "Użyj domyślnych Emoji systemowych"
-  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
+  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "Informacje o użytkowniku są kopiowane."
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user} udostępnił(a)"
   error:
-    title: 'Coś poszło nie tak'
-    retry: 'Ponów próbę'
+    title: "Coś poszło nie tak"
+    retry: "Ponów próbę"
   reversi:
     drawn: "Remis"
     my-turn: "Twoja kolej"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "非ダークモード時に使用するテーマ"
   dark-theme: "ダークモード時に使用するテーマ"
   light-themes: "Jasny Motyw"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "Podstawowy motyw"
   base-theme-light: "Jasny"
   base-theme-dark: "Ciemny"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "Nazwa motywu"
   preview-created-theme: "Pokaż podgląd"
   invalid-theme: "テーマが正しくありません。"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "Pokaż więcej"
   chars: "{count} znaków"
   files: "{count} plików"
+  poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "Znajdź użytkownika"
   you: "Ty"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "Autorzy"
   feedback: "Podziel się opinią"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "Szczegóły"
   copy-link: "Skopiuj adres"
   favorite: "Dodaj do ulubionych"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "Łączenie"
   reconnecting: "Ponowne łączenie"
   connected: "Połączono"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "Połącz"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "Widoczny tylko dla osób, które Cię śledzą"
   specified: "Bezpośredni"
   specified-desc: "Tylko dla określonych użytkowników"
-  private: "Prywatny"
   local-public: "公開 (ローカルのみ)"
   local-public-desc: "リモートへは公開しない"
   local-home: "ホーム (ローカルのみ)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "To konto jest prowadzone przez bota"
   is-locked: "Żądanania śledzenia wymagają zatwierdzenia"
   careful-bot: "Botからのフォローだけ承認制にする"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "Inne"
   privacy: "Prywatność"
   save: "Zapisz"
@@ -527,10 +538,10 @@ common/views/widgets/tips.vue:
   tips-line19: "Część okien może zostać odłączona z przeglądarki."
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示しています"
   tips-line21: "Możesz też używać API, aby tworzyć boty."
-  tips-line23: "まゆかわいいよまゆ"
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskey zaczął działać w 2014."
   tips-line25: "Możesz otrzymywać powiadomienia nawet jeżeli Misskey nie jest otwarty w obsługiwanej przeglądarce."
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "Zalogowany jako {}"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "Informacje o lokalizacji"
   renote: "Udostępnij"
   add-reaction: "Dodaj reakcję"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "Odpowiedz"
   renote: "Udostępnij"
   add-reaction: "Dodaj reakcję"
+  undo-reaction: "リアクション解除"
   detail: "Szczegóły"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "Uwierzytelnianie dwuetapowe"
   other: "Inne"
   license: "Licencja"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "Motyw"
   behaviour: "Zachowanie"
   fetch-on-scroll: "Automatycznie ładuj po przeciągnięciu w dół"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "Tryb ciemny"
   use-shadow: "Użyj cieni w UI"
   rounded-corners: "Zaokrąglaj rogi w UI"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "Używaj okrągłych ikon"
   contrasted-acct: "ユーザー名にコントラストを付ける"
   post-form-on-timeline: "Wyświetlaj formularz tworzenia wpisu w górnej części osi czasu"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "Pamięć podręczna informacji o koncie/wpisów/odpowiedzi/wiadomości/ustawień przechowywanych w przeglądarce zostanie usunięta. Będziesz musiał odświeżyć stronę po wyczyszczeniu."
   cache-cleared: "Wyczyszczono pamięć podręczną"
   cache-cleared-desc: "Proszę odświeżyć stronę."
-  auto-watch: "Automatycznie nasłuchuj"
-  auto-watch-desc: "Otrzymuj natychmiastowo informacje o wpisach/odpowiedziach/reakcjach."
   about: "O Misskey"
   operator: "Administrator instancji"
   update: "Aktualizacja Misskey"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "Wprowadź hasło"
   authenticator: "Na początek musisz zainstalować Google Authenticator na swoim urządzeniu:"
   howtoinstall: "Jak zainstalować"
+  token: "トークン"
   scan: "Później, zeskanuje ten kod QR:"
   done: "Wprowadź token wyświetlony na Twoim urządzeniu:"
   submit: "Wyślij"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "Wprowadź hasło"
   console:
-    title: 'Konsola API'
-    endpoint: 'エンドポイント'
-    parameter: 'Parametry'
+    title: "Konsola API"
+    endpoint: "エンドポイント"
+    parameter: "Parametry"
     credential-info: "「i」パラメータは自動で付与されます。"
-    send: 'Wyślij'
-    sending: '応答待ち'
-    response: '結果'
+    send: "Wyślij"
+    sending: "応答待ち"
+    response: "結果"
 desktop/views/components/settings.apps.vue:
   no-apps: "Brak zautoryzowanych aplikacji"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "Wpisy"
   following: "Śledzeni"
   followers: "Śledzący"
+  mention: "メンション"
   is-bot: "To konto jest botem"
   years-old: "{age} lat"
   year: "/"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "Wpisy"
   with-replies: "Wpisy i odpowiedzi"
   with-media: "Multimedia"
+  my-posts: "私の投稿"
   empty: "Ten użytkownik nie umieścił jeszcze niczego."
 desktop/views/widgets/messaging.vue:
   title: "Wiadomości"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知の表示"
   notification-position-bottom: "Dół"
   notification-position-top: "Góra"
-  theme: "Motyw"
   behavior: "Zachowanie"
   fetch-on-scroll: "Automatycznie ładuj po przeciągnięciu w dół"
   note-visibility: "Widoczność wpisów"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "Przegląd"
   timeline: "Oś czasu"
   media: "Multimedia"
-  is-suspended: "To konto zostało zablokowane"
   mute: "Wycisz"
   unmute: "ミュート解除"
   block: "Zablokuj"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "Wpisy"
   following: "Śledzeni"
   followers: "Śledzący"
+  mention: "メンション"
   images: "Zdjęcia"
   activity: "Aktywność"
   timeline: "Oś czasu"

locales/pt-PT.yml

@@ -90,7 +90,6 @@ common:
     followers-desc: "自分のフォロワーにのみ公開"
     specified: "ダイレクト"
     specified-desc: "指定したユーザーにのみ公開"
-    private: "非公開"
     local-public: "公開 (ローカルのみ)"
     local-home: "ホーム (ローカルのみ)"
     local-followers: "フォロワー (ローカルのみ)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "Seu token foi recriado, portanto você foi deslogado."
   i-like-sushi: "Eu prefiro sushi a pudim"
   show-reversi-board-labels: "Mostrar etiquetas de colunas e linhas no Reversi"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "Conta verificada"
   disable-animated-mfm: "Desativar texto animado nas publicações"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "UIの動きを減らす"
   this-setting-is-this-device-only: "このデバイスのみ"
   use-os-default-emojis: "OS標準の絵文字を使用"
-  do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
+  do-not-use-in-production: "これは開発ビルドです。本番環境で使用しないでください。"
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user}がRenote"
   error:
-    title: '問題が発生しました'
-    retry: 'やり直す'
+    title: "問題が発生しました"
+    retry: "やり直す"
   reversi:
     drawn: "Empatado"
     my-turn: "Seu turno"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "非ダークモード時に使用するテーマ"
   dark-theme: "ダークモード時に使用するテーマ"
   light-themes: "明るいテーマ"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "ベーステーマ"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "テーマ名"
   preview-created-theme: "プレビュー"
   invalid-theme: "テーマが正しくありません。"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "もっと見る"
   chars: "{count}文字"
   files: "{count}ファイル"
+  poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "ユーザーを探す"
   you: "Você"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "開発者"
   feedback: "フィードバック"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "接続中"
   reconnecting: "再接続中"
   connected: "接続完了"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "接続する"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "自分のフォロワーにのみ公開"
   specified: "ダイレクト"
   specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
   local-public: "公開 (ローカルのみ)"
   local-public-desc: "リモートへは公開しない"
   local-home: "ホーム (ローカルのみ)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotです"
   is-locked: "フォローを承認制にする"
   careful-bot: "Botからのフォローだけ承認制にする"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシー"
   save: "保存"
@@ -527,10 +538,10 @@ common/views/widgets/tips.vue:
   tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができます"
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示しています"
   tips-line21: "APIを利用してbotの開発なども行えます"
-  tips-line23: "まゆかわいいよまゆ"
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskeyは2014年にサービスを開始しました"
   tips-line25: "対応ブラウザではMisskeyを開いていなくても通知を受け取れます"
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "{}としてサインイン中"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
   detail: "詳細"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "二段階認証"
   other: "その他"
   license: "ライセンス"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "テーマ"
   behaviour: "動作"
   fetch-on-scroll: "スクロールで自動読み込み"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "ダークモード"
   use-shadow: "UIに影を使用"
   rounded-corners: "UIの角を丸める"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "円形のアイコンを使用"
   contrasted-acct: "ユーザー名にコントラストを付ける"
   post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
   cache-cleared: "キャッシュを削除しました"
   cache-cleared-desc: "ページを再度読み込みしてください。"
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
   about: "Misskeyについて"
   operator: "このサーバーの運営者"
   update: "Misskey Update"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "パスワードを入力してください"
   authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
   howtoinstall: "インストール方法はこちら"
+  token: "トークン"
   scan: "次に、表示されているQRコードをスキャンします:"
   done: "お使いのデバイスに表示されているトークンを入力して完了します:"
   submit: "完了"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "パスワードを入力してください"
   console:
-    title: 'APIコンソール'
-    endpoint: 'エンドポイント'
-    parameter: 'パラメータ'
+    title: "APIコンソール"
+    endpoint: "エンドポイント"
+    parameter: "パラメータ"
     credential-info: "「i」パラメータは自動で付与されます。"
-    send: '送信'
-    sending: '応答待ち'
-    response: '結果'
+    send: "送信"
+    sending: "応答待ち"
+    response: "結果"
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   is-bot: "このアカウントはBotです"
   years-old: "{age}歳"
   year: "年"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "投稿"
   with-replies: "投稿と返信"
   with-media: "メディア"
+  my-posts: "私の投稿"
   empty: "このユーザーはまだ何も投稿していないようです。"
 desktop/views/widgets/messaging.vue:
   title: "メッセージ"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知の表示"
   notification-position-bottom: "下"
   notification-position-top: "上"
-  theme: "テーマ"
   behavior: "動作"
   fetch-on-scroll: "スクロールで自動読み込み"
   note-visibility: "投稿の公開範囲"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "概要"
   timeline: "Linha do tempo"
   media: "Mídia"
-  is-suspended: "Esta conta foi suspensa"
   mute: "ミュート"
   unmute: "ミュート解除"
   block: "ブロック"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   images: "画像"
   activity: "アクティビティ"
   timeline: "タイムライン"

locales/ru-RU.yml

@@ -26,12 +26,12 @@ common:
   close: "Закрыть"
   do-not-copy-paste: "Пожалуйста, не вводите и не вставляйте сюда код. Аккаунту может угрожать опасность."
   load-more: "Загрузить больше"
-  enter-password: "パスワードを入力してください"
+  enter-password: "Пожалуйста, введите ваш пароль"
   got-it: "わかった"
   customization-tips:
-    title: "カスタマイズのヒント"
+    title: "Советы по настройке"
     paragraph: "<p>ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。</p><p>一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。</p><p>ウィジェットを削除するには、ヘッダーの<strong>「ゴミ箱」</strong>と書かれたエリアにウィジェットをドラッグ&ドロップします。</p><p>カスタマイズを終了するには、右上の「完了」をクリックします。</p>"
-    gotit: "Got it!"
+    gotit: "Понятно!"
   notification:
     file-uploaded: "Файл отправлен!"
     message-from: "Сообщение от {}:"
@@ -64,17 +64,17 @@ common:
     friday: "Пт"
     saturday: "Сб"
   weekday:
-    sunday: "日曜日"
-    monday: "月曜日"
-    tuesday: "火曜日"
-    wednesday: "水曜日"
-    thursday: "木曜日"
-    friday: "金曜日"
-    saturday: "土曜日"
+    sunday: "Воскресенье"
+    monday: "Понедельник"
+    tuesday: "Вторник"
+    wednesday: "Среда"
+    thursday: "Четверг"
+    friday: "Пятница"
+    saturday: "Суббота"
   reactions:
-    like: "いいね"
+    like: "Нравится"
     love: "しゅき"
-    laugh: "笑"
+    laugh: "Ха-Ха"
     hmm: "ふぅ～む"
     surprise: "わお"
     congrats: "おめでとう"
@@ -90,7 +90,6 @@ common:
     followers-desc: "自分のフォロワーにのみ公開"
     specified: "ダイレクト"
     specified-desc: "指定したユーザーにのみ公開"
-    private: "非公開"
     local-public: "公開 (ローカルのみ)"
     local-home: "ホーム (ローカルのみ)"
     local-followers: "フォロワー (ローカルのみ)"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "公式アカウント"
   disable-animated-mfm: "Отключить анимированный текст в постах"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "Уменьшить движение в интерфейсе"
   this-setting-is-this-device-only: "Только для этого устройства"
   use-os-default-emojis: "Использовать стандартные Emoji из ОС"
-  do-not-use-in-production: 'Эта сборка для разработчиков. Не используйте в продакшне.'
+  do-not-use-in-production: "Эта сборка для разработчиков. Не используйте в продакшне."
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "このユーザー情報はコピーです。"
   is-remote-post: "この投稿情報はコピーです。"
   view-on-remote: "正確な情報を見る"
   renoted-by: "{user}がRenote"
   error:
-    title: 'Что-то пошло не так :('
-    retry: 'Повторить'
+    title: "Что-то пошло не так :("
+    retry: "Повторить"
   reversi:
     drawn: "Ничья"
     my-turn: "Ваш ход"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "閲覧注意"
   click-to-show: "クリックして表示"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "非ダークモード時に使用するテーマ"
   dark-theme: "ダークモード時に使用するテーマ"
   light-themes: "明るいテーマ"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "ベーステーマ"
   base-theme-light: "Light"
   base-theme-dark: "Dark"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "テーマ名"
   preview-created-theme: "プレビュー"
   invalid-theme: "テーマが正しくありません。"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "もっと見る"
   chars: "{count}文字"
   files: "{count}ファイル"
+  poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "ユーザーを探す"
   you: "あなた"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "開発者"
   feedback: "フィードバック"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "詳細"
   copy-link: "リンクをコピー"
   favorite: "お気に入り"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "接続中"
   reconnecting: "再接続中"
   connected: "接続完了"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "接続する"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "自分のフォロワーにのみ公開"
   specified: "ダイレクト"
   specified-desc: "指定したユーザーにのみ公開"
-  private: "非公開"
   local-public: "公開 (ローカルのみ)"
   local-public-desc: "リモートへは公開しない"
   local-home: "ホーム (ローカルのみ)"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "このアカウントはBotです"
   is-locked: "フォローを承認制にする"
   careful-bot: "Botからのフォローだけ承認制にする"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "その他"
   privacy: "プライバシー"
   save: "保存"
@@ -527,10 +538,10 @@ common/views/widgets/tips.vue:
   tips-line19: "いくつかのウィンドウはブラウザの外に切り離すことができます"
   tips-line20: "カレンダーウィジェットのパーセンテージは、経過の割合を示しています"
   tips-line21: "APIを利用してbotの開発なども行えます"
-  tips-line23: "まゆかわいいよまゆ"
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskeyは2014年にサービスを開始しました"
   tips-line25: "対応ブラウザではMisskeyを開いていなくても通知を受け取れます"
-common/views/pages/404.vue:
+common/views/pages/not-found.vue:
   page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "{}としてサインイン中"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "位置情報"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "返信"
   renote: "Renote"
   add-reaction: "リアクション"
+  undo-reaction: "リアクション解除"
   detail: "詳細"
   private: "この投稿は非公開です"
   deleted: "この投稿は削除されました"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "二段階認証"
   other: "その他"
   license: "ライセンス"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "テーマ"
   behaviour: "動作"
   fetch-on-scroll: "スクロールで自動読み込み"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "ダークモード"
   use-shadow: "UIに影を使用"
   rounded-corners: "UIの角を丸める"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "円形のアイコンを使用"
   contrasted-acct: "ユーザー名にコントラストを付ける"
   post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
   cache-cleared: "キャッシュを削除しました"
   cache-cleared-desc: "ページを再度読み込みしてください。"
-  auto-watch: "投稿の自動ウォッチ"
-  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
   about: "Misskeyについて"
   operator: "このサーバーの運営者"
   update: "Misskey Update"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "パスワードを入力してください"
   authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
   howtoinstall: "インストール方法はこちら"
+  token: "トークン"
   scan: "次に、表示されているQRコードをスキャンします:"
   done: "お使いのデバイスに表示されているトークンを入力して完了します:"
   submit: "完了"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "Token:"
   enter-password: "パスワードを入力してください"
   console:
-    title: 'APIコンソール'
-    endpoint: 'エンドポイント'
-    parameter: 'パラメータ'
+    title: "APIコンソール"
+    endpoint: "エンドポイント"
+    parameter: "パラメータ"
     credential-info: "「i」パラメータは自動で付与されます。"
-    send: '送信'
-    sending: '応答待ち'
-    response: '結果'
+    send: "送信"
+    sending: "応答待ち"
+    response: "結果"
 desktop/views/components/settings.apps.vue:
   no-apps: "連携しているアプリケーションはありません"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   is-bot: "このアカウントはBotです"
   years-old: "{age}歳"
   year: "年"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "投稿"
   with-replies: "投稿と返信"
   with-media: "メディア"
+  my-posts: "私の投稿"
   empty: "このユーザーはまだ何も投稿していないようです。"
 desktop/views/widgets/messaging.vue:
   title: "メッセージ"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知の表示"
   notification-position-bottom: "下"
   notification-position-top: "上"
-  theme: "テーマ"
   behavior: "動作"
   fetch-on-scroll: "スクロールで自動読み込み"
   note-visibility: "投稿の公開範囲"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "概要"
   timeline: "タイムライン"
   media: "メディア"
-  is-suspended: "このユーザーは凍結されています。"
   mute: "ミュート"
   unmute: "ミュート解除"
   block: "ブロック"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "投稿"
   following: "フォロー"
   followers: "フォロワー"
+  mention: "メンション"
   images: "画像"
   activity: "アクティビティ"
   timeline: "タイムライン"

locales/zh-CN.yml

@@ -90,7 +90,6 @@ common:
     followers-desc: "仅发送至粉丝"
     specified: "指定用户"
     specified-desc: "仅发送至指定用户"
-    private: "私密"
     local-public: "公开（仅限本地）"
     local-home: "首页（仅限本地）"
     local-followers: "关注者（仅限本地）"
@@ -110,7 +109,7 @@ common:
   my-token-regenerated: "您的 Token 已被重置, 您将自动登出。"
   i-like-sushi: "相比于布丁来说, 我更喜欢寿司。"
   show-reversi-board-labels: "在 Reversi 中显示行和列表签"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "认证用户"
   disable-animated-mfm: "在帖子中禁用动画文本"
   suggest-recent-hashtags: "在帖子表单上显示最近流行的主题标签"
@@ -121,14 +120,15 @@ common:
   reduce-motion: "减弱UI中的动画效果"
   this-setting-is-this-device-only: "设置仅在本设备中生效"
   use-os-default-emojis: "使用设备系统默认的 emojis"
-  do-not-use-in-production: '这是一个开发者测试版. 请勿在生产环境中使用.'
+  do-not-use-in-production: "这是一个开发者测试版. 请勿在生产环境中使用."
+  user-suspended: "このユーザーは凍結されています。"
   is-remote-user: "该用户的信息已被复制."
   is-remote-post: "该投稿已被复制."
   view-on-remote: "查看准确的信息"
   renoted-by: "由 {user} Renote"
   error:
-    title: '哦不, 发生了一些问题! :('
-    retry: '重试'
+    title: "哦不, 发生了一些问题! :("
+    retry: "重试"
   reversi:
     drawn: "平局"
     my-turn: "轮到你了"
@@ -260,6 +260,7 @@ common/views/components/media-banner.vue:
   sensitive: "阅读注意"
   click-to-show: "点击以显示"
 common/views/components/theme.vue:
+  theme: "テーマ"
   light-theme: "主题"
   dark-theme: "黑暗模式主题"
   light-themes: "明亮主题"
@@ -276,6 +277,7 @@ common/views/components/theme.vue:
   base-theme: "基础主题"
   base-theme-light: "亮"
   base-theme-dark: "暗"
+  find-more-theme: "その他のテーマを入手"
   theme-name: "主题名称"
   preview-created-theme: "预览"
   invalid-theme: "无效主题"
@@ -299,6 +301,7 @@ common/views/components/cw-button.vue:
   show: "查看更多"
   chars: "{count}文字"
   files: "{count} 个文件"
+  poll: "アンケート"
 common/views/components/messaging.vue:
   search-user: "查找用户"
   you: "您"
@@ -328,6 +331,7 @@ common/views/components/nav.vue:
   develop: "开发者"
   feedback: "反馈"
 common/views/components/note-menu.vue:
+  mention: "メンション"
   detail: "详细信息"
   copy-link: "复制链接"
   favorite: "收藏这个投稿"
@@ -403,6 +407,13 @@ common/views/components/stream-indicator.vue:
   connecting: "连接中"
   reconnecting: "重新连接中"
   connected: "已连接"
+common/views/components/notification-settings.vue:
+  title: "通知"
+  mark-as-read-all-notifications: "すべての通知を既読にする"
+  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
+  mark-as-read-all-talk-messages: "すべてのトークを既読にする"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
 common/views/components/integration-settings.vue:
   title: "サービス連携"
   connect: "连接"
@@ -432,7 +443,6 @@ common/views/components/visibility-chooser.vue:
   followers-desc: "仅发送至关注者"
   specified: "直接"
   specified-desc: "仅发送至指定用户"
-  private: "私密"
   local-public: "公开（仅限本地）"
   local-public-desc: "不要发布到公开"
   local-home: "首页（仅限本地）"
@@ -461,6 +471,7 @@ common/views/components/profile-editor.vue:
   is-bot: "整个账户是机器人"
   is-locked: "关注者请求需要批准"
   careful-bot: "机器人的关注者请求需要批准"
+  auto-accept-followed: "フォローしているユーザーからのフォローを自動承認する"
   advanced: "其他选项"
   privacy: "隐私"
   save: "保存"
@@ -527,11 +538,11 @@ common/views/widgets/tips.vue:
   tips-line19: "可以在浏览器外部分离多个窗口。"
   tips-line20: "日历小部件的百分比显示经过的时间百分比。"
   tips-line21: "您也可以使用API开发机器人。"
-  tips-line23: "Mayu的眉毛非常可爱。"
+  tips-line23: "藍かわいいよ藍"
   tips-line24: "Misskey自2014年开始运营。"
   tips-line25: "在与通知功能兼容的浏览器中，您可以在Misskey未打开的情况下接收通知"
-common/views/pages/404.vue:
-  page-not-found: "您要找的网页不存在。"
+common/views/pages/not-found.vue:
+  page-not-found: "ページが見つかりませんでした"
 common/views/pages/follow.vue:
   signed-in-as: "用 {}登录"
   following: "正在关注"
@@ -667,10 +678,12 @@ desktop/views/components/note-detail.vue:
   location: "位置信息"
   renote: "转发"
   add-reaction: "添加一个反应"
+  undo-reaction: "リアクション解除"
 desktop/views/components/note.vue:
   reply: "回复"
   renote: "Renote"
   add-reaction: "添加一个反应"
+  undo-reaction: "リアクション解除"
   detail: "详细信息"
   private: "这个投稿是私密的"
   deleted: "投稿已删除"
@@ -744,7 +757,6 @@ desktop/views/components/settings.vue:
   2fa: "两步验证"
   other: "其他"
   license: "许可证"
-  mark-as-read-all-unread-notes: "すべての投稿を既読にする"
   theme: "主题"
   behaviour: "行为"
   fetch-on-scroll: "向下滚动时自动加载"
@@ -770,6 +782,10 @@ desktop/views/components/settings.vue:
   dark-mode: "黑暗模式"
   use-shadow: "在UI中使用阴影效果"
   rounded-corners: "UI界面圆角效果"
+  line-width: "線の太さ"
+  line-width-thin: "細い"
+  line-width-normal: "普通"
+  line-width-thick: "太い"
   circle-icons: "使用圆形图标"
   contrasted-acct: "增加用户名的对比度"
   post-form-on-timeline: "在时间线顶部显示帖子表单"
@@ -801,8 +817,6 @@ desktop/views/components/settings.vue:
   cache-warn: "将删除存储在浏览器中的帐户信息/帖子/回复/消息/设置的缓存。 清理完毕后需要刷新页面。"
   cache-cleared: "已清除缓存"
   cache-cleared-desc: "请刷新页面。"
-  auto-watch: "自动查看帖子"
-  auto-watch-desc: "自动接收有关帖子/回复/反应的通知。"
   about: "关于 Misskey"
   operator: "网站运营者"
   update: "更新 Misskey"
@@ -841,6 +855,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "请输入您的密码"
   authenticator: "首先，您需要在设备上安装 Google Authenticator："
   howtoinstall: "怎样安装"
+  token: "トークン"
   scan: "然后，扫描二维码:"
   done: "请输入显示在您设备上的密钥:"
   submit: "提交"
@@ -855,13 +870,13 @@ common/views/components/api-settings.vue:
   token: "令牌:"
   enter-password: "请输入您的密码"
   console:
-    title: 'API 控制台'
-    endpoint: '端点'
-    parameter: '参数'
+    title: "API 控制台"
+    endpoint: "端点"
+    parameter: "参数"
     credential-info: "此控制台不需要参数“i”。"
-    send: '发送'
-    sending: '等待回应'
-    response: '结果'
+    send: "发送"
+    sending: "等待回应"
+    response: "结果"
 desktop/views/components/settings.apps.vue:
   no-apps: "没有已连接的应用程序"
 common/views/components/drive-settings.vue:
@@ -1215,6 +1230,7 @@ desktop/views/pages/user/user.header.vue:
   posts: "帖子"
   following: "关注中"
   followers: "关注者"
+  mention: "メンション"
   is-bot: "这个账户是Bot"
   years-old: "{age}岁"
   year: "年"
@@ -1224,6 +1240,7 @@ desktop/views/pages/user/user.timeline.vue:
   default: "帖子"
   with-replies: "帖子与回复"
   with-media: "媒体"
+  my-posts: "私の投稿"
   empty: "看起来这个用户还没有发布什么呢。"
 desktop/views/widgets/messaging.vue:
   title: "信息"
@@ -1422,7 +1439,6 @@ mobile/views/pages/settings.vue:
   notification-position: "通知形式"
   notification-position-bottom: "底部"
   notification-position-top: "顶部"
-  theme: "主题"
   behavior: "动作"
   fetch-on-scroll: "滚动无限加载"
   note-visibility: "帖子可见性"
@@ -1455,7 +1471,6 @@ mobile/views/pages/user.vue:
   overview: "概观"
   timeline: "时间线"
   media: "媒体"
-  is-suspended: "此账户已被冻结。"
   mute: "静音"
   unmute: "取消静音"
   block: "屏蔽"
@@ -1509,6 +1524,7 @@ deck/deck.user-column.vue:
   posts: "帖子"
   following: "关注中"
   followers: "关注者"
+  mention: "メンション"
   images: "图片"
   activity: "活动"
   timeline: "时间线"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.67.0",
-	"clientVersion": "2.0.12978",
+	"version": "10.73.0",
+	"clientVersion": "2.0.13266",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -23,14 +23,14 @@
 		"@fortawesome/fontawesome-svg-core": "1.2.8",
 		"@fortawesome/free-brands-svg-icons": "5.6.0",
 		"@fortawesome/free-regular-svg-icons": "5.5.0",
-		"@fortawesome/free-solid-svg-icons": "5.6.1",
+		"@fortawesome/free-solid-svg-icons": "5.6.3",
 		"@fortawesome/vue-fontawesome": "0.1.2",
-		"@koa/cors": "2.2.2",
+		"@koa/cors": "2.2.3",
 		"@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/dateformat": "3.0.0",
 		"@types/debug": "0.0.31",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
@@ -44,7 +44,7 @@
 		"@types/gulp-util": "3.0.34",
 		"@types/is-root": "1.0.0",
 		"@types/is-url": "1.2.28",
-		"@types/js-yaml": "3.11.2",
+		"@types/js-yaml": "3.11.4",
 		"@types/katex": "0.5.0",
 		"@types/koa": "2.0.47",
 		"@types/koa-bodyparser": "5.0.2",
@@ -76,7 +76,7 @@
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
 		"@types/sharp": "0.21.0",
-		"@types/showdown": "1.7.5",
+		"@types/showdown": "1.9.0",
 		"@types/speakeasy": "2.0.3",
 		"@types/systeminformation": "3.23.1",
 		"@types/tinycolor2": "1.4.1",
@@ -111,8 +111,8 @@
 		"elasticsearch": "15.2.0",
 		"emojilib": "2.4.0",
 		"escape-regexp": "0.0.1",
-		"eslint": "5.8.0",
-		"eslint-plugin-vue": "4.7.1",
+		"eslint": "5.11.1",
+		"eslint-plugin-vue": "5.0.0",
 		"eventemitter3": "3.1.0",
 		"feed": "2.0.2",
 		"file-loader": "2.0.0",
@@ -155,7 +155,7 @@
 		"koa-slow": "2.1.0",
 		"koa-views": "6.1.4",
 		"langmap": "0.0.16",
-		"loader-utils": "1.1.0",
+		"loader-utils": "1.2.3",
 		"minio": "7.0.2",
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",
@@ -164,7 +164,7 @@
 		"mongodb": "3.1.10",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
-		"nan": "2.11.1",
+		"nan": "2.12.1",
 		"nested-property": "0.0.7",
 		"nodemailer": "4.7.0",
 		"nprogress": "0.2.0",
@@ -223,13 +223,13 @@
 		"vue-content-loading": "1.5.3",
 		"vue-cropperjs": "3.0.0",
 		"vue-i18n": "8.3.2",
-		"vue-js-modal": "1.3.27",
+		"vue-js-modal": "1.3.28",
 		"vue-loader": "15.4.2",
 		"vue-marquee-text-component": "1.1.0",
 		"vue-router": "3.0.2",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.4",
+		"vue-svg-inline-loader": "1.2.7",
 		"vue-template-compiler": "2.5.17",
 		"vuedraggable": "2.17.0",
 		"vuewordcloud": "18.7.11",

src/client/app/admin/script.ts

@@ -9,7 +9,7 @@ import './style.styl';
 
 import init from '../init';
 import Index from './views/index.vue';
-import NotFound from '../common/views/pages/404.vue';
+import NotFound from '../common/views/pages/not-found.vue';
 
 init(launch => {
 	document.title = 'Admin';

src/client/app/auth/script.ts

@@ -9,7 +9,7 @@ import './style.styl';
 
 import init from '../init';
 import Index from './views/index.vue';
-import NotFound from '../common/views/pages/404.vue';
+import NotFound from '../common/views/pages/not-found.vue';
 
 /**
  * init

src/client/app/common/scripts/get-median.ts

@@ -1,11 +0,0 @@
-/**
- * 中央値を求めます
- * @param samples サンプル
- */
-export default function(samples) {
-	if (!samples.length) return 0;
-	const numbers = samples.slice(0).sort((a, b) => a - b);
-	const middle = Math.floor(numbers.length / 2);
-	const isEven = numbers.length % 2 === 0;
-	return isEven ? (numbers[middle] + numbers[middle - 1]) / 2 : numbers[middle];
-}

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

@@ -65,6 +65,10 @@ export default (opts: Opts = {}) => ({
 			return this.isRenote ? this.note.renote : this.note;
 		},
 
+		isMyNote(): boolean {
+			return this.$store.getters.isSignedIn && (this.$store.state.i.id === this.appearNote.userId);
+		},
+
 		reactionsCount(): number {
 			return this.appearNote.reactionCounts
 				? sum(Object.values(this.appearNote.reactionCounts))
@@ -125,9 +129,7 @@ export default (opts: Opts = {}) => ({
 				source: this.$refs.reactButton,
 				note: this.appearNote,
 				showFocus: viaKeyboard,
-				animation: !viaKeyboard,
-				compact: opts.mobile,
-				big: opts.mobile
+				animation: !viaKeyboard
 			}).$once('closed', this.focus);
 		},
 
@@ -138,6 +140,14 @@ export default (opts: Opts = {}) => ({
 			});
 		},
 
+		undoReact(note) {
+			const oldReaction = note.myReaction;
+			if (!oldReaction) return;
+			this.$root.api('notes/reactions/delete', {
+				noteId: note.id
+			});
+		},
+
 		favorite() {
 			this.$root.api('notes/favorites/create', {
 				noteId: this.appearNote.id
@@ -159,8 +169,7 @@ export default (opts: Opts = {}) => ({
 			this.$root.new(MkNoteMenu, {
 				source: this.$refs.menuButton,
 				note: this.appearNote,
-				animation: !viaKeyboard,
-				compact: opts.mobile,
+				animation: !viaKeyboard
 			}).$once('closed', this.focus);
 		},
 

src/client/app/common/scripts/should-mute-note.ts

@@ -2,8 +2,17 @@ export default function(me, settings, note) {
 	const isMyNote = note.userId == me.id;
 	const isPureRenote = note.renoteId != null && note.text == null && note.fileIds.length == 0 && note.poll == null;
 
-	return settings.showMyRenotes === false && isMyNote && isPureRenote ||
-		settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id ||
-		settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null ||
-		!isMyNote && note.text && settings.mutedWords.some(q => q.length > 0 && !q.some(word => !note.text.includes(word)));
+	const includesMutedWords = (text: string) =>
+		text
+			? settings.mutedWords.some(q => q.length > 0 && !q.some(word => !text.includes(word)))
+			: false;
+
+	return (
+		(!isMyNote && note.reply && includesMutedWords(note.reply.text)) ||
+		(!isMyNote && note.renote && includesMutedWords(note.renote.text)) ||
+		(settings.showMyRenotes === false && isMyNote && isPureRenote) ||
+		(settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id) ||
+		(settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null) ||
+		(!isMyNote && includesMutedWords(note.text))
+	);
 }

src/client/app/common/views/components/cw-button.vue

@@ -1,11 +1,7 @@
 <template>
 <button class="nrvgflfuaxwgkxoynpnumyookecqrrvh" @click="toggle">
 	<b>{{ value ? this.$t('hide') : this.$t('show') }}</b>
-	<span v-if="!value">
-		<span v-if="note.text">{{ this.$t('chars', { count: length(note.text) }) | number }}</span>
-		<span v-if="note.text && note.files && note.files.length > 0"> / </span>
-		<span v-if="note.files && note.files.length > 0">{{ this.$t('files', { count: note.files.length }) }}</span>
-	</span>
+	<span v-if="!value">{{ this.label }}</span>
 </button>
 </template>
 
@@ -13,6 +9,7 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import { length } from 'stringz';
+import { concat } from '../../../../../prelude/array';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/cw-button.vue'),
@@ -28,6 +25,16 @@ export default Vue.extend({
 		}
 	},
 
+	computed: {
+		label(): string {
+			return concat([
+				this.note.text ? [this.$t('chars', { count: length(this.note.text) })] : [],
+				this.note.files && this.note.files.length !== 0 ? [this.$t('files', { count: this.note.files.length }) ] : [],
+				this.note.poll != null ? [this.$t('poll')] : []
+			] as string[][]).join(' / ');
+		}
+	},
+
 	methods: {
 		length,
 

src/client/app/common/views/components/formula-core.vue

@@ -15,7 +15,9 @@ export default Vue.extend({
 	},
 	computed: {
 		compiledFormula(): any {
-			return katex.renderToString(this.formula);
+			return katex.renderToString(this.formula, {
+				throwOnError: false
+			} as any);
 		}
 	}
 });

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

@@ -30,11 +30,11 @@
 						:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
 						@click="set(i)"
 						:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
-					<template v-if="!$store.state.settings.games.reversi.useWhiteBlackStones">
+					<template v-if="$store.state.settings.games.reversi.useAvatarStones">
 						<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black">
 						<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white">
 					</template>
-					<template v-if="$store.state.settings.games.reversi.useWhiteBlackStones">
+					<template v-else>
 						<fa v-if="stone === true" :icon="fasCircle"/>
 						<fa v-if="stone === false" :icon="farCircle"/>
 					</template>

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

@@ -53,14 +53,14 @@ export default Vue.extend({
 		pointer-events none
 		user-select none
 		padding 0 4px
-		background var(--primary)
-		border solid 1px var(--primary)
+		background var(--mfmMention)
+		border solid var(--lineWidth) var(--mfmMention)
 		border-radius 4px 0 0 4px
-		color var(--primaryForeground)
+		color var(--mfmMentionForeground)
 
 		& + .main
 			padding 0 4px
-			border solid 1px var(--primary)
+			border solid var(--lineWidth) var(--mfmMention)
 			border-radius 0 4px 4px 0
 
 	> .main

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

@@ -1,5 +1,5 @@
 <template>
-<div class="onchrpzrvnoruiaenfcqvccjfuupzzwv" :class="{ big: $root.isMobile }">
+<div class="onchrpzrvnoruiaenfcqvccjfuupzzwv" :class="{ isMobile: $root.isMobile }">
 	<div class="backdrop" ref="backdrop" @click="close"></div>
 	<div class="popover" :class="{ hukidasi }" ref="popover">
 		<template v-for="item, i in items">
@@ -24,16 +24,11 @@ export default Vue.extend({
 		items: {
 			type: Array,
 			required: true
-		},
-		compact: {
-			type: Boolean,
-			required: false,
-			default: false
 		}
 	},
 	data() {
 		return {
-			hukidasi: !this.compact
+			hukidasi: !this.$root.isMobile
 		};
 	},
 	mounted() {
@@ -47,7 +42,7 @@ export default Vue.extend({
 			let left;
 			let top;
 
-			if (this.compact) {
+			if (this.$root.isMobile) {
 				const x = rect.left + window.pageXOffset + (this.source.offsetWidth / 2);
 				const y = rect.top + window.pageYOffset + (this.source.offsetHeight / 2);
 				left = (x - (width / 2));
@@ -121,11 +116,10 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .onchrpzrvnoruiaenfcqvccjfuupzzwv
 	$bg-color = var(--popupBg)
-	$border-color = rgba(27, 31, 35, 0.15)
 
 	position initial
 
-	&.big
+	&.isMobile
 		> .popover
 			> button
 				font-size 15px
@@ -145,7 +139,6 @@ export default Vue.extend({
 		z-index 10001
 		padding 8px 0
 		background $bg-color
-		border 1px solid $border-color
 		border-radius 4px
 		box-shadow 0 3px 12px rgba(27, 31, 35, 0.15)
 		transform scale(0.5)
@@ -170,14 +163,6 @@ export default Vue.extend({
 				border-top solid $balloon-size transparent
 				border-left solid $balloon-size transparent
 				border-right solid $balloon-size transparent
-				border-bottom solid $balloon-size $border-color
-
-			&:after
-				top -($balloon-size * 2) + 1.5px
-				left s('calc(50% - %s)', $balloon-size)
-				border-top solid $balloon-size transparent
-				border-left solid $balloon-size transparent
-				border-right solid $balloon-size transparent
 				border-bottom solid $balloon-size $bg-color
 
 		> button
@@ -201,7 +186,7 @@ export default Vue.extend({
 
 		> div
 			margin 8px 0
-			height 1px
+			height var(--lineWidth)
 			background var(--faceDivider)
 
 </style>

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

@@ -129,8 +129,10 @@ export default Vue.component('misskey-flavored-markdown', {
 						key: Math.random(),
 						props: {
 							url: token.node.props.url,
-							target: '_blank',
-							style: 'color:var(--mfmLink);'
+							target: '_blank'
+						},
+						attrs: {
+							style: 'color:var(--mfmUrl);'
 						}
 					})];
 				}

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

@@ -18,8 +18,7 @@
 		<span class="visibility" v-if="note.visibility != 'public'">
 			<fa v-if="note.visibility == 'home'" icon="home"/>
 			<fa v-if="note.visibility == 'followers'" icon="unlock"/>
-			<fa v-if="note.visibility == 'specified'" icon="envelope"/>
-			<fa v-if="note.visibility == 'private'" icon="lock"/>
+			<fa v-if="note.visibility == 'specified'" icon="lock"/>
 		</span>
 		<span class="localOnly" v-if="note.localOnly == true"><fa icon="heart"/></span>
 	</div>

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

@@ -1,6 +1,6 @@
 <template>
 <div style="position:initial">
-	<mk-menu :source="source" :compact="compact" :items="items" @closed="closed"/>
+	<mk-menu :source="source" :items="items" @closed="closed"/>
 </div>
 </template>
 
@@ -13,10 +13,17 @@ import { concat, intersperse } from '../../../../../prelude/array';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/note-menu.vue'),
-	props: ['note', 'source', 'compact'],
+	props: ['note', 'source'],
 	computed: {
 		items(): any[] {
 			return concat(intersperse([null], [
+				[
+					[{
+						icon: 'at',
+						text: this.$t('mention'),
+						action: this.mention
+					}]
+				],
 				[
 					[{
 						icon: 'info-circle',
@@ -66,6 +73,10 @@ export default Vue.extend({
 	},
 
 	methods: {
+		mention() {
+			this.$post({ mention: this.note.user });
+		},
+
 		detail() {
 			this.$router.push(`/notes/${this.note.id}`);
 		},

src/client/app/common/views/components/notification-settings.vue

@@ -0,0 +1,44 @@
+<template>
+<ui-card>
+	<div slot="title"><fa :icon="['far', 'bell']"/> {{ $t('title') }}</div>
+	<section>
+		<ui-switch v-model="$store.state.i.settings.autoWatch" @change="onChangeAutoWatch">
+			{{ $t('auto-watch') }}<span slot="desc">{{ $t('auto-watch-desc') }}</span>
+		</ui-switch>
+		<section>
+			<ui-button @click="readAllNotifications">{{ $t('mark-as-read-all-notifications') }}</ui-button>
+			<ui-button @click="readAllUnreadNotes">{{ $t('mark-as-read-all-unread-notes') }}</ui-button>
+			<ui-button @click="readAllMessagingMessages">{{ $t('mark-as-read-all-talk-messages') }}</ui-button>
+		</section>
+	</section>
+</ui-card>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/notification-settings.vue'),
+
+	methods: {
+		onChangeAutoWatch(v) {
+			this.$root.api('i/update', {
+				autoWatch: v
+			});
+		},
+
+		readAllUnreadNotes() {
+			this.$root.api('i/read_all_unread_notes');
+		},
+
+		readAllMessagingMessages() {
+			this.$root.api('i/read_all_messaging_messages');
+		},
+
+		readAllNotifications() {
+			this.$root.api('notifications/mark_all_as_read');
+		}
+	}
+});
+</script>

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

@@ -69,7 +69,8 @@
 
 		<div>
 			<ui-switch v-model="isLocked" @change="save(false)">{{ $t('is-locked') }}</ui-switch>
-			<ui-switch v-model="carefulBot" @change="save(false)">{{ $t('careful-bot') }}</ui-switch>
+			<ui-switch v-model="carefulBot" :disabled="isLocked" @change="save(false)">{{ $t('careful-bot') }}</ui-switch>
+			<ui-switch v-model="autoAcceptFollowed" :disabled="!isLocked && !carefulBot" @change="save(false)">{{ $t('auto-accept-followed') }}</ui-switch>
 		</div>
 	</section>
 
@@ -118,6 +119,7 @@ export default Vue.extend({
 			isBot: false,
 			isLocked: false,
 			carefulBot: false,
+			autoAcceptFollowed: false,
 			saving: false,
 			avatarUploading: false,
 			bannerUploading: false
@@ -156,6 +158,7 @@ export default Vue.extend({
 		this.isBot = this.$store.state.i.isBot;
 		this.isLocked = this.$store.state.i.isLocked;
 		this.carefulBot = this.$store.state.i.carefulBot;
+		this.autoAcceptFollowed = this.$store.state.i.autoAcceptFollowed;
 	},
 
 	methods: {
@@ -217,7 +220,8 @@ export default Vue.extend({
 				isCat: !!this.isCat,
 				isBot: !!this.isBot,
 				isLocked: !!this.isLocked,
-				carefulBot: !!this.carefulBot
+				carefulBot: !!this.carefulBot,
+				autoAcceptFollowed: !!this.autoAcceptFollowed
 			}).then(i => {
 				this.saving = false;
 				this.$store.state.i.avatarId = i.avatarId;

src/client/app/common/views/components/reaction-picker.vue

@@ -1,8 +1,8 @@
 <template>
-<div class="mk-reaction-picker" v-hotkey.global="keymap">
+<div class="rdfaahpb" v-hotkey.global="keymap">
 	<div class="backdrop" ref="backdrop" @click="close"></div>
-	<div class="popover" :class="{ compact, big }" ref="popover">
-		<p v-if="!compact">{{ title }}</p>
+	<div class="popover" :class="{ isMobile: $root.isMobile }" ref="popover">
+		<p v-if="!$root.isMobile">{{ title }}</p>
 		<div ref="buttons" :class="{ showFocus }">
 			<button @click="react('like')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="1" :title="$t('@.reactions.like')" v-particle><mk-reaction-icon reaction="like"/></button>
 			<button @click="react('love')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="2" :title="$t('@.reactions.love')" v-particle><mk-reaction-icon reaction="love"/></button>
@@ -36,22 +36,10 @@ export default Vue.extend({
 			required: true
 		},
 
-		compact: {
-			type: Boolean,
-			required: false,
-			default: false
-		},
-
 		cb: {
 			required: false
 		},
 
-		big: {
-			type: Boolean,
-			required: false,
-			default: false
-		},
-
 		showFocus: {
 			type: Boolean,
 			required: false,
@@ -115,7 +103,7 @@ export default Vue.extend({
 			const width = popover.offsetWidth;
 			const height = popover.offsetHeight;
 
-			if (this.compact) {
+			if (this.$root.isMobile) {
 				const x = rect.left + window.pageXOffset + (this.source.offsetWidth / 2);
 				const y = rect.top + window.pageYOffset + (this.source.offsetHeight / 2);
 				popover.style.left = (x - (width / 2)) + 'px';
@@ -210,9 +198,7 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-$border-color = rgba(27, 31, 35, 0.15)
-
-.mk-reaction-picker
+.rdfaahpb
 	position initial
 
 	> .backdrop
@@ -230,41 +216,12 @@ $border-color = rgba(27, 31, 35, 0.15)
 		position absolute
 		z-index 10001
 		background $bgcolor
-		border 1px solid $border-color
 		border-radius 4px
 		box-shadow 0 3px 12px rgba(27, 31, 35, 0.15)
 		transform scale(0.5)
 		opacity 0
 
-		$balloon-size = 16px
-
-		&:not(.compact)
-			margin-top $balloon-size
-			transform-origin center -($balloon-size)
-
-			&:before
-				content ""
-				display block
-				position absolute
-				top -($balloon-size * 2)
-				left s('calc(50% - %s)', $balloon-size)
-				border-top solid $balloon-size transparent
-				border-left solid $balloon-size transparent
-				border-right solid $balloon-size transparent
-				border-bottom solid $balloon-size $border-color
-
-			&:after
-				content ""
-				display block
-				position absolute
-				top -($balloon-size * 2) + 1.5px
-				left s('calc(50% - %s)', $balloon-size)
-				border-top solid $balloon-size transparent
-				border-left solid $balloon-size transparent
-				border-right solid $balloon-size transparent
-				border-bottom solid $balloon-size $bgcolor
-
-		&.big
+		&.isMobile
 			> div
 				width 280px
 
@@ -274,13 +231,30 @@ $border-color = rgba(27, 31, 35, 0.15)
 					font-size 28px
 					border-radius 4px
 
+		&:not(.isMobile)
+			$arrow-size = 16px
+
+			margin-top $arrow-size
+			transform-origin center -($arrow-size)
+
+			&:before
+				content ""
+				display block
+				position absolute
+				top -($arrow-size * 2)
+				left s('calc(50% - %s)', $arrow-size)
+				border-top solid $arrow-size transparent
+				border-left solid $arrow-size transparent
+				border-right solid $arrow-size transparent
+				border-bottom solid $arrow-size $bgcolor
+
 		> p
 			display block
 			margin 0
 			padding 8px 10px
 			font-size 14px
 			color var(--popupFg)
-			border-bottom solid 1px var(--faceDivider)
+			border-bottom solid var(--lineWidth) var(--faceDivider)
 
 		> div
 			padding 4px

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

@@ -1,16 +1,16 @@
 <template>
-<div class="mk-reactions-viewer">
+<div class="mk-reactions-viewer" :class="{ isMe }">
 	<template v-if="reactions">
-		<span :class="{ reacted: note.myReaction == 'like' }" @click="toggleReaction('like')" v-if="reactions.like" v-particle><mk-reaction-icon reaction="like" ref="like"/><span>{{ reactions.like }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'love' }" @click="toggleReaction('love')" v-if="reactions.love" v-particle><mk-reaction-icon reaction="love" ref="love"/><span>{{ reactions.love }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'laugh' }" @click="toggleReaction('laugh')" v-if="reactions.laugh" v-particle><mk-reaction-icon reaction="laugh" ref="laugh"/><span>{{ reactions.laugh }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'hmm' }" @click="toggleReaction('hmm')" v-if="reactions.hmm" v-particle><mk-reaction-icon reaction="hmm" ref="hmm"/><span>{{ reactions.hmm }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'surprise' }" @click="toggleReaction('surprise')" v-if="reactions.surprise" v-particle><mk-reaction-icon reaction="surprise" ref="surprise"/><span>{{ reactions.surprise }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'congrats' }" @click="toggleReaction('congrats')" v-if="reactions.congrats" v-particle><mk-reaction-icon reaction="congrats" ref="congrats"/><span>{{ reactions.congrats }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'angry' }" @click="toggleReaction('angry')" v-if="reactions.angry" v-particle><mk-reaction-icon reaction="angry" ref="angry"/><span>{{ reactions.angry }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'confused' }" @click="toggleReaction('confused')" v-if="reactions.confused" v-particle><mk-reaction-icon reaction="confused" ref="confused"/><span>{{ reactions.confused }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'rip' }" @click="toggleReaction('rip')" v-if="reactions.rip" v-particle><mk-reaction-icon reaction="rip" ref="rip"/><span>{{ reactions.rip }}</span></span>
-		<span :class="{ reacted: note.myReaction == 'pudding' }" @click="toggleReaction('pudding')" v-if="reactions.pudding" v-particle><mk-reaction-icon reaction="pudding" ref="pudding"/><span>{{ reactions.pudding }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'like' }" @click="toggleReaction('like')" v-if="reactions.like" v-particle="!isMe"><mk-reaction-icon reaction="like" ref="like"/><span>{{ reactions.like }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'love' }" @click="toggleReaction('love')" v-if="reactions.love" v-particle="!isMe"><mk-reaction-icon reaction="love" ref="love"/><span>{{ reactions.love }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'laugh' }" @click="toggleReaction('laugh')" v-if="reactions.laugh" v-particle="!isMe"><mk-reaction-icon reaction="laugh" ref="laugh"/><span>{{ reactions.laugh }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'hmm' }" @click="toggleReaction('hmm')" v-if="reactions.hmm" v-particle="!isMe"><mk-reaction-icon reaction="hmm" ref="hmm"/><span>{{ reactions.hmm }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'surprise' }" @click="toggleReaction('surprise')" v-if="reactions.surprise" v-particle="!isMe"><mk-reaction-icon reaction="surprise" ref="surprise"/><span>{{ reactions.surprise }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'congrats' }" @click="toggleReaction('congrats')" v-if="reactions.congrats" v-particle="!isMe"><mk-reaction-icon reaction="congrats" ref="congrats"/><span>{{ reactions.congrats }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'angry' }" @click="toggleReaction('angry')" v-if="reactions.angry" v-particle="!isMe"><mk-reaction-icon reaction="angry" ref="angry"/><span>{{ reactions.angry }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'confused' }" @click="toggleReaction('confused')" v-if="reactions.confused" v-particle="!isMe"><mk-reaction-icon reaction="confused" ref="confused"/><span>{{ reactions.confused }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'rip' }" @click="toggleReaction('rip')" v-if="reactions.rip" v-particle="!isMe"><mk-reaction-icon reaction="rip" ref="rip"/><span>{{ reactions.rip }}</span></span>
+		<span :class="{ reacted: note.myReaction == 'pudding' }" @click="toggleReaction('pudding')" v-if="reactions.pudding" v-particle="!isMe"><mk-reaction-icon reaction="pudding" ref="pudding"/><span>{{ reactions.pudding }}</span></span>
 	</template>
 </div>
 </template>
@@ -21,10 +21,18 @@ import Icon from './reaction-icon.vue';
 import * as anime from 'animejs';
 
 export default Vue.extend({
-	props: ['note'],
+	props: {
+		note: {
+			type: Object,
+			required: true
+		}
+	},
 	computed: {
 		reactions(): any {
 			return this.note.reactionCounts;
+		},
+		isMe(): boolean {
+			return this.$store.getters.isSignedIn && (this.$store.state.i.id === this.note.userId);
 		}
 	},
 	watch: {
@@ -61,6 +69,8 @@ export default Vue.extend({
 	},
 	methods: {
 		toggleReaction(reaction: string) {
+			if (this.isMe) return;
+
 			const oldReaction = this.note.myReaction;
 			if (oldReaction) {
 				this.$root.api('notes/reactions/delete', {
@@ -128,12 +138,20 @@ export default Vue.extend({
 	&:empty
 		display none
 
+	&.isMe
+		> span
+			cursor default !important
+
+			&:hover
+				background var(--reactionViewerButtonBg) !important
+
 	> span
 		display inline-block
 		height 32px
 		margin-right 6px
 		padding 0 6px
 		border-radius 4px
+		cursor pointer
 
 		*
 			user-select none
@@ -146,7 +164,6 @@ export default Vue.extend({
 				color var(--primaryForeground)
 
 		&:not(.reacted)
-			cursor pointer
 			background var(--reactionViewerButtonBg)
 
 			&:hover

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

@@ -13,8 +13,7 @@
 		<span class="visibility" v-if="note.visibility != 'public'">
 			<fa v-if="note.visibility == 'home'" icon="home"/>
 			<fa v-if="note.visibility == 'followers'" icon="unlock"/>
-			<fa v-if="note.visibility == 'specified'" icon="envelope"/>
-			<fa v-if="note.visibility == 'private'" icon="lock"/>
+			<fa v-if="note.visibility == 'specified'" icon="lock"/>
 		</span>
 		<span class="localOnly" v-if="note.localOnly == true"><fa icon="heart"/></span>
 	</div>

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

@@ -1,99 +1,104 @@
 <template>
-<div class="nicnklzforebnpfgasiypmpdaaglujqm">
-	<label>
-		<span><fa :icon="faSun"/> {{ $t('light-theme') }}</span>
-		<ui-select v-model="light" :placeholder="$t('light-theme')">
-			<optgroup :label="$t('light-themes')">
-				<option v-for="x in lightThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
-			</optgroup>
-			<optgroup :label="$t('dark-themes')">
-				<option v-for="x in darkThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
-			</optgroup>
-		</ui-select>
-	</label>
+<ui-card>
+	<div slot="title"><fa icon="palette"/> {{ $t('theme') }}</div>
+	<section class="nicnklzforebnpfgasiypmpdaaglujqm fit-top">
+		<label>
+			<ui-select v-model="light" :placeholder="$t('light-theme')">
+				<span slot="label"><fa :icon="faSun"/> {{ $t('light-theme') }}</span>
+				<optgroup :label="$t('light-themes')">
+					<option v-for="x in lightThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
+				</optgroup>
+				<optgroup :label="$t('dark-themes')">
+					<option v-for="x in darkThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
+				</optgroup>
+			</ui-select>
+		</label>
 
-	<label>
-		<span><fa :icon="faMoon"/> {{ $t('dark-theme') }}</span>
-		<ui-select v-model="dark" :placeholder="$t('dark-theme')">
-			<optgroup :label="$t('dark-themes')">
-				<option v-for="x in darkThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
-			</optgroup>
-			<optgroup :label="$t('light-themes')">
-				<option v-for="x in lightThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
-			</optgroup>
-		</ui-select>
-	</label>
+		<label>
+			<ui-select v-model="dark" :placeholder="$t('dark-theme')">
+				<span slot="label"><fa :icon="faMoon"/> {{ $t('dark-theme') }}</span>
+				<optgroup :label="$t('dark-themes')">
+					<option v-for="x in darkThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
+				</optgroup>
+				<optgroup :label="$t('light-themes')">
+					<option v-for="x in lightThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
+				</optgroup>
+			</ui-select>
+		</label>
 
-	<details class="creator">
-		<summary><fa icon="palette"/> {{ $t('create-a-theme') }}</summary>
-		<div>
-			<span>{{ $t('base-theme') }}:</span>
-			<ui-radio v-model="myThemeBase" value="light">{{ $t('base-theme-light') }}</ui-radio>
-			<ui-radio v-model="myThemeBase" value="dark">{{ $t('base-theme-dark') }}</ui-radio>
-		</div>
-		<div>
-			<ui-input v-model="myThemeName">
-				<span>{{ $t('theme-name') }}</span>
-			</ui-input>
-			<ui-textarea v-model="myThemeDesc">
-				<span>{{ $t('desc') }}</span>
-			</ui-textarea>
-		</div>
-		<div>
-			<div style="padding-bottom:8px;">{{ $t('primary-color') }}:</div>
-			<color-picker v-model="myThemePrimary"/>
-		</div>
-		<div>
-			<div style="padding-bottom:8px;">{{ $t('secondary-color') }}:</div>
-			<color-picker v-model="myThemeSecondary"/>
-		</div>
-		<div>
-			<div style="padding-bottom:8px;">{{ $t('text-color') }}:</div>
-			<color-picker v-model="myThemeText"/>
-		</div>
-		<ui-button @click="preview()"><fa icon="eye"/> {{ $t('preview-created-theme') }}</ui-button>
-		<ui-button primary @click="gen()"><fa :icon="['far', 'save']"/> {{ $t('save-created-theme') }}</ui-button>
-	</details>
+		<a href="https://assets.msky.cafe/theme/list" target="_blank">{{ $t('find-more-theme') }}</a>
 
-	<details>
-		<summary><fa icon="download"/> {{ $t('install-a-theme') }}</summary>
-		<ui-button @click="import_()"><fa icon="file-import"/> {{ $t('import') }}</ui-button>
-		<input ref="file" type="file" accept=".misskeytheme" style="display:none;" @change="onUpdateImportFile"/>
-		<p>{{ $t('import-by-code') }}:</p>
-		<ui-textarea v-model="installThemeCode">
-			<span>{{ $t('theme-code') }}</span>
-		</ui-textarea>
-		<ui-button @click="() => install(this.installThemeCode)"><fa icon="check"/> {{ $t('install') }}</ui-button>
-	</details>
+		<details class="creator">
+			<summary><fa icon="palette"/> {{ $t('create-a-theme') }}</summary>
+			<div>
+				<span>{{ $t('base-theme') }}:</span>
+				<ui-radio v-model="myThemeBase" value="light">{{ $t('base-theme-light') }}</ui-radio>
+				<ui-radio v-model="myThemeBase" value="dark">{{ $t('base-theme-dark') }}</ui-radio>
+			</div>
+			<div>
+				<ui-input v-model="myThemeName">
+					<span>{{ $t('theme-name') }}</span>
+				</ui-input>
+				<ui-textarea v-model="myThemeDesc">
+					<span>{{ $t('desc') }}</span>
+				</ui-textarea>
+			</div>
+			<div>
+				<div style="padding-bottom:8px;">{{ $t('primary-color') }}:</div>
+				<color-picker v-model="myThemePrimary"/>
+			</div>
+			<div>
+				<div style="padding-bottom:8px;">{{ $t('secondary-color') }}:</div>
+				<color-picker v-model="myThemeSecondary"/>
+			</div>
+			<div>
+				<div style="padding-bottom:8px;">{{ $t('text-color') }}:</div>
+				<color-picker v-model="myThemeText"/>
+			</div>
+			<ui-button @click="preview()"><fa icon="eye"/> {{ $t('preview-created-theme') }}</ui-button>
+			<ui-button primary @click="gen()"><fa :icon="['far', 'save']"/> {{ $t('save-created-theme') }}</ui-button>
+		</details>
 
-	<details>
-		<summary><fa icon="folder-open"/> {{ $t('manage-themes') }}</summary>
-		<ui-select v-model="selectedThemeId" :placeholder="$t('select-theme')">
-			<optgroup :label="$t('builtin-themes')">
-				<option v-for="x in builtinThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
-			</optgroup>
-			<optgroup :label="$t('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="$t('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="selectedTheme">
-			<ui-input readonly :value="selectedTheme.author">
-				<span>{{ $t('author') }}</span>
-			</ui-input>
-			<ui-textarea v-if="selectedTheme.desc" readonly :value="selectedTheme.desc">
-				<span>{{ $t('desc') }}</span>
-			</ui-textarea>
-			<ui-textarea readonly :value="selectedThemeCode">
+		<details>
+			<summary><fa icon="download"/> {{ $t('install-a-theme') }}</summary>
+			<ui-button @click="import_()"><fa icon="file-import"/> {{ $t('import') }}</ui-button>
+			<input ref="file" type="file" accept=".misskeytheme" style="display:none;" @change="onUpdateImportFile"/>
+			<p>{{ $t('import-by-code') }}:</p>
+			<ui-textarea v-model="installThemeCode">
 				<span>{{ $t('theme-code') }}</span>
 			</ui-textarea>
-			<ui-button @click="export_()" link :download="`${selectedTheme.name}.misskeytheme`" ref="export"><fa icon="box"/> {{ $t('export') }}</ui-button>
-			<ui-button @click="uninstall()" v-if="!builtinThemes.some(t => t.id == selectedTheme.id)"><fa :icon="['far', 'trash-alt']"/> {{ $t('uninstall') }}</ui-button>
-		</template>
-	</details>
-</div>
+			<ui-button @click="() => install(this.installThemeCode)"><fa icon="check"/> {{ $t('install') }}</ui-button>
+		</details>
+
+		<details>
+			<summary><fa icon="folder-open"/> {{ $t('manage-themes') }}</summary>
+			<ui-select v-model="selectedThemeId" :placeholder="$t('select-theme')">
+				<optgroup :label="$t('builtin-themes')">
+					<option v-for="x in builtinThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
+				</optgroup>
+				<optgroup :label="$t('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="$t('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="selectedTheme">
+				<ui-input readonly :value="selectedTheme.author">
+					<span>{{ $t('author') }}</span>
+				</ui-input>
+				<ui-textarea v-if="selectedTheme.desc" readonly :value="selectedTheme.desc">
+					<span>{{ $t('desc') }}</span>
+				</ui-textarea>
+				<ui-textarea readonly tall :value="selectedThemeCode">
+					<span>{{ $t('theme-code') }}</span>
+				</ui-textarea>
+				<ui-button @click="export_()" link :download="`${selectedTheme.name}.misskeytheme`" ref="export"><fa icon="box"/> {{ $t('export') }}</ui-button>
+				<ui-button @click="uninstall()" v-if="!builtinThemes.some(t => t.id == selectedTheme.id)"><fa :icon="['far', 'trash-alt']"/> {{ $t('uninstall') }}</ui-button>
+			</template>
+		</details>
+	</section>
+</ui-card>
 </template>
 
 <script lang="ts">
@@ -331,8 +336,13 @@ export default Vue.extend({
 
 <style lang="stylus" scoped>
 .nicnklzforebnpfgasiypmpdaaglujqm
+	> a
+		display block
+		margin-top -16px
+		margin-bottom 16px
+
 	> details
-		border-top solid 1px var(--faceDivider)
+		border-top solid var(--lineWidth) var(--faceDivider)
 
 		> summary
 			padding 16px 0
@@ -343,5 +353,5 @@ export default Vue.extend({
 	> .creator
 		> div
 			padding 16px 0
-			border-bottom solid 1px var(--faceDivider)
+			border-bottom solid var(--lineWidth) var(--faceDivider)
 </style>

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

@@ -41,7 +41,7 @@ export default Vue.extend({
 
 	> section
 		padding 20px 16px
-		border-top solid 1px var(--faceDivider)
+		border-top solid var(--lineWidth) var(--faceDivider)
 
 		@media (min-width 500px)
 			padding 32px

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

@@ -25,11 +25,9 @@ export default Vue.extend({
 	},
 	props: {
 		model: {
-			type: String,
 			required: false
 		},
 		value: {
-			type: String,
 			required: false
 		},
 		disabled: {
@@ -66,10 +64,10 @@ export default Vue.extend({
 
 	&.checked
 		> .button
-			border-color var(--primary)
+			border-color var(--radioActive)
 
 			&:after
-				background-color var(--primary)
+				background-color var(--radioActive)
 				transform scale(1)
 				opacity 1
 

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

@@ -77,11 +77,11 @@ export default Vue.extend({
 
 	&.checked
 		> .button
-			background-color var(--primaryAlpha04)
-			border-color var(--primaryAlpha04)
+			background-color var(--switchActiveTrack)
+			border-color var(--switchActiveTrack)
 
 			> *
-				background-color var(--primary)
+				background-color var(--switchActive)
 				transform translateX(14px)
 
 	> input

src/client/app/common/views/components/url-preview.vue

@@ -207,7 +207,7 @@ export default Vue.extend({
 	> a
 		display block
 		font-size 14px
-		border solid 1px var(--urlPreviewBorder)
+		border solid var(--lineWidth) var(--urlPreviewBorder)
 		border-radius 4px
 		overflow hidden
 

src/client/app/common/views/components/visibility-chooser.vue

@@ -1,7 +1,7 @@
 <template>
-<div class="mk-visibility-chooser">
+<div class="gqyayizv">
 	<div class="backdrop" ref="backdrop" @click="close"></div>
-	<div class="popover" :class="{ compact }" ref="popover">
+	<div class="popover" :class="{ isMobile: $root.isMobile }" ref="popover">
 		<div @click="choose('public')" :class="{ active: v == 'public' }">
 			<div><fa icon="globe"/></div>
 			<div>
@@ -23,18 +23,12 @@
 			</div>
 		</div>
 		<div @click="choose('specified')" :class="{ active: v == 'specified' }">
-			<div><fa icon="envelope"/></div>
+			<div><fa icon="lock"/></div>
 			<div>
 				<span>{{ $t('specified') }}</span>
 				<span>{{ $t('specified-desc') }}</span>
 			</div>
 		</div>
-		<div @click="choose('private')" :class="{ active: v == 'private' }">
-			<div><fa icon="lock"/></div>
-			<div>
-				<span>{{ $t('private') }}</span>
-			</div>
-		</div>
 		<div @click="choose('local-public')" :class="{ active: v == 'local-public' }">
 			<div><fa icon="globe"/></div>
 			<div>
@@ -65,10 +59,18 @@ import * as anime from 'animejs';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/visibility-chooser.vue'),
-	props: ['source', 'compact'],
+	props: {
+		source: {
+			required: true
+		},
+		currentVisibility: {
+			type: String,
+			required: false
+		}
+	},
 	data() {
 		return {
-			v: this.$store.state.settings.rememberNoteVisibility ? (this.$store.state.device.visibility || this.$store.state.settings.defaultNoteVisibility) : this.$store.state.settings.defaultNoteVisibility
+			v: this.$store.state.settings.rememberNoteVisibility ? (this.$store.state.device.visibility || this.$store.state.settings.defaultNoteVisibility) : (this.currentVisibility || this.$store.state.settings.defaultNoteVisibility)
 		}
 	},
 	mounted() {
@@ -82,7 +84,7 @@ export default Vue.extend({
 			let left;
 			let top;
 
-			if (this.compact) {
+			if (this.$root.isMobile) {
 				const x = rect.left + window.pageXOffset + (this.source.offsetWidth / 2);
 				const y = rect.top + window.pageYOffset + (this.source.offsetHeight / 2);
 				left = (x - (width / 2));
@@ -148,9 +150,7 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-$border-color = rgba(27, 31, 35, 0.15)
-
-.mk-visibility-chooser
+.gqyayizv
 	position initial
 
 	> .backdrop
@@ -170,39 +170,27 @@ $border-color = rgba(27, 31, 35, 0.15)
 		width 240px
 		padding 8px 0
 		background $bgcolor
-		border 1px solid $border-color
 		border-radius 4px
 		box-shadow 0 3px 12px rgba(27, 31, 35, 0.15)
 		transform scale(0.5)
 		opacity 0
 
-		$balloon-size = 10px
+		&:not(.isMobile)
+			$arrow-size = 10px
 
-		&:not(.compact)
-			margin-top $balloon-size
-			transform-origin center -($balloon-size)
+			margin-top $arrow-size
+			transform-origin center -($arrow-size)
 
 			&:before
 				content ""
 				display block
 				position absolute
-				top -($balloon-size * 2)
-				left s('calc(50% - %s)', $balloon-size)
-				border-top solid $balloon-size transparent
-				border-left solid $balloon-size transparent
-				border-right solid $balloon-size transparent
-				border-bottom solid $balloon-size $border-color
-
-			&:after
-				content ""
-				display block
-				position absolute
-				top -($balloon-size * 2) + 1.5px
-				left s('calc(50% - %s)', $balloon-size)
-				border-top solid $balloon-size transparent
-				border-left solid $balloon-size transparent
-				border-right solid $balloon-size transparent
-				border-bottom solid $balloon-size $bgcolor
+				top -($arrow-size * 2)
+				left s('calc(50% - %s)', $arrow-size)
+				border-top solid $arrow-size transparent
+				border-left solid $arrow-size transparent
+				border-right solid $arrow-size transparent
+				border-bottom solid $arrow-size $bgcolor
 
 		> div
 			display flex
@@ -241,4 +229,5 @@ $border-color = rgba(27, 31, 35, 0.15)
 
 				> span:last-child:not(:first-child)
 					opacity 0.6
+
 </style>

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

@@ -5,6 +5,8 @@ export default {
 		if (vn.context.$store.state.device.reduceMotion) return;
 
 		el.addEventListener('click', () => {
+			if (binding.value === false) return;
+
 			const rect = el.getBoundingClientRect();
 
 			const x = rect.left + (el.clientWidth / 2);

src/client/app/common/views/pages/not-found.vue

@@ -13,7 +13,7 @@ import Vue from 'vue'
 import i18n from '../../../i18n';
 
 export default Vue.extend({
-	i18n: i18n('common/views/pages/404.vue'),
+	i18n: i18n('common/views/pages/not-found.vue'),
 	data() {
 		return {
 			src: ''

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

@@ -72,7 +72,7 @@ export default define({
 			color var(--inputText)
 			background var(--face)
 			border none
-			border-bottom solid 1px var(--faceDivider)
+			border-bottom solid var(--lineWidth) var(--faceDivider)
 			border-radius 0
 
 		> button

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

@@ -77,7 +77,7 @@ export default define({
 				display block
 				padding 4px 0
 				color var(--text)
-				border-bottom dashed 1px var(--faceDivider)
+				border-bottom dashed var(--lineWidth) var(--faceDivider)
 
 				&:last-child
 					border-bottom none

src/client/app/common/views/widgets/server.info.vue

@@ -22,5 +22,5 @@ export default Vue.extend({
 	> p
 		margin 0
 		font-size 12px
-		color #505050
+		color var(--text)
 </style>

src/client/app/common/views/widgets/server.uptimes.vue

@@ -40,7 +40,7 @@ export default Vue.extend({
 	> p
 		margin 0
 		font-size 12px
-		color #505050
+		color var(--text)
 
 		&:first-child
 			font-weight bold

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

@@ -84,6 +84,7 @@ export default define({
 <style lang="stylus" scoped>
 .mkw-tips
 	overflow visible !important
+	opacity 0.8
 
 	> p
 		display block
@@ -91,7 +92,7 @@ export default define({
 		padding 0 12px
 		text-align center
 		font-size 0.7em
-		color #999
+		color var(--text)
 
 		> [data-icon]
 			margin-right 4px
@@ -102,7 +103,7 @@ export default define({
 			margin 0 2px
 			font-size 1em
 			font-family inherit
-			border solid 1px #999
+			border solid 1px var(--text)
 			border-radius 2px
 
 </style>

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

@@ -24,6 +24,7 @@ p
 	padding 0 12px
 	text-align center
 	font-size 0.7em
-	color #aaa
+	color var(--text)
+	opacity 0.8
 
 </style>

src/client/app/desktop/script.ts

@@ -28,7 +28,8 @@ import MkTag from './views/pages/tag.vue';
 import MkReversi from './views/pages/games/reversi.vue';
 import MkShare from './views/pages/share.vue';
 import MkFollow from '../common/views/pages/follow.vue';
-import MkNotFound from '../common/views/pages/404.vue';
+import MkNotFound from '../common/views/pages/not-found.vue';
+import MkSettings from './views/pages/settings.vue';
 
 import Ctx from './views/components/context-menu.vue';
 import PostFormWindow from './views/components/post-form-window.vue';
@@ -69,6 +70,7 @@ init(async (launch) => {
 				} else {
 					const vm = this.$root.new(PostFormWindow, {
 						reply: o.reply,
+						mention: o.mention,
 						animation: o.animation == null ? true : o.animation
 					});
 					if (o.cb) vm.$once('closed', o.cb);
@@ -140,6 +142,7 @@ init(async (launch) => {
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },
 			{ path: '/i/drive', component: MkDrive },
 			{ path: '/i/drive/folder/:folder', component: MkDrive },
+			{ path: '/i/settings', component: MkSettings },
 			{ path: '/selectdrive', component: MkSelectDrive },
 			{ path: '/search', component: MkSearch },
 			{ path: '/tags/:tag', name: 'tag', component: MkTag },

src/client/app/desktop/style.styl

@@ -12,6 +12,14 @@ html
 	background var(--bg)
 
 	&, *
+		scrollbar-color var(--scrollbarHandle) var(--scrollbarTrack)
+
+		&:hover
+			scrollbar-color var(--scrollbarHandleHover) var(--scrollbarTrack)
+
+		&:active
+			scrollbar-color var(--primary) var(--scrollbarTrack)
+
 		&::-webkit-scrollbar
 			width 6px
 			height 6px

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

@@ -151,7 +151,7 @@ export default Vue.extend({
 		font-weight bold
 		color var(--faceHeaderText)
 		background var(--faceHeader)
-		box-shadow 0 1px rgba(#000, 0.07)
+		box-shadow 0 var(--lineWidth) rgba(#000, 0.07)
 
 		> [data-icon]
 			margin-right 4px
@@ -199,11 +199,11 @@ export default Vue.extend({
 					color var(--calendarSaturdayOrSunday)
 
 				&[data-today]
-					box-shadow 0 0 0 1px var(--calendarWeek) inset
+					box-shadow 0 0 0 var(--lineWidth) var(--calendarWeek) inset
 					border-radius 6px
 
 					&[data-is-donichi]
-						box-shadow 0 0 0 1px var(--calendarSaturdayOrSunday) inset
+						box-shadow 0 0 0 var(--lineWidth) var(--calendarSaturdayOrSunday) inset
 
 			&.day
 				cursor pointer

src/client/app/desktop/views/components/context-menu.menu.vue

@@ -46,7 +46,7 @@ export default Vue.extend({
 		&.divider
 			margin-top $padding
 			padding-top $padding
-			border-top solid 1px var(--faceDivider)
+			border-top solid var(--lineWidth) var(--faceDivider)
 
 		&.nest
 			> p

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

@@ -32,8 +32,7 @@
 					<span class="visibility" v-if="appearNote.visibility != 'public'">
 						<fa v-if="appearNote.visibility == 'home'" icon="home"/>
 						<fa v-if="appearNote.visibility == 'followers'" icon="unlock"/>
-						<fa v-if="appearNote.visibility == 'specified'" icon="envelope"/>
-						<fa v-if="appearNote.visibility == 'private'" icon="lock"/>
+						<fa v-if="appearNote.visibility == 'specified'" icon="lock"/>
 					</span>
 					<span class="localOnly" v-if="appearNote.localOnly == true"><fa icon="heart"/></span>
 				</div>
@@ -70,14 +69,17 @@
 				<template v-else><fa icon="reply"/></template>
 				<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
 			</button>
-				<button v-if="['public', 'home'].includes(appearNote.visibility)" class="renoteButton" @click="renote()" :title="$t('renote')">
-					<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount > 0">{{ appearNote.renoteCount }}</p>
-				</button>
-				<button v-else class="inhibitedButton">
-					<fa icon="ban"/>
-				</button>
-			<button class="reactionButton" :class="{ reacted: appearNote.myReaction != null }" @click="react()" ref="reactButton" :title="$t('add-reaction')">
-				<fa icon="plus"/><p class="count" v-if="appearNote.reactions_count > 0">{{ appearNote.reactions_count }}</p>
+			<button v-if="['public', 'home'].includes(appearNote.visibility)" class="renoteButton" @click="renote()" :title="$t('renote')">
+				<fa icon="retweet"/>
+			</button>
+			<button v-else class="inhibitedButton">
+				<fa icon="ban"/>
+			</button>
+			<button v-if="!isMyNote && appearNote.myReaction == null" class="reactionButton" @click="react()" ref="reactButton" :title="$t('add-reaction')">
+				<fa icon="plus"/>
+			</button>
+			<button v-if="!isMyNote && appearNote.myReaction != null" class="reactionButton reacted" @click="undoReact(appearNote)" ref="reactButton" :title="$t('undo-reaction')">
+				<fa icon="minus"/>
 			</button>
 			<button @click="menu()" ref="menuButton">
 				<fa icon="ellipsis-h"/>
@@ -335,7 +337,8 @@ export default Vue.extend({
 				> .count
 					display inline
 					margin 0 0 0 8px
-					color #999
+					color var(--text)
+					opacity 0.7
 
 				&.reacted, &.reacted:hover
 					color var(--noteActionsReactionHover)

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

@@ -48,13 +48,16 @@
 					<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
 				</button>
 				<button v-if="['public', 'home'].includes(appearNote.visibility)" class="renoteButton" @click="renote()" :title="$t('renote')">
-					<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount > 0">{{ appearNote.renoteCount }}</p>
+					<fa icon="retweet"/>
 				</button>
 				<button v-else class="inhibitedButton">
 					<fa icon="ban"/>
 				</button>
-				<button class="reactionButton" :class="{ reacted: appearNote.myReaction != null }" @click="react()" ref="reactButton" :title="$t('add-reaction')">
-					<fa icon="plus"/><p class="count" v-if="appearNote.reactions_count > 0">{{ appearNote.reactions_count }}</p>
+				<button v-if="!isMyNote && appearNote.myReaction == null" class="reactionButton" @click="react()" ref="reactButton" :title="$t('add-reaction')">
+					<fa icon="plus"/>
+				</button>
+				<button v-if="!isMyNote && appearNote.myReaction != null" class="reactionButton reacted" @click="undoReact(appearNote)" ref="reactButton" :title="$t('undo-reaction')">
+					<fa icon="minus"/>
 				</button>
 				<button @click="menu()" ref="menuButton">
 					<fa icon="ellipsis-h"/>
@@ -137,7 +140,7 @@ export default Vue.extend({
 	margin 0
 	padding 0
 	background var(--face)
-	border-bottom solid 1px var(--faceDivider)
+	border-bottom solid var(--lineWidth) var(--faceDivider)
 
 	&.mini
 		font-size 13px
@@ -258,7 +261,7 @@ export default Vue.extend({
 
 						> *
 							padding 16px
-							border dashed 1px var(--quoteBorder)
+							border dashed var(--lineWidth) var(--quoteBorder)
 							border-radius 8px
 
 			> footer
@@ -300,7 +303,8 @@ export default Vue.extend({
 					> .count
 						display inline
 						margin 0 0 0 8px
-						color #999
+						color var(--text)
+						opacity 0.7
 
 					&.reacted, &.reacted:hover
 						color var(--noteActionsReactionHover)

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

@@ -209,7 +209,7 @@ export default Vue.extend({
 			text-align center
 			color var(--dateDividerFg)
 			background var(--dateDividerBg)
-			border-bottom solid 1px var(--faceDivider)
+			border-bottom solid var(--lineWidth) var(--faceDivider)
 
 			span
 				margin 0 16px
@@ -233,7 +233,7 @@ export default Vue.extend({
 			text-align center
 			color #ccc
 			background var(--face)
-			border-top solid 1px var(--faceDivider)
+			border-top solid var(--lineWidth) var(--faceDivider)
 			border-bottom-left-radius 6px
 			border-bottom-right-radius 6px
 

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

@@ -248,7 +248,7 @@ export default Vue.extend({
 				padding 16px
 				overflow-wrap break-word
 				font-size 12px
-				border-bottom solid 1px var(--faceDivider)
+				border-bottom solid var(--lineWidth) var(--faceDivider)
 
 				&:last-child
 					border-bottom none
@@ -332,7 +332,7 @@ export default Vue.extend({
 				font-size 0.8em
 				color var(--dateDividerFg)
 				background var(--dateDividerBg)
-				border-bottom solid 1px var(--faceDivider)
+				border-bottom solid var(--lineWidth) var(--faceDivider)
 
 				span
 					margin 0 16px
@@ -345,7 +345,7 @@ export default Vue.extend({
 		width 100%
 		padding 16px
 		color var(--text)
-		border-top solid 1px rgba(#000, 0.05)
+		border-top solid var(--lineWidth) rgba(#000, 0.05)
 
 		&:hover
 			background rgba(#000, 0.025)

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

@@ -12,6 +12,7 @@
 		<mk-note-preview v-if="reply" class="notePreview" :note="reply"/>
 		<mk-post-form ref="form"
 			:reply="reply"
+			:mention="mention"
 			@posted="onPosted"
 			@change-uploadings="onChangeUploadings"
 			@change-attached-files="onChangeFiles"
@@ -32,6 +33,10 @@ export default Vue.extend({
 			type: Object,
 			required: false
 		},
+		mention: {
+			type: Object,
+			required: false
+		},
 
 		animation: {
 			type: Boolean,

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

@@ -50,8 +50,7 @@
 		<span v-if="visibility === 'public'"><fa icon="globe"/></span>
 		<span v-if="visibility === 'home'"><fa icon="home"/></span>
 		<span v-if="visibility === 'followers'"><fa icon="unlock"/></span>
-		<span v-if="visibility === 'specified'"><fa icon="envelope"/></span>
-		<span v-if="visibility === 'private'"><fa icon="lock"/></span>
+		<span v-if="visibility === 'specified'"><fa icon="lock"/></span>
 	</button>
 	<p class="text-count" :class="{ over: trimmedLength(text) > maxNoteTextLength }">{{ maxNoteTextLength - trimmedLength(text) }}</p>
 	<ui-button primary :wait="posting" class="submit" :disabled="!canPost" @click="post">
@@ -92,6 +91,10 @@ export default Vue.extend({
 			type: Object,
 			required: false
 		},
+		mention: {
+			type: Object,
+			required: false
+		},
 		initialText: {
 			type: String,
 			required: false
@@ -178,6 +181,11 @@ export default Vue.extend({
 			this.text = this.initialText;
 		}
 
+		if (this.mention) {
+			this.text = this.mention.host ? `@${this.mention.username}@${toASCII(this.mention.host)}` : `@${this.mention.username}`;
+			this.text += ' ';
+		}
+
 		if (this.reply && this.reply.user.host != null) {
 			this.text = `@${this.reply.user.username}@${toASCII(this.reply.user.host)} `;
 		}
@@ -203,7 +211,7 @@ export default Vue.extend({
 		this.applyVisibility(this.$store.state.settings.rememberNoteVisibility ? (this.$store.state.device.visibility || this.$store.state.settings.defaultNoteVisibility) : this.$store.state.settings.defaultNoteVisibility);
 
 		// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
-		if (this.reply && ['home', 'followers', 'specified', 'private'].includes(this.reply.visibility)) {
+		if (this.reply && ['home', 'followers', 'specified'].includes(this.reply.visibility)) {
 			this.visibility = this.reply.visibility;
 		}
 
@@ -215,7 +223,7 @@ export default Vue.extend({
 
 		this.$nextTick(() => {
 			// 書きかけの投稿を復元
-			if (!this.instant) {
+			if (!this.instant && !this.mention) {
 				const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[this.draftId];
 				if (draft) {
 					this.text = draft.data.text;
@@ -373,7 +381,8 @@ export default Vue.extend({
 
 		setVisibility() {
 			const w = this.$root.new(MkVisibilityChooser, {
-				source: this.$refs.visibilityButton
+				source: this.$refs.visibilityButton,
+				currentVisibility: this.visibility
 			});
 			w.$once('chosen', v => {
 				this.applyVisibility(v);

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

@@ -7,16 +7,16 @@
 		<p>{{ $t('already-registered') }}</p>
 		<ui-button @click="unregister">{{ $t('unregister') }}</ui-button>
 	</template>
-	<div v-if="data">
+	<div v-if="data && !$store.state.i.twoFactorEnabled">
 		<ol>
 			<li>{{ $t('authenticator') }}<a href="https://support.google.com/accounts/answer/1066447" target="_blank">{{ $t('howtoinstall') }}</a></li>
 			<li>{{ $t('scan') }}<br><img :src="data.qr"></li>
 			<li>{{ $t('done') }}<br>
-				<input type="number" v-model="token" class="ui">
+				<ui-input v-model="token">{{ $t('token') }}</ui-input>
 				<ui-button primary @click="submit">{{ $t('submit') }}</ui-button>
 			</li>
 		</ol>
-		<div class="ui info"><p><fa icon="info-circle"/>{{ $t('info') }}</p></div>
+		<ui-info>{{ $t('info') }}</ui-info>
 	</div>
 </div>
 </template>

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

@@ -1,6 +1,6 @@
 <template>
 <div class="mk-settings">
-	<div class="nav">
+	<div class="nav" :class="{ inWindow }">
 		<p :class="{ active: page == 'profile' }" @mousedown="page = 'profile'"><fa icon="user" fixed-width/>{{ $t('profile') }}</p>
 		<p :class="{ active: page == 'theme' }" @mousedown="page = 'theme'"><fa icon="palette" fixed-width/>{{ $t('theme') }}</p>
 		<p :class="{ active: page == 'web' }" @mousedown="page = 'web'"><fa icon="desktop" fixed-width/>Web</p>
@@ -19,13 +19,7 @@
 			<x-integration-settings/>
 		</div>
 
-		<ui-card class="theme" v-show="page == 'theme'">
-			<div slot="title"><fa icon="palette"/> {{ $t('theme') }}</div>
-
-			<section>
-				<x-theme/>
-			</section>
-		</ui-card>
+		<x-theme class="theme" v-show="page == 'theme'"/>
 
 		<ui-card class="web" v-show="page == 'web'">
 			<div slot="title"><fa icon="sliders-h"/> {{ $t('behaviour') }}</div>
@@ -64,7 +58,6 @@
 						<option value="home">{{ $t('@.note-visibility.home') }}</option>
 						<option value="followers">{{ $t('@.note-visibility.followers') }}</option>
 						<option value="specified">{{ $t('@.note-visibility.specified') }}</option>
-						<option value="private">{{ $t('@.note-visibility.private') }}</option>
 						<option value="local-public">{{ $t('@.note-visibility.local-public') }}</option>
 						<option value="local-home">{{ $t('@.note-visibility.local-home') }}</option>
 						<option value="local-followers">{{ $t('@.note-visibility.local-followers') }}</option>
@@ -87,8 +80,10 @@
 			</section>
 			<section>
 				<header>{{ $t('wallpaper') }}</header>
-				<ui-button @click="updateWallpaper">{{ $t('choose-wallpaper') }}</ui-button>
-				<ui-button @click="deleteWallpaper">{{ $t('delete-wallpaper') }}</ui-button>
+				<ui-horizon-group class="fit-bottom">
+					<ui-button @click="updateWallpaper">{{ $t('choose-wallpaper') }}</ui-button>
+					<ui-button @click="deleteWallpaper">{{ $t('delete-wallpaper') }}</ui-button>
+				</ui-horizon-group>
 			</section>
 			<section>
 				<header>{{ $t('navbar-position') }}</header>
@@ -104,6 +99,12 @@
 				<ui-switch v-model="useShadow">{{ $t('use-shadow') }}</ui-switch>
 				<ui-switch v-model="roundedCorners">{{ $t('rounded-corners') }}</ui-switch>
 				<ui-switch v-model="circleIcons">{{ $t('circle-icons') }}</ui-switch>
+				<section>
+					<header>{{ $t('@.line-width') }}</header>
+					<ui-radio v-model="lineWidth" :value="0.5">{{ $t('@.line-width-thin') }}</ui-radio>
+					<ui-radio v-model="lineWidth" :value="1">{{ $t('@.line-width-normal') }}</ui-radio>
+					<ui-radio v-model="lineWidth" :value="2">{{ $t('@.line-width-thick') }}</ui-radio>
+				</section>
 				<ui-switch v-model="reduceMotion">{{ $t('@.reduce-motion') }}</ui-switch>
 				<ui-switch v-model="contrastedAcct">{{ $t('contrasted-acct') }}</ui-switch>
 				<ui-switch v-model="showFullAcct">{{ $t('@.show-full-acct') }}</ui-switch>
@@ -136,7 +137,7 @@
 			</section>
 			<section>
 				<ui-switch v-model="games_reversi_showBoardLabels">{{ $t('@.show-reversi-board-labels') }}</ui-switch>
-				<ui-switch v-model="games_reversi_useWhiteBlackStones">{{ $t('@.use-white-black-reversi-stones') }}</ui-switch>
+				<ui-switch v-model="games_reversi_useAvatarStones">{{ $t('@.use-avatar-reversi-stones') }}</ui-switch>
 			</section>
 		</ui-card>
 
@@ -170,17 +171,7 @@
 			</section>
 		</ui-card>
 
-		<ui-card class="notification" v-show="page == 'notification'">
-			<div slot="title"><fa :icon="['far', 'bell']"/> {{ $t('notification') }}</div>
-			<section>
-				<ui-switch v-model="$store.state.i.settings.autoWatch" @change="onChangeAutoWatch">
-					{{ $t('auto-watch') }}<span slot="desc">{{ $t('auto-watch-desc') }}</span>
-				</ui-switch>
-				<section>
-					<ui-button @click="readAllUnreadNotes">{{ $t('mark-as-read-all-unread-notes') }}</ui-button>
-				</section>
-			</section>
-		</ui-card>
+		<x-notification-settings v-show="page == 'notification'"/>
 
 		<div class="drive" v-if="page == 'drive'">
 			<x-drive-settings/>
@@ -289,6 +280,7 @@ import XPasswordSettings from '../../../common/views/components/password-setting
 import XProfileEditor from '../../../common/views/components/profile-editor.vue';
 import XApiSettings from '../../../common/views/components/api-settings.vue';
 import XLanguageSettings from '../../../common/views/components/language-settings.vue';
+import XNotificationSettings from '../../../common/views/components/notification-settings.vue';
 
 import { url, clientVersion as version } from '../../../config';
 import checkForUpdate from '../../../common/scripts/check-for-update';
@@ -308,11 +300,17 @@ export default Vue.extend({
 		XProfileEditor,
 		XApiSettings,
 		XLanguageSettings,
+		XNotificationSettings,
 	},
 	props: {
 		initialPage: {
 			type: String,
 			required: false
+		},
+		inWindow: {
+			type: Boolean,
+			required: false,
+			default: true
 		}
 	},
 	data() {
@@ -415,6 +413,11 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'roundedCorners', value }); }
 		},
 
+		lineWidth: {
+			get() { return this.$store.state.device.lineWidth; },
+			set(value) { this.$store.commit('device/set', { key: 'lineWidth', value }); }
+		},
+
 		fetchOnScroll: {
 			get() { return this.$store.state.settings.fetchOnScroll; },
 			set(value) { this.$store.dispatch('settings/set', { key: 'fetchOnScroll', value }); }
@@ -505,9 +508,9 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.showBoardLabels', value }); }
 		},
 
-		games_reversi_useWhiteBlackStones: {
-			get() { return this.$store.state.settings.games.reversi.useWhiteBlackStones; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useWhiteBlackStones', value }); }
+		games_reversi_useAvatarStones: {
+			get() { return this.$store.state.settings.games.reversi.useAvatarStones; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useAvatarStones', value }); }
 		},
 
 		disableAnimatedMfm: {
@@ -526,9 +529,6 @@ export default Vue.extend({
 		});
 	},
 	methods: {
-		readAllUnreadNotes() {
-			this.$root.api('i/read_all_unread_notes');
-		},
 		customizeHome() {
 			this.$router.push('/i/customize-home');
 			this.$emit('done');
@@ -547,11 +547,6 @@ export default Vue.extend({
 				wallpaperId: null
 			});
 		},
-		onChangeAutoWatch(v) {
-			this.$root.api('i/update', {
-				autoWatch: v
-			});
-		},
 		checkForUpdate() {
 			this.checkingForUpdate = true;
 			checkForUpdate(this.$root, true, true).then(newer => {
@@ -598,9 +593,11 @@ export default Vue.extend({
 		height 100%
 		padding 16px 0 0 0
 		overflow auto
-		box-shadow var(--shadowRight)
 		z-index 1
 
+		&.inWindow
+			box-shadow var(--shadowRight)
+
 		> p
 			display block
 			padding 10px 16px

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

@@ -173,7 +173,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .mk-timeline-core
 	> .mk-friends-maker
-		border-bottom solid 1px #eee
+		border-bottom solid var(--lineWidth) #eee
 
 </style>
 

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

@@ -139,7 +139,6 @@ export default Vue.extend({
 
 			this.$root.new(Menu, {
 				source: this.$refs.listButton,
-				compact: false,
 				items: menu
 			});
 		},
@@ -170,7 +169,6 @@ export default Vue.extend({
 
 			this.$root.new(Menu, {
 				source: this.$refs.tagButton,
-				compact: false,
 				items: menu
 			});
 		}
@@ -189,7 +187,7 @@ export default Vue.extend({
 		padding 0 8px
 		z-index 10
 		background var(--faceHeader)
-		box-shadow 0 1px var(--desktopTimelineHeaderShadow)
+		box-shadow 0 var(--lineWidth) var(--desktopTimelineHeaderShadow)
 
 		> .buttons
 			position absolute
@@ -209,7 +207,7 @@ export default Vue.extend({
 					top -4px
 					right 4px
 					font-size 10px
-					color var(--primary)
+					color var(--notificationIndicator)
 
 				&:hover
 					color var(--faceTextButtonHover)

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

@@ -51,12 +51,12 @@
 						<i><fa icon="angle-right"/></i>
 					</router-link>
 				</li>
-				<li @click="settings">
-					<p>
+				<li>
+					<router-link to="/i/settings">
 						<i><fa icon="cog"/></i>
 						<span>{{ $t('settings') }}</span>
 						<i><fa icon="angle-right"/></i>
-					</p>
+					</router-link>
 				</li>
 				<li v-if="$store.state.i.isAdmin || $store.state.i.isModerator">
 					<a href="/admin">
@@ -153,10 +153,6 @@ export default Vue.extend({
 			this.close();
 			this.$root.new(MkFollowRequestsWindow);
 		},
-		settings() {
-			this.close();
-			this.$root.new(MkSettingsWindow);
-		},
 		signout() {
 			this.$root.signout();
 		},
@@ -231,7 +227,7 @@ export default Vue.extend({
 		font-size 0.8em
 		background $bgcolor
 		border-radius 4px
-		box-shadow 0 1px 4px rgba(#000, 0.25)
+		box-shadow 0 var(--lineWidth) 4px rgba(#000, 0.25)
 
 		&:before
 			content ""
@@ -265,7 +261,7 @@ export default Vue.extend({
 
 			& + ul
 				padding-top 10px
-				border-top solid 1px var(--faceDivider)
+				border-top solid var(--lineWidth) var(--faceDivider)
 
 			> li
 				display block

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

@@ -147,7 +147,7 @@ export default Vue.extend({
 				> [data-icon]:last-child
 					margin-left 5px
 					font-size 10px
-					color var(--primary)
+					color var(--notificationIndicator)
 
 					@media (max-width 1100px)
 						margin-left -5px

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

@@ -90,7 +90,7 @@ export default Vue.extend({
 			margin-left -5px
 			vertical-align super
 			font-size 10px
-			color var(--primary)
+			color var(--notificationIndicator)
 
 	> .pop
 		$bgcolor = var(--face)

src/client/app/desktop/views/components/widget-container.vue

@@ -46,7 +46,7 @@ export default Vue.extend({
 			font-size 0.9em
 			font-weight bold
 			color var(--faceHeaderText)
-			box-shadow 0 1px rgba(#000, 0.07)
+			box-shadow 0 var(--lineWidth) rgba(#000, 0.07)
 
 			> [data-icon]
 				margin-right 6px

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

@@ -240,7 +240,6 @@ export default Vue.extend({
 		showMenu() {
 			this.$root.new(Menu, {
 				source: this.$refs.menu,
-				compact: false,
 				items: this.getMenu()
 			});
 		},
@@ -374,7 +373,7 @@ export default Vue.extend({
 		font-size 14px
 		color var(--faceHeaderText)
 		background var(--faceHeader)
-		box-shadow 0 1px rgba(#000, 0.15)
+		box-shadow 0 var(--lineWidth) rgba(#000, 0.15)
 		cursor pointer
 
 		&, *

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

@@ -214,7 +214,7 @@ export default Vue.extend({
 			text-align center
 			color var(--dateDividerFg)
 			background var(--dateDividerBg)
-			border-bottom solid 1px var(--faceDivider)
+			border-bottom solid var(--lineWidth) var(--faceDivider)
 
 			span
 				margin 0 16px
@@ -231,7 +231,7 @@ export default Vue.extend({
 			text-align center
 			color #ccc
 			background var(--face)
-			border-top solid 1px var(--faceDivider)
+			border-top solid var(--lineWidth) var(--faceDivider)
 			border-bottom-left-radius 6px
 			border-bottom-right-radius 6px
 

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

@@ -177,7 +177,7 @@ export default Vue.extend({
 	> .notifications
 
 		> .notification:not(:last-child)
-			border-bottom solid 1px var(--faceDivider)
+			border-bottom solid var(--lineWidth) var(--faceDivider)
 
 		> .date
 			display block
@@ -187,7 +187,7 @@ export default Vue.extend({
 			font-size 12px
 			color var(--dateDividerFg)
 			background var(--dateDividerBg)
-			border-bottom solid 1px var(--faceDivider)
+			border-bottom solid var(--lineWidth) var(--faceDivider)
 
 			span
 				margin 0 16px
@@ -200,7 +200,7 @@ export default Vue.extend({
 		width 100%
 		padding 16px
 		color #555
-		border-top solid 1px rgba(#000, 0.05)
+		border-top solid var(--lineWidth) rgba(#000, 0.05)
 
 		&:hover
 			background rgba(#000, 0.025)

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

@@ -49,6 +49,9 @@
 					<b>{{ user.followersCount | number }}</b>
 					<span>{{ $t('followers') }}</span>
 				</div>
+				<div class="mention">
+					<button @click="mention" :title="$t('mention')"><fa icon="at"/></button>
+				</div>
 			</div>
 		</div>
 		<div class="pinned" v-if="user.pinnedNotes && user.pinnedNotes.length > 0">
@@ -307,6 +310,10 @@ export default Vue.extend({
 			return promise;
 		},
 
+		mention() {
+			this.$post({ mention: this.user });
+		},
+
 		menu() {
 			let menu = [{
 				icon: 'list',
@@ -329,7 +336,6 @@ export default Vue.extend({
 
 			this.$root.new(Menu, {
 				source: this.$refs.menu,
-				compact: false,
 				items: menu
 			});
 		},
@@ -454,9 +460,9 @@ export default Vue.extend({
 
 		> .counts
 			display grid
-			grid-template-columns 1fr 1fr 1fr
+			grid-template-columns 2fr 2fr 2fr 1fr
 			margin-top 8px
-			border-top solid 1px var(--faceDivider)
+			border-top solid var(--lineWidth) var(--faceDivider)
 
 			> div
 				padding 8px 8px 0 8px
@@ -471,6 +477,9 @@ export default Vue.extend({
 					font-size 80%
 					opacity 0.7
 
+			> .mention
+				display flex
+
 	> *
 		> p.caption
 			margin 0

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

@@ -179,7 +179,6 @@ export default Vue.extend({
 		add() {
 			this.$root.new(Menu, {
 				source: this.$refs.add,
-				compact: true,
 				items: [{
 					icon: 'home',
 					text: this.$t('@deck.home'),

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

@@ -0,0 +1,24 @@
+<template>
+<mk-ui>
+	<main>
+		<x-settings :in-window="false"/>
+	</main>
+</mk-ui>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	components: {
+		XSettings: () => import('../components/settings.vue').then(m => m.default)
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+main
+	margin 0 auto
+	max-width 900px
+
+</style>

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

@@ -36,6 +36,7 @@
 			<span class="notes-count"><b>{{ user.notesCount | number }}</b>{{ $t('posts') }}</span>
 			<router-link :to="user | userPage('following')" class="following clickable"><b>{{ user.followingCount | number }}</b>{{ $t('following') }}</router-link>
 			<router-link :to="user | userPage('followers')" class="followers clickable"><b>{{ user.followersCount | number }}</b>{{ $t('followers') }}</router-link>
+			<button @click="mention" :title="$t('mention')"><fa icon="at"/></button>
 		</div>
 	</div>
 </div>
@@ -77,6 +78,9 @@ export default Vue.extend({
 		}
 	},
 	methods: {
+		mention() {
+			this.$post({ mention: this.user });
+		},
 		onScroll() {
 			const banner = this.$refs.banner as any;
 

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

@@ -1,7 +1,7 @@
 <template>
 <mk-ui>
 	<div class="xygkxeaeontfaokvqmiblezmhvhostak" v-if="!fetching">
-		<div class="is-suspended" v-if="user.isSuspended"><fa icon="exclamation-triangle"/> {{ $t('@.is-suspended') }}</div>
+		<div class="is-suspended" v-if="user.isSuspended"><fa icon="exclamation-triangle"/> {{ $t('@.user-suspended') }}</div>
 		<div class="is-remote" v-if="user.host != null"><fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}<a :href="user.url || user.uri" target="_blank">{{ $t('@.view-on-remote') }}</a></div>
 		<main>
 			<div class="main">

src/client/app/dev/script.ts

@@ -18,7 +18,7 @@ import Apps from './views/apps.vue';
 import AppNew from './views/new-app.vue';
 import App from './views/app.vue';
 import ui from './views/ui.vue';
-import NotFound from '../common/views/pages/404.vue';
+import NotFound from '../common/views/pages/not-found.vue';
 
 Vue.use(BootstrapVue);
 

src/client/app/init.ts

@@ -413,6 +413,15 @@ export default (callback: (launch: (router: VueRouter) => [Vue, MiOS]) => void,
 			});
 			//#endregion
 
+			//#region line width
+			document.documentElement.style.setProperty('--lineWidth', `${os.store.state.device.lineWidth}px`);
+			os.store.watch(s => {
+				return s.device.lineWidth;
+			}, v => {
+				document.documentElement.style.setProperty('--lineWidth', `${os.store.state.device.lineWidth}px`);
+			});
+			//#endregion
+
 			// Navigation hook
 			router.beforeEach((to, from, next) => {
 				next(os.store.state.navHook && os.store.state.navHook(to) ? false : undefined);

src/client/app/mobile/script.ts

@@ -31,7 +31,7 @@ import MkReversi from './views/pages/games/reversi.vue';
 import MkTag from './views/pages/tag.vue';
 import MkShare from './views/pages/share.vue';
 import MkFollow from '../common/views/pages/follow.vue';
-import MkNotFound from '../common/views/pages/404.vue';
+import MkNotFound from '../common/views/pages/not-found.vue';
 
 import PostForm from './views/components/post-form-dialog.vue';
 import FileChooser from './views/components/drive-file-chooser.vue';
@@ -60,6 +60,7 @@ init((launch) => {
 
 				const vm = this.$root.new(PostForm, {
 					reply: o.reply,
+					mention: o.mention,
 					renote: o.renote
 				});
 

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

@@ -54,8 +54,7 @@
 			<span class="visibility" v-if="appearNote.visibility != 'public'">
 				<fa v-if="appearNote.visibility == 'home'" icon="home"/>
 				<fa v-if="appearNote.visibility == 'followers'" icon="unlock"/>
-				<fa v-if="appearNote.visibility == 'specified'" icon="envelope"/>
-				<fa v-if="appearNote.visibility == 'private'" icon="lock"/>
+				<fa v-if="appearNote.visibility == 'specified'" icon="lock"/>
 			</span>
 			<span class="localOnly" v-if="appearNote.localOnly == true"><fa icon="heart"/></span>
 		</div>
@@ -67,13 +66,16 @@
 				<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
 			</button>
 			<button v-if="['public', 'home'].includes(appearNote.visibility)" @click="renote()" title="Renote">
-				<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount > 0">{{ appearNote.renoteCount }}</p>
+				<fa icon="retweet"/>
 			</button>
 			<button v-else>
 				<fa icon="ban"/>
 			</button>
-			<button :class="{ reacted: appearNote.myReaction != null }" @click="react()" ref="reactButton" :title="$t('title')">
-				<fa icon="plus"/><p class="count" v-if="appearNote.reactions_count > 0">{{ appearNote.reactions_count }}</p>
+			<button v-if="!isMyNote && appearNote.myReaction == null" class="reactionButton" @click="react()" ref="reactButton">
+				<fa icon="plus"/>
+			</button>
+			<button v-if="!isMyNote && appearNote.myReaction != null" class="reactionButton reacted" @click="undoReact(appearNote)" ref="reactButton">
+				<fa icon="minus"/>
 			</button>
 			<button @click="menu()" ref="menuButton">
 				<fa icon="ellipsis-h"/>
@@ -328,7 +330,8 @@ export default Vue.extend({
 				> .count
 					display inline
 					margin 0 0 0 8px
-					color #999
+					color var(--text)
+					opacity 0.7
 
 				&.reacted
 					color var(--primary)

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

@@ -44,13 +44,16 @@
 					<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
 				</button>
 				<button v-if="['public', 'home'].includes(appearNote.visibility)" @click="renote()" title="Renote">
-					<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount > 0">{{ appearNote.renoteCount }}</p>
+					<fa icon="retweet"/>
 				</button>
 				<button v-else>
 					<fa icon="ban"/>
 				</button>
-				<button :class="{ reacted: appearNote.myReaction != null }" @click="react()" ref="reactButton">
-					<fa icon="plus"/><p class="count" v-if="appearNote.reactions_count > 0">{{ appearNote.reactions_count }}</p>
+				<button v-if="!isMyNote && appearNote.myReaction == null" class="reactionButton" @click="react()" ref="reactButton">
+					<fa icon="plus"/>
+				</button>
+				<button v-if="!isMyNote && appearNote.myReaction != null" class="reactionButton reacted" @click="undoReact(appearNote)" ref="reactButton">
+					<fa icon="minus"/>
 				</button>
 				<button class="menu" @click="menu()" ref="menuButton">
 					<fa icon="ellipsis-h"/>
@@ -95,7 +98,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .note
 	font-size 12px
-	border-bottom solid 1px var(--faceDivider)
+	border-bottom solid var(--lineWidth) var(--faceDivider)
 
 	&:focus
 		z-index 1
@@ -228,7 +231,7 @@ export default Vue.extend({
 
 						> *
 							padding 16px
-							border dashed 1px var(--quoteBorder)
+							border dashed var(--lineWidth) var(--quoteBorder)
 							border-radius 8px
 
 				> .app
@@ -255,7 +258,8 @@ export default Vue.extend({
 					> .count
 						display inline
 						margin 0 0 0 8px
-						color #999
+						color var(--text)
+						opacity 0.7
 
 					&.reacted
 						color var(--primary)

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

@@ -210,7 +210,7 @@ export default Vue.extend({
 			font-size 0.9em
 			color var(--dateDividerFg)
 			background var(--dateDividerBg)
-			border-bottom solid 1px var(--faceDivider)
+			border-bottom solid var(--lineWidth) var(--faceDivider)
 
 			span
 				margin 0 16px
@@ -240,7 +240,7 @@ export default Vue.extend({
 
 	> footer
 		text-align center
-		border-top solid 1px var(--faceDivider)
+		border-top solid var(--lineWidth) var(--faceDivider)
 
 		&:empty
 			display none

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

@@ -152,7 +152,7 @@ export default Vue.extend({
 	> .notifications
 
 		> .mk-notification:not(:last-child)
-			border-bottom solid 1px var(--faceDivider)
+			border-bottom solid var(--lineWidth) var(--faceDivider)
 
 		> .date
 			display block
@@ -162,7 +162,7 @@ export default Vue.extend({
 			font-size 0.8em
 			color var(--dateDividerFg)
 			background var(--dateDividerBg)
-			border-bottom solid 1px var(--faceDivider)
+			border-bottom solid var(--lineWidth) var(--faceDivider)
 
 			span
 				margin 0 16px
@@ -175,7 +175,7 @@ export default Vue.extend({
 		width 100%
 		padding 16px
 		color var(--text)
-		border-top solid 1px rgba(#000, 0.05)
+		border-top solid var(--lineWidth) rgba(#000, 0.05)
 
 		> [data-icon]
 			margin-right 4px

src/client/app/mobile/views/components/post-form-dialog.vue

@@ -5,6 +5,7 @@
 		<mk-post-form ref="form"
 			:reply="reply"
 			:renote="renote"
+			:mention="mention"
 			:initial-text="initialText"
 			:instant="instant"
 			@posted="onPosted"
@@ -27,6 +28,10 @@ export default Vue.extend({
 			type: Object,
 			required: false
 		},
+		mention: {
+			type: Object,
+			required: false
+		},
 		initialText: {
 			type: String,
 			required: false

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

@@ -41,8 +41,7 @@
 					<span v-if="visibility === 'public'"><fa icon="globe"/></span>
 					<span v-if="visibility === 'home'"><fa icon="home"/></span>
 					<span v-if="visibility === 'followers'"><fa icon="unlock"/></span>
-					<span v-if="visibility === 'specified'"><fa icon="envelope"/></span>
-					<span v-if="visibility === 'private'"><fa icon="lock"/></span>
+					<span v-if="visibility === 'specified'"><fa icon="lock"/></span>
 				</button>
 			</footer>
 			<input ref="file" class="file" type="file" multiple="multiple" @change="onChangeFile"/>
@@ -84,6 +83,10 @@ export default Vue.extend({
 			type: Object,
 			required: false
 		},
+		mention: {
+			type: Object,
+			required: false
+		},
 		initialText: {
 			type: String,
 			required: false
@@ -172,6 +175,11 @@ export default Vue.extend({
 			this.text = `@${this.reply.user.username}@${toASCII(this.reply.user.host)} `;
 		}
 
+		if (this.mention) {
+			this.text = this.mention.host ? `@${this.mention.username}@${toASCII(this.mention.host)}` : `@${this.mention.username}`;
+			this.text += ' ';
+		}
+
 		if (this.reply && this.reply.text != null) {
 			const ast = parse(this.reply.text);
 
@@ -193,7 +201,7 @@ export default Vue.extend({
 		this.applyVisibility(this.$store.state.settings.rememberNoteVisibility ? (this.$store.state.device.visibility || this.$store.state.settings.defaultNoteVisibility) : this.$store.state.settings.defaultNoteVisibility);
 
 		// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
-		if (this.reply && ['home', 'followers', 'specified', 'private'].includes(this.reply.visibility)) {
+		if (this.reply && ['home', 'followers', 'specified'].includes(this.reply.visibility)) {
 			this.visibility = this.reply.visibility;
 		}
 
@@ -293,7 +301,7 @@ export default Vue.extend({
 		setVisibility() {
 			const w = this.$root.new(MkVisibilityChooser, {
 				source: this.$refs.visibilityButton,
-				compact: true
+				currentVisibility: this.visibility
 			});
 			w.$once('chosen', v => {
 				this.applyVisibility(v);

src/client/app/mobile/views/components/ui.header.vue

@@ -79,8 +79,10 @@ export default Vue.extend({
 
 	position fixed
 	top 0
+	left -8px
 	z-index 1024
-	width 100%
+	width calc(100% + 16px)
+	padding 0 8px
 	box-shadow 0 0px 8px rgba(0, 0, 0, 0.25)
 
 	&, *
@@ -157,7 +159,7 @@ export default Vue.extend({
 				left 8px
 				pointer-events none
 				font-size 10px
-				color var(--primary)
+				color var(--notificationIndicator)
 
 			> button:last-child
 				display block

src/client/app/mobile/views/components/ui.nav.vue

@@ -104,7 +104,7 @@ export default Vue.extend({
 			}).then(async ({ canceled, result: query }) => {
 				if (canceled) return;
 
-				const q = this.q.trim();
+				const q = query.trim();
 				if (q.startsWith('@')) {
 					this.$router.push(`/${q}`);
 				} else if (q.startsWith('#')) {
@@ -238,7 +238,7 @@ export default Vue.extend({
 				> i.circle
 					margin-left 6px
 					font-size 10px
-					color var(--primary)
+					color var(--notificationIndicator)
 
 				> i:last-child
 					position absolute

src/client/app/mobile/views/pages/home.vue

@@ -225,7 +225,7 @@ main
 					> .badge
 						margin-left 6px
 						font-size 10px
-						color var(--primary)
+						color var(--notificationIndicator)
 
 	> .tl
 		max-width 680px
@@ -248,7 +248,7 @@ main
 .badge
 	margin-left 6px
 	font-size 10px
-	color var(--primary)
+	color var(--notificationIndicator)
 	vertical-align middle
 
 </style>

src/client/app/mobile/views/pages/notifications.vue

@@ -41,8 +41,6 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-
-
 main
 	width 100%
 	max-width 680px

src/client/app/mobile/views/pages/settings.vue

@@ -7,12 +7,7 @@
 		<div>
 			<x-profile-editor/>
 
-			<ui-card>
-				<div slot="title"><fa icon="palette"/> {{ $t('theme') }}</div>
-				<section>
-					<x-theme/>
-				</section>
-			</ui-card>
+			<x-theme/>
 
 			<ui-card>
 				<div slot="title"><fa icon="poll-h"/> {{ $t('design') }}</div>
@@ -20,6 +15,12 @@
 				<section>
 					<ui-switch v-model="darkmode">{{ $t('dark-mode') }}</ui-switch>
 					<ui-switch v-model="circleIcons">{{ $t('circle-icons') }}</ui-switch>
+					<section>
+						<header>{{ $t('@.line-width') }}</header>
+						<ui-radio v-model="lineWidth" :value="0.5">{{ $t('@.line-width-thin') }}</ui-radio>
+						<ui-radio v-model="lineWidth" :value="1">{{ $t('@.line-width-normal') }}</ui-radio>
+						<ui-radio v-model="lineWidth" :value="2">{{ $t('@.line-width-thick') }}</ui-radio>
+					</section>
 					<ui-switch v-model="reduceMotion">{{ $t('@.reduce-motion') }} ({{ $t('@.this-setting-is-this-device-only') }})</ui-switch>
 					<ui-switch v-model="contrastedAcct">{{ $t('contrasted-acct') }}</ui-switch>
 					<ui-switch v-model="showFullAcct">{{ $t('@.show-full-acct') }}</ui-switch>
@@ -33,7 +34,7 @@
 
 				<section>
 					<ui-switch v-model="games_reversi_showBoardLabels">{{ $t('@.show-reversi-board-labels') }}</ui-switch>
-					<ui-switch v-model="games_reversi_useWhiteBlackStones">{{ $t('@.use-white-black-reversi-stones') }}</ui-switch>
+					<ui-switch v-model="games_reversi_useAvatarStones">{{ $t('@.use-avatar-reversi-stones') }}</ui-switch>
 				</section>
 
 				<section>
@@ -80,7 +81,6 @@
 							<option value="home">{{ $t('@.note-visibility.home') }}</option>
 							<option value="followers">{{ $t('@.note-visibility.followers') }}</option>
 							<option value="specified">{{ $t('@.note-visibility.specified') }}</option>
-							<option value="private">{{ $t('@.note-visibility.private') }}</option>
 							<option value="local-public">{{ $t('@.note-visibility.local-public') }}</option>
 							<option value="local-home">{{ $t('@.note-visibility.local-home') }}</option>
 							<option value="local-followers">{{ $t('@.note-visibility.local-followers') }}</option>
@@ -94,6 +94,8 @@
 				</section>
 			</ui-card>
 
+			<x-notification-settings/>
+
 			<x-drive-settings/>
 
 			<x-mute-and-block/>
@@ -157,6 +159,7 @@ import XProfileEditor from '../../../common/views/components/profile-editor.vue'
 import XApiSettings from '../../../common/views/components/api-settings.vue';
 import XLanguageSettings from '../../../common/views/components/language-settings.vue';
 import XIntegrationSettings from '../../../common/views/components/integration-settings.vue';
+import XNotificationSettings from '../../../common/views/components/notification-settings.vue';
 
 export default Vue.extend({
 	i18n: i18n('mobile/views/pages/settings.vue'),
@@ -170,6 +173,7 @@ export default Vue.extend({
 		XApiSettings,
 		XLanguageSettings,
 		XIntegrationSettings,
+		XNotificationSettings,
 	},
 
 	data() {
@@ -262,6 +266,11 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'circleIcons', value }); }
 		},
 
+		lineWidth: {
+			get() { return this.$store.state.device.lineWidth; },
+			set(value) { this.$store.commit('device/set', { key: 'lineWidth', value }); }
+		},
+
 		contrastedAcct: {
 			get() { return this.$store.state.settings.contrastedAcct; },
 			set(value) { this.$store.dispatch('settings/set', { key: 'contrastedAcct', value }); }
@@ -287,9 +296,9 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.showBoardLabels', value }); }
 		},
 
-		games_reversi_useWhiteBlackStones: {
-			get() { return this.$store.state.settings.games.reversi.useWhiteBlackStones; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useWhiteBlackStones', value }); }
+		games_reversi_useAvatarStones: {
+			get() { return this.$store.state.settings.games.reversi.useAvatarStones; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useAvatarStones', value }); }
 		},
 
 		disableAnimatedMfm: {

src/client/app/mobile/views/pages/user.vue

@@ -4,7 +4,7 @@
 		<mk-user-name :user="user"/>
 	</template>
 	<main v-if="!fetching">
-		<div class="is-suspended" v-if="user.isSuspended"><p><fa icon="exclamation-triangle"/> {{ $t('is-suspended') }}</p></div>
+		<div class="is-suspended" v-if="user.isSuspended"><p><fa icon="exclamation-triangle"/> {{ $t('@.user-suspended') }}</p></div>
 		<div class="is-remote" v-if="user.host != null"><p><fa icon="exclamation-triangle"/> {{ $t('@.is-remote-user') }}<a :href="user.url || user.uri" target="_blank">{{ $t('@.view-on-remote') }}</a></p></div>
 		<header>
 			<div class="banner" :style="style"></div>
@@ -55,6 +55,7 @@
 						<b>{{ user.followersCount | number }}</b>
 						<i>{{ $t('followers') }}</i>
 					</a>
+					<button @click="mention"><fa icon="at"/></button>
 				</div>
 			</div>
 		</header>
@@ -126,6 +127,10 @@ export default Vue.extend({
 			});
 		},
 
+		mention() {
+			this.$post({ mention: this.user });
+		},
+
 		menu() {
 			let menu = [{
 				icon: ['fas', 'list'],
@@ -203,7 +208,6 @@ export default Vue.extend({
 
 			this.$root.new(Menu, {
 				source: this.$refs.menu,
-				compact: true,
 				items: menu
 			});
 		},
@@ -365,6 +369,9 @@ main
 					> i
 						font-size 14px
 
+				> button
+					color var(--text)
+
 	> nav
 		position -webkit-sticky
 		position sticky

src/client/app/store.ts

@@ -40,7 +40,7 @@ const defaultSettings = {
 	games: {
 		reversi: {
 			showBoardLabels: false,
-			useWhiteBlackStones: false,
+			useAvatarStones: true,
 		}
 	}
 };
@@ -52,6 +52,7 @@ const defaultDeviceSettings = {
 	darkmode: false,
 	darkTheme: 'dark',
 	lightTheme: 'light',
+	lineWidth: 1,
 	themes: [],
 	enableSounds: true,
 	soundVolume: 0.5,

src/client/app/test/script.ts

@@ -5,7 +5,7 @@ import './style.styl';
 
 import init from '../init';
 import Index from './views/index.vue';
-import NotFound from '../common/views/pages/404.vue';
+import NotFound from '../common/views/pages/not-found.vue';
 
 init(launch => {
 	document.title = 'Misskey';

src/client/app/theme.ts

@@ -15,13 +15,27 @@ export const darkTheme: Theme = require('../theme/dark.json5');
 export const pinkTheme: Theme = require('../theme/pink.json5');
 export const blackTheme: Theme = require('../theme/black.json5');
 export const halloweenTheme: Theme = require('../theme/halloween.json5');
+export const cafeTheme: Theme = require('../theme/cafe.json5');
+export const japaneseSushiSetTheme: Theme = require('../theme/japanese-sushi-set.json5');
+export const gruvboxDarkTheme: Theme = require('../theme/gruvbox-dark.json5');
+export const monokaiTheme: Theme = require('../theme/monokai.json5');
+export const colorfulTheme: Theme = require('../theme/colorful.json5');
+export const naturalTheme: Theme = require('../theme/natural.json5');
+export const mauveTheme: Theme = require('../theme/mauve.json5');
 
 export const builtinThemes = [
 	lightTheme,
 	darkTheme,
 	pinkTheme,
 	blackTheme,
-	halloweenTheme
+	halloweenTheme,
+	cafeTheme,
+	japaneseSushiSetTheme,
+	gruvboxDarkTheme,
+	monokaiTheme,
+	colorfulTheme,
+	naturalTheme,
+	mauveTheme,
 ];
 
 export function applyTheme(theme: Theme, persisted = true) {
@@ -85,12 +99,12 @@ function compile(theme: Theme): { [key: string]: string } {
 		props['primaryAlpha0' + i] = genValue(color);
 	}
 
-	for (let i = 1; i < 100; i++) {
+	for (let i = 5; i < 100; i += 5) {
 		const color = primary.clone().lighten(i);
 		props['primaryLighten' + i] = genValue(color);
 	}
 
-	for (let i = 1; i < 100; i++) {
+	for (let i = 5; i < 100; i += 5) {
 		const color = primary.clone().darken(i);
 		props['primaryDarken' + i] = genValue(color);
 	}

src/client/style.styl

@@ -22,7 +22,7 @@ html, body
 
 a
 	text-decoration none
-	color var(--primary)
+	color var(--link)
 	cursor pointer
 
 	&:hover
@@ -33,7 +33,7 @@ a
 
 @css {
 	a {
-		tap-highlight-color: var(--primaryAlpha07) !important;
-		-webkit-tap-highlight-color: var(--primaryAlpha07) !important;
+		tap-highlight-color: var(--linkTapHighlight) !important;
+		-webkit-tap-highlight-color: var(--linkTapHighlight) !important;
 	}
 }

src/client/theme/cafe.json5

@@ -0,0 +1,20 @@
+{
+	id: '0ff48d43-aab3-46e7-ab12-8492110d2e2b',
+
+	name: 'Cafe',
+	author: 'syuilo',
+
+	base: 'light',
+
+	vars: {
+		primary: 'rgb(234, 154, 82)',
+		secondary: 'rgb(238, 236, 232)',
+		text: 'rgb(149, 143, 139)',
+	},
+
+	props: {
+		renoteGradient: '#ffe1c7',
+		renoteText: '$primary',
+		quoteBorder: '$primary',
+	},
+}

src/client/theme/colorful.json5

@@ -0,0 +1,23 @@
+{
+	id: '2d066d6e-bd39-4f23-bd48-686d5c1c6ae8',
+
+	name: 'Colorful',
+	author: 'syuilo',
+
+	base: 'light',
+
+	vars: {
+		primary: 'rgb(255, 153, 64)',
+		secondary: 'rgb(255, 255, 255)',
+		text: 'rgb(108, 118, 128)',
+	},
+
+	props: {
+		bg: 'rgb(250, 250, 250)',
+		mfmMention: '#f07171',
+		mfmMentionForeground: '#fff',
+		mfmUrl: '#86b300',
+		mfmLink: '#399ee6',
+		mfmHashtag: '#fa8d3e'
+	},
+}

src/client/theme/dark.json5

@@ -24,6 +24,15 @@
 		scrollbarHandle: ':lighten<5<$secondary',
 		scrollbarHandleHover: ':lighten<10<$secondary',
 
+		link: '$primary',
+		linkTapHighlight: ':alpha<0.7<@link',
+
+		notificationIndicator: '$primary',
+
+		switchActive: '$primary',
+		switchActiveTrack: ':alpha<0.4<@switchActive',
+		radioActive: '$primary',
+
 		face: '$secondary',
 		faceText: '#fff',
 		faceHeader: ':lighten<5<$secondary',
@@ -120,8 +129,10 @@
 		mfmTitleBg: 'rgba(0, 0, 0, 0.2)',
 		mfmQuote: ':alpha<0.7<$text',
 		mfmQuoteLine: ':alpha<0.6<$text',
-		mfmLink: '$primary',
+		mfmUrl: '$primary',
+		mfmLink: '@mfmUrl',
 		mfmMention: '$primary',
+		mfmMentionForeground: '@primaryForeground',
 		mfmHashtag: '$primary',
 
 		suspendedInfoBg: '#611d1d',

src/client/theme/gruvbox-dark.json5

@@ -0,0 +1,29 @@
+{
+	id: '0c6e70e2-a1ec-4053-9b1a-b6082fe016cb',
+
+	name: 'Gruvbox Dark',
+	author: 'syuilo',
+
+	base: 'dark',
+
+	vars: {
+		primary: 'rgb(215, 153, 33)',
+		secondary: 'rgb(40, 40, 40)',
+		text: 'rgb(235, 219, 178)',
+	},
+
+	props: {
+		renoteGradient: '#58581e',
+		renoteText: 'rgb(169, 174, 36)',
+		quoteBorder: 'rgb(169, 174, 36)',
+		mfmMention: 'rgb(177, 98, 134)',
+		mfmMentionForeground: '#fff',
+		mfmUrl: 'rgb(69, 133, 136)',
+		mfmLink: 'rgb(104, 157, 106)',
+		mfmHashtag: 'rgb(251, 73, 52)',
+		notificationIndicator: 'rgb(184, 187, 38)',
+		switchActive: 'rgb(254, 128, 25)',
+		radioActive: 'rgb(131, 165, 152)',
+		link: 'rgb(104, 157, 106)',
+	},
+}

src/client/theme/japanese-sushi-set.json5

@@ -0,0 +1,20 @@
+{
+	id: '2b0a0654-cdb4-4c9a-8244-736b647d3c2a',
+
+	name: 'Japanese Sushi Set',
+	author: 'noizenecio & syuilo',
+
+	base: 'dark',
+
+	vars: {
+		primary: 'rgb(234, 136, 50)',
+		secondary: 'rgb(34, 36, 42)',
+		text: 'rgb(221, 209, 203)',
+	},
+
+	props: {
+		renoteGradient: '#6d3d14',
+		renoteText: '$primary',
+		quoteBorder: '$primary',
+	},
+}

src/client/theme/light.json5

@@ -24,6 +24,15 @@
 		scrollbarHandle: '#00000033',
 		scrollbarHandleHover: '#00000066',
 
+		link: '$primary',
+		linkTapHighlight: ':alpha<0.7<@link',
+
+		notificationIndicator: '$primary',
+
+		switchActive: '$primary',
+		switchActiveTrack: ':alpha<0.4<@switchActive',
+		radioActive: '$primary',
+
 		face: '$secondary',
 		faceText: '$text',
 		faceHeader: ':lighten<5<$secondary',
@@ -120,8 +129,10 @@
 		mfmTitleBg: 'rgba(0, 0, 0, 0.07)',
 		mfmQuote: ':alpha<0.6<$text',
 		mfmQuoteLine: ':alpha<0.5<$text',
-		mfmLink: '$primary',
+		mfmUrl: '$primary',
+		mfmLink: '@mfmUrl',
 		mfmMention: '$primary',
+		mfmMentionForeground: '@primaryForeground',
 		mfmHashtag: '$primary',
 
 		suspendedInfoBg: '#ffdbdb',
@@ -212,7 +223,7 @@
 		reversiGameHeaderLine: '#c4cdd4',
 		reversiGameEmptyCell: 'rgba(0, 0, 0, 0.06)',
 		reversiGameEmptyCellMyTurn: 'rgba(0, 0, 0, 0.12)',
-		reversiGameEmptyCellCanPut: 'rgba(0, 0, 0, 0.9)',
+		reversiGameEmptyCellCanPut: 'rgba(0, 0, 0, 0.09)',
 
 		adminDashboardHeaderFg: ':alpha<0.9<$text',
 		adminDashboardHeaderBorder: 'rgba(0, 0, 0, 0.1)',